Hello all. This is an update for FWBuilder to fresh release. It supports PF from OpenBSD 4.9 and ever contains PF parser (not so useful on "wild" configurations, though). Also new release is a bit more stable than current version we have in ports.
Upstream merged almost all our patches, and also a few patches for regressions found by unit tests (and many for tests themselves). There is one regression test failing (ObjectMatcherTest), upstream was notified and replied that test just wasn't updated. libfwbuilder package is gone, it contents was merged into fwbuilder package. I added a devel/quirks patch for safety, in case someone installed libfwbuilder without fwbuilder. Runs fine for me on i386. -- Vadim Zhukov Index: security/fwbuilder/Makefile =================================================================== RCS file: /cvs/ports/security/fwbuilder/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- security/fwbuilder/Makefile 12 Apr 2011 12:38:08 -0000 1.24 +++ security/fwbuilder/Makefile 31 Jul 2011 15:02:59 -0000 @@ -3,16 +3,15 @@ # Consumes more than 512MB on at least i386 when building qrc_MainRes.o VMEM_WARNING = Yes -V = 4.1.3 COMMENT = firewall GUI -DISTNAME = fwbuilder-$V +DISTNAME = fwbuilder-5.0.0.3568 CATEGORIES = net security HOMEPAGE = http://www.fwbuilder.org/ MAINTAINER = Vadim Zhukov <persg...@gmail.com> -# GPLv2+ +# GPLv2+ mostly, some code under BSD-like PERMIT_PACKAGE_FTP = Yes PERMIT_PACKAGE_CDROM = Yes PERMIT_DISTFILES_FTP = Yes @@ -20,14 +19,20 @@ PERMIT_DISTFILES_CDROM =Yes MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fwbuilder/} +# .orig produces too much spam in tests directories +PATCHORIG = .ports.orig + AUTOMAKE_VERSION = 1.10 AUTOCONF_VERSION = 2.63 CONFIGURE_STYLE = gnu -BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \ - ${MODGNU_AUTOMAKE_DEPENDS} \ - devel/cppunit +# Port doesn't respect CFLAGS/CXXFLAGS itself everywhere +COPTS = ${DEBUG} + +BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \ + ${MODGNU_AUTOMAKE_DEPENDS} \ + devel/cppunit CONFIGURE_ARGS += --with-docdir=${TRUEPREFIX}/share/doc/fwbuilder \ --with-templatedir=${TRUEPREFIX}/share/fwbuilder \ @@ -36,23 +41,30 @@ CONFIGURE_ARGS += --with-docdir=${TRUEPR --without-distcc MAKE_ENV += QMAKE=${MODQT_QTDIR}/bin/qmake \ CXXFLAGS="${CXXFLAGS}" \ + COPTS="${COPTS}" \ LDFLAGS="${LDFLAGS}" -MODULES = x11/qt4 converters/libiconv DESTDIRNAME = INSTALL_ROOT -LIB_DEPENDS = libfwbuilder-$V:security/libfwbuilder \ - x11/qt4 + +MODULES = x11/qt4 converters/libiconv +LIB_DEPENDS = net/net-snmp \ + textproc/libxml \ + textproc/libxslt \ + x11/qt4 \ -REGRESS_TARGET =tests -USE_GROFF = Yes +WANTLIB += c crypto m netsnmp +WANTLIB += pthread stdc++ util xml2 xslt z +WANTLIB += QtGui QtNetwork -WANTLIB += c crypto m netsnmp -WANTLIB += pthread stdc++ util xml2 xslt z -WANTLIB += QtDBus QtGui QtNetwork QtXml -WANTLIB += fwcompiler>=14 fwbuilder>=14 +USE_GROFF = Yes FAKE_FLAGS = INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_FILE="${INSTALL_DATA}" + +REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} +REGRESS_TARGET = tests +REGRESS_ENV += COPTS="${COPTS}" +REGRESS_IS_INTERACTIVE = X11 post-patch: cd ${WRKSRC}; \ Index: security/fwbuilder/distinfo =================================================================== RCS file: /cvs/ports/security/fwbuilder/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- security/fwbuilder/distinfo 12 Apr 2011 12:38:08 -0000 1.11 +++ security/fwbuilder/distinfo 31 Jul 2011 15:02:59 -0000 @@ -1,5 +1,5 @@ -MD5 (fwbuilder-4.1.3.tar.gz) = fLbVDObwK0hVJUBb0A2MMw== -RMD160 (fwbuilder-4.1.3.tar.gz) = mjP9FFtFsdEmou9MGYx5f0ZhtAE= -SHA1 (fwbuilder-4.1.3.tar.gz) = YS2/181mnC74iJFXrj+PANKFN/4= -SHA256 (fwbuilder-4.1.3.tar.gz) = +K9JC8OgkSTrWsbOEVc2ZTDLUWz4VqOYtuzoGbbmZD4= -SIZE (fwbuilder-4.1.3.tar.gz) = 5683404 +MD5 (fwbuilder-5.0.0.3568.tar.gz) = AyTtqxAynd4CmVPWRqqNrQ== +RMD160 (fwbuilder-5.0.0.3568.tar.gz) = Ikjx8BWBzhbIYeBBIwFR02ehgsY= +SHA1 (fwbuilder-5.0.0.3568.tar.gz) = HLwA2vBuwd+es53wbJWPH+5E6+0= +SHA256 (fwbuilder-5.0.0.3568.tar.gz) = 3EKVa/paDE9wM1Os4qNt3+yYX0QxqwDACuCsnKb2csA= +SIZE (fwbuilder-5.0.0.3568.tar.gz) = 6703816 Index: security/fwbuilder/patches/patch-autogen_sh =================================================================== RCS file: /cvs/ports/security/fwbuilder/patches/patch-autogen_sh,v retrieving revision 1.1 diff -u -p -r1.1 patch-autogen_sh --- security/fwbuilder/patches/patch-autogen_sh 14 Jul 2010 08:46:35 -0000 1.1 +++ security/fwbuilder/patches/patch-autogen_sh 31 Jul 2011 15:02:59 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-autogen_sh,v 1.1 2010/07/14 08:46:35 sthen Exp $ ---- autogen.sh.orig Tue Jul 13 22:51:31 2010 -+++ autogen.sh Tue Jul 13 22:51:41 2010 +$OpenBSD$ +--- autogen.sh.ports.orig Thu May 12 01:02:03 2011 ++++ autogen.sh Sun May 15 00:11:20 2011 @@ -40,12 +40,8 @@ $LIBTOOLIZE --dry-run --install > /dev/null 2>&1 && { LIBTOOLIZE_ARGS="--force --copy" } cvs server: cannot find security/fwbuilder/patches/patch-qmake_inc_in Index: security/fwbuilder/patches/patch-unit_tests_sh =================================================================== RCS file: security/fwbuilder/patches/patch-unit_tests_sh diff -N security/fwbuilder/patches/patch-unit_tests_sh --- security/fwbuilder/patches/patch-unit_tests_sh 14 Jul 2010 08:46:35 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-unit_tests_sh,v 1.1 2010/07/14 08:46:35 sthen Exp $ ---- unit_tests.sh.orig Tue Jul 13 22:53:21 2010 -+++ unit_tests.sh Tue Jul 13 22:53:31 2010 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - action=$@ - -@@ -6,7 +6,7 @@ for directory in $(find . -name unit_tests) - do - home=`pwd` - cd $directory -- qmake -spec $QMAKESPEC || exit 1 -+ ${QMAKE} -spec $QMAKESPEC || exit 1 - $action || exit 1 - cd $home --done -\ No newline at end of file -+done Index: security/fwbuilder/pkg/PLIST =================================================================== RCS file: /cvs/ports/security/fwbuilder/pkg/PLIST,v retrieving revision 1.11 diff -u -p -r1.11 PLIST --- security/fwbuilder/pkg/PLIST 12 Apr 2011 12:38:08 -0000 1.11 +++ security/fwbuilder/pkg/PLIST 31 Jul 2011 15:02:59 -0000 @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST,v 1.11 2011/04/12 12:38:08 sthen Exp $ +@conflict libfwbuilder-* +@pkgpath security/libfwbuilder @bin bin/fwb_iosacl @bin bin/fwb_ipf @bin bin/fwb_ipfw @@ -8,7 +10,6 @@ @bin bin/fwb_procurve_acl @bin bin/fwbedit @bin bin/fwbuilder -@bin bin/transfer_secuwall @man man/man1/fwb_iosacl.1 @man man/man1/fwb_ipf.1 @man man/man1/fwb_ipfw.1 @@ -39,12 +40,16 @@ share/doc/fwbuilder/README.routing share/fwbuilder/ share/fwbuilder/configlets/ share/fwbuilder/configlets/bsd/ +share/fwbuilder/configlets/bsd/bridge_interface +share/fwbuilder/configlets/bsd/bridge_port share/fwbuilder/configlets/bsd/carp_interface +share/fwbuilder/configlets/bsd/ifconfig_interface share/fwbuilder/configlets/bsd/kernel_vars share/fwbuilder/configlets/bsd/pfsync_interface share/fwbuilder/configlets/bsd/shell_functions share/fwbuilder/configlets/bsd/tools share/fwbuilder/configlets/bsd/update_addresses +share/fwbuilder/configlets/bsd/update_bridge share/fwbuilder/configlets/bsd/update_carp share/fwbuilder/configlets/bsd/update_pfsync share/fwbuilder/configlets/bsd/update_vlans @@ -63,10 +68,35 @@ share/fwbuilder/configlets/dd-wrt-nvram/ share/fwbuilder/configlets/dd-wrt-nvram/script_skeleton share/fwbuilder/configlets/dd-wrt-nvram/top_comment share/fwbuilder/configlets/freebsd/ +share/fwbuilder/configlets/freebsd/carp_interface +share/fwbuilder/configlets/freebsd/ifconfig_interface share/fwbuilder/configlets/freebsd/installer_commands_reg_user share/fwbuilder/configlets/freebsd/installer_commands_root share/fwbuilder/configlets/freebsd/kernel_vars +share/fwbuilder/configlets/freebsd/rc_conf_bridge_port +share/fwbuilder/configlets/freebsd/rc_conf_carp_interface +share/fwbuilder/configlets/freebsd/rc_conf_ifconfig_interface +share/fwbuilder/configlets/freebsd/rc_conf_kernel_vars +share/fwbuilder/configlets/freebsd/rc_conf_pfsync_interface +share/fwbuilder/configlets/freebsd/routing_functions share/fwbuilder/configlets/freebsd/tools +share/fwbuilder/configlets/fwsm_os/ +share/fwbuilder/configlets/fwsm_os/failover_commands_2 +share/fwbuilder/configlets/fwsm_os/failover_commands_3_2 +share/fwbuilder/configlets/fwsm_os/failover_interface_2 +share/fwbuilder/configlets/fwsm_os/failover_interface_3_2 +share/fwbuilder/configlets/fwsm_os/installer_commands_post_config +share/fwbuilder/configlets/fwsm_os/installer_commands_pre_config +share/fwbuilder/configlets/fwsm_os/installer_commands_reg_user +share/fwbuilder/configlets/fwsm_os/ntp +share/fwbuilder/configlets/fwsm_os/regular_interface_2 +share/fwbuilder/configlets/fwsm_os/regular_interface_3_2 +share/fwbuilder/configlets/fwsm_os/snmp +share/fwbuilder/configlets/fwsm_os/ssh +share/fwbuilder/configlets/fwsm_os/vlan_parent_interface_2 +share/fwbuilder/configlets/fwsm_os/vlan_parent_interface_3_2 +share/fwbuilder/configlets/fwsm_os/vlan_subinterface_2 +share/fwbuilder/configlets/fwsm_os/vlan_subinterface_3_2 share/fwbuilder/configlets/ios/ share/fwbuilder/configlets/ios/installer_commands_post_config share/fwbuilder/configlets/ios/installer_commands_pre_config @@ -109,6 +139,7 @@ share/fwbuilder/configlets/linux24/routi share/fwbuilder/configlets/linux24/run_time_address_tables share/fwbuilder/configlets/linux24/run_time_wrappers share/fwbuilder/configlets/linux24/script_body_iptables_restore +share/fwbuilder/configlets/linux24/script_body_iptables_shell share/fwbuilder/configlets/linux24/script_body_single_rule share/fwbuilder/configlets/linux24/script_skeleton share/fwbuilder/configlets/linux24/shell_functions @@ -129,6 +160,7 @@ share/fwbuilder/configlets/openbsd/ share/fwbuilder/configlets/openbsd/installer_commands_reg_user share/fwbuilder/configlets/openbsd/installer_commands_root share/fwbuilder/configlets/openbsd/kernel_vars +share/fwbuilder/configlets/openbsd/routing_functions share/fwbuilder/configlets/openbsd/tools share/fwbuilder/configlets/openwrt/ share/fwbuilder/configlets/openwrt/check_utilities @@ -139,6 +171,9 @@ share/fwbuilder/configlets/openwrt/scrip share/fwbuilder/configlets/openwrt/top_comment share/fwbuilder/configlets/pf/ share/fwbuilder/configlets/pf/activation +share/fwbuilder/configlets/pf/rc_conf_activation +share/fwbuilder/configlets/pf/rc_conf_skeleton +share/fwbuilder/configlets/pf/rc_conf_top_comment share/fwbuilder/configlets/pf/script_skeleton share/fwbuilder/configlets/pf/top_comment share/fwbuilder/configlets/pix_os/ @@ -183,6 +218,7 @@ share/fwbuilder/configlets/sveasoft/inst share/fwbuilder/configlets/sveasoft/script_skeleton share/fwbuilder/configlets/sveasoft/shell_functions share/fwbuilder/configlets/sveasoft/top_comment +share/fwbuilder/fwbuilder.dtd share/fwbuilder/help/ share/fwbuilder/help/en_US/ share/fwbuilder/help/en_US/cluster_interfaces.png @@ -215,6 +251,10 @@ share/fwbuilder/help/en_US/release_notes share/fwbuilder/help/en_US/release_notes_4.1.1.html share/fwbuilder/help/en_US/release_notes_4.1.2.html share/fwbuilder/help/en_US/release_notes_4.1.3.html +share/fwbuilder/help/en_US/release_notes_4.2.0.html +share/fwbuilder/help/en_US/release_notes_4.2.1.html +share/fwbuilder/help/en_US/release_notes_4.2.2.html +share/fwbuilder/help/en_US/release_notes_5.0.0.html share/fwbuilder/help/en_US/state_sync_configuration.png share/fwbuilder/help/en_US/tip01.html share/fwbuilder/help/en_US/tip02.html @@ -227,9 +267,85 @@ share/fwbuilder/help/en_US/tip08.html share/fwbuilder/help/en_US/tip09.html share/fwbuilder/help/en_US/tip10.html share/fwbuilder/help/en_US/vlan_interfaces.png -share/fwbuilder/locale/ -share/fwbuilder/locale/fwbuilder_ja.qm -share/fwbuilder/locale/fwbuilder_ru.qm +share/fwbuilder/migration/ +share/fwbuilder/migration/FWObjectDatabase_0.10.0.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.1.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.10.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.11.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.12.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.13.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.14.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.2.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.3.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.4.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.5.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.6.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.7.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.8.xslt +share/fwbuilder/migration/FWObjectDatabase_0.10.9.xslt +share/fwbuilder/migration/FWObjectDatabase_0.9.0.xslt +share/fwbuilder/migration/FWObjectDatabase_0.9.1.xslt +share/fwbuilder/migration/FWObjectDatabase_0.9.2.xslt +share/fwbuilder/migration/FWObjectDatabase_0.9.3.xslt +share/fwbuilder/migration/FWObjectDatabase_0.9.4.xslt +share/fwbuilder/migration/FWObjectDatabase_0.9.5.xslt +share/fwbuilder/migration/FWObjectDatabase_1.0.0.xslt +share/fwbuilder/migration/FWObjectDatabase_1.0.1.xslt +share/fwbuilder/migration/FWObjectDatabase_1.0.2.xslt +share/fwbuilder/migration/FWObjectDatabase_10.xslt +share/fwbuilder/migration/FWObjectDatabase_11.xslt +share/fwbuilder/migration/FWObjectDatabase_12.xslt +share/fwbuilder/migration/FWObjectDatabase_13.xslt +share/fwbuilder/migration/FWObjectDatabase_14.xslt +share/fwbuilder/migration/FWObjectDatabase_15.xslt +share/fwbuilder/migration/FWObjectDatabase_16.xslt +share/fwbuilder/migration/FWObjectDatabase_17.xslt +share/fwbuilder/migration/FWObjectDatabase_18.xslt +share/fwbuilder/migration/FWObjectDatabase_19.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.0.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.1.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.10.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.11.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.12.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.2.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.3.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.4.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.5.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.6.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.7.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.8.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.9.xslt +share/fwbuilder/migration/FWObjectDatabase_2.0.99.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.0.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.1.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.10.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.11.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.12.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.13.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.14.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.15.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.16.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.17.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.18.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.19.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.2.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.3.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.4.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.5.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.6.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.7.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.8.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.9.xslt +share/fwbuilder/migration/FWObjectDatabase_2.1.99.xslt +share/fwbuilder/migration/FWObjectDatabase_20.xslt +share/fwbuilder/migration/FWObjectDatabase_21.xslt +share/fwbuilder/migration/FWObjectDatabase_3.xslt +share/fwbuilder/migration/FWObjectDatabase_4.xslt +share/fwbuilder/migration/FWObjectDatabase_5.xslt +share/fwbuilder/migration/FWObjectDatabase_6.xslt +share/fwbuilder/migration/FWObjectDatabase_7.xslt +share/fwbuilder/migration/FWObjectDatabase_8.xslt +share/fwbuilder/migration/FWObjectDatabase_9.xslt share/fwbuilder/objects_init.xml share/fwbuilder/os/ share/fwbuilder/os/dd-wrt-jffs.xml @@ -262,6 +378,8 @@ share/fwbuilder/platform/procurve_acl.xm share/fwbuilder/platform/unknown.xml share/fwbuilder/resources.xml share/fwbuilder/templates.xml +@exec %D/bin/update-desktop-database +@unexec-delete %D/bin/update-desktop-database share/icons/ share/icons/hicolor/ share/icons/hicolor/128x128/ @@ -288,5 +406,3 @@ share/icons/hicolor/512x512/apps/fwbuild share/icons/hicolor/72x72/ share/icons/hicolor/72x72/apps/ share/icons/hicolor/72x72/apps/fwbuilder.png -@exec %D/bin/update-desktop-database -@unexec-delete %D/bin/update-desktop-database Index: security/libfwbuilder/Makefile =================================================================== RCS file: security/libfwbuilder/Makefile diff -N security/libfwbuilder/Makefile --- security/libfwbuilder/Makefile 12 Apr 2011 12:38:08 -0000 1.19 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,61 +0,0 @@ -# $OpenBSD: Makefile,v 1.19 2011/04/12 12:38:08 sthen Exp $ - -COMMENT= libraries for fwbuilder -DISTNAME= libfwbuilder-4.1.3 -CATEGORIES= net security -SHARED_LIBS= fwbuilder 16.0 \ - fwcompiler 16.0 - -HOMEPAGE= http://www.fwbuilder.org/ - -MAINTAINER= Vadim Zhukov <persg...@gmail.com> - -# GPLv2+ -PERMIT_PACKAGE_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes - -WANTLIB= crypto m netsnmp stdc++ xml2 xslt z - -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/} - -MODULES= x11/qt4 converters/libiconv -LIB_DEPENDS+= textproc/libxslt \ - textproc/libxml \ - net/net-snmp - -AUTOMAKE_VERSION = 1.10 -AUTOCONF_VERSION = 2.63 - -USE_GMAKE = Yes - -CONFIGURE_STYLE = gnu - -BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \ - ${MODGNU_AUTOMAKE_DEPENDS} -# wants libtoolize but does not use libtool -BUILD_DEPENDS +=devel/libtool - -CONFIGURE_ARGS += --with-docdir=${TRUEPREFIX}/share/doc/libfwbuilder \ - --with-templatedir=${TRUEPREFIX}/share/libfwbuilder \ - --with-qtdir=${MODQT_QTDIR} \ - --with-qmake=qmake4 \ - --without-distcc -MAKE_ENV += QMAKE=${MODQT_QTDIR}/bin/qmake \ - CXXFLAGS="${CXXFLAGS}" \ - CCACHE=/nonexistent - -REGRESS_TARGET= tests - -MAKE_FLAGS= LIBfwbuilder_VERSION=${LIBfwbuilder_VERSION} \ - LIBfwcompiler_VERSION=${LIBfwcompiler_VERSION} -DESTDIRNAME= INSTALL_ROOT - -post-patch: - cd ${WRKSRC}; \ - AUTOCONF_VERSION=${AUTOCONF_VERSION} \ - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ - sh autogen.sh - -.include <bsd.port.mk> Index: security/libfwbuilder/distinfo =================================================================== RCS file: security/libfwbuilder/distinfo diff -N security/libfwbuilder/distinfo --- security/libfwbuilder/distinfo 12 Apr 2011 12:38:08 -0000 1.11 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,5 +0,0 @@ -MD5 (libfwbuilder-4.1.3.tar.gz) = gQ6DKjytxiWRdAP0sZH9og== -RMD160 (libfwbuilder-4.1.3.tar.gz) = 7I0miYaFQtBepYSjmt3MITFVWnw= -SHA1 (libfwbuilder-4.1.3.tar.gz) = TGseW67l5Lo2Pej3nIvMJyoGibw= -SHA256 (libfwbuilder-4.1.3.tar.gz) = oWV+XOnK7w4Xi5n1dgB2i0/kfK4RWEAMSTO21BrRPxY= -SIZE (libfwbuilder-4.1.3.tar.gz) = 363194 Index: security/libfwbuilder/patches/patch-autogen_sh =================================================================== RCS file: security/libfwbuilder/patches/patch-autogen_sh diff -N security/libfwbuilder/patches/patch-autogen_sh --- security/libfwbuilder/patches/patch-autogen_sh 14 Jul 2010 08:46:35 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-autogen_sh,v 1.1 2010/07/14 08:46:35 sthen Exp $ ---- autogen.sh.orig Thu May 7 00:41:20 2009 -+++ autogen.sh Tue Jul 13 22:42:51 2010 -@@ -40,12 +40,9 @@ $LIBTOOLIZE --dry-run --install > /dev/null 2>&1 && { - LIBTOOLIZE_ARGS="--force --copy" - } - --echo This script runs configure ... -- - $LIBTOOLIZE $LIBTOOLIZE_ARGS - - which acinclude >/dev/null 2>&1 && acinclude - which aclocal >/dev/null 2>&1 && aclocal - autoconf - --./configure ${CFGARGS} $* Index: security/libfwbuilder/patches/patch-qmake_inc_in =================================================================== RCS file: security/libfwbuilder/patches/patch-qmake_inc_in diff -N security/libfwbuilder/patches/patch-qmake_inc_in --- security/libfwbuilder/patches/patch-qmake_inc_in 14 Jul 2010 08:46:35 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-qmake_inc_in,v 1.5 2010/07/14 08:46:35 sthen Exp $ ---- qmake.inc.in.orig Sun Feb 28 05:23:02 2010 -+++ qmake.inc.in Sun May 23 00:40:33 2010 -@@ -35,7 +35,7 @@ unix { - migration.path = @TEMPLATE_DIR@/migration - doc.path = @DOCDIR@ - -- CONFIG += warn_on debug -+ CONFIG += warn_on release - QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter - QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter - QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ Index: security/libfwbuilder/patches/patch-src_fwbuilder_unit_tests_unit_tests_sh =================================================================== RCS file: security/libfwbuilder/patches/patch-src_fwbuilder_unit_tests_unit_tests_sh diff -N security/libfwbuilder/patches/patch-src_fwbuilder_unit_tests_unit_tests_sh --- security/libfwbuilder/patches/patch-src_fwbuilder_unit_tests_unit_tests_sh 11 Oct 2010 20:19:11 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_fwbuilder_unit_tests_unit_tests_sh,v 1.2 2010/10/11 20:19:11 sthen Exp $ - -XXX handrolled; no trailing eol - ---- src/fwbuilder/unit_tests/unit_tests.sh.orig Sun Feb 28 20:11:11 2010 -+++ src/fwbuilder/unit_tests/unit_tests.sh Sun Oct 10 10:17:28 2010 -@@ -1,11 +1,11 @@ --#!/bin/bash -+#!/bin/sh - - commands=$@ - --for directory in `find . -maxdepth 1 -type d -regex '\./[A-Za-z0-9\-\_]*'` -+for directory in `find . -maxdepth 1 -type d -name '[A-Za-z0-9_-]*'` - do - cd $directory -- [ ! -e Makefile ] && qmake -spec $QMAKESPEC -+ [ ! -e Makefile ] && ${QMAKE} -spec $QMAKESPEC - $commands || exit 1 - cd - - done; -\ No newline at end of file Index: security/libfwbuilder/patches/patch-unit_tests_sh =================================================================== RCS file: security/libfwbuilder/patches/patch-unit_tests_sh diff -N security/libfwbuilder/patches/patch-unit_tests_sh --- security/libfwbuilder/patches/patch-unit_tests_sh 14 Jul 2010 08:46:35 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-unit_tests_sh,v 1.1 2010/07/14 08:46:35 sthen Exp $ - -XXX handrolled; no trailing eol - ---- unit_tests.sh.orig Tue Jul 13 21:55:13 2010 -+++ unit_tests.sh Tue Jul 13 21:56:28 2010 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - action=$@ - -@@ -7,7 +7,7 @@ do - home=`pwd` - cd $directory - echo $directory -- qmake -spec $QMAKESPEC || exit 1 -+ ${QMAKE} -spec $QMAKESPEC || exit 1 - $action || exit 1 - cd $home --done -\ No newline at end of file -+done Index: security/libfwbuilder/pkg/DESCR =================================================================== RCS file: security/libfwbuilder/pkg/DESCR diff -N security/libfwbuilder/pkg/DESCR --- security/libfwbuilder/pkg/DESCR 21 May 2005 09:35:19 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -fwbuilder is a GUI + xml specs for various firewall software. -This package holds the lib and API for fwbuilder. Index: security/libfwbuilder/pkg/PFRAG.shared =================================================================== RCS file: security/libfwbuilder/pkg/PFRAG.shared diff -N security/libfwbuilder/pkg/PFRAG.shared --- security/libfwbuilder/pkg/PFRAG.shared 28 Dec 2005 22:52:31 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/28 22:52:31 sturm Exp $ -@lib lib/libfwbuilder.so.${LIBfwbuilder_VERSION} -@lib lib/libfwcompiler.so.${LIBfwcompiler_VERSION} Index: security/libfwbuilder/pkg/PLIST =================================================================== RCS file: security/libfwbuilder/pkg/PLIST diff -N security/libfwbuilder/pkg/PLIST --- security/libfwbuilder/pkg/PLIST 12 Apr 2011 12:38:08 -0000 1.8 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,171 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.8 2011/04/12 12:38:08 sthen Exp $ -%%SHARED%% -bin/libfwbuilder-config-4 -include/fwb-4/ -include/fwb-4/fwbuilder/ -include/fwb-4/fwbuilder/Address.h -include/fwb-4/fwbuilder/AddressRange.h -include/fwb-4/fwbuilder/AddressTable.h -include/fwb-4/fwbuilder/BackgroundOp.h -include/fwb-4/fwbuilder/Cluster.h -include/fwb-4/fwbuilder/ClusterGroup.h -include/fwb-4/fwbuilder/Constants.h -include/fwb-4/fwbuilder/CustomService.h -include/fwb-4/fwbuilder/DNSName.h -include/fwb-4/fwbuilder/Dispatch.h -include/fwb-4/fwbuilder/FWException.h -include/fwb-4/fwbuilder/FWIntervalReference.h -include/fwb-4/fwbuilder/FWObject.h -include/fwb-4/fwbuilder/FWObjectDatabase.h -include/fwb-4/fwbuilder/FWObjectReference.h -include/fwb-4/fwbuilder/FWOptions.h -include/fwb-4/fwbuilder/FWReference.h -include/fwb-4/fwbuilder/FWServiceReference.h -include/fwb-4/fwbuilder/FailoverClusterGroup.h -include/fwb-4/fwbuilder/Firewall.h -include/fwb-4/fwbuilder/Group.h -include/fwb-4/fwbuilder/Host.h -include/fwb-4/fwbuilder/HostsFile.h -include/fwb-4/fwbuilder/ICMP6Service.h -include/fwb-4/fwbuilder/ICMPService.h -include/fwb-4/fwbuilder/IPRoute.h -include/fwb-4/fwbuilder/IPService.h -include/fwb-4/fwbuilder/IPv4.h -include/fwb-4/fwbuilder/IPv6.h -include/fwb-4/fwbuilder/Inet6AddrMask.h -include/fwb-4/fwbuilder/InetAddr.h -include/fwb-4/fwbuilder/InetAddrMask.h -include/fwb-4/fwbuilder/Interface.h -include/fwb-4/fwbuilder/InterfaceData.h -include/fwb-4/fwbuilder/Interval.h -include/fwb-4/fwbuilder/IntervalGroup.h -include/fwb-4/fwbuilder/Library.h -include/fwb-4/fwbuilder/Logger.h -include/fwb-4/fwbuilder/Management.h -include/fwb-4/fwbuilder/MultiAddress.h -include/fwb-4/fwbuilder/NAT.h -include/fwb-4/fwbuilder/Network.h -include/fwb-4/fwbuilder/NetworkIPv6.h -include/fwb-4/fwbuilder/ObjectGroup.h -include/fwb-4/fwbuilder/ObjectMatcher.h -include/fwb-4/fwbuilder/ObjectMirror.h -include/fwb-4/fwbuilder/Policy.h -include/fwb-4/fwbuilder/Pool.h -include/fwb-4/fwbuilder/Resources.h -include/fwb-4/fwbuilder/Routing.h -include/fwb-4/fwbuilder/Rule.h -include/fwb-4/fwbuilder/RuleElement.h -include/fwb-4/fwbuilder/RuleSet.h -include/fwb-4/fwbuilder/SecuwallMgmtFile.h -include/fwb-4/fwbuilder/Service.h -include/fwb-4/fwbuilder/ServiceGroup.h -include/fwb-4/fwbuilder/StateSyncClusterGroup.h -include/fwb-4/fwbuilder/SyncQueue.h -include/fwb-4/fwbuilder/TCPService.h -include/fwb-4/fwbuilder/TCPUDPService.h -include/fwb-4/fwbuilder/TagService.h -include/fwb-4/fwbuilder/ThreadTools.h -include/fwb-4/fwbuilder/Tools.h -include/fwb-4/fwbuilder/UDPService.h -include/fwb-4/fwbuilder/UserService.h -include/fwb-4/fwbuilder/XMLTools.h -include/fwb-4/fwbuilder/dns.h -include/fwb-4/fwbuilder/inet_net.h -include/fwb-4/fwbuilder/libfwbuilder-config.h -include/fwb-4/fwbuilder/libfwbuilder-version.h -include/fwb-4/fwbuilder/physAddress.h -include/fwb-4/fwbuilder/snmp.h -include/fwb-4/fwbuilder/uint128.h -include/fwb-4/fwcompiler/ -include/fwb-4/fwcompiler/BaseCompiler.h -include/fwb-4/fwcompiler/Compiler.h -include/fwb-4/fwcompiler/NATCompiler.h -include/fwb-4/fwcompiler/OSConfigurator.h -include/fwb-4/fwcompiler/PolicyCompiler.h -include/fwb-4/fwcompiler/Preprocessor.h -include/fwb-4/fwcompiler/RoutingCompiler.h -include/fwb-4/fwcompiler/RuleProcessor.h -share/doc/libfwbuilder/ -share/doc/libfwbuilder/AUTHORS -share/doc/libfwbuilder/COPYING -share/doc/libfwbuilder/ChangeLog -share/doc/libfwbuilder/Credits -share/doc/libfwbuilder/INSTALL -share/doc/libfwbuilder/PatchAcceptancePolicy.txt -share/libfwbuilder/ -share/libfwbuilder/fwbuilder.dtd -share/libfwbuilder/migration/ -share/libfwbuilder/migration/FWObjectDatabase_0.10.0.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.1.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.10.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.11.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.12.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.13.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.14.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.2.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.3.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.4.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.5.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.6.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.7.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.8.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.10.9.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.8.7.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.9.0.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.9.1.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.9.2.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.9.3.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.9.4.xslt -share/libfwbuilder/migration/FWObjectDatabase_0.9.5.xslt -share/libfwbuilder/migration/FWObjectDatabase_1.0.0.xslt -share/libfwbuilder/migration/FWObjectDatabase_1.0.1.xslt -share/libfwbuilder/migration/FWObjectDatabase_1.0.2.xslt -share/libfwbuilder/migration/FWObjectDatabase_10.xslt -share/libfwbuilder/migration/FWObjectDatabase_11.xslt -share/libfwbuilder/migration/FWObjectDatabase_12.xslt -share/libfwbuilder/migration/FWObjectDatabase_13.xslt -share/libfwbuilder/migration/FWObjectDatabase_14.xslt -share/libfwbuilder/migration/FWObjectDatabase_15.xslt -share/libfwbuilder/migration/FWObjectDatabase_16.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.0.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.1.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.10.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.11.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.12.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.2.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.3.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.4.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.5.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.6.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.7.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.8.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.9.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.0.99.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.0.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.1.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.10.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.11.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.12.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.13.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.14.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.15.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.16.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.17.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.18.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.19.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.2.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.3.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.4.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.5.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.6.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.7.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.8.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.9.xslt -share/libfwbuilder/migration/FWObjectDatabase_2.1.99.xslt -share/libfwbuilder/migration/FWObjectDatabase_3.xslt -share/libfwbuilder/migration/FWObjectDatabase_4.xslt -share/libfwbuilder/migration/FWObjectDatabase_5.xslt -share/libfwbuilder/migration/FWObjectDatabase_6.xslt -share/libfwbuilder/migration/FWObjectDatabase_7.xslt -share/libfwbuilder/migration/FWObjectDatabase_8.xslt -share/libfwbuilder/migration/FWObjectDatabase_9.xslt Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.55 diff -u -p -r1.55 Makefile --- devel/quirks/Makefile 20 Jul 2011 07:59:28 -0000 1.55 +++ devel/quirks/Makefile 31 Jul 2011 15:02:59 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-1.53 +PKGNAME = quirks-1.54 PKG_ARCH = * MAINTAINER = Marc Espie <es...@openbsd.org> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.60 diff -u -p -r1.60 Quirks.pm --- devel/quirks/files/Quirks.pm 20 Jul 2011 07:59:28 -0000 1.60 +++ devel/quirks/files/Quirks.pm 31 Jul 2011 15:02:59 -0000 @@ -249,7 +249,8 @@ my $stem_extensions = { 'wqy-zenhei-ttf' => 'zh-wqy-zenhei-ttf', 'wqy-bitmapfont' => 'zh-wqy-bitmapfont', 'ptsans' => 'ru-ptsans', - 'py-zeya' => 'zeya' + 'py-zeya' => 'zeya', + 'libfwbuilder' => 'fwbuilder' }; # ->is_base_system($handle, $state):
