9 files changed, 132 insertions, 27 deletions

diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index ba4fb9c0cca7..374138569deb 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -7,33 +7,38 @@
 
 PORTNAME=	fwbuilder
 PORTVERSION=	1.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
 
-MAINTAINER=	devnull@uptsoft.com
+MAINTAINER=	vadim@fwbuilder.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
-		automake:${PORTSDIR}/devel/automake
+BUILD_DEPENDS=  autoconf:${PORTSDIR}/devel/autoconf \
+		aclocal:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		fwbuilder.5:${PORTSDIR}/security/libfwbuilder
 
 CONFIGURE_SCRIPT= autogen.sh
-# CONFIGURE_ARGS+=  --with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
-# USE_AUTOCONF=   yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_GTK=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
-MAN1=		fwbuilder.1 fwblookup.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 fwb_pf.1 \
+MAN1=           fwbuilder.1 fwblookup.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 fwb_pf.1 \
 		fwb_install.1
 
-post-extract:
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+EXTRA_PATCHES=  ${FILESDIR}/CertDruidP30Dialog.cc-patch
+.endif
+
+post-patch:
 	@${ECHO_CMD} "===! Running aclocal"
 	@(cd ${WRKSRC}; aclocal; autoconf)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/fwbuilder-devel/files/CertDruidP30Dialog.cc-patch b/security/fwbuilder-devel/files/CertDruidP30Dialog.cc-patch
new file mode 100644
index 000000000000..22ade18f8560
--- /dev/null
+++ b/security/fwbuilder-devel/files/CertDruidP30Dialog.cc-patch
@@ -0,0 +1,16 @@
+diff --exclude=work -ruN /usr/ports/security/fwbuilder/files/CertDruidP30Dialog.
+cc-patch ./files/CertDruidP30Dialog.cc-patch
+--- /usr/ports/security/fwbuilder/files/CertDruidP30Dialog.cc-patch     Thu Jan 
+ 1 08:00:00 1970
++++ ./files/CertDruidP30Dialog.cc-patch Fri May 23 07:37:51 2003
+@@ -0,0 +1,9 @@
++--- src/gui/CertDruidP30Dialog.cc.orig Thu May 22 22:42:13 2003
+++++ src/gui/CertDruidP30Dialog.cc      Thu May 22 22:42:37 2003
++@@ -25,5 +25,5 @@
++ */
++ 
++-
+++#include <cmath>
++ 
++ #define _XOPEN_SOURCE /* glibc2 needs this for strptime   --vk */
+
diff --git a/security/fwbuilder-devel/files/patch-aa b/security/fwbuilder-devel/files/patch-aa
new file mode 100644
index 000000000000..7c91a3de3f60
--- /dev/null
+++ b/security/fwbuilder-devel/files/patch-aa
@@ -0,0 +1,14 @@
+--- config.h.in.old	Sat May 31 14:40:22 2003
++++ config.h.in	Sat May 31 14:40:40 2003
+@@ -33,6 +33,11 @@
+ #undef HAVE_SETENV
+ #undef HAVE_PUTENV
+ 
++#ifdef HAVE_GETOPT_H
++#  define HAVE_DECL_GETOPT  HAVE_GETOPT_H
++#endif
++
++
+ /*
+  *  This is needed for Solaris
+  */
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index ba4fb9c0cca7..374138569deb 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -7,33 +7,38 @@
 
 PORTNAME=	fwbuilder
 PORTVERSION=	1.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
 
-MAINTAINER=	devnull@uptsoft.com
+MAINTAINER=	vadim@fwbuilder.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
-		automake:${PORTSDIR}/devel/automake
+BUILD_DEPENDS=  autoconf:${PORTSDIR}/devel/autoconf \
+		aclocal:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		fwbuilder.5:${PORTSDIR}/security/libfwbuilder
 
 CONFIGURE_SCRIPT= autogen.sh
-# CONFIGURE_ARGS+=  --with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
-# USE_AUTOCONF=   yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_GTK=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
-MAN1=		fwbuilder.1 fwblookup.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 fwb_pf.1 \
+MAN1=           fwbuilder.1 fwblookup.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 fwb_pf.1 \
 		fwb_install.1
 
-post-extract:
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+EXTRA_PATCHES=  ${FILESDIR}/CertDruidP30Dialog.cc-patch
+.endif
+
+post-patch:
 	@${ECHO_CMD} "===! Running aclocal"
 	@(cd ${WRKSRC}; aclocal; autoconf)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/fwbuilder/files/CertDruidP30Dialog.cc-patch b/security/fwbuilder/files/CertDruidP30Dialog.cc-patch
