Update 3.0.0 --> 3.0.2

16 files changed, 48 insertions, 180 deletions

diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index 9fe30a0dcb93..a15dad9094d1 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -6,10 +6,14 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	3.0.0
+PORTVERSION=	3.0.2
 CATEGORIES=	security
+.if defined(BUILD)
+MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-3.0/build-${BUILD}/
+.else
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
+.endif
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall Builder GUI and policy compilers
@@ -60,6 +64,7 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 post-install:
+	@${STRIP_CMD} ${PREFIX}/bin/fwbuilder
 	@${ECHO} If you are upgrading from a previous version of fwbuilder,
 	@${ECHO} please make sure to backup your fwbuilder database files
 	@${ECHO} prior to invoking fwbuilder for the first time.
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
index 0630bda6b1a1..13a7f965c027 100644
--- a/security/fwbuilder-devel/distinfo
+++ b/security/fwbuilder-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (fwbuilder-3.0.0.tar.gz) = f1032f4ebc8263224d7e829a204e8d5e
-SHA256 (fwbuilder-3.0.0.tar.gz) = 03036d8a56bb729589ffe9fc4800a491e13d55b8f177fee78e7ee43305a93185
-SIZE (fwbuilder-3.0.0.tar.gz) = 2130909
+MD5 (fwbuilder-3.0.2.tar.gz) = 074e9288420d37b90786276b833c9887
+SHA256 (fwbuilder-3.0.2.tar.gz) = 945fcfe9cf33148888e9297401c8fbb37342d9e2d76f25ece7bb03e64572a915
+SIZE (fwbuilder-3.0.2.tar.gz) = 2336054
diff --git a/security/fwbuilder-devel/files/patch-src-gui-ipfAdvancedDialog.cpp b/security/fwbuilder-devel/files/patch-src-gui-ipfAdvancedDialog.cpp
deleted file mode 100644
index 17a27be76ba5..000000000000
--- a/security/fwbuilder-devel/files/patch-src-gui-ipfAdvancedDialog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/ipfAdvancedDialog.cpp.orig	2008-09-01 00:45:50.000000000 -0700
-+++ src/gui/ipfAdvancedDialog.cpp	2008-09-02 11:23:23.533839864 -0700
-@@ -97,6 +97,8 @@
-     data.registerOption( m_dialog->ipf_nat_irc_proxy        ,fwopt, "ipf_nat_irc_proxy");
-     data.registerOption( m_dialog->ipf_nat_ftp_proxy        ,fwopt, "ipf_nat_ftp_proxy");
-     data.registerOption( m_dialog->ipf_nat_rcmd_proxy       ,fwopt, "ipf_nat_rcmd_proxy");
-+    data.registerOption( m_dialog->ipf_nat_krcmd_proxy       ,fwopt, "ipf_nat_krcmd_proxy");
-+    data.registerOption( m_dialog->ipf_nat_ekshell_proxy       ,fwopt, "ipf_nat_ekshell_proxy");
-     data.registerOption( m_dialog->ipf_fw_dir               ,fwopt, "firewall_dir"      );
-     data.registerOption( m_dialog->ipf_user                 ,fwopt, "admUser"           );
-     data.registerOption( m_dialog->altAddress               ,fwopt, "altAddress"        );
diff --git a/security/fwbuilder-devel/files/patch-src-gui-ipfadvanceddialog_q.ui b/security/fwbuilder-devel/files/patch-src-gui-ipfadvanceddialog_q.ui
deleted file mode 100644
index 0b7dd82a8956..000000000000
--- a/security/fwbuilder-devel/files/patch-src-gui-ipfadvanceddialog_q.ui
+++ /dev/null
@@ -1,67 +0,0 @@
---- src/gui/ipfadvanceddialog_q.ui.orig	2008-09-01 00:45:50.000000000 -0700
-+++ src/gui/ipfadvanceddialog_q.ui	2008-09-02 11:31:37.027058950 -0700
-@@ -142,21 +142,21 @@
-          </property>
-         </spacer>
-        </item>
--       <item row="4" column="1" >
-+       <item row="6" column="1" >
-         <widget class="QCheckBox" name="ipf_nat_raudio_proxy" >
-          <property name="text" >
-           <string>Use raudio proxy in NAT rules</string>
-          </property>
-         </widget>
-        </item>
--       <item row="5" column="1" >
-+       <item row="7" column="1" >
-         <widget class="QCheckBox" name="ipf_nat_h323_proxy" >
-          <property name="text" >
-           <string>Use h323 proxy in NAT rules</string>
-          </property>
-         </widget>
-        </item>
--       <item row="6" column="1" >
-+       <item row="8" column="1" >
-         <widget class="QCheckBox" name="ipf_nat_ipsec_proxy" >
-          <property name="text" >
-           <string>Use ipsec proxy in NAT rules</string>
-@@ -193,7 +193,21 @@
-          </property>
-         </widget>
-        </item>
--       <item row="9" column="1" >
-+       <item row="4" column="1" >
-+        <widget class="QCheckBox" name="ipf_nat_krcmd_proxy" >
-+         <property name="text" >
-+          <string>Use Kerberos rcmd proxy in NAT rules</string>
-+         </property>
-+        </widget>
-+       </item>
-+       <item row="5" column="1" >
-+        <widget class="QCheckBox" name="ipf_nat_ekshell_proxy" >
-+         <property name="text" >
-+          <string>Use Kerberos ekshell proxy in NAT rules</string>
-+         </property>
-+        </widget>
-+       </item>
-+       <item row="11" column="1" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Vertical</enum>
-@@ -209,14 +223,14 @@
-          </property>
-         </spacer>
-        </item>
--       <item row="7" column="1" >
-+       <item row="9" column="1" >
-         <widget class="QCheckBox" name="ipf_nat_pptp_proxy" >
-          <property name="text" >
-           <string>Use PPTP proxy in NAT rules</string>
-          </property>
-         </widget>
-        </item>
--       <item row="8" column="1" >
-+       <item row="10" column="1" >
-         <widget class="QCheckBox" name="ipf_nat_irc_proxy" >
-          <property name="text" >
-           <string>Use IRC proxy in NAT rules for DCC</string>
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
index 4b2c3ead0522..662871f1ba1b 100644
--- a/security/fwbuilder-devel/pkg-plist
+++ b/security/fwbuilder-devel/pkg-plist
@@ -12,7 +12,10 @@ share/fwbuilder-%%BUILD_VERSION%%/templates.xml
 share/fwbuilder-%%BUILD_VERSION%%/resources.xml
 share/fwbuilder-%%BUILD_VERSION%%/help/iptAdvancedDialog_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/help/linux24AdvancedDialog_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/main_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/help/pfAdvancedDialog_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/locale/fwbuilder_ja.qm
