4 files changed, 48 insertions, 67 deletions

diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index 3ce96d5c6ae4..b12a938547bc 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	2.0.10
+PORTVERSION=	2.1.8
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
 
-MAINTAINER=	vadim@fwbuilder.org
+MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-LIB_DEPENDS=	fwbuilder.6:${PORTSDIR}/security/libfwbuilder
+LIB_DEPENDS=	fwbuilder.7:${PORTSDIR}/security/libfwbuilder
 
+BUILD_VERSION=	21
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 USE_QT_VER=	3
 
 QTDIR?=		${X11BASE}
@@ -38,8 +40,6 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 MAN1=		fwbuilder.1 \
 		fwblookup.1 \
 		fwbedit.1 \
-		fwb_compile_all.1 \
-		fwb_install.1 \
 		fwb_ipt.1 \
 		fwb_ipf.1 \
 		fwb_ipfw.1 \
diff --git a/security/fwbuilder2/distinfo b/security/fwbuilder2/distinfo
index df86ac0ef149..e2d70c01a4b5 100644
--- a/security/fwbuilder2/distinfo
+++ b/security/fwbuilder2/distinfo
@@ -1,2 +1 @@
-MD5 (fwbuilder-2.0.10.tar.gz) = 3a0946ed322df40be9814124ac7a9cfd
-SHA256 (fwbuilder-2.0.10.tar.gz) = f6cc322aa5c98f541651a866e426ff28c331235f3740641d7918b919a9319c41
+MD5 (fwbuilder-2.1.8.tar.gz) = 96351a89878c649e332ed0dc5769f94f
diff --git a/security/fwbuilder2/files/patch-aa b/security/fwbuilder2/files/patch-aa
index c4d56a641e17..5a52a1a5bd17 100644
--- a/security/fwbuilder2/files/patch-aa
+++ b/security/fwbuilder2/files/patch-aa
@@ -1,14 +1,15 @@
---- qmake.inc.in.linux	2005-04-27 19:17:10.000000000 -0700
-+++ qmake.inc.in	2005-04-27 19:17:38.000000000 -0700
-@@ -33,11 +33,6 @@
- 	LIBS                   += $$LIBS_FWBUILDER
+--- qmake.inc.in.linux	2006-06-22 08:36:05.000000000 -0700
++++ qmake.inc.in	2006-06-22 08:36:27.000000000 -0700
+@@ -34,10 +34,8 @@
  
  	PKGLOCALEDIR            = $$res.path/locale
--
+ 
 -	QMAKE_CFLAGS_DEBUG     += -Wno-unused-parameter
 -	QMAKE_CFLAGS_RELEASE   += -Wno-unused-parameter
--	QMAKE_CXXFLAGS_DEBUG   += -Wno-unused-parameter
--	QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
+-	QMAKE_CXXFLAGS_DEBUG   += -Wno-unused-parameter @CXXFLAGS@
+-	QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
++	QMAKE_CXXFLAGS_DEBUG   += @CXXFLAGS@
++	QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
  }
  }
  
diff --git a/security/fwbuilder2/pkg-plist b/security/fwbuilder2/pkg-plist
index 3540db152081..3545f62744ee 100644
--- a/security/fwbuilder2/pkg-plist
+++ b/security/fwbuilder2/pkg-plist
@@ -1,5 +1,3 @@
-bin/fwb_compile_all
-bin/fwb_install
 bin/fwb_ipf
 bin/fwb_ipfw
 bin/fwb_ipt
@@ -16,55 +14,38 @@ bin/fwbuilder
 %%DOCSDIR%%/README.ipfw
 %%DOCSDIR%%/README.ipt
 %%DOCSDIR%%/README.pf
