Update 4.0.1 --> 4.1.3

7 files changed, 27 insertions, 19 deletions

diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index b6c68525eae0..115f059a8166 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	fwbuilder
-DISTVERSION=	4.0.1
+DISTVERSION=	4.1.3
 PORTVERSION=	${DISTVERSION}
-PORTREVISION=	1
-BUILD=		2929
+BUILD=		3421
 CATEGORIES=	security
 .if defined(BUILD)
-MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-4.0/build-${BUILD}/
+MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-4.1/build-${BUILD}/
 PKGNAMESUFFIX=	-devel
 PORTVERSION=	${DISTVERSION}.b${BUILD}
 .else
@@ -48,7 +47,7 @@ QTDIR?=		${QT_PREFIX}
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf aclocal libtool
+USE_AUTOTOOLS=	autoconf:268 aclocal:111 libtool:22
 CONFIGURE_SCRIPT=	autogen.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
index 931a934eba1b..564254efcd5a 100644
--- a/security/fwbuilder-devel/distinfo
+++ b/security/fwbuilder-devel/distinfo
@@ -1,3 +1,2 @@
-MD5 (fwbuilder-4.0.1.tar.gz) = 684f00944ee1bc9da9a8fd4a774c5eb0
-SHA256 (fwbuilder-4.0.1.tar.gz) = 208cce7e304b66efe5b6c7c8fa100b573f66180b006ee84ce8c83a0781dc2904
-SIZE (fwbuilder-4.0.1.tar.gz) = 5528377
+SHA256 (fwbuilder-4.1.3.tar.gz) = f8af490bc3a09124eb5ac6ce1157366530cb516cf856a398b6ece819b6e6643e
+SIZE (fwbuilder-4.1.3.tar.gz) = 5683404
diff --git a/security/fwbuilder-devel/files/patch-aa b/security/fwbuilder-devel/files/patch-aa
index 27e7557251e4..08ae9b5ede34 100644
--- a/security/fwbuilder-devel/files/patch-aa
+++ b/security/fwbuilder-devel/files/patch-aa
@@ -1,6 +1,6 @@
 --- qmake.inc.in.orig	2010-01-26 15:58:20.000000000 -0800
 +++ qmake.inc.in	2010-05-02 23:23:06.953322354 -0700
-@@ -68,10 +68,6 @@
+@@ -68,11 +68,7 @@
          LIBS += $$LIBS_FWBUILDER @LIBS@
  
          CONFIG += warn_on debug
@@ -8,6 +8,7 @@
 -        QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
 -        QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
 -        QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
+
      }
  }
  
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
index bb94673a24f2..2ce968b0a3f6 100644
--- a/security/fwbuilder-devel/pkg-plist
+++ b/security/fwbuilder-devel/pkg-plist
@@ -18,13 +18,17 @@ share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/update_addresses
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/update_carp
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/update_pfsync
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/update_vlans
+share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs/check_utilities
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs/installer_commands_reg_user
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs/installer_commands_root
+share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs/routing_functions
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs/script_skeleton
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs/top_comment
+share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/check_utilities
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/installer_commands_reg_user
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/installer_commands_root
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/script_skeleton
+share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/routing_functions
 share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram/top_comment
 share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/installer_commands_reg_user
 share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd/installer_commands_root
@@ -52,6 +56,7 @@ share/fwbuilder-%%BUILD_VERSION%%/configlets/ipf/top_comment
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ipfw/script_skeleton
 share/fwbuilder-%%BUILD_VERSION%%/configlets/ipfw/top_comment
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/automatic_rules
+share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/block_action
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/check_utilities
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/conntrack
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/constants
@@ -63,6 +68,7 @@ share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/load_modules
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/prolog_epilog_functions
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/reset_iptables
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/routing_functions
+share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/run_time_address_tables
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/run_time_wrappers
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/script_body_iptables_restore
 share/fwbuilder-%%BUILD_VERSION%%/configlets/linux24/script_body_single_rule
@@ -155,8 +161,12 @@ share/fwbuilder-%%BUILD_VERSION%%/help/en_US/pix-failover-groups-mapping.png
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/pix-statesync-group-1.png
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/pix-statesync-group-mapping.png
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.0.0.html
+share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.0.1.html
+share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.1.0.html
+share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.1.1.html
+share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.1.2.html
+share/fwbuilder-%%BUILD_VERSION%%/help/en_US/release_notes_4.1.3.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/state_sync_configuration.png
-share/fwbuilder-%%BUILD_VERSION%%/help/en_US/summary.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/tip01.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/tip02.html
 share/fwbuilder-%%BUILD_VERSION%%/help/en_US/tip03.html
@@ -222,7 +232,6 @@ share/fwbuilder-%%BUILD_VERSION%%/templates.xml
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/freebsd
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-nvram
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/dd-wrt-jffs
-@dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/cisco
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd
 @dirrm share/fwbuilder-%%BUILD_VERSION%%/configlets
 @dirrm share/fwbuilder-%%BUILD_VERSION%%
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index 3e02a9951444..6415fda16d27 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-DISTVERSION=	4.0.1
+DISTVERSION=	4.1.3
 PORTVERSION=	${DISTVERSION}
-PORTREVISION=	2
-BUILD=		2929
+BUILD=		3421
 CATEGORIES=	security
 
 .if defined(BUILD)
-MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-4.0/build-${BUILD}/ \
+MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-4.1/build-${BUILD}/ \
 		http://www.komquats.com/distfiles/
 PKGNAMESUFFIX=	-devel
 PORTVERSION=	${DISTVERSION}.b${BUILD}
@@ -50,7 +49,7 @@ QTDIR?=		${QT_PREFIX}
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf aclocal libtool
+USE_AUTOTOOLS=	autoconf:268 aclocal:111 libtool:22
 CONFIGURE_SCRIPT=	autogen.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/libfwbuilder-devel/distinfo b/security/libfwbuilder-devel/distinfo
index 9e7ba0326ea8..94c146b6a6f3 100644
--- a/security/libfwbuilder-devel/distinfo
+++ b/security/libfwbuilder-devel/distinfo
@@ -1,3 +1,2 @@
-MD5 (libfwbuilder-4.0.1.tar.gz) = 434f2c222a9b1656c1adc14315cd578e
-SHA256 (libfwbuilder-4.0.1.tar.gz) = 877723f464f08fab25ed72941a02ccff1b618a6f1d9d7fb63ebb20e136e090a6
-SIZE (libfwbuilder-4.0.1.tar.gz) = 376739
+SHA256 (libfwbuilder-4.1.3.tar.gz) = a1657e5ce9caef0e178b99f57600768b4fe47cae1158400c4933b6d41ad13f16
+SIZE (libfwbuilder-4.1.3.tar.gz) = 363194
diff --git a/security/libfwbuilder-devel/pkg-plist b/security/libfwbuilder-devel/pkg-plist
index c90a0cad1a44..e03c98567106 100644
--- a/security/libfwbuilder-devel/pkg-plist
+++ b/security/libfwbuilder-devel/pkg-plist
@@ -79,6 +79,7 @@ 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
 lib/libfwcompiler.so.9.1.0
 lib/libfwcompiler.so.9
 lib/libfwcompiler.so
@@ -158,6 +159,7 @@ share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_12.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_13.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_14.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_15.xslt
+share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_16.xslt
 share/libfwbuilder-%%BUILD_VERSION%%/fwbuilder.dtd
 @dirrm share/libfwbuilder-%%BUILD_VERSION%%/migration
 @dirrm share/libfwbuilder-%%BUILD_VERSION%%