+share/fwbuilder-%%BUILD_VERSION%%/locale/fwbuilder_ru.qm
 share/fwbuilder-%%BUILD_VERSION%%/platform/iosacl.xml
 share/fwbuilder-%%BUILD_VERSION%%/platform/iptables.xml
 share/fwbuilder-%%BUILD_VERSION%%/platform/ipf.xml
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 9fe30a0dcb93..a15dad9094d1 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -6,10 +6,14 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	3.0.0
+PORTVERSION=	3.0.2
 CATEGORIES=	security
+.if defined(BUILD)
+MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-3.0/build-${BUILD}/
+.else
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
+.endif
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall Builder GUI and policy compilers
@@ -60,6 +64,7 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 post-install:
+	@${STRIP_CMD} ${PREFIX}/bin/fwbuilder
 	@${ECHO} If you are upgrading from a previous version of fwbuilder,
 	@${ECHO} please make sure to backup your fwbuilder database files
 	@${ECHO} prior to invoking fwbuilder for the first time.
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 0630bda6b1a1..13a7f965c027 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,3 +1,3 @@
-MD5 (fwbuilder-3.0.0.tar.gz) = f1032f4ebc8263224d7e829a204e8d5e
-SHA256 (fwbuilder-3.0.0.tar.gz) = 03036d8a56bb729589ffe9fc4800a491e13d55b8f177fee78e7ee43305a93185
-SIZE (fwbuilder-3.0.0.tar.gz) = 2130909
+MD5 (fwbuilder-3.0.2.tar.gz) = 074e9288420d37b90786276b833c9887
+SHA256 (fwbuilder-3.0.2.tar.gz) = 945fcfe9cf33148888e9297401c8fbb37342d9e2d76f25ece7bb03e64572a915
+SIZE (fwbuilder-3.0.2.tar.gz) = 2336054
diff --git a/security/fwbuilder/files/patch-src-gui-ipfAdvancedDialog.cpp b/security/fwbuilder/files/patch-src-gui-ipfAdvancedDialog.cpp
deleted file mode 100644
index 17a27be76ba5..000000000000
--- a/security/fwbuilder/files/patch-src-gui-ipfAdvancedDialog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/ipfAdvancedDialog.cpp.orig	2008-09-01 00:45:50.000000000 -0700
-+++ src/gui/ipfAdvancedDialog.cpp	2008-09-02 11:23:23.533839864 -0700
-@@ -97,6 +97,8 @@
-     data.registerOption( m_dialog->ipf_nat_irc_proxy        ,fwopt, "ipf_nat_irc_proxy");
-     data.registerOption( m_dialog->ipf_nat_ftp_proxy        ,fwopt, "ipf_nat_ftp_proxy");
-     data.registerOption( m_dialog->ipf_nat_rcmd_proxy       ,fwopt, "ipf_nat_rcmd_proxy");
-+    data.registerOption( m_dialog->ipf_nat_krcmd_proxy       ,fwopt, "ipf_nat_krcmd_proxy");
-+    data.registerOption( m_dialog->ipf_nat_ekshell_proxy       ,fwopt, "ipf_nat_ekshell_proxy");
-     data.registerOption( m_dialog->ipf_fw_dir               ,fwopt, "firewall_dir"      );
-     data.registerOption( m_dialog->ipf_user                 ,fwopt, "admUser"           );
-     data.registerOption( m_dialog->altAddress               ,fwopt, "altAddress"        );
diff --git a/security/fwbuilder/files/patch-src-gui-ipfadvanceddialog_q.ui b/security/fwbuilder/files/patch-src-gui-ipfadvanceddialog_q.ui
deleted file mode 100644
index 0b7dd82a8956..000000000000
--- a/security/fwbuilder/files/patch-src-gui-ipfadvanceddialog_q.ui
+++ /dev/null
@@ -1,67 +0,0 @@
---- src/gui/ipfadvanceddialog_q.ui.orig	2008-09-01 00:45:50.000000000 -0700
-+++ src/gui/ipfadvanceddialog_q.ui	2008-09-02 11:31:37.027058950 -0700
-@@ -142,21 +142,21 @@
-          </property>
-         </spacer>
-        </item>
--       <item row="4" column="1" >
-+       <item row="6" column="1" >
-         <widget class="QCheckBox" name="ipf_nat_raudio_proxy" >
-          <property name="text" >
-           <string>Use raudio proxy in NAT rules</string>
-          </property>
-         </widget>
-        </item>
--       <item row="5" column="1" >
-+       <item row="7" column="1" >
-         <widget class="QCheckBox" name="ipf_nat_h323_proxy" >
-          <property name="text" >
-           <string>Use h323 proxy in NAT rules</string>
-          </property>
-         </widget>
-        </item>
--       <item row="6" column="1" >
-+       <item row="8" column="1" >
-         <widget class="QCheckBox" name="ipf_nat_ipsec_proxy" >
-          <property name="text" >
-           <string>Use ipsec proxy in NAT rules</string>
-@@ -193,7 +193,21 @@
-          </property>
-         </widget>
-        </item>
--       <item row="9" column="1" >
-+       <item row="4" column="1" >
-+        <widget class="QCheckBox" name="ipf_nat_krcmd_proxy" >
-+         <property name="text" >
-+          <string>Use Kerberos rcmd proxy in NAT rules</string>
-+         </property>
-+        </widget>
-+       </item>
-+       <item row="5" column="1" >
-+        <widget class="QCheckBox" name="ipf_nat_ekshell_proxy" >
-+         <property name="text" >
-+          <string>Use Kerberos ekshell proxy in NAT rules</string>
-+         </property>
-+        </widget>
-+       </item>
-+       <item row="11" column="1" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Vertical</enum>
-@@ -209,14 +223,14 @@
-          </property>
-         </spacer>
-        </item>
--       <item row="7" column="1" >
-+       <item row="9" column="1" >
-         <widget class="QCheckBox" name="ipf_nat_pptp_proxy" >
-          <property name="text" >
-           <string>Use PPTP proxy in NAT rules</string>
-          </property>
-         </widget>
-        </item>
--       <item row="8" column="1" >
-+       <item row="10" column="1" >
-         <widget class="QCheckBox" name="ipf_nat_irc_proxy" >
-          <property name="text" >
-           <string>Use IRC proxy in NAT rules for DCC</string>
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index 4b2c3ead0522..662871f1ba1b 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -12,7 +12,10 @@ share/fwbuilder-%%BUILD_VERSION%%/templates.xml
 share/fwbuilder-%%BUILD_VERSION%%/resources.xml
 share/fwbuilder-%%BUILD_VERSION%%/help/iptAdvancedDialog_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/help/linux24AdvancedDialog_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/help/main_en_US.html
 share/fwbuilder-%%BUILD_VERSION%%/help/pfAdvancedDialog_en_US.html
