Date: Mon, 9 Jun 2003 12:46:11 -0700 From: Vadim Kurland <vadim@vk.crocodile.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: vadim@vk.crocodile.org Subject: ports/53120: [patch] port: security/fwbuilder Fix build errors under 5.x Message-ID: <200306091946.h59JkBi2001903@mail.vk.crocodile.org> Resent-Message-ID: <200306091950.h59Jo6br065221@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 53120
>Category: ports
>Synopsis: [patch] port: security/fwbuilder Fix build errors under 5.x
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 09 12:50:05 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Vadim Kurland
>Release: FreeBSD 4.8-STABLE i386
>Organization:
Firewall Builder project
>Environment:
System: FreeBSD freebsd48s.vk.crocodile.org 4.8-STABLE FreeBSD 4.8-STABLE #0: Sun May 18 01:55:53 PDT 2003 root@freebsd48s.vk.crocodile.org:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Port needed dependency on aclocal:${PORTSDIR}/devel/automake and
gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
A patch has been added to make the port build if devel/libgnugetopt
is also installed on the system.
Also I am taking over maintainership of this port. I am the author
of the original software Firewall Builder
>How-To-Repeat:
>Fix:
--- fwbuilder-port.diff begins here ---
diff -urN /usr/ports/security/fwbuilder/Makefile ./Makefile
--- /usr/ports/security/fwbuilder/Makefile Sun Jun 1 08:28:03 2003
+++ ./Makefile Sat Jun 7 23:22:02 2003
@@ -12,28 +12,38 @@
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
+ 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_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
+.include <bsd.port.pre.mk>
+
+
+.if ${OSVERSION} >= 500000
+EXTRA_PATCHES= files/CertDruidP30Dialog.cc-patch
+.endif
+
+
post-extract:
@${ECHO_CMD} "===! Running aclocal"
- @(cd ${WRKSRC}; aclocal; autoconf)
+ @(cd ${WRKSRC}; aclocal -I /usr/local/share/aclocal; autoconf)
+
+.include <bsd.port.post.mk>
-.include <bsd.port.mk>
diff -urN /usr/ports/security/fwbuilder/files/CertDruidP30Dialog.cc-patch ./files/CertDruidP30Dialog.cc-patch
--- /usr/ports/security/fwbuilder/files/CertDruidP30Dialog.cc-patch Wed Dec 31 16:00:00 1969
+++ ./files/CertDruidP30Dialog.cc-patch Mon Jun 2 22:35:09 2003
@@ -0,0 +1,21 @@
+--- src/gui/CertDruidP30Dialog.cc.ol Tue Jun 3 07:31:22 2003
++++ src/gui/CertDruidP30Dialog.cc Tue Jun 3 07:31:52 2003
+@@ -25,14 +25,17 @@
+ */
+
+
+-
++#if 0
+ #define _XOPEN_SOURCE /* glibc2 needs this for strptime --vk */
++#endif
+
+ #include "config.h"
+ #include "CertDruidP30Dialog.hh"
+ #include "MessageDialog.hh"
+
+ #include <time.h>
++
++#include <cmath>
+
+ using namespace std;
+ using namespace libfwbuilder;
diff -urN /usr/ports/security/fwbuilder/files/patch-aa ./files/patch-aa
--- /usr/ports/security/fwbuilder/files/patch-aa Wed Dec 31 16:00:00 1969
+++ ./files/patch-aa Sat May 31 14:57:30 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
+ */
--- fwbuilder-port.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306091946.h59JkBi2001903>