-%%DOCSDIR%%/ReleaseNotes_2_0.html
-%%DOCSDIR%%/ReleaseNotes_2_0.txt
-%%DOCSDIR%%/ReleaseNotes_2.0.1.html
-%%DOCSDIR%%/ReleaseNotes_2.0.1.txt
-%%DOCSDIR%%/ReleaseNotes_2.0.2.html
-%%DOCSDIR%%/ReleaseNotes_2.0.2.txt
-%%DOCSDIR%%/ReleaseNotes_2.0.3.html
-%%DOCSDIR%%/ReleaseNotes_2.0.3.txt
-%%DOCSDIR%%/ReleaseNotes_2.0.4.html
-%%DOCSDIR%%/ReleaseNotes_2.0.4.txt
-%%DOCSDIR%%/ReleaseNotes_2.0.5.html
-%%DOCSDIR%%/ReleaseNotes_2.0.5.txt
-%%DOCSDIR%%/ReleaseNotes_2.0.6.html
-%%DOCSDIR%%/ReleaseNotes_2.0.6.txt
-%%DOCSDIR%%/ReleaseNotes_2.0.7.html
-%%DOCSDIR%%/ReleaseNotes_2.0.7.txt
-%%DOCSDIR%%/ReleaseNotes_2.0.8.html
-%%DOCSDIR%%/ReleaseNotes_2.0.8.txt
-%%DOCSDIR%%/ReleaseNotes_2.0.9.html
-%%DOCSDIR%%/ReleaseNotes_2.0.9.txt
-%%DOCSDIR%%/ReleaseNotes_2.0.10.html
-%%DOCSDIR%%/ReleaseNotes_2.0.10.txt
+%%DOCSDIR%%/README.routing
+%%DOCSDIR%%/FWBuilder-Routing-LICENSE.txt
 %%DOCSDIR%%/PatchAcceptancePolicy.txt
-%%DATADIR%%/objects_init.xml
-%%DATADIR%%/templates.xml
-%%DATADIR%%/resources.xml
-%%DATADIR%%/platform/iptables.xml
-%%DATADIR%%/platform/ipf.xml
-%%DATADIR%%/platform/pf.xml
-%%DATADIR%%/platform/ipfw.xml
-%%DATADIR%%/platform/pix.xml
-%%DATADIR%%/platform/fwsm.xml
-%%DATADIR%%/platform/unknown.xml
-%%DATADIR%%/os/linux24.xml
-%%DATADIR%%/os/linksys.xml
-%%DATADIR%%/os/macosx.xml
-%%DATADIR%%/os/freebsd.xml
-%%DATADIR%%/os/openbsd.xml
-%%DATADIR%%/os/solaris.xml
-%%DATADIR%%/os/pix_os.xml
-%%DATADIR%%/os/fwsm_os.xml
-%%DATADIR%%/os/unknown_os.xml
-%%DATADIR%%/locale/fwbuilder_de.qm
-%%DATADIR%%/locale/fwbuilder_es.qm
-%%DATADIR%%/locale/fwbuilder_fr.qm
-%%DATADIR%%/locale/fwbuilder_ja.qm
-%%DATADIR%%/locale/fwbuilder_ru.qm
+%%DOCSDIR%%/ReleaseNotes_2.1.7.html
+%%DOCSDIR%%/ReleaseNotes_2.1.7.txt
+share/fwbuilder%%BUILD_VERSION%%/objects_init.xml
+share/fwbuilder%%BUILD_VERSION%%/templates.xml
+share/fwbuilder%%BUILD_VERSION%%/resources.xml
+share/fwbuilder%%BUILD_VERSION%%/platform/iptables.xml
+share/fwbuilder%%BUILD_VERSION%%/platform/ipf.xml
+share/fwbuilder%%BUILD_VERSION%%/platform/pf.xml
+share/fwbuilder%%BUILD_VERSION%%/platform/ipfw.xml
+share/fwbuilder%%BUILD_VERSION%%/platform/fwsm.xml
+share/fwbuilder%%BUILD_VERSION%%/platform/pix.xml
+share/fwbuilder%%BUILD_VERSION%%/platform/unknown.xml
+share/fwbuilder%%BUILD_VERSION%%/os/linux24.xml
+share/fwbuilder%%BUILD_VERSION%%/os/linksys.xml
+share/fwbuilder%%BUILD_VERSION%%/os/macosx.xml
+share/fwbuilder%%BUILD_VERSION%%/os/freebsd.xml
+share/fwbuilder%%BUILD_VERSION%%/os/openbsd.xml
+share/fwbuilder%%BUILD_VERSION%%/os/solaris.xml
+share/fwbuilder%%BUILD_VERSION%%/os/pix_os.xml
+share/fwbuilder%%BUILD_VERSION%%/os/fwsm_os.xml
+share/fwbuilder%%BUILD_VERSION%%/os/unknown_os.xml
+share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_de.qm
+share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_es.qm
+share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_fr.qm
+share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_ja.qm
+share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_ru.qm
+share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_sv.qm
 @dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/platform
-@dirrm %%DATADIR%%/os
-@dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%
+@dirrm share/fwbuilder%%BUILD_VERSION%%/platform
+@dirrm share/fwbuilder%%BUILD_VERSION%%/os
+@dirrm share/fwbuilder%%BUILD_VERSION%%/locale
+@dirrm share/fwbuilder%%BUILD_VERSION%%