+share/fwbuilder-%%BUILD_VERSION%%/locale/fwbuilder_ja.qm
+share/fwbuilder-%%BUILD_VERSION%%/locale/fwbuilder_ru.qm
 share/fwbuilder-%%BUILD_VERSION%%/platform/iosacl.xml
 share/fwbuilder-%%BUILD_VERSION%%/platform/iptables.xml
 share/fwbuilder-%%BUILD_VERSION%%/platform/ipf.xml
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index 12ac3d70b3df..5ba2f82132e1 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -5,10 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-PORTVERSION=	3.0.0
+PORTVERSION=	3.0.2
 CATEGORIES=	security
+.if defined(BUILD)
+MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-3.0/build-${BUILD}/
+.else
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fwbuilder
+.endif
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall Builder API
@@ -45,8 +49,8 @@ USE_LDCONFIG=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 post-install:
-	${RM} ${PREFIX}/lib/libfwbuilder.so.8.0
-	${RM} ${PREFIX}/lib/libfwcompiler.so.8.0
+	${RM} ${PREFIX}/lib/libfwbuilder.so.8.1
+	${RM} ${PREFIX}/lib/libfwcompiler.so.8.1
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
diff --git a/security/libfwbuilder-devel/distinfo b/security/libfwbuilder-devel/distinfo
index 8a1866de6104..a2a7cfbb9937 100644
--- a/security/libfwbuilder-devel/distinfo
+++ b/security/libfwbuilder-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (libfwbuilder-3.0.0.tar.gz) = 993aa8d0838bf7f915ad3dbfcc03d161
-SHA256 (libfwbuilder-3.0.0.tar.gz) = 949982c6af3b7d075ca79551f2bb8559cb591a524d3e0a9f25b1656b65c77402
-SIZE (libfwbuilder-3.0.0.tar.gz) = 537382
+MD5 (libfwbuilder-3.0.2.tar.gz) = a92161066dfb3d78d28491799da3321d
+SHA256 (libfwbuilder-3.0.2.tar.gz) = 9f8d3670909a736ebe94861d3aa11d2f02bfb020605afada286741384c1f3ed6
+SIZE (libfwbuilder-3.0.2.tar.gz) = 529266
diff --git a/security/libfwbuilder-devel/pkg-plist b/security/libfwbuilder-devel/pkg-plist
index 0111555564aa..1b0d7e1529e6 100644
--- a/security/libfwbuilder-devel/pkg-plist
+++ b/security/libfwbuilder-devel/pkg-plist
@@ -71,10 +71,10 @@ include/fwb-3/fwbuilder/libfwbuilder-config.h
 include/fwb-3/fwbuilder/libfwbuilder-version.h
 include/fwb-3/fwbuilder/physAddress.h
 include/fwb-3/fwbuilder/snmp.h
