ports/53120: [patch] port: security/fwbuilder Fix build errors under 5.x

[Foxfair Hu]

This is another patch against to Makefile v1.12, the latest version in
ports CVS. You can also obtain it at this link:

http://www.freebsd.org/cgi/cvsweb.cgi/ports/security/fwbuilder/
  
  Note that I bump PORTREVISION too. I sill have some trouble with
port package issue, and you can reproduce the problem by doing
`make package` and pkg_add / pkg_delete things. There are several
errors in the last two steps in my boxes.

foxfair
======= patch start ======
diff --exclude=work -ruN /usr/ports/security/fwbuilder/Makefile ./Makefile
--- /usr/ports/security/fwbuilder/Makefile	Mon Jun  2 12:56:07 2003
+++ ./Makefile	Tue Jun 10 09:04:52 2003
@@ -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 at uptsoft.com
+MAINTAINER=	vadim at 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 --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	Mon Jun  9 11:18:32 2003
@@ -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 --exclude=work -ruN /usr/ports/security/fwbuilder/files/patch-aa ./files/patch-aa
--- /usr/ports/security/fwbuilder/files/patch-aa	Thu Jan  1 08:00:00 1970
+++ ./files/patch-aa	Mon Jun  9 16:56:08 2003
@@ -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
+  */
====== patch end ======

  To Vadim: Another patch made only for your tarball file is also
availble here:

http://people.freebsd.org/~foxfair/patch.fwbuilder-orig


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20030610/fdc9199e/attachment.bin