4 files changed, 136 insertions, 115 deletions

diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index 69572743ba64..1bcda52066bd 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -5,19 +5,20 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-PORTVERSION=	2.0.10
-PORTREVISION=	1
+PORTVERSION=	2.1.8
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fwbuilder
 
-MAINTAINER=	vadim@fwbuilder.org
+MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall Builder API
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt \
 		netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
 
+BUILD_VERSION=	21
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 USE_QT_VER=	3
 
 QTDIR?=		${X11BASE}
@@ -25,7 +26,7 @@ QTDIR?=		${X11BASE}
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR}
@@ -36,7 +37,7 @@ INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 post-install:
-	${RM} ${PREFIX}/lib/libfwbuilder.so.6.3
-	${RM} ${PREFIX}/lib/libfwcompiler.so.6.3
+	${RM} ${PREFIX}/lib/libfwbuilder.so.7.3
+	${RM} ${PREFIX}/lib/libfwcompiler.so.7.3
 
 .include <bsd.port.mk>
diff --git a/security/libfwbuilder-devel/distinfo b/security/libfwbuilder-devel/distinfo
index 8601ae2418ac..47a7575d836f 100644
--- a/security/libfwbuilder-devel/distinfo
+++ b/security/libfwbuilder-devel/distinfo
@@ -1,2 +1 @@
-MD5 (libfwbuilder-2.0.10.tar.gz) = 7f171715bd398137e832a53628642fe6
-SHA256 (libfwbuilder-2.0.10.tar.gz) = 468aa458877f324778220af1cf823b9f33e8d55b2d491f9741fa04e3729051df
+MD5 (libfwbuilder-2.1.8.tar.gz) = 8463607f12ff8cf0ec3649e3fc51a688
diff --git a/security/libfwbuilder-devel/files/patch-aa b/security/libfwbuilder-devel/files/patch-aa
index 3230b1246887..dc543e5b2a9d 100644
--- a/security/libfwbuilder-devel/files/patch-aa
+++ b/security/libfwbuilder-devel/files/patch-aa
@@ -1,13 +1,15 @@
---- qmake.inc.in.linux	2005-04-27 19:15:38.000000000 -0700
-+++ qmake.inc.in	2005-04-27 19:15:48.000000000 -0700
-@@ -28,10 +28,6 @@
+--- qmake.inc.in.linux	2006-06-22 08:34:48.000000000 -0700
++++ qmake.inc.in	2006-06-22 08:35:03.000000000 -0700
+@@ -28,10 +28,8 @@
  	doc.path                =$(DDIR)@DOCDIR@
  
  	CONFIG                 += warn_on debug
 -	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/libfwbuilder-devel/pkg-plist b/security/libfwbuilder-devel/pkg-plist
