3 files changed, 117 insertions, 127 deletions

diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index c60c60487e00..f83d35e46b4b 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTVERSION=	2.0.2
+PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -14,16 +14,28 @@ MASTER_SITE_SUBDIR=	fwbuilder
 MAINTAINER=	vadim@fwbuilder.org
 COMMENT=	Firewall Builder API
 
-LIB_DEPENDS=	netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp
+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt \
+		netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp
+
+USE_QT_VER=	3
+
+QTDIR?=		${X11BASE}
 
-USE_GNOME=	glib12 libxslt
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
+CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR}
+MAKE_ARGS+=	QTDIR="${QTDIR}" \
+		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 INSTALLS_SHLIB=	yes
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+
+post-install:
+	${RM} ${PREFIX}/lib/libfwbuilder.so.6.1
+	${RM} ${PREFIX}/lib/libfwcompiler.so.6.1
 
 .include <bsd.port.mk>
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index 6dcae5f4f7a5..6f3343016c4c 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,2 +1 @@
-MD5 (libfwbuilder-1.0.2.tar.gz) = f5e50b8165b1dded26f461cf488553ea
-SIZE (libfwbuilder-1.0.2.tar.gz) = 403462
+MD5 (libfwbuilder-2.0.2.tar.gz) = 8c89034ed4320608258db5665c7f3abf
diff --git a/security/libfwbuilder/pkg-plist b/security/libfwbuilder/pkg-plist
index 9241f7389705..26c42740141d 100644
--- a/security/libfwbuilder/pkg-plist
+++ b/security/libfwbuilder/pkg-plist
@@ -1,123 +1,102 @@
-@comment $FreeBSD$
-bin/libfwbuilder-config
-include/fwbuilder/Address.hh
-include/fwbuilder/AddressRange.hh
-include/fwbuilder/BackgroundOp.hh
-include/fwbuilder/Constants.hh
-include/fwbuilder/CustomService.hh
-include/fwbuilder/FWException.hh
-include/fwbuilder/FWIntervalReference.hh
-include/fwbuilder/FWObject.hh
-include/fwbuilder/FWObjectDatabase.hh
-include/fwbuilder/FWObjectReference.hh
-include/fwbuilder/FWOptions.hh
-include/fwbuilder/FWReference.hh
-include/fwbuilder/FWServiceReference.hh
-include/fwbuilder/Firewall.hh
-include/fwbuilder/Group.hh
-include/fwbuilder/Host.hh
-include/fwbuilder/HostsFile.hh
-include/fwbuilder/ICMPService.hh
-include/fwbuilder/IPAddress.hh
-include/fwbuilder/IPService.hh
-include/fwbuilder/IPv4.hh
-include/fwbuilder/Interface.hh
-include/fwbuilder/InterfacePolicy.hh
-include/fwbuilder/Interval.hh
-include/fwbuilder/IntervalGroup.hh
-include/fwbuilder/Logger.hh
-include/fwbuilder/Management.hh
-include/fwbuilder/NAT.hh
-include/fwbuilder/Network.hh
-include/fwbuilder/ObjectGroup.hh
-include/fwbuilder/Policy.hh
-include/fwbuilder/Pool.hh
-include/fwbuilder/Resources.hh
-include/fwbuilder/Rule.hh
-include/fwbuilder/RuleElement.hh
-include/fwbuilder/RuleSet.hh
-include/fwbuilder/Service.hh
-include/fwbuilder/ServiceGroup.hh
-include/fwbuilder/SyncQueue.hh
-include/fwbuilder/TCPService.hh
-include/fwbuilder/ThreadTools.hh
-include/fwbuilder/Tools.hh
-include/fwbuilder/UDPService.hh
-include/fwbuilder/XMLTools.hh
-include/fwbuilder/crypto.hh
-include/fwbuilder/dns.hh
-include/fwbuilder/libfwbuilder-config.h
-include/fwbuilder/physAddress.hh
-include/fwbuilder/snmp.hh
-include/fwcompiler/Compiler.hh
-include/fwcompiler/NATCompiler.hh
-include/fwcompiler/OSConfigurator.hh
-include/fwcompiler/PolicyCompiler.hh
-include/fwcompiler/RuleProcessor.hh
-include/fwcompiler/manifest.hh
-lib/libfwbuilder.a
-lib/libfwbuilder.so
-lib/libfwbuilder.so.5
-lib/libfwcompiler.a
+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.1.0
+lib/libfwcompiler.so.6
 lib/libfwcompiler.so
-lib/libfwcompiler.so.5
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/Credits
+lib/libfwbuilder.so.6.1.0
+lib/libfwbuilder.so.6
+lib/libfwbuilder.so
 %%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/README
+%%DOCSDIR%%/Credits
+%%DOCSDIR%%/ChangeLog
+%%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%%/fwbuilder.dtd
-%%DATADIR%%/migration/0.10.0/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.1/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.10/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.11/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.12/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.13/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.14/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.2/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.3/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.4/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.5/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.6/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.7/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.8/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.10.9/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.8.7/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.9.0/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.9.1/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.9.2/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.9.3/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.9.4/FWObjectDatabase.xslt
-%%DATADIR%%/migration/0.9.5/FWObjectDatabase.xslt
-%%DATADIR%%/migration/1.0.0/FWObjectDatabase.xslt
-%%DATADIR%%/migration/1.0.1/FWObjectDatabase.xslt
-@dirrm %%DATADIR%%/migration/0.9.5
-@dirrm %%DATADIR%%/migration/0.9.4
-@dirrm %%DATADIR%%/migration/0.9.3
-@dirrm %%DATADIR%%/migration/0.9.2
-@dirrm %%DATADIR%%/migration/0.9.1
-@dirrm %%DATADIR%%/migration/0.9.0
-@dirrm %%DATADIR%%/migration/0.8.7
-@dirrm %%DATADIR%%/migration/0.10.14
-@dirrm %%DATADIR%%/migration/0.10.13
-@dirrm %%DATADIR%%/migration/0.10.12
-@dirrm %%DATADIR%%/migration/0.10.11
-@dirrm %%DATADIR%%/migration/0.10.10
-@dirrm %%DATADIR%%/migration/0.10.9
-@dirrm %%DATADIR%%/migration/0.10.8
-@dirrm %%DATADIR%%/migration/0.10.7
-@dirrm %%DATADIR%%/migration/0.10.6
-@dirrm %%DATADIR%%/migration/0.10.5
-@dirrm %%DATADIR%%/migration/0.10.4
-@dirrm %%DATADIR%%/migration/0.10.3
-@dirrm %%DATADIR%%/migration/0.10.2
-@dirrm %%DATADIR%%/migration/0.10.1
-@dirrm %%DATADIR%%/migration/0.10.0
-@dirrm %%DATADIR%%/migration/1.0.0
-@dirrm %%DATADIR%%/migration/1.0.1
 @dirrm %%DATADIR%%/migration
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
-@dirrm include/fwcompiler
-@dirrm include/fwbuilder
+@dirrm include/fwb-2.0/fwcompiler
+@dirrm include/fwb-2.0/fwbuilder