diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 522c4feaf43..83de679e188 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.49 2009/09/06 10:46:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.50 2009/11/30 23:45:35 edd Exp $ COMMENT= Data Display Debugger, graphical front-end for GDB, etc -DISTNAME= ddd-3.3.11 -PKGNAME= ${DISTNAME}p4 +DISTNAME= ddd-3.3.12 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=ddd/} @@ -27,7 +26,7 @@ USE_MOTIF= any USE_GMAKE= Yes USE_LIBTOOL= Yes USE_X11= Yes -CONFIGURE_STYLE=gnu autoconf no-autoheader +CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ CXXFLAGS="${CXXFLAGS}" @@ -37,20 +36,17 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" LIB_DEPENDS+= elf::devel/libelf .endif -AUTOCONF_VERSION=2.59 SEPARATE_BUILD= simple CONFIGURE_ARGS= --with-readline-libraries=/usr/lib MAKE_FLAGS= MAINTAINER="'${MAINTAINER}'" -DOCS= ddd-paper.ps ddd-themes.pdf ddd-themes.ps ddd.pdf ddd.ps html/ddd.html - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ddd - cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/ddd - @${GZIP_CMD} ${PREFIX}/share/doc/ddd/ddd-paper.ps - @${GZIP_CMD} ${PREFIX}/share/doc/ddd/ddd-themes.ps - @${GZIP_CMD} ${PREFIX}/share/doc/ddd/ddd.ps + ${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${PREFIX}/share/doc/ddd + ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${PREFIX}/share/doc/ddd + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ddd/html + ${INSTALL_DATA} ${WRKSRC}/doc/html/* ${PREFIX}/share/doc/ddd/html .include diff --git a/devel/ddd/distinfo b/devel/ddd/distinfo index 3e31f2b64d5..841e31166f7 100644 --- a/devel/ddd/distinfo +++ b/devel/ddd/distinfo @@ -1,5 +1,5 @@ -MD5 (ddd-3.3.11.tar.gz) = 8ZQ36/218mZ9beMPcA3TGQ== -RMD160 (ddd-3.3.11.tar.gz) = 2dcFpJQ3P2Wdk2zvEVrQryN5c4k= -SHA1 (ddd-3.3.11.tar.gz) = wwLDe9zMqtIuI1F39ZYt7EJLHeM= -SHA256 (ddd-3.3.11.tar.gz) = pVXXbh1NX6CSsZD/uZzd6IgBMcBj5LU0Nd86Ai7U09o= -SIZE (ddd-3.3.11.tar.gz) = 7564005 +MD5 (ddd-3.3.12.tar.gz) = xQOW23usOGKm0lVbOyLDTg== +RMD160 (ddd-3.3.12.tar.gz) = /McbK1f016LBesgXc5Z0yJ4d16A= +SHA1 (ddd-3.3.12.tar.gz) = uR0t+xFFr0CROL00UXqJg0FyTlY= +SHA256 (ddd-3.3.12.tar.gz) = OtbNZ9f0sday04U3JhVkoNJqrtB3vyXFHvwUdNDotlw= +SIZE (ddd-3.3.12.tar.gz) = 5687115 diff --git a/devel/ddd/patches/patch-Makefile_in b/devel/ddd/patches/patch-Makefile_in index 8ee7945ba61..e0ad12dabe0 100644 --- a/devel/ddd/patches/patch-Makefile_in +++ b/devel/ddd/patches/patch-Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2003/10/26 17:30:40 sturm Exp $ ---- Makefile.in.orig 2003-06-03 21:35:10.000000000 +1000 -+++ Makefile.in 2003-10-10 12:46:52.000000000 +1000 -@@ -220,7 +220,7 @@ TEXINFO_DISTFILES = \ +$OpenBSD: patch-Makefile_in,v 1.3 2009/11/30 23:45:35 edd Exp $ +--- Makefile.in.orig Wed Feb 11 17:25:55 2009 ++++ Makefile.in Mon Sep 28 09:40:49 2009 +@@ -307,7 +307,7 @@ TEXINFO_DISTFILES = \ # Shared data installation -dddrootdir = $(pkgdatadir)-$(VERSION) +dddrootdir = $(pkgdatadir) - # ----------------------------------------------------------------------------- + # Data. diff --git a/devel/ddd/patches/patch-ddd_Command_C b/devel/ddd/patches/patch-ddd_Command_C new file mode 100644 index 00000000000..04042a9b57d --- /dev/null +++ b/devel/ddd/patches/patch-ddd_Command_C @@ -0,0 +1,15 @@ +$OpenBSD: patch-ddd_Command_C,v 1.1 2009/11/30 23:45:35 edd Exp $ + +fixes things on amd64; from pkgsrc. + +--- ddd/Command.C.orig Wed Feb 11 17:25:07 2009 ++++ ddd/Command.C Mon Nov 30 22:39:56 2009 +@@ -188,6 +188,8 @@ void translate_command(string& command) + case GDB: + case MAKE: + break; ++ default: ++ break; + } + + // When recording, realize certain commands as auto commands. diff --git a/devel/ddd/patches/patch-ddd_Makefile_in b/devel/ddd/patches/patch-ddd_Makefile_in index f1c91182b66..190105e2c24 100644 --- a/devel/ddd/patches/patch-ddd_Makefile_in +++ b/devel/ddd/patches/patch-ddd_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-ddd_Makefile_in,v 1.5 2005/06/28 19:31:57 aanriot Exp $ ---- ddd/Makefile.in.orig Sat Jun 11 21:14:20 2005 -+++ ddd/Makefile.in Sat Jun 11 21:15:42 2005 -@@ -484,8 +484,8 @@ SUFFIXES = .C .c .Y .L .txt .xbm .xbmxx +$OpenBSD: patch-ddd_Makefile_in,v 1.6 2009/11/30 23:45:35 edd Exp $ +--- ddd/Makefile.in.orig Wed Feb 11 17:25:55 2009 ++++ ddd/Makefile.in Mon Sep 28 09:40:49 2009 +@@ -499,8 +499,8 @@ SUFFIXES = .C .c .Y .L .txt .xbm .xbmxx .xpm .xpmxx \ # Shared data installation @@ -12,7 +12,7 @@ $OpenBSD: patch-ddd_Makefile_in,v 1.5 2005/06/28 19:31:57 aanriot Exp $ # ----------------------------------------------------------------------------- # DDD Sources. -@@ -2595,18 +2595,8 @@ configinfo.C: USERINFO.txt $(srcdir)/con +@@ -2718,18 +2718,8 @@ configinfo.C: USERINFO.txt $(srcdir)/config-info $(SHELL) $(srcdir)/config-info $(srcdir)/USERINFO.txt USERINFO.txt > $@~ && \ $(MV) $@~ $@ diff --git a/devel/ddd/patches/patch-ddd_comm-manag_C b/devel/ddd/patches/patch-ddd_comm-manag_C index 04c29067994..8a0288c5721 100644 --- a/devel/ddd/patches/patch-ddd_comm-manag_C +++ b/devel/ddd/patches/patch-ddd_comm-manag_C @@ -1,7 +1,7 @@ -$OpenBSD: patch-ddd_comm-manag_C,v 1.5 2003/10/26 17:30:40 sturm Exp $ ---- ddd/comm-manag.C.orig 2003-05-25 01:27:06.000000000 +1000 -+++ ddd/comm-manag.C 2003-10-10 12:55:05.000000000 +1000 -@@ -86,6 +86,7 @@ char comm_manager_rcsid[] = +$OpenBSD: patch-ddd_comm-manag_C,v 1.6 2009/11/30 23:45:35 edd Exp $ +--- ddd/comm-manag.C.orig Wed Feb 11 17:25:07 2009 ++++ ddd/comm-manag.C Mon Sep 28 09:40:49 2009 +@@ -82,6 +82,7 @@ char comm_manager_rcsid[] = #include #include diff --git a/devel/ddd/patches/patch-ddd_show_C b/devel/ddd/patches/patch-ddd_show_C index 1fdd89b7ea7..57a20ac93dd 100644 --- a/devel/ddd/patches/patch-ddd_show_C +++ b/devel/ddd/patches/patch-ddd_show_C @@ -1,7 +1,7 @@ -$OpenBSD: patch-ddd_show_C,v 1.4 2003/10/26 17:30:40 sturm Exp $ ---- ddd/show.C.orig 2003-05-25 01:27:12.000000000 +1000 -+++ ddd/show.C 2003-10-10 12:31:23.000000000 +1000 -@@ -60,6 +60,7 @@ char show_rcsid[] = +$OpenBSD: patch-ddd_show_C,v 1.5 2009/11/30 23:45:35 edd Exp $ +--- ddd/show.C.orig Wed Feb 11 17:25:07 2009 ++++ ddd/show.C Mon Sep 28 09:40:49 2009 +@@ -56,6 +56,7 @@ char show_rcsid[] = #include #include #include diff --git a/devel/ddd/patches/patch-themes_Makefile_in b/devel/ddd/patches/patch-themes_Makefile_in index c7522bf3512..34e86bcd87d 100644 --- a/devel/ddd/patches/patch-themes_Makefile_in +++ b/devel/ddd/patches/patch-themes_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-themes_Makefile_in,v 1.2 2003/10/26 17:30:40 sturm Exp $ ---- themes/Makefile.in.orig 2003-06-03 21:37:09.000000000 +1000 -+++ themes/Makefile.in 2003-10-10 12:47:33.000000000 +1000 -@@ -199,7 +199,7 @@ ddd = @ddd@ - install_sh = @install_sh@ +$OpenBSD: patch-themes_Makefile_in,v 1.3 2009/11/30 23:45:35 edd Exp $ +--- themes/Makefile.in.orig Wed Feb 11 17:25:55 2009 ++++ themes/Makefile.in Mon Sep 28 09:40:50 2009 +@@ -270,7 +270,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ # Shared data installation -dddrootdir = $(pkgdatadir)-@VERSION@ +dddrootdir = $(pkgdatadir) - # ----------------------------------------------------------------------------- + # DDD themes. diff --git a/devel/ddd/patches/patch-vsllib_Makefile_in b/devel/ddd/patches/patch-vsllib_Makefile_in index 5ac6bbb6877..d3218000cd7 100644 --- a/devel/ddd/patches/patch-vsllib_Makefile_in +++ b/devel/ddd/patches/patch-vsllib_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-vsllib_Makefile_in,v 1.2 2003/10/26 17:30:40 sturm Exp $ ---- vsllib/Makefile.in.orig 2003-06-03 21:37:15.000000000 +1000 -+++ vsllib/Makefile.in 2003-10-10 12:47:55.000000000 +1000 -@@ -199,7 +199,7 @@ ddd = @ddd@ - install_sh = @install_sh@ +$OpenBSD: patch-vsllib_Makefile_in,v 1.3 2009/11/30 23:45:35 edd Exp $ +--- vsllib/Makefile.in.orig Wed Feb 11 17:25:55 2009 ++++ vsllib/Makefile.in Mon Nov 30 22:39:47 2009 +@@ -270,7 +270,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ # Shared data installation -dddrootdir = $(pkgdatadir)-@VERSION@ +dddrootdir = $(pkgdatadir) - # ----------------------------------------------------------------------------- + # VSL files. diff --git a/devel/ddd/pkg/PLIST b/devel/ddd/pkg/PLIST index 064fde7b6a2..3d2e07ab915 100644 --- a/devel/ddd/pkg/PLIST +++ b/devel/ddd/pkg/PLIST @@ -1,8 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.12 2008/10/22 17:04:14 landry Exp $ +@comment $OpenBSD: PLIST,v 1.13 2009/11/30 23:45:35 edd Exp $ @bin bin/ddd @info info/ddd-themes.info @info info/ddd.info @man man/man1/ddd.1 +share/applications/ +share/applications/ddd.desktop share/ddd/ share/ddd/COPYING share/ddd/NEWS @@ -16,6 +18,7 @@ share/ddd/themes/smalltitles.vsl share/ddd/themes/smallvalues.vsl share/ddd/themes/suppress.vsl share/ddd/themes/tinyvalues.vsl +share/ddd/themes/x86.vsl share/ddd/vsllib/ share/ddd/vsllib/arcs.vsl share/ddd/vsllib/builtin.vsl @@ -38,9 +41,8 @@ share/ddd/vsllib/vsl.vsl share/ddd/vsllib/vsldef.vsl share/ddd/vsllib/vsllib.vsl share/doc/ddd/ -share/doc/ddd/ddd-paper.ps.gz +share/doc/ddd/ddd-paper.ps share/doc/ddd/ddd-themes.pdf -share/doc/ddd/ddd-themes.ps.gz -share/doc/ddd/ddd.html share/doc/ddd/ddd.pdf -share/doc/ddd/ddd.ps.gz +share/doc/ddd/html/ +share/doc/ddd/html/ddd.html