-lib/libfwcompiler.so.8.0.0
+lib/libfwcompiler.so.8.1.0
 lib/libfwcompiler.so.8
 lib/libfwcompiler.so
-lib/libfwbuilder.so.8.0.0
+lib/libfwbuilder.so.8.1.0
 lib/libfwbuilder.so.8
 lib/libfwbuilder.so
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.5.xslt
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 12ac3d70b3df..5ba2f82132e1 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -5,10 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-PORTVERSION=	3.0.0
+PORTVERSION=	3.0.2
 CATEGORIES=	security
+.if defined(BUILD)
+MASTER_SITES=	http://www.fwbuilder.org/nightly_builds/fwbuilder-3.0/build-${BUILD}/
+.else
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fwbuilder
+.endif
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall Builder API
@@ -45,8 +49,8 @@ USE_LDCONFIG=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 post-install:
-	${RM} ${PREFIX}/lib/libfwbuilder.so.8.0
-	${RM} ${PREFIX}/lib/libfwcompiler.so.8.0
+	${RM} ${PREFIX}/lib/libfwbuilder.so.8.1
+	${RM} ${PREFIX}/lib/libfwcompiler.so.8.1
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index 8a1866de6104..a2a7cfbb9937 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,3 +1,3 @@
-MD5 (libfwbuilder-3.0.0.tar.gz) = 993aa8d0838bf7f915ad3dbfcc03d161
-SHA256 (libfwbuilder-3.0.0.tar.gz) = 949982c6af3b7d075ca79551f2bb8559cb591a524d3e0a9f25b1656b65c77402
-SIZE (libfwbuilder-3.0.0.tar.gz) = 537382
+MD5 (libfwbuilder-3.0.2.tar.gz) = a92161066dfb3d78d28491799da3321d
+SHA256 (libfwbuilder-3.0.2.tar.gz) = 9f8d3670909a736ebe94861d3aa11d2f02bfb020605afada286741384c1f3ed6
+SIZE (libfwbuilder-3.0.2.tar.gz) = 529266
diff --git a/security/libfwbuilder/pkg-plist b/security/libfwbuilder/pkg-plist
index 0111555564aa..1b0d7e1529e6 100644
--- a/security/libfwbuilder/pkg-plist
+++ b/security/libfwbuilder/pkg-plist
@@ -71,10 +71,10 @@ include/fwb-3/fwbuilder/libfwbuilder-config.h
 include/fwb-3/fwbuilder/libfwbuilder-version.h
 include/fwb-3/fwbuilder/physAddress.h
 include/fwb-3/fwbuilder/snmp.h
-lib/libfwcompiler.so.8.0.0
+lib/libfwcompiler.so.8.1.0
 lib/libfwcompiler.so.8
 lib/libfwcompiler.so
-lib/libfwbuilder.so.8.0.0
+lib/libfwbuilder.so.8.1.0
 lib/libfwbuilder.so.8
 lib/libfwbuilder.so
 share/libfwbuilder-%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.5.xslt