index f0f5e6d9768c..72ff6d9b863f 100644
--- a/security/libfwbuilder-devel/pkg-plist
+++ b/security/libfwbuilder-devel/pkg-plist
@@ -1,65 +1,72 @@
-bin/libfwbuilder-config-2
-include/fwb-2.0/fwcompiler/RuleProcessor.h
-include/fwb-2.0/fwcompiler/PolicyCompiler.h
-include/fwb-2.0/fwcompiler/OSConfigurator.h
-include/fwb-2.0/fwcompiler/NATCompiler.h
-include/fwb-2.0/fwcompiler/Compiler.h
-include/fwb-2.0/fwbuilder/snmp.h
-include/fwb-2.0/fwbuilder/physAddress.h
-include/fwb-2.0/fwbuilder/libfwbuilder-config.h
-include/fwb-2.0/fwbuilder/libfwbuilder-version.h
-include/fwb-2.0/fwbuilder/dns.h
-include/fwb-2.0/fwbuilder/crypto.h
-include/fwb-2.0/fwbuilder/XMLTools.h
-include/fwb-2.0/fwbuilder/UDPService.h
-include/fwb-2.0/fwbuilder/Tools.h
-include/fwb-2.0/fwbuilder/ThreadTools.h
-include/fwb-2.0/fwbuilder/TCPService.h
-include/fwb-2.0/fwbuilder/SyncQueue.h
-include/fwb-2.0/fwbuilder/ServiceGroup.h
-include/fwb-2.0/fwbuilder/Service.h
-include/fwb-2.0/fwbuilder/RuleSet.h
-include/fwb-2.0/fwbuilder/RuleElement.h
-include/fwb-2.0/fwbuilder/Rule.h
-include/fwb-2.0/fwbuilder/Resources.h
-include/fwb-2.0/fwbuilder/Pool.h
-include/fwb-2.0/fwbuilder/Policy.h
-include/fwb-2.0/fwbuilder/ObjectGroup.h
-include/fwb-2.0/fwbuilder/Network.h
-include/fwb-2.0/fwbuilder/NAT.h
-include/fwb-2.0/fwbuilder/Management.h
-include/fwb-2.0/fwbuilder/Logger.h
-include/fwb-2.0/fwbuilder/Library.h
-include/fwb-2.0/fwbuilder/IntervalGroup.h
-include/fwb-2.0/fwbuilder/Interval.h
-include/fwb-2.0/fwbuilder/InterfacePolicy.h
-include/fwb-2.0/fwbuilder/Interface.h
-include/fwb-2.0/fwbuilder/IPv4.h
-include/fwb-2.0/fwbuilder/IPService.h
-include/fwb-2.0/fwbuilder/IPAddress.h
-include/fwb-2.0/fwbuilder/ICMPService.h
-include/fwb-2.0/fwbuilder/HostsFile.h
-include/fwb-2.0/fwbuilder/Host.h
-include/fwb-2.0/fwbuilder/Group.h
-include/fwb-2.0/fwbuilder/Firewall.h
-include/fwb-2.0/fwbuilder/FWServiceReference.h
-include/fwb-2.0/fwbuilder/FWReference.h
-include/fwb-2.0/fwbuilder/FWOptions.h
-include/fwb-2.0/fwbuilder/FWObjectReference.h
-include/fwb-2.0/fwbuilder/FWObjectDatabase.h
-include/fwb-2.0/fwbuilder/FWObject.h
-include/fwb-2.0/fwbuilder/FWIntervalReference.h
-include/fwb-2.0/fwbuilder/FWException.h
-include/fwb-2.0/fwbuilder/CustomService.h
-include/fwb-2.0/fwbuilder/Constants.h
-include/fwb-2.0/fwbuilder/BackgroundOp.h
-include/fwb-2.0/fwbuilder/AddressRange.h
-include/fwb-2.0/fwbuilder/Address.h
-lib/libfwcompiler.so.6.3.0
-lib/libfwcompiler.so.6
+bin/libfwbuilder-config-2.1
+include/fwb-2.1/fwcompiler/Compiler.h
+include/fwb-2.1/fwcompiler/NATCompiler.h
+include/fwb-2.1/fwcompiler/OSConfigurator.h
+include/fwb-2.1/fwcompiler/PolicyCompiler.h
+include/fwb-2.1/fwcompiler/Preprocessor.h
+include/fwb-2.1/fwcompiler/RoutingCompiler.h
+include/fwb-2.1/fwcompiler/RuleProcessor.h
+include/fwb-2.1/fwbuilder/Address.h
+include/fwb-2.1/fwbuilder/AddressRange.h
+include/fwb-2.1/fwbuilder/AddressTable.h
+include/fwb-2.1/fwbuilder/BackgroundOp.h
+include/fwb-2.1/fwbuilder/Constants.h
+include/fwb-2.1/fwbuilder/CustomService.h
+include/fwb-2.1/fwbuilder/DNSName.h
+include/fwb-2.1/fwbuilder/FWException.h
+include/fwb-2.1/fwbuilder/FWIntervalReference.h
+include/fwb-2.1/fwbuilder/FWObject.h
+include/fwb-2.1/fwbuilder/FWObjectDatabase.h
+include/fwb-2.1/fwbuilder/FWObjectReference.h
+include/fwb-2.1/fwbuilder/FWOptions.h
+include/fwb-2.1/fwbuilder/FWReference.h
+include/fwb-2.1/fwbuilder/FWServiceReference.h
+include/fwb-2.1/fwbuilder/Firewall.h
+include/fwb-2.1/fwbuilder/Group.h
+include/fwb-2.1/fwbuilder/Host.h
+include/fwb-2.1/fwbuilder/HostsFile.h
+include/fwb-2.1/fwbuilder/ICMPService.h
+include/fwb-2.1/fwbuilder/IPAddress.h
+include/fwb-2.1/fwbuilder/IPService.h
+include/fwb-2.1/fwbuilder/IPv4.h
+include/fwb-2.1/fwbuilder/Interface.h
+include/fwb-2.1/fwbuilder/InterfacePolicy.h
+include/fwb-2.1/fwbuilder/Interval.h
+include/fwb-2.1/fwbuilder/IntervalGroup.h
+include/fwb-2.1/fwbuilder/Library.h
+include/fwb-2.1/fwbuilder/Logger.h
+include/fwb-2.1/fwbuilder/Management.h
+include/fwb-2.1/fwbuilder/MultiAddress.h
+include/fwb-2.1/fwbuilder/NAT.h
+include/fwb-2.1/fwbuilder/Network.h
+include/fwb-2.1/fwbuilder/ObjectGroup.h
+include/fwb-2.1/fwbuilder/Policy.h
+include/fwb-2.1/fwbuilder/Pool.h
+include/fwb-2.1/fwbuilder/Resources.h
+include/fwb-2.1/fwbuilder/Routing.h
+include/fwb-2.1/fwbuilder/Rule.h
+include/fwb-2.1/fwbuilder/RuleElement.h
+include/fwb-2.1/fwbuilder/RuleSet.h
+include/fwb-2.1/fwbuilder/Service.h
+include/fwb-2.1/fwbuilder/ServiceGroup.h
+include/fwb-2.1/fwbuilder/SyncQueue.h
+include/fwb-2.1/fwbuilder/TCPService.h
+include/fwb-2.1/fwbuilder/TagService.h
+include/fwb-2.1/fwbuilder/ThreadTools.h
+include/fwb-2.1/fwbuilder/Tools.h
+include/fwb-2.1/fwbuilder/UDPService.h
+include/fwb-2.1/fwbuilder/XMLTools.h
+include/fwb-2.1/fwbuilder/crypto.h
+include/fwb-2.1/fwbuilder/dns.h
+include/fwb-2.1/fwbuilder/libfwbuilder-config.h
+include/fwb-2.1/fwbuilder/libfwbuilder-version.h
+include/fwb-2.1/fwbuilder/physAddress.h
+include/fwb-2.1/fwbuilder/snmp.h
+lib/libfwcompiler.so.7.3.0
+lib/libfwcompiler.so.7
 lib/libfwcompiler.so
