Fix build failure on i386, due to firestring dependency that now requires

GCC 3.2 / C99 support.

PR:		ports/66375
Submitted by:	Dean Hollister <dean@odyssey.apana.org.au> (maintainer)

5 files changed, 38 insertions, 5 deletions

diff --git a/mail/dsbl-testers/Makefile b/mail/dsbl-testers/Makefile
index 20428af84d17..486c0bb79a08 100644
--- a/mail/dsbl-testers/Makefile
+++ b/mail/dsbl-testers/Makefile
@@ -7,8 +7,9 @@
 
 PORTNAME=	dsbl-testers
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	http://firestuff.org/projects/ \
+MASTER_SITES=	http://www.firestuff.org/projects/ \
 		http://www.wa.apana.org.au/~dean/sources/ \
 		ftp://ftp.wa.apana.org.au/pub/pc/unix/packages/
 
@@ -19,8 +20,6 @@ BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring \
 		${LOCALBASE}/include/firedns.h:${PORTSDIR}/dns/firedns
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${LIBS} ${PTHREAD_LIBS}" PREFIX="${PREFIX}"
 INSTALL_SHLIBS=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -31,6 +30,8 @@ MAN5=	dsbl.conf.5
 
 post-patch:
 	@-${RM} ${WRKSRC}/firemake/*.orig
+	@-${RM} ${WRKSRC}/firedns/firemake/*.orig
+	@-${RM} ${WRKSRC}/firestring/firemake/*.orig
 
 # install ourselves to insure proper ownership/permissions
 # as dictated by port's rules
diff --git a/mail/dsbl-testers/files/patch-firedns_firemake_makefiletop b/mail/dsbl-testers/files/patch-firedns_firemake_makefiletop
new file mode 100644
index 000000000000..6b42cf76188c
--- /dev/null
+++ b/mail/dsbl-testers/files/patch-firedns_firemake_makefiletop
@@ -0,0 +1,11 @@
+--- firedns/firemake/makefiletop.orig	Sun May  9 01:00:55 2004
++++ firedns/firemake/makefiletop	Sun May  9 01:01:03 2004
+@@ -3,7 +3,7 @@
+ #require make
+ #phase makefile
+ dispn "Writing Makefile top entries..."
+-if test "$MAKE_CONDSET" = "y"; then
++if test "$MAKE_CONDSET" = "never"; then
+ 	$ECHO "PREFIX ?= $FM_PREFIX"
+
+ 	if test "$FM_MANDIRSTRICT" = "y"; then
diff --git a/mail/dsbl-testers/files/patch-firedns_tester.c b/mail/dsbl-testers/files/patch-firedns_tester.c
new file mode 100644
index 000000000000..8f0379721d10
--- /dev/null
+++ b/mail/dsbl-testers/files/patch-firedns_tester.c
@@ -0,0 +1,10 @@
+--- firedns/tester.c.orig	Sun May  9 10:29:54 2004
++++ firedns/tester.c	Sun May  9 10:30:18 2004
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <netdb.h>
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <sys/time.h>
diff --git a/mail/dsbl-testers/files/patch-firemake_makefiletop b/mail/dsbl-testers/files/patch-firemake_makefiletop
index 77d5aa87173b..0d5242719860 100644
--- a/mail/dsbl-testers/files/patch-firemake_makefiletop
+++ b/mail/dsbl-testers/files/patch-firemake_makefiletop
@@ -1,5 +1,5 @@
---- firemake/makefiletop.orig	Sun Feb  1 02:04:08 2004
-+++ firemake/makefiletop	Sun Feb  1 02:04:51 2004
+--- firemake/makefiletop.orig	Sun May  9 01:05:56 2004
++++ firemake/makefiletop	Sun May  9 01:06:03 2004
 @@ -3,7 +3,7 @@
  #require make
  #phase makefile
diff --git a/mail/dsbl-testers/files/patch-firestring_firemake_makefiletop b/mail/dsbl-testers/files/patch-firestring_firemake_makefiletop
new file mode 100644
index 000000000000..453f18a05a11
--- /dev/null
+++ b/mail/dsbl-testers/files/patch-firestring_firemake_makefiletop
@@ -0,0 +1,11 @@
+--- firestring/firemake/makefiletop.orig	Sun May  9 01:02:34 2004
++++ firestring/firemake/makefiletop	Sun May  9 01:03:05 2004
+@@ -3,7 +3,7 @@
+ #require make
+ #phase makefile
+ dispn "Writing Makefile top entries..."
+-if test "$MAKE_CONDSET" = "y"; then
++if test "$MAKE_CONDSET" = "never"; then
+ 	$ECHO "PREFIX ?= $FM_PREFIX"
+
+ 	if test "$FM_MANDIRSTRICT" = "y"; then