new file mode 100644
index 000000000000..22ade18f8560
--- /dev/null
+++ b/security/fwbuilder/files/CertDruidP30Dialog.cc-patch
@@ -0,0 +1,16 @@
+diff --exclude=work -ruN /usr/ports/security/fwbuilder/files/CertDruidP30Dialog.
+cc-patch ./files/CertDruidP30Dialog.cc-patch
+--- /usr/ports/security/fwbuilder/files/CertDruidP30Dialog.cc-patch     Thu Jan 
+ 1 08:00:00 1970
++++ ./files/CertDruidP30Dialog.cc-patch Fri May 23 07:37:51 2003
+@@ -0,0 +1,9 @@
++--- src/gui/CertDruidP30Dialog.cc.orig Thu May 22 22:42:13 2003
+++++ src/gui/CertDruidP30Dialog.cc      Thu May 22 22:42:37 2003
++@@ -25,5 +25,5 @@
++ */
++ 
++-
+++#include <cmath>
++ 
++ #define _XOPEN_SOURCE /* glibc2 needs this for strptime   --vk */
+
diff --git a/security/fwbuilder/files/patch-aa b/security/fwbuilder/files/patch-aa
new file mode 100644
index 000000000000..7c91a3de3f60
--- /dev/null
+++ b/security/fwbuilder/files/patch-aa
@@ -0,0 +1,14 @@
+--- config.h.in.old	Sat May 31 14:40:22 2003
++++ config.h.in	Sat May 31 14:40:40 2003
+@@ -33,6 +33,11 @@
+ #undef HAVE_SETENV
+ #undef HAVE_PUTENV
+ 
++#ifdef HAVE_GETOPT_H
++#  define HAVE_DECL_GETOPT  HAVE_GETOPT_H
++#endif
++
++
+ /*
+  *  This is needed for Solaris
+  */
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index ba4fb9c0cca7..374138569deb 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -7,33 +7,38 @@
 
 PORTNAME=	fwbuilder
 PORTVERSION=	1.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
 
-MAINTAINER=	devnull@uptsoft.com
+MAINTAINER=	vadim@fwbuilder.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
-		automake:${PORTSDIR}/devel/automake
+BUILD_DEPENDS=  autoconf:${PORTSDIR}/devel/autoconf \
+		aclocal:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		fwbuilder.5:${PORTSDIR}/security/libfwbuilder
 
 CONFIGURE_SCRIPT= autogen.sh
-# CONFIGURE_ARGS+=  --with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
-# USE_AUTOCONF=   yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_GTK=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
-MAN1=		fwbuilder.1 fwblookup.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 fwb_pf.1 \
+MAN1=           fwbuilder.1 fwblookup.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 fwb_pf.1 \
 		fwb_install.1
 
-post-extract:
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+EXTRA_PATCHES=  ${FILESDIR}/CertDruidP30Dialog.cc-patch
+.endif
+
+post-patch:
 	@${ECHO_CMD} "===! Running aclocal"
 	@(cd ${WRKSRC}; aclocal; autoconf)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/fwbuilder2/files/CertDruidP30Dialog.cc-patch b/security/fwbuilder2/files/CertDruidP30Dialog.cc-patch
new file mode 100644
index 000000000000..22ade18f8560
--- /dev/null
+++ b/security/fwbuilder2/files/CertDruidP30Dialog.cc-patch
@@ -0,0 +1,16 @@
+diff --exclude=work -ruN /usr/ports/security/fwbuilder/files/CertDruidP30Dialog.
+cc-patch ./files/CertDruidP30Dialog.cc-patch
+--- /usr/ports/security/fwbuilder/files/CertDruidP30Dialog.cc-patch     Thu Jan 
+ 1 08:00:00 1970
++++ ./files/CertDruidP30Dialog.cc-patch Fri May 23 07:37:51 2003
+@@ -0,0 +1,9 @@
++--- src/gui/CertDruidP30Dialog.cc.orig Thu May 22 22:42:13 2003
+++++ src/gui/CertDruidP30Dialog.cc      Thu May 22 22:42:37 2003
++@@ -25,5 +25,5 @@
++ */
++ 
++-
+++#include <cmath>
++ 
++ #define _XOPEN_SOURCE /* glibc2 needs this for strptime   --vk */
+
diff --git a/security/fwbuilder2/files/patch-aa b/security/fwbuilder2/files/patch-aa
new file mode 100644
index 000000000000..7c91a3de3f60
--- /dev/null
+++ b/security/fwbuilder2/files/patch-aa
@@ -0,0 +1,14 @@
+--- config.h.in.old	Sat May 31 14:40:22 2003
++++ config.h.in	Sat May 31 14:40:40 2003
+@@ -33,6 +33,11 @@
+ #undef HAVE_SETENV
+ #undef HAVE_PUTENV
+ 
++#ifdef HAVE_GETOPT_H
++#  define HAVE_DECL_GETOPT  HAVE_GETOPT_H
++#endif
++
++
+ /*
+  *  This is needed for Solaris
+  */