-lib/libfwbuilder.so.6.3.0
-lib/libfwbuilder.so.6
+lib/libfwbuilder.so.7.3.0
+lib/libfwbuilder.so.7
 lib/libfwbuilder.so
 %%DOCSDIR%%/INSTALL
 %%DOCSDIR%%/Credits
@@ -67,45 +74,57 @@ lib/libfwbuilder.so
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/PatchAcceptancePolicy.txt
-%%DATADIR%%/migration/FWObjectDatabase_0.9.5.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.9.4.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.9.3.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.9.2.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.9.1.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.9.0.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.8.7.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.14.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.13.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.12.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.11.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.10.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.9.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.8.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.7.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.6.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.5.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.4.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.3.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.2.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.1.xslt
-%%DATADIR%%/migration/FWObjectDatabase_0.10.0.xslt
-%%DATADIR%%/migration/FWObjectDatabase_1.0.0.xslt
-%%DATADIR%%/migration/FWObjectDatabase_1.0.1.xslt
-%%DATADIR%%/migration/FWObjectDatabase_1.0.2.xslt
-%%DATADIR%%/migration/FWObjectDatabase_2.0.0.xslt
-%%DATADIR%%/migration/FWObjectDatabase_2.0.1.xslt
-%%DATADIR%%/migration/FWObjectDatabase_2.0.2.xslt
-%%DATADIR%%/migration/FWObjectDatabase_2.0.3.xslt
-%%DATADIR%%/migration/FWObjectDatabase_2.0.4.xslt
-%%DATADIR%%/migration/FWObjectDatabase_2.0.5.xslt
-%%DATADIR%%/migration/FWObjectDatabase_2.0.6.xslt
-%%DATADIR%%/migration/FWObjectDatabase_2.0.7.xslt
-%%DATADIR%%/migration/FWObjectDatabase_2.0.8.xslt
-%%DATADIR%%/migration/FWObjectDatabase_2.0.9.xslt
-%%DATADIR%%/fwbuilder.dtd
-@dirrm %%DATADIR%%/migration
-@dirrm %%DATADIR%%
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.5.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.4.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.3.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.2.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.1.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.0.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.8.7.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.14.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.13.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.12.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.11.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.10.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.9.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.8.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.7.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.6.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.5.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.4.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.3.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.2.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.1.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.0.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_1.0.0.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_1.0.1.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_1.0.2.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.0.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.1.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.2.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.3.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.4.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.5.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.6.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.7.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.8.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.9.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.10.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.11.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.12.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.99.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.0.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.1.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.2.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.3.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.4.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.5.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.6.xslt
+share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.7.xslt
+share/libfwbuilder%%BUILD_VERSION%%/fwbuilder.dtd
+@dirrm share/libfwbuilder%%BUILD_VERSION%%/migration
+@dirrm share/libfwbuilder%%BUILD_VERSION%%
 @dirrm %%DOCSDIR%%
-@dirrm include/fwb-2.0/fwcompiler
-@dirrm include/fwb-2.0/fwbuilder
-@dirrm include/fwb-2.0
+@dirrm include/fwb-2.1/fwcompiler
+@dirrm include/fwb-2.1/fwbuilder
+@dirrm include/fwb-2.1