Attachment #46118 for bug #70894

View | Details | Raw Unified | Return to bug 70894
Collapse All | Expand All




#

PORTNAME=	ddd
PORTVERSION=	3.3.9
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	sergio@softshark.org
COMMENT=	Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB

LIB_DEPENDS=	iberty.1:${PORTSDIR}/devel/freelibiberty

CFLAGS+=	-Wno-deprecated
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include/freelibiberty ${CPPFLAGS}' \
		LDFLAGS='${LDFLAGS}'
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS=	--with-motif-libraries="${LIBXMDIR}" \

		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)

.endif

.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
.endif

pre-patch:
	@${RM} -fv ${WRKSRC}/ddd/ddd.info*

Lines 1-2 Link Here

(-)/usr/ports/devel/ddd/distinfo (-2 / +2 lines)
1	MD5 (ddd-3.3.8.tar.gz) = 60c5bfbfe1564926edda629ffcf01e52	1	MD5 (ddd-3.3.9.tar.gz) = acfca53c62507795f4ceb355cb34e2a2
2	SIZE (ddd-3.3.8.tar.gz) = 8606382	2	SIZE (ddd-3.3.9.tar.gz) = 8238347

Lines 1-10 Link Here

(-)/usr/ports/devel/ddd/files/extra-patch-configure-gcc33 (-10 lines)
1	--- configure.orig Fri Apr 9 15:32:46 2004
2	+++ configure Fri Apr 9 15:33:05 2004
3	@@ -4871,6 +4871,7 @@
4	#line $LINENO "configure"
5	#include "confdefs.h"
6	#include <iostream>
7	+#include <fstream>
8	#ifdef F77_DUMMY_MAIN
9	# ifdef __cplusplus
10	extern "C"




--- 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
@@ -35756,7 +35756,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $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*

Lines 1-12 Link Here

(-)/usr/ports/devel/ddd/files/patch-ddd::Ddd.in (-12 lines)
1	--- ddd/Ddd.in.orig Wed Oct 22 15:25:51 2003
2	+++ ddd/Ddd.in Fri Feb 27 13:33:02 2004
3	@@ -284,7 +284,8 @@
4
5
6	! Paper size, in format WIDTH x HEIGHT. (Default: A4).
7	-@Ddd@*paperSize: 210mm x 297mm
8	+!@Ddd@*paperSize: 210mm x 297mm
9	+@Ddd@*paperSize: 8.5" x 11"
10
11
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");

-	_raiseIOWarning("cannot set file to non-blocking mode");
+    if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1) {
+#if defined(__FreeBSD__)
+    if(errno != EAGAIN)
+#endif
+	    _raiseIOWarning("cannot set file to non-blocking mode");
+    }
 #endif
 
     // Read stuff
@@ -251,8 +255,12 @@
 
 #if HAVE_FCNTL && defined(F_SETFL)
     // Reset file state

-	_raiseIOWarning("cannot restore file mode");
+    if (fcntl(fileno(fp), F_SETFL, flags) == -1) {
+#if defined(__FreeBSD__)
+    if(errno != EAGAIN)
+#endif
+	    _raiseIOWarning("cannot restore file mode");
+    }

Lines 1-11 Link Here

(-)/usr/ports/devel/ddd/files/patch-ddd::Makefile.in (-9 / +9 lines)
1	--- ddd/Makefile.in.orig Wed Oct 22 15:29:49 2003	1	--- ddd/Makefile.in.orig Thu Aug 19 20:39:55 2004
2	+++ ddd/Makefile.in Fri Feb 27 13:33:02 2004	2	+++ ddd/Makefile.in Thu Aug 19 20:40:10 2004
3	@@ -2170,7 +2170,7 @@	3	@@ -469,7 +469,7 @@
4	&& $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \	4	LPR = @LPR@
5	`echo $< \| sed 's,.*/,,'`	5	LTLIBOBJS = @LTLIBOBJS@
6		6	M4 = @M4@
7	-MAKEINFO = @MAKEINFO@	7	-MAKEINFO = @MAKEINFO@
8	+MAKEINFO = @MAKEINFO@ --no-split	8	+MAKEINFO = @MAKEINFO@ --no-split
9	TEXI2DVI = texi2dvi	9	MINIMAL_TOC = @MINIMAL_TOC@
10		10	NICKNAME = @NICKNAME@
11	uninstall-info-am:	11	OBJEXT = @OBJEXT@




--- 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
     {

 	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);
+#endif
     }
 #endif




--- 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. */

+#ifndef __FreeBSD__
 #ifndef HAVE_SYS_ERRLIST
 
 #define sys_nerr sys_nerr__
@@ -472,6 +473,7 @@
 extern int sys_nerr;
 extern char *sys_errlist[];
 
