aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--devel/ddd/Makefile21
-rw-r--r--devel/ddd/distinfo4
-rw-r--r--devel/ddd/files/extra-patch-configure-gcc3310
-rw-r--r--devel/ddd/files/patch-configure16
-rw-r--r--devel/ddd/files/patch-ddd::Ddd.in12
-rw-r--r--devel/ddd/files/patch-ddd::LiterateA.C12
-rw-r--r--devel/ddd/files/patch-ddd::Makefile.in18
-rw-r--r--devel/ddd/files/patch-ddd::TTYAgent.C22
-rw-r--r--devel/ddd/files/patch-libiberty::strerror.c10
-rw-r--r--devel/ddd/files/patch-libiberty::strsignal.c11
-rw-r--r--devel/ddd/pkg-plist7
11 files changed, 55 insertions, 88 deletions
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 6d75018e38a1..05c5a8f5694e 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -7,12 +7,12 @@
#
PORTNAME= ddd
-PORTVERSION= 3.3.8
+PORTVERSION= 3.3.9
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ddd
+MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= sergio@softshark.org
COMMENT= Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB
LIB_DEPENDS= iberty.1:${PORTSDIR}/devel/freelibiberty
@@ -26,7 +26,7 @@ USE_LIBTOOL_VER=13
CFLAGS+= -Wno-deprecated
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include/freelibiberty ${CPPFLAGS} -fpermissive' \
+CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include/freelibiberty ${CPPFLAGS}' \
LDFLAGS='${LDFLAGS}'
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-motif-libraries="${LIBXMDIR}" \
@@ -39,6 +39,7 @@ DOCS= AUTHORS INSTALL PROBLEMS README TIPS TODO \
doc/html/ddd.html doc/ddd-paper.ps \
doc/ddd-themes.ps doc/ddd.ps \
doc/ddd-themes.pdf doc/ddd.pdf
+INFO= ddd ddd-themes
.if defined(MOTIFLIB)
.if defined(MOTIF_STATIC)
@@ -52,16 +53,8 @@ LIBXMDIR= ${X11BASE}
.include <bsd.port.pre.mk>
-# DDD builds with either GCC 3.1, GCC 3.2 or GCC 3.3
-# Use 3.1 or 3.2 if it is available with base system
-# Otherwise, default to 3.3
-.if ${OSVERSION} >= 500035 && ${OSVERSION} <= 500038
-USE_GCC=3.1
-.elif ${OSVERSION} > 500038 && ${OSVERSION} < 501103
-USE_GCC=3.2
-.else
-USE_GCC=3.3
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure-gcc33
+.if ${OSVERSION} < 500000
+USE_GCC= 3.3
.endif
pre-patch:
diff --git a/devel/ddd/distinfo b/devel/ddd/distinfo
index 1b440bfdae68..16c4d2c81129 100644
--- a/devel/ddd/distinfo
+++ b/devel/ddd/distinfo
@@ -1,2 +1,2 @@
-MD5 (ddd-3.3.8.tar.gz) = 60c5bfbfe1564926edda629ffcf01e52
-SIZE (ddd-3.3.8.tar.gz) = 8606382
+MD5 (ddd-3.3.9.tar.gz) = acfca53c62507795f4ceb355cb34e2a2
+SIZE (ddd-3.3.9.tar.gz) = 8238347
diff --git a/devel/ddd/files/extra-patch-configure-gcc33 b/devel/ddd/files/extra-patch-configure-gcc33
deleted file mode 100644
index 46ec3865caba..000000000000
--- a/devel/ddd/files/extra-patch-configure-gcc33
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Fri Apr 9 15:32:46 2004
-+++ configure Fri Apr 9 15:33:05 2004
-@@ -4871,6 +4871,7 @@
- #line $LINENO "configure"
- #include "confdefs.h"
- #include <iostream>
-+#include <fstream>
- #ifdef F77_DUMMY_MAIN
- # ifdef __cplusplus
- extern "C"
diff --git a/devel/ddd/files/patch-configure b/devel/ddd/files/patch-configure
index 004fc879ee4a..48df2aed9c9e 100644
--- a/devel/ddd/files/patch-configure
+++ b/devel/ddd/files/patch-configure
@@ -1,20 +1,20 @@
---- configure.orig Wed Oct 22 15:29:40 2003
-+++ configure Fri Feb 27 13:33:02 2004
-@@ -3811,7 +3811,7 @@
- RANLIB="$ac_cv_prog_RANLIB"
- fi
+--- configure.orig Thu Aug 19 19:58:54 2004
++++ configure Thu Aug 19 20:08:09 2004
+@@ -3009,7 +3009,7 @@
+
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-for ac_prog in 'bison -y' byacc
+for ac_prog in byacc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -23156,7 +23156,7 @@
+@@ -35756,7 +35756,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "${ice_re_word}ioctl *\(" >/dev/null 2>&1; then
-+ egrep "${ice_re_word}\(?ioctl\)? *\(" >/dev/null 2>&1; then
+- $EGREP "${ice_re_word}ioctl *$ice_re_params\(\(" >/dev/null 2>&1; then
++ $EGREP "${ice_re_word}\(?ioctl\?) *$ice_re_params\(\(" >/dev/null 2>&1; then
ice_cv_have_ioctl_decl=yes
fi
rm -f conftest*
diff --git a/devel/ddd/files/patch-ddd::Ddd.in b/devel/ddd/files/patch-ddd::Ddd.in
deleted file mode 100644
index ca0ec28526a2..000000000000
--- a/devel/ddd/files/patch-ddd::Ddd.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- ddd/Ddd.in.orig Wed Oct 22 15:25:51 2003
-+++ ddd/Ddd.in Fri Feb 27 13:33:02 2004
-@@ -284,7 +284,8 @@
-
-
- ! Paper size, in format WIDTH x HEIGHT. (Default: A4).
--@Ddd@*paperSize: 210mm x 297mm
-+!@Ddd@*paperSize: 210mm x 297mm
-+@Ddd@*paperSize: 8.5" x 11"
-
-
-
diff --git a/devel/ddd/files/patch-ddd::LiterateA.C b/devel/ddd/files/patch-ddd::LiterateA.C
index f1b3c4ea7aa2..5ce55bf12986 100644
--- a/devel/ddd/files/patch-ddd::LiterateA.C
+++ b/devel/ddd/files/patch-ddd::LiterateA.C
@@ -1,6 +1,6 @@
---- ddd/LiterateA.C.orig Sat May 24 11:27:03 2003
-+++ ddd/LiterateA.C Fri Feb 27 13:33:02 2004
-@@ -220,8 +220,12 @@
+--- ddd/LiterateA.C.orig Thu Aug 19 20:16:55 2004
++++ ddd/LiterateA.C Thu Aug 19 20:23:49 2004
+@@ -216,8 +216,12 @@
int flags = fcntl(fileno(fp), F_GETFL, 0);
if (flags == -1)
_raiseIOWarning("cannot get file descriptor status flags");
@@ -8,14 +8,14 @@
- _raiseIOWarning("cannot set file to non-blocking mode");
+ if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1) {
+#if defined(__FreeBSD__)
-+ if(errno != EAGAIN)
++ if(errno != EAGAIN)
+#endif
+ _raiseIOWarning("cannot set file to non-blocking mode");
+ }
#endif
// Read stuff
-@@ -255,8 +259,12 @@
+@@ -251,8 +255,12 @@
#if HAVE_FCNTL && defined(F_SETFL)
// Reset file state
@@ -23,7 +23,7 @@
- _raiseIOWarning("cannot restore file mode");
+ if (fcntl(fileno(fp), F_SETFL, flags) == -1) {
+#if defined(__FreeBSD__)
-+ if(errno != EAGAIN)
++ if(errno != EAGAIN)
+#endif
+ _raiseIOWarning("cannot restore file mode");
+ }
diff --git a/devel/ddd/files/patch-ddd::Makefile.in b/devel/ddd/files/patch-ddd::Makefile.in
index a478af869911..3834468678c3 100644
--- a/devel/ddd/files/patch-ddd::Makefile.in
+++ b/devel/ddd/files/patch-ddd::Makefile.in
@@ -1,11 +1,11 @@
---- ddd/Makefile.in.orig Wed Oct 22 15:29:49 2003
-+++ ddd/Makefile.in Fri Feb 27 13:33:02 2004
-@@ -2170,7 +2170,7 @@
- && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
- `echo $< | sed 's,.*/,,'`
-
+--- ddd/Makefile.in.orig Thu Aug 19 20:39:55 2004
++++ ddd/Makefile.in Thu Aug 19 20:40:10 2004
+@@ -469,7 +469,7 @@
+ LPR = @LPR@
+ LTLIBOBJS = @LTLIBOBJS@
+ M4 = @M4@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
- TEXI2DVI = texi2dvi
-
- uninstall-info-am:
+ MINIMAL_TOC = @MINIMAL_TOC@
+ NICKNAME = @NICKNAME@
+ OBJEXT = @OBJEXT@
diff --git a/devel/ddd/files/patch-ddd::TTYAgent.C b/devel/ddd/files/patch-ddd::TTYAgent.C
index 59b6cd09fee3..3a035a36492c 100644
--- a/devel/ddd/files/patch-ddd::TTYAgent.C
+++ b/devel/ddd/files/patch-ddd::TTYAgent.C
@@ -1,6 +1,6 @@
---- ddd/TTYAgent.C.orig Sat May 24 11:27:05 2003
-+++ ddd/TTYAgent.C Fri Feb 27 13:33:02 2004
-@@ -719,8 +719,19 @@
+--- ddd/TTYAgent.C.orig Thu Aug 19 20:41:45 2004
++++ ddd/TTYAgent.C Thu Aug 19 20:45:56 2004
+@@ -715,8 +715,19 @@
}
else
{
@@ -8,14 +8,14 @@
if (fcntl(master, F_SETFL, flags | O_NONBLOCK) == -1)
_raiseIOWarning("cannot set file to non-blocking mode");
+#else
-+ do {
-+ if(fcntl(master, F_SETFL, flags | O_NONBLOCK) != -1)
-+ break;
-+ else if(errno == EAGAIN)
-+ sleep(1);
-+ else
-+ _raiseIOWarning("cannot set file to non-blocking mode");
-+ } while(errno == EAGAIN);
++ do {
++ if(fcntl(master, F_SETFL, flags | O_NONBLOCK) != -1)
++ break;
++ else if(errno == EAGAIN)
++ sleep(1);
++ else
++ _raiseIOWarning("cannot set file to non-blocking mode");
++ } while(errno == EAGAIN);
+#endif
}
#endif
diff --git a/devel/ddd/files/patch-libiberty::strerror.c b/devel/ddd/files/patch-libiberty::strerror.c
index d36cce74d790..e567fe70f073 100644
--- a/devel/ddd/files/patch-libiberty::strerror.c
+++ b/devel/ddd/files/patch-libiberty::strerror.c
@@ -1,5 +1,5 @@
---- libiberty/strerror.c.orig Wed Oct 22 14:46:55 2003
-+++ libiberty/strerror.c Fri Feb 27 13:53:29 2004
+--- libiberty/strerror.c.orig Thu Aug 19 20:54:24 2004
++++ libiberty/strerror.c Thu Aug 19 20:55:15 2004
@@ -460,6 +460,7 @@
same name, it differs from other implementations in that it is dynamically
initialized rather than statically initialized. */
@@ -7,12 +7,12 @@
+#ifndef __FreeBSD__
#ifndef HAVE_SYS_ERRLIST
- static int sys_nerr;
-@@ -470,6 +471,7 @@
+ #define sys_nerr sys_nerr__
+@@ -472,6 +473,7 @@
extern int sys_nerr;
extern char *sys_errlist[];
+#endif
#endif
-
+ /*
diff --git a/devel/ddd/files/patch-libiberty::strsignal.c b/devel/ddd/files/patch-libiberty::strsignal.c
index 12af26746dde..bfeb132b509d 100644
--- a/devel/ddd/files/patch-libiberty::strsignal.c
+++ b/devel/ddd/files/patch-libiberty::strsignal.c
@@ -1,5 +1,5 @@
---- libiberty/strsignal.c.orig Wed Oct 22 14:46:55 2003
-+++ libiberty/strsignal.c Fri Feb 27 13:33:02 2004
+--- libiberty/strsignal.c.orig Thu Aug 19 20:58:24 2004
++++ libiberty/strsignal.c Thu Aug 19 20:59:24 2004
@@ -241,6 +241,7 @@
same name, it differs from other implementations in that it is dynamically
initialized rather than statically initialized. */
@@ -8,11 +8,12 @@
#ifndef HAVE_SYS_SIGLIST
static int sys_nsig;
-@@ -257,6 +258,7 @@
- #endif
+@@ -258,7 +259,7 @@
extern const char * const sys_siglist[];
-+#endif
#endif
+-
++#endif
+ /*
diff --git a/devel/ddd/pkg-plist b/devel/ddd/pkg-plist
index 0c92aaaf4634..1a50b00d0854 100644
--- a/devel/ddd/pkg-plist
+++ b/devel/ddd/pkg-plist
@@ -1,15 +1,10 @@
bin/ddd
-info/ddd.info
-@exec install-info %D/info/ddd.info %D/info/dir
-@unexec install-info --delete %D/info/ddd.info %D/info/dir
-info/ddd-themes.info
-@exec install-info %D/info/ddd-themes.info %D/info/dir
-@unexec install-info --delete %D/info/ddd-themes.info %D/info/dir
share/ddd-%%VERSION%%/COPYING
share/ddd-%%VERSION%%/NEWS
share/ddd-%%VERSION%%/ddd/Ddd
share/ddd-%%VERSION%%/themes/green.vsl
share/ddd-%%VERSION%%/themes/red.vsl
+share/ddd-%%VERSION%%/themes/rednil.vsl
share/ddd-%%VERSION%%/themes/smalltitles.vsl
share/ddd-%%VERSION%%/themes/smallvalues.vsl
share/ddd-%%VERSION%%/themes/suppress.vsl