From ad2a3bc80401c6f7c87692b3e450de1940683059 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 12 Dec 2007 17:59:20 +0000 Subject: Changes 2.1.15: * Bug fix release --- security/fwbuilder21/Makefile | 22 ++++++------ security/fwbuilder21/PLIST | 65 +++++++++++++++++++++-------------- security/fwbuilder21/distinfo | 11 +++--- security/fwbuilder21/patches/patch-ab | 10 +++--- security/fwbuilder21/patches/patch-af | 63 +++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 47 deletions(-) create mode 100644 security/fwbuilder21/patches/patch-af (limited to 'security/fwbuilder21') diff --git a/security/fwbuilder21/Makefile b/security/fwbuilder21/Makefile index 16a91161217..897a2387c61 100644 --- a/security/fwbuilder21/Makefile +++ b/security/fwbuilder21/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2007/03/24 18:37:20 bad Exp $ +# $NetBSD: Makefile,v 1.3 2007/12/12 17:59:21 adam Exp $ -DISTNAME= fwbuilder-2.1.10 -PKGNAME= fwbuilder21-2.1.10 +DISTNAME= fwbuilder-2.1.15 +PKGNAME= fwbuilder21-2.1.15 CATEGORIES= security net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/} @@ -11,17 +11,15 @@ COMMENT= Firewall Builder GUI CONFLICTS= fwbuilder-[0-9]* -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= gmake -USE_LANGUAGES= c c++ +USE_TOOLS+= gmake +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes +GNU_CONFIGURE= yes UNLIMIT_RESOURCES+= datasize - -QMAKE= ${QTDIR}/bin/qmake -CONFIGURE_ENV+= QMAKE=${QMAKE:Q} -MAKE_ENV+= QMAKE=${QMAKE:Q} +CONFIGURE_ENV+= QMAKE=${QMAKE:Q} +MAKE_ENV+= QMAKE=${QMAKE:Q} +QMAKE= ${QTDIR}/bin/qmake .include "../../security/libfwbuilder21/buildlink3.mk" .include "../../x11/qt3-tools/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/security/fwbuilder21/PLIST b/security/fwbuilder21/PLIST index 0f9f1fa9152..0deeb7abe85 100644 --- a/security/fwbuilder21/PLIST +++ b/security/fwbuilder21/PLIST @@ -1,45 +1,62 @@ -@comment $NetBSD: PLIST,v 1.2 2007/03/24 18:37:20 bad Exp $ +@comment $NetBSD: PLIST,v 1.3 2007/12/12 17:59:21 adam Exp $ +bin/fwb_ipf +bin/fwb_ipfw +bin/fwb_ipt +bin/fwb_pf bin/fwbedit bin/fwblookup bin/fwbuilder -bin/fwb_ipt -bin/fwb_pf -bin/fwb_ipf -bin/fwb_ipfw +man/man1/fwb_ipf.1 +man/man1/fwb_ipfw.1 +man/man1/fwb_ipt.1 +man/man1/fwb_pf.1 +man/man1/fwbedit.1 +man/man1/fwblookup.1 +man/man1/fwbuilder.1 share/doc/fwbuilder-${PKGVERSION}/AUTHORS share/doc/fwbuilder-${PKGVERSION}/ChangeLog share/doc/fwbuilder-${PKGVERSION}/COPYING share/doc/fwbuilder-${PKGVERSION}/Credits share/doc/fwbuilder-${PKGVERSION}/FWBuilder-Routing-LICENSE.txt +share/doc/fwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt +share/doc/fwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt share/doc/fwbuilder-${PKGVERSION}/README.floppyfw +share/doc/fwbuilder-${PKGVERSION}/README.iosacl share/doc/fwbuilder-${PKGVERSION}/README.ipf share/doc/fwbuilder-${PKGVERSION}/README.ipfw share/doc/fwbuilder-${PKGVERSION}/README.ipt share/doc/fwbuilder-${PKGVERSION}/README.pf +share/doc/fwbuilder-${PKGVERSION}/README.policy_import share/doc/fwbuilder-${PKGVERSION}/README.routing +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.10.html +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.10.txt +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.11.html +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.11.txt +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.12.html +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.12.txt +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.13.html +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.13.txt +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.14.html +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.14.txt +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.15.html +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.15.txt share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.7.txt share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.7.html -share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.8.html -share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.8.txt -share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.9.html -share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.9.txt -share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.10.html -share/doc/fwbuilder-2.1.10/ReleaseNotes_2.1.10.txt -share/doc/fwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt -share/doc/fwbuilder-${PKGVERSION}/PatchAcceptancePolicy.txt -@dirrm share/doc/fwbuilder-${PKGVERSION} +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.8.html +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.8.txt +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.9.html +share/doc/fwbuilder-${PKGVERSION}/ReleaseNotes_2.1.9.txt share/fwbuilder21/locale/fwbuilder_de.qm share/fwbuilder21/locale/fwbuilder_es.qm share/fwbuilder21/locale/fwbuilder_fr.qm share/fwbuilder21/locale/fwbuilder_ja.qm +share/fwbuilder21/locale/fwbuilder_pt_BR.qm share/fwbuilder21/locale/fwbuilder_ru.qm share/fwbuilder21/locale/fwbuilder_sv.qm -@dirrm share/fwbuilder21/locale share/fwbuilder21/objects_init.xml -share/fwbuilder21/templates.xml -share/fwbuilder21/resources.xml share/fwbuilder21/os/freebsd.xml share/fwbuilder21/os/fwsm_os.xml +share/fwbuilder21/os/ios.xml share/fwbuilder21/os/linksys.xml share/fwbuilder21/os/linux24.xml share/fwbuilder21/os/macosx.xml @@ -47,20 +64,18 @@ share/fwbuilder21/os/openbsd.xml share/fwbuilder21/os/pix_os.xml share/fwbuilder21/os/solaris.xml share/fwbuilder21/os/unknown_os.xml -@dirrm share/fwbuilder21/os share/fwbuilder21/platform/fwsm.xml +share/fwbuilder21/platform/iosacl.xml share/fwbuilder21/platform/ipf.xml share/fwbuilder21/platform/ipfw.xml share/fwbuilder21/platform/iptables.xml share/fwbuilder21/platform/pf.xml share/fwbuilder21/platform/pix.xml share/fwbuilder21/platform/unknown.xml +share/fwbuilder21/resources.xml +share/fwbuilder21/templates.xml @dirrm share/fwbuilder21/platform +@dirrm share/fwbuilder21/os +@dirrm share/fwbuilder21/locale @dirrm share/fwbuilder21 -share/man/man1/fwbedit.1 -share/man/man1/fwb_ipf.1 -share/man/man1/fwb_ipfw.1 -share/man/man1/fwb_ipt.1 -share/man/man1/fwblookup.1 -share/man/man1/fwb_pf.1 -share/man/man1/fwbuilder.1 +@dirrm share/doc/fwbuilder-${PKGVERSION} diff --git a/security/fwbuilder21/distinfo b/security/fwbuilder21/distinfo index 58459b08f67..92723029c44 100644 --- a/security/fwbuilder21/distinfo +++ b/security/fwbuilder21/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.2 2007/03/24 18:37:20 bad Exp $ +$NetBSD: distinfo,v 1.3 2007/12/12 17:59:21 adam Exp $ -SHA1 (fwbuilder-2.1.10.tar.gz) = 811c66eac219cf2cedd6a1c2676b83e34c1a144a -RMD160 (fwbuilder-2.1.10.tar.gz) = 9a106acf18f032a35dd06587096d2bca172db7c3 -Size (fwbuilder-2.1.10.tar.gz) = 1539007 bytes +SHA1 (fwbuilder-2.1.15.tar.gz) = 1597c28af5b002c357c646943d2fd99fce0c35c4 +RMD160 (fwbuilder-2.1.15.tar.gz) = b7516c202bcf8675224266c10dc30f9109fe9f58 +Size (fwbuilder-2.1.15.tar.gz) = 1799660 bytes SHA1 (patch-aa) = dadac6310b0d27c326209867ee356610907f099c -SHA1 (patch-ab) = 2210d7c6813e19108004d491073b0c46ef56577d +SHA1 (patch-ab) = 7060bef9b5a4f017e076bf9274ce3f33b4cfe895 SHA1 (patch-ac) = 74f94531167bebc473299bbc8d636173de7a5e3a SHA1 (patch-ad) = 593e9459076bb2b633507c17b489a66cbcac0f55 SHA1 (patch-ae) = c88624f1b18c55deca7d722b46103b8a09f7c98a +SHA1 (patch-af) = a97b916ac7b9b0d0590d9eb782b8333158f6d2fa diff --git a/security/fwbuilder21/patches/patch-ab b/security/fwbuilder21/patches/patch-ab index 66a7fefdedb..825bce17c5b 100644 --- a/security/fwbuilder21/patches/patch-ab +++ b/security/fwbuilder21/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2006/11/09 19:07:56 bad Exp $ +$NetBSD: patch-ab,v 1.2 2007/12/12 17:59:21 adam Exp $ ---- qmake.inc.in.orig 2006-06-21 09:20:37.000000000 +0200 -+++ qmake.inc.in 2006-11-08 01:26:21.000000000 +0100 -@@ -27,7 +27,7 @@ +--- qmake.inc.in.orig 2007-08-06 09:07:21.000000000 +0200 ++++ qmake.inc.in +@@ -36,7 +36,7 @@ unix { res_os.path = $(DDIR)@RES_DIR@/os res_platform.path = $(DDIR)@RES_DIR@/platform @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/11/09 19:07:56 bad Exp $ INCLUDEPATH += @LIBFWBUILDER_INCLUDEPATH@ LIBS += $$LIBS_FWBUILDER @LIBS@ -@@ -35,9 +35,8 @@ +@@ -44,9 +44,8 @@ unix { PKGLOCALEDIR = $$res.path/locale QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter diff --git a/security/fwbuilder21/patches/patch-af b/security/fwbuilder21/patches/patch-af new file mode 100644 index 00000000000..5555b81e69f --- /dev/null +++ b/security/fwbuilder21/patches/patch-af @@ -0,0 +1,63 @@ +$NetBSD: patch-af,v 1.1 2007/12/12 17:59:21 adam Exp $ + +--- configure.orig 2007-12-12 18:11:16.000000000 +0100 ++++ configure +@@ -5986,7 +5986,7 @@ echo "${ECHO_T}Win32 mingw" >&6 + *-*-darwin*) + OS=MacOSX + OS_MACOSX=1 +- MANDIR="${PREFIX}/share/man/" ++ MANDIR="${PREFIX}/man/" + echo "$as_me:$LINENO: result: MacOSX" >&5 + echo "${ECHO_T}MacOSX" >&6 + DEFAULT_RES_DIR="../Resources" +@@ -5995,12 +5995,21 @@ echo "${ECHO_T}MacOSX" >&6 + *-*-solaris*) + OS=Solaris + OS_SOLARIS=1 +- MANDIR="${PREFIX}/share/man/" ++ MANDIR="${PREFIX}/man/" + echo "$as_me:$LINENO: result: Solaris" >&5 + echo "${ECHO_T}Solaris" >&6 + DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}" + ;; + ++ *-*-netbsd*) ++ OS=NetBSD ++ OS_NETBSD=1 ++ MANDIR="${PREFIX}/man/" ++ echo "$as_me:$LINENO: result: NetBSD" >&5 ++echo "${ECHO_T}NetBSD" >&6 ++ DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}" ++ ;; ++ + *-*-freebsd*) + OS=FreeBSD + OS_FREEBSD=1 +@@ -6027,7 +6036,7 @@ echo "${ECHO_T}OpenBSD" >&6 + else + DISTRO="Unknown" + fi +- MANDIR="${PREFIX}/share/man/" ++ MANDIR="${PREFIX}/man/" + echo "$as_me:$LINENO: result: $DISTRO GNU/kFreeBSD" >&5 + echo "${ECHO_T}$DISTRO GNU/kFreeBSD" >&6 + DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}" +@@ -6054,7 +6063,7 @@ echo "${ECHO_T}$DISTRO GNU/kFreeBSD" >&6 + else + DISTRO="Unknown" + fi +- MANDIR="${PREFIX}/share/man/" ++ MANDIR="${PREFIX}/man/" + echo "$as_me:$LINENO: result: $DISTRO Linux" >&5 + echo "${ECHO_T}$DISTRO Linux" >&6 + ;; +@@ -6063,7 +6072,7 @@ echo "${ECHO_T}$DISTRO Linux" >&6 + OS=Unknown + OS_UNKNOWN=1 + DISTRO=Unknown +- MANDIR="${PREFIX}/share/man/" ++ MANDIR="${PREFIX}/man/" + echo "$as_me:$LINENO: result: Unknown" >&5 + echo "${ECHO_T}Unknown" >&6 + DEFAULT_RES_DIR="${PREFIX}/share/fwbuilder${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}" -- cgit v1.2.3