+#endif
 #endif
 
 /*




--- 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. */

 #ifndef HAVE_SYS_SIGLIST
 
 static int sys_nsig;
@@ -258,7 +259,7 @@
 #endif
 extern const char * const sys_siglist[];
 
+#endif
 #endif
-
+#endif
 
 /*
 




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

Return to bug 70894

Lines 7-18 Link Here

(-)/usr/ports/devel/ddd/Makefile (-16 / +5 lines)
7	#	7	#
8		8
9	PORTNAME= ddd	9	PORTNAME= ddd
10	PORTVERSION= 3.3.8	10	PORTVERSION= 3.3.9
11	CATEGORIES= devel	11	CATEGORIES= devel
12	MASTER_SITES= ${MASTER_SITE_GNU}	12	MASTER_SITES= ${MASTER_SITE_GNU}
13	MASTER_SITE_SUBDIR= ddd	13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= sergio@softshark.org
16	COMMENT= Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB	16	COMMENT= Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB
17		17
18	LIB_DEPENDS= iberty.1:${PORTSDIR}/devel/freelibiberty	18	LIB_DEPENDS= iberty.1:${PORTSDIR}/devel/freelibiberty
Lines 26-32 Link Here
26	CFLAGS+= -Wno-deprecated	26	CFLAGS+= -Wno-deprecated
27	CPPFLAGS+= -I${LOCALBASE}/include	27	CPPFLAGS+= -I${LOCALBASE}/include
28	LDFLAGS+= -L${LOCALBASE}/lib	28	LDFLAGS+= -L${LOCALBASE}/lib
29	CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include/freelibiberty ${CPPFLAGS} -fpermissive' \	29	CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include/freelibiberty ${CPPFLAGS}' \
30	LDFLAGS='${LDFLAGS}'	30	LDFLAGS='${LDFLAGS}'
31	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	31	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
32	CONFIGURE_ARGS= --with-motif-libraries="${LIBXMDIR}" \	32	CONFIGURE_ARGS= --with-motif-libraries="${LIBXMDIR}" \
Lines 39-44 Link Here
39	doc/html/ddd.html doc/ddd-paper.ps \	39	doc/html/ddd.html doc/ddd-paper.ps \
40	doc/ddd-themes.ps doc/ddd.ps \	40	doc/ddd-themes.ps doc/ddd.ps \
41	doc/ddd-themes.pdf doc/ddd.pdf	41	doc/ddd-themes.pdf doc/ddd.pdf
		42	INFO= ddd ddd-themes
42		43
43	.if defined(MOTIFLIB)	44	.if defined(MOTIFLIB)
44	.if defined(MOTIF_STATIC)	45	.if defined(MOTIF_STATIC)
Lines 51-68 Link Here
51	.endif	52	.endif
52		53
53	.include <bsd.port.pre.mk>	54	.include <bsd.port.pre.mk>
54
55	# DDD builds with either GCC 3.1, GCC 3.2 or GCC 3.3
56	# Use 3.1 or 3.2 if it is available with base system
57	# Otherwise, default to 3.3
58	.if ${OSVERSION} >= 500035 && ${OSVERSION} <= 500038
59	USE_GCC=3.1
60	.elif ${OSVERSION} > 500038 && ${OSVERSION} < 501103
61	USE_GCC=3.2
62	.else
63	USE_GCC=3.3
64	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure-gcc33
65	.endif
66		55
67	pre-patch:	56	pre-patch:
68	@${RM} -fv ${WRKSRC}/ddd/ddd.info*	57	@${RM} -fv ${WRKSRC}/ddd/ddd.info*

Lines 1-20 Link Here

(-)/usr/ports/devel/ddd/files/patch-configure (-8 / +8 lines)
1	--- configure.orig Wed Oct 22 15:29:40 2003	1	--- configure.orig Thu Aug 19 19:58:54 2004
2	+++ configure Fri Feb 27 13:33:02 2004	2	+++ configure Thu Aug 19 20:08:09 2004
3	@@ -3811,7 +3811,7 @@	3	@@ -3009,7 +3009,7 @@
4	RANLIB="$ac_cv_prog_RANLIB"	4
5	fi	5	test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
6		6
7	-for ac_prog in 'bison -y' byacc	7	-for ac_prog in 'bison -y' byacc
8	+for ac_prog in byacc	8	+for ac_prog in byacc
9	do	9	do
10	# Extract the first word of "$ac_prog", so it can be a program name with args.	10	# Extract the first word of "$ac_prog", so it can be a program name with args.
11	set dummy $ac_prog; ac_word=$2	11	set dummy $ac_prog; ac_word=$2
12	@@ -23156,7 +23156,7 @@	12	@@ -35756,7 +35756,7 @@
13		13
14	_ACEOF	14	_ACEOF
15	if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|	15	if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
16	- egrep "${ice_re_word}ioctl *\(" >/dev/null 2>&1; then	16	- $EGREP "${ice_re_word}ioctl *$ice_re_params\(\(" >/dev/null 2>&1; then
17	+ egrep "${ice_re_word}\(?ioctl\)? *\(" >/dev/null 2>&1; then	17	+ $EGREP "${ice_re_word}\(?ioctl\?) *$ice_re_params\(\(" >/dev/null 2>&1; then
18	ice_cv_have_ioctl_decl=yes	18	ice_cv_have_ioctl_decl=yes
19	fi	19	fi
20	rm -f conftest*	20	rm -f conftest*

Lines 1-6 Link Here

(-)/usr/ports/devel/ddd/files/patch-ddd::LiterateA.C (-6 / +6 lines)
1	--- ddd/LiterateA.C.orig Sat May 24 11:27:03 2003	1	--- ddd/LiterateA.C.orig Thu Aug 19 20:16:55 2004
2	+++ ddd/LiterateA.C Fri Feb 27 13:33:02 2004	2	+++ ddd/LiterateA.C Thu Aug 19 20:23:49 2004
3	@@ -220,8 +220,12 @@	3	@@ -216,8 +216,12 @@
4	int flags = fcntl(fileno(fp), F_GETFL, 0);	4	int flags = fcntl(fileno(fp), F_GETFL, 0);
5	if (flags == -1)	5	if (flags == -1)
6	_raiseIOWarning("cannot get file descriptor status flags");	6	_raiseIOWarning("cannot get file descriptor status flags");
Lines 8-21 Link Here
8	- _raiseIOWarning("cannot set file to non-blocking mode");	8	- _raiseIOWarning("cannot set file to non-blocking mode");
9	+ if (fcntl(fileno(fp), F_SETFL, flags \| O_NONBLOCK) == -1) {	9	+ if (fcntl(fileno(fp), F_SETFL, flags \| O_NONBLOCK) == -1) {
10	+#if defined(__FreeBSD__)	10	+#if defined(__FreeBSD__)
11	+ if(errno != EAGAIN)	11	+ if(errno != EAGAIN)
12	+#endif	12	+#endif
13	+ _raiseIOWarning("cannot set file to non-blocking mode");	13	+ _raiseIOWarning("cannot set file to non-blocking mode");
14	+ }	14	+ }
15	#endif	15	#endif
16		16
17	// Read stuff	17	// Read stuff
18	@@ -255,8 +259,12 @@	18	@@ -251,8 +255,12 @@
19		19
20	#if HAVE_FCNTL && defined(F_SETFL)	20	#if HAVE_FCNTL && defined(F_SETFL)
21	// Reset file state	21	// Reset file state
Lines 23-29 Link Here
23	- _raiseIOWarning("cannot restore file mode");	23	- _raiseIOWarning("cannot restore file mode");
24	+ if (fcntl(fileno(fp), F_SETFL, flags) == -1) {	24	+ if (fcntl(fileno(fp), F_SETFL, flags) == -1) {
25	+#if defined(__FreeBSD__)	25	+#if defined(__FreeBSD__)
26	+ if(errno != EAGAIN)	26	+ if(errno != EAGAIN)
27	+#endif	27	+#endif
28	+ _raiseIOWarning("cannot restore file mode");	28	+ _raiseIOWarning("cannot restore file mode");
29	+ }	29	+ }

Lines 1-6 Link Here

(-)/usr/ports/devel/ddd/files/patch-ddd::TTYAgent.C (-11 / +11 lines)
1	--- ddd/TTYAgent.C.orig Sat May 24 11:27:05 2003	1	--- ddd/TTYAgent.C.orig Thu Aug 19 20:41:45 2004
2	+++ ddd/TTYAgent.C Fri Feb 27 13:33:02 2004	2	+++ ddd/TTYAgent.C Thu Aug 19 20:45:56 2004
3	@@ -719,8 +719,19 @@	3	@@ -715,8 +715,19 @@
4	}	4	}
5	else	5	else
6	{	6	{
Lines 8-21 Link Here
8	if (fcntl(master, F_SETFL, flags \| O_NONBLOCK) == -1)	8	if (fcntl(master, F_SETFL, flags \| O_NONBLOCK) == -1)
9	_raiseIOWarning("cannot set file to non-blocking mode");	9	_raiseIOWarning("cannot set file to non-blocking mode");
10	+#else	10	+#else
11	+ do {	11	+ do {
12	+ if(fcntl(master, F_SETFL, flags \| O_NONBLOCK) != -1)	12	+ if(fcntl(master, F_SETFL, flags \| O_NONBLOCK) != -1)
13	+ break;	13	+ break;
14	+ else if(errno == EAGAIN)	14	+ else if(errno == EAGAIN)
15	+ sleep(1);	15	+ sleep(1);
16	+ else	16	+ else
17	+ _raiseIOWarning("cannot set file to non-blocking mode");	17	+ _raiseIOWarning("cannot set file to non-blocking mode");
18	+ } while(errno == EAGAIN);	18	+ } while(errno == EAGAIN);
19	+#endif	19	+#endif
20	}	20	}
21	#endif	21	#endif

Lines 1-5 Link Here

(-)/usr/ports/devel/ddd/files/patch-libiberty::strerror.c (-5 / +5 lines)
1	--- libiberty/strerror.c.orig Wed Oct 22 14:46:55 2003	1	--- libiberty/strerror.c.orig Thu Aug 19 20:54:24 2004
2	+++ libiberty/strerror.c Fri Feb 27 13:53:29 2004	2	+++ libiberty/strerror.c Thu Aug 19 20:55:15 2004
3	@@ -460,6 +460,7 @@	3	@@ -460,6 +460,7 @@
4	same name, it differs from other implementations in that it is dynamically	4	same name, it differs from other implementations in that it is dynamically
5	initialized rather than statically initialized. */	5	initialized rather than statically initialized. */
Lines 7-18 Link Here
7	+#ifndef __FreeBSD__	7	+#ifndef __FreeBSD__
8	#ifndef HAVE_SYS_ERRLIST	8	#ifndef HAVE_SYS_ERRLIST
9		9
10	static int sys_nerr;	10	#define sys_nerr sys_nerr__
11	@@ -470,6 +471,7 @@	11	@@ -472,6 +473,7 @@
12	extern int sys_nerr;	12	extern int sys_nerr;
13	extern char *sys_errlist[];	13	extern char *sys_errlist[];
14		14
15	+#endif	15	+#endif
16	#endif	16	#endif
17		17
18		18	/*

Lines 1-5 Link Here

(-)/usr/ports/devel/ddd/files/patch-libiberty::strsignal.c (-5 / +6 lines)
1	--- libiberty/strsignal.c.orig Wed Oct 22 14:46:55 2003	1	--- libiberty/strsignal.c.orig Thu Aug 19 20:58:24 2004
2	+++ libiberty/strsignal.c Fri Feb 27 13:33:02 2004	2	+++ libiberty/strsignal.c Thu Aug 19 20:59:24 2004
3	@@ -241,6 +241,7 @@	3	@@ -241,6 +241,7 @@
4	same name, it differs from other implementations in that it is dynamically	4	same name, it differs from other implementations in that it is dynamically
5	initialized rather than statically initialized. */	5	initialized rather than statically initialized. */
Lines 8-18 Link Here
8	#ifndef HAVE_SYS_SIGLIST	8	#ifndef HAVE_SYS_SIGLIST
9		9
10	static int sys_nsig;	10	static int sys_nsig;
11	@@ -257,6 +258,7 @@	11	@@ -258,7 +259,7 @@
12	#endif
13	extern const char * const sys_siglist[];	12	extern const char * const sys_siglist[];
14		13
15	+#endif
16	#endif	14	#endif
		15	-
		16	+#endif
17		17
		18	/*
18		19

Lines 1-15 Link Here

(-)/usr/ports/devel/ddd/pkg-plist (-6 / +1 lines)
1	bin/ddd	1	bin/ddd
2	info/ddd.info
3	@exec install-info %D/info/ddd.info %D/info/dir
4	@unexec install-info --delete %D/info/ddd.info %D/info/dir
5	info/ddd-themes.info
6	@exec install-info %D/info/ddd-themes.info %D/info/dir
7	@unexec install-info --delete %D/info/ddd-themes.info %D/info/dir
8	share/ddd-%%VERSION%%/COPYING	2	share/ddd-%%VERSION%%/COPYING
9	share/ddd-%%VERSION%%/NEWS	3	share/ddd-%%VERSION%%/NEWS
10	share/ddd-%%VERSION%%/ddd/Ddd	4	share/ddd-%%VERSION%%/ddd/Ddd
11	share/ddd-%%VERSION%%/themes/green.vsl	5	share/ddd-%%VERSION%%/themes/green.vsl
12	share/ddd-%%VERSION%%/themes/red.vsl	6	share/ddd-%%VERSION%%/themes/red.vsl
		7	share/ddd-%%VERSION%%/themes/rednil.vsl
13	share/ddd-%%VERSION%%/themes/smalltitles.vsl	8	share/ddd-%%VERSION%%/themes/smalltitles.vsl
14	share/ddd-%%VERSION%%/themes/smallvalues.vsl	9	share/ddd-%%VERSION%%/themes/smallvalues.vsl
15	share/ddd-%%VERSION%%/themes/suppress.vsl	10	share/ddd-%%VERSION%%/themes/suppress.vsl