12 files changed, 360 insertions, 306 deletions

diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index 5908f3361e38..4715c5f932c6 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -5,28 +5,35 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-PORTVERSION=	0.10.7
+PORTVERSION=	1.0.0
+PORTREVISION=   RC2
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	fwbuilder
+MASTER_SITES=	ftp://downloads.fwbuilder.org/pub/fwbuilder/nightly_builds/current/ \
+		${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 
 MAINTAINER=	devnull@uptsoft.com
 COMMENT=	Firewall Builder API
 
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
+		automake:${PORTSDIR}/devel/automake
+
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xslt.1:${PORTSDIR}/textproc/libxslt \
-		sigc.1:${PORTSDIR}/devel/libsigc++
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
+		crypto.3:${PORTSDIR}/security/openssl \
+		netsnmp.5:${PORTSDIR}/net/net-snmp \
+		isc.1:${PORTSDIR}/net/bind9
 
+CONFIGURE_SCRIPT= autogen.sh
+CONFIGURE_ARGS=
+USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gtk12
+USE_GTK=	no
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
-.include <bsd.port.post.mk>
+post-patch:
+	@${ECHO_CMD} "===! Running aclocal"
+	@(cd ${WRKSRC}; aclocal)
+
+.include <bsd.port.mk>
diff --git a/security/libfwbuilder-devel/distinfo b/security/libfwbuilder-devel/distinfo
index d7c38195dffb..58105deed4d9 100644
--- a/security/libfwbuilder-devel/distinfo
+++ b/security/libfwbuilder-devel/distinfo
@@ -1 +1 @@
-MD5 (libfwbuilder-0.10.7.tar.gz) = 12e0817e202b89464dedf634d23461f1
+MD5 (libfwbuilder-1.0.0.tar.gz) = 7306aed2b2a10ffb4678cc43287d8651
diff --git a/security/libfwbuilder-devel/pkg-descr b/security/libfwbuilder-devel/pkg-descr
index ebf7ea9de767..9a2e7ce64dd5 100644
--- a/security/libfwbuilder-devel/pkg-descr
+++ b/security/libfwbuilder-devel/pkg-descr
@@ -1,4 +1,4 @@
-This is the library is an API for Firewall Builder.
+This is Firewall Builder API library.
 Firewall Builder consists of object-oriented GUI and set of policy compilers
 for various firewall platforms.
 
diff --git a/security/libfwbuilder-devel/pkg-plist b/security/libfwbuilder-devel/pkg-plist
index 42b6ed167f2a..752863d1007f 100644
--- a/security/libfwbuilder-devel/pkg-plist
+++ b/security/libfwbuilder-devel/pkg-plist
@@ -1,107 +1,118 @@
-include/fwbd/fwbd.h
+share/libfwbuilder/migration/0.9.5/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.4/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.3/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.2/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.1/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.0/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.8.7/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.14/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.13/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.12/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.11/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.10/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.9/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.8/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.7/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.6/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.5/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.4/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.3/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.2/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.1/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.0/FWObjectDatabase.xslt
+share/libfwbuilder/fwbuilder.dtd
+share/doc/libfwbuilder-1.0.0/README
+share/doc/libfwbuilder-1.0.0/INSTALL
+share/doc/libfwbuilder-1.0.0/Credits
+share/doc/libfwbuilder-1.0.0/ChangeLog
+share/doc/libfwbuilder-1.0.0/COPYING
+share/doc/libfwbuilder-1.0.0/AUTHORS
+lib/libfwcompiler.so.5
+lib/libfwcompiler.so
+lib/libfwcompiler.a
+lib/libfwbuilder.so.5
+lib/libfwbuilder.so
+lib/libfwbuilder.a
 include/fwcompiler/manifest.hh
-include/fwcompiler/Compiler.hh
+include/fwcompiler/RuleProcessor.hh
 include/fwcompiler/PolicyCompiler.hh
-include/fwcompiler/NATCompiler.hh
 include/fwcompiler/OSConfigurator.hh
-include/fwcompiler/RuleProcessor.hh
+include/fwcompiler/NATCompiler.hh
+include/fwcompiler/Compiler.hh
+include/fwbuilder/snmp.hh
+include/fwbuilder/physAddress.hh
 include/fwbuilder/libfwbuilder-config.h
-include/fwbuilder/Constants.hh
-include/fwbuilder/Tools.hh
-include/fwbuilder/XMLTools.hh
+include/fwbuilder/dns.hh
 include/fwbuilder/crypto.hh
-include/fwbuilder/FWException.hh
-include/fwbuilder/IPAddress.hh
+include/fwbuilder/XMLTools.hh
+include/fwbuilder/UDPService.hh
+include/fwbuilder/Tools.hh
 include/fwbuilder/ThreadTools.hh
-include/fwbuilder/dns.hh
-include/fwbuilder/snmp.hh
-include/fwbuilder/HostsFile.hh
-include/fwbuilder/Logger.hh
-include/fwbuilder/BackgroundOp.hh
+include/fwbuilder/TCPService.hh
 include/fwbuilder/SyncQueue.hh
-include/fwbuilder/Pool.hh
-include/fwbuilder/FWObjectDatabase.hh
-include/fwbuilder/FWReference.hh
-include/fwbuilder/FWServiceReference.hh
-include/fwbuilder/FWIntervalReference.hh
-include/fwbuilder/FWObjectReference.hh
-include/fwbuilder/FWObject.hh
-include/fwbuilder/Address.hh
+include/fwbuilder/ServiceGroup.hh
 include/fwbuilder/Service.hh
-include/fwbuilder/TCPService.hh
-include/fwbuilder/UDPService.hh
-include/fwbuilder/CustomService.hh
+include/fwbuilder/RuleSet.hh
+include/fwbuilder/RuleElement.hh
+include/fwbuilder/Rule.hh
+include/fwbuilder/Resources.hh
+include/fwbuilder/Pool.hh
+include/fwbuilder/Policy.hh
+include/fwbuilder/ObjectGroup.hh
+include/fwbuilder/Network.hh
+include/fwbuilder/NAT.hh
+include/fwbuilder/Management.hh
+include/fwbuilder/Logger.hh
+include/fwbuilder/IntervalGroup.hh
+include/fwbuilder/Interval.hh
+include/fwbuilder/InterfacePolicy.hh
+include/fwbuilder/Interface.hh
+include/fwbuilder/IPv4.hh
 include/fwbuilder/IPService.hh
+include/fwbuilder/IPAddress.hh
 include/fwbuilder/ICMPService.hh
-include/fwbuilder/Interval.hh
-include/fwbuilder/Management.hh
+include/fwbuilder/HostsFile.hh
 include/fwbuilder/Host.hh
-include/fwbuilder/Interface.hh
-include/fwbuilder/InterfacePolicy.hh
 include/fwbuilder/Group.hh
-include/fwbuilder/Rule.hh
-include/fwbuilder/RuleSet.hh
-include/fwbuilder/RuleElement.hh
-include/fwbuilder/FWOptions.hh
 include/fwbuilder/Firewall.hh
-include/fwbuilder/NAT.hh
-include/fwbuilder/Policy.hh
-include/fwbuilder/Network.hh
+include/fwbuilder/FWServiceReference.hh
+include/fwbuilder/FWReference.hh
+include/fwbuilder/FWOptions.hh
+include/fwbuilder/FWObjectReference.hh
+include/fwbuilder/FWObjectDatabase.hh
+include/fwbuilder/FWObject.hh
+include/fwbuilder/FWIntervalReference.hh
+include/fwbuilder/FWException.hh
+include/fwbuilder/CustomService.hh
+include/fwbuilder/Constants.hh
+include/fwbuilder/BackgroundOp.hh
 include/fwbuilder/AddressRange.hh
-include/fwbuilder/ObjectGroup.hh
-include/fwbuilder/ServiceGroup.hh
-include/fwbuilder/IntervalGroup.hh
-share/libfwbuilder/migration/0.8.7/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.1/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.2/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.3/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.4/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.5/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.1/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.2/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.3/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.4/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.5/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.6/FWObjectDatabase.xslt
-share/libfwbuilder/fwbuilder.dtd
+include/fwbuilder/Address.hh
 bin/libfwbuilder-config
-lib/libfwbuilder.so.2
-lib/libfwbuilder.so
-lib/libfwbuilder.la
-lib/libfwbuilder.a
-lib/libfwcompiler.so.2
-lib/libfwcompiler.so
-lib/libfwcompiler.la
-lib/libfwcompiler.a
-lib/libfwbd.so.2
-lib/libfwbd.so
-lib/libfwbd.la
-lib/libfwbd.a
-share/doc/libfwbuilder-%%PORTVERSION%%/AUTHORS
-share/doc/libfwbuilder-%%PORTVERSION%%/COPYING
-share/doc/libfwbuilder-%%PORTVERSION%%/ChangeLog
-share/doc/libfwbuilder-%%PORTVERSION%%/Credits
-share/doc/libfwbuilder-%%PORTVERSION%%/README
-@dirrm include/fwbd
-@dirrm include/fwbuilder
-@dirrm include/fwcompiler
-@dirrm share/libfwbuilder/migration/0.8.7
-@dirrm share/libfwbuilder/migration/0.9.0
-@dirrm share/libfwbuilder/migration/0.9.1
-@dirrm share/libfwbuilder/migration/0.9.2
-@dirrm share/libfwbuilder/migration/0.9.3
-@dirrm share/libfwbuilder/migration/0.9.4
 @dirrm share/libfwbuilder/migration/0.9.5
-@dirrm share/libfwbuilder/migration/0.10.0
-@dirrm share/libfwbuilder/migration/0.10.1
-@dirrm share/libfwbuilder/migration/0.10.2
-@dirrm share/libfwbuilder/migration/0.10.3
-@dirrm share/libfwbuilder/migration/0.10.4
-@dirrm share/libfwbuilder/migration/0.10.5
+@dirrm share/libfwbuilder/migration/0.9.4
+@dirrm share/libfwbuilder/migration/0.9.3
+@dirrm share/libfwbuilder/migration/0.9.2
+@dirrm share/libfwbuilder/migration/0.9.1
+@dirrm share/libfwbuilder/migration/0.9.0
+@dirrm share/libfwbuilder/migration/0.8.7
+@dirrm share/libfwbuilder/migration/0.10.14
+@dirrm share/libfwbuilder/migration/0.10.13
+@dirrm share/libfwbuilder/migration/0.10.12
+@dirrm share/libfwbuilder/migration/0.10.11
+@dirrm share/libfwbuilder/migration/0.10.10
+@dirrm share/libfwbuilder/migration/0.10.9
+@dirrm share/libfwbuilder/migration/0.10.8
+@dirrm share/libfwbuilder/migration/0.10.7
 @dirrm share/libfwbuilder/migration/0.10.6
+@dirrm share/libfwbuilder/migration/0.10.5
+@dirrm share/libfwbuilder/migration/0.10.4
+@dirrm share/libfwbuilder/migration/0.10.3
+@dirrm share/libfwbuilder/migration/0.10.2
+@dirrm share/libfwbuilder/migration/0.10.1
+@dirrm share/libfwbuilder/migration/0.10.0
 @dirrm share/libfwbuilder/migration
 @dirrm share/libfwbuilder
-@unexec rmdir %D/share/doc/libfwbuilder-%%PORTVERSION%%/classref > /dev/null 2>&1 || true
-@dirrm share/doc/libfwbuilder-%%PORTVERSION%%
+@dirrm share/doc/libfwbuilder-1.0.0
+@dirrm include/fwcompiler
+@dirrm include/fwbuilder
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 5908f3361e38..4715c5f932c6 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -5,28 +5,35 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-PORTVERSION=	0.10.7
+PORTVERSION=	1.0.0
+PORTREVISION=   RC2
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	fwbuilder
+MASTER_SITES=	ftp://downloads.fwbuilder.org/pub/fwbuilder/nightly_builds/current/ \
+		${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 
 MAINTAINER=	devnull@uptsoft.com
 COMMENT=	Firewall Builder API
 
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
+		automake:${PORTSDIR}/devel/automake
+
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xslt.1:${PORTSDIR}/textproc/libxslt \
-		sigc.1:${PORTSDIR}/devel/libsigc++
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
+		crypto.3:${PORTSDIR}/security/openssl \
+		netsnmp.5:${PORTSDIR}/net/net-snmp \
+		isc.1:${PORTSDIR}/net/bind9
 
+CONFIGURE_SCRIPT= autogen.sh
+CONFIGURE_ARGS=
+USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gtk12
+USE_GTK=	no
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
-.include <bsd.port.post.mk>
+post-patch:
+	@${ECHO_CMD} "===! Running aclocal"
+	@(cd ${WRKSRC}; aclocal)
+
+.include <bsd.port.mk>
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index d7c38195dffb..58105deed4d9 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1 +1 @@
-MD5 (libfwbuilder-0.10.7.tar.gz) = 12e0817e202b89464dedf634d23461f1
+MD5 (libfwbuilder-1.0.0.tar.gz) = 7306aed2b2a10ffb4678cc43287d8651
diff --git a/security/libfwbuilder/pkg-descr b/security/libfwbuilder/pkg-descr
index ebf7ea9de767..9a2e7ce64dd5 100644
--- a/security/libfwbuilder/pkg-descr
+++ b/security/libfwbuilder/pkg-descr
@@ -1,4 +1,4 @@
-This is the library is an API for Firewall Builder.
+This is Firewall Builder API library.
 Firewall Builder consists of object-oriented GUI and set of policy compilers
 for various firewall platforms.
 
diff --git a/security/libfwbuilder/pkg-plist b/security/libfwbuilder/pkg-plist
index 42b6ed167f2a..752863d1007f 100644
--- a/security/libfwbuilder/pkg-plist
+++ b/security/libfwbuilder/pkg-plist
@@ -1,107 +1,118 @@
-include/fwbd/fwbd.h
+share/libfwbuilder/migration/0.9.5/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.4/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.3/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.2/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.1/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.0/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.8.7/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.14/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.13/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.12/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.11/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.10/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.9/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.8/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.7/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.6/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.5/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.4/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.3/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.2/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.1/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.0/FWObjectDatabase.xslt
+share/libfwbuilder/fwbuilder.dtd
+share/doc/libfwbuilder-1.0.0/README
+share/doc/libfwbuilder-1.0.0/INSTALL
+share/doc/libfwbuilder-1.0.0/Credits
+share/doc/libfwbuilder-1.0.0/ChangeLog
+share/doc/libfwbuilder-1.0.0/COPYING
+share/doc/libfwbuilder-1.0.0/AUTHORS
+lib/libfwcompiler.so.5
+lib/libfwcompiler.so
+lib/libfwcompiler.a
+lib/libfwbuilder.so.5
+lib/libfwbuilder.so
+lib/libfwbuilder.a
 include/fwcompiler/manifest.hh
-include/fwcompiler/Compiler.hh
+include/fwcompiler/RuleProcessor.hh
 include/fwcompiler/PolicyCompiler.hh
-include/fwcompiler/NATCompiler.hh
 include/fwcompiler/OSConfigurator.hh
-include/fwcompiler/RuleProcessor.hh
+include/fwcompiler/NATCompiler.hh
+include/fwcompiler/Compiler.hh
+include/fwbuilder/snmp.hh
+include/fwbuilder/physAddress.hh
 include/fwbuilder/libfwbuilder-config.h
-include/fwbuilder/Constants.hh
-include/fwbuilder/Tools.hh
-include/fwbuilder/XMLTools.hh
+include/fwbuilder/dns.hh
 include/fwbuilder/crypto.hh
-include/fwbuilder/FWException.hh
-include/fwbuilder/IPAddress.hh
+include/fwbuilder/XMLTools.hh
+include/fwbuilder/UDPService.hh
+include/fwbuilder/Tools.hh
 include/fwbuilder/ThreadTools.hh
-include/fwbuilder/dns.hh
-include/fwbuilder/snmp.hh
-include/fwbuilder/HostsFile.hh
-include/fwbuilder/Logger.hh
-include/fwbuilder/BackgroundOp.hh
+include/fwbuilder/TCPService.hh
 include/fwbuilder/SyncQueue.hh
-include/fwbuilder/Pool.hh
-include/fwbuilder/FWObjectDatabase.hh
-include/fwbuilder/FWReference.hh
-include/fwbuilder/FWServiceReference.hh
-include/fwbuilder/FWIntervalReference.hh
-include/fwbuilder/FWObjectReference.hh
-include/fwbuilder/FWObject.hh
-include/fwbuilder/Address.hh
+include/fwbuilder/ServiceGroup.hh
 include/fwbuilder/Service.hh
-include/fwbuilder/TCPService.hh
-include/fwbuilder/UDPService.hh
-include/fwbuilder/CustomService.hh
+include/fwbuilder/RuleSet.hh
+include/fwbuilder/RuleElement.hh
+include/fwbuilder/Rule.hh
+include/fwbuilder/Resources.hh
+include/fwbuilder/Pool.hh
+include/fwbuilder/Policy.hh
+include/fwbuilder/ObjectGroup.hh
+include/fwbuilder/Network.hh
+include/fwbuilder/NAT.hh
+include/fwbuilder/Management.hh
+include/fwbuilder/Logger.hh
+include/fwbuilder/IntervalGroup.hh
+include/fwbuilder/Interval.hh
+include/fwbuilder/InterfacePolicy.hh
+include/fwbuilder/Interface.hh
+include/fwbuilder/IPv4.hh
 include/fwbuilder/IPService.hh
+include/fwbuilder/IPAddress.hh
 include/fwbuilder/ICMPService.hh
-include/fwbuilder/Interval.hh
-include/fwbuilder/Management.hh
+include/fwbuilder/HostsFile.hh
 include/fwbuilder/Host.hh
-include/fwbuilder/Interface.hh
-include/fwbuilder/InterfacePolicy.hh
 include/fwbuilder/Group.hh
-include/fwbuilder/Rule.hh
-include/fwbuilder/RuleSet.hh
-include/fwbuilder/RuleElement.hh
-include/fwbuilder/FWOptions.hh
 include/fwbuilder/Firewall.hh
-include/fwbuilder/NAT.hh
-include/fwbuilder/Policy.hh
-include/fwbuilder/Network.hh
+include/fwbuilder/FWServiceReference.hh
+include/fwbuilder/FWReference.hh
+include/fwbuilder/FWOptions.hh
+include/fwbuilder/FWObjectReference.hh
+include/fwbuilder/FWObjectDatabase.hh
+include/fwbuilder/FWObject.hh
+include/fwbuilder/FWIntervalReference.hh
+include/fwbuilder/FWException.hh
+include/fwbuilder/CustomService.hh
+include/fwbuilder/Constants.hh
+include/fwbuilder/BackgroundOp.hh
 include/fwbuilder/AddressRange.hh
-include/fwbuilder/ObjectGroup.hh
-include/fwbuilder/ServiceGroup.hh
-include/fwbuilder/IntervalGroup.hh
-share/libfwbuilder/migration/0.8.7/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.1/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.2/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.3/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.4/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.5/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.1/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.2/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.3/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.4/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.5/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.6/FWObjectDatabase.xslt
-share/libfwbuilder/fwbuilder.dtd
+include/fwbuilder/Address.hh
 bin/libfwbuilder-config
-lib/libfwbuilder.so.2
-lib/libfwbuilder.so
-lib/libfwbuilder.la
-lib/libfwbuilder.a
-lib/libfwcompiler.so.2
-lib/libfwcompiler.so
-lib/libfwcompiler.la
-lib/libfwcompiler.a
-lib/libfwbd.so.2
-lib/libfwbd.so
-lib/libfwbd.la
-lib/libfwbd.a
-share/doc/libfwbuilder-%%PORTVERSION%%/AUTHORS
-share/doc/libfwbuilder-%%PORTVERSION%%/COPYING
-share/doc/libfwbuilder-%%PORTVERSION%%/ChangeLog
-share/doc/libfwbuilder-%%PORTVERSION%%/Credits
-share/doc/libfwbuilder-%%PORTVERSION%%/README
-@dirrm include/fwbd
-@dirrm include/fwbuilder
-@dirrm include/fwcompiler
-@dirrm share/libfwbuilder/migration/0.8.7
-@dirrm share/libfwbuilder/migration/0.9.0
-@dirrm share/libfwbuilder/migration/0.9.1
-@dirrm share/libfwbuilder/migration/0.9.2
-@dirrm share/libfwbuilder/migration/0.9.3
-@dirrm share/libfwbuilder/migration/0.9.4
 @dirrm share/libfwbuilder/migration/0.9.5
-@dirrm share/libfwbuilder/migration/0.10.0
-@dirrm share/libfwbuilder/migration/0.10.1
-@dirrm share/libfwbuilder/migration/0.10.2
-@dirrm share/libfwbuilder/migration/0.10.3
-@dirrm share/libfwbuilder/migration/0.10.4
-@dirrm share/libfwbuilder/migration/0.10.5
+@dirrm share/libfwbuilder/migration/0.9.4
+@dirrm share/libfwbuilder/migration/0.9.3
+@dirrm share/libfwbuilder/migration/0.9.2
+@dirrm share/libfwbuilder/migration/0.9.1
+@dirrm share/libfwbuilder/migration/0.9.0
+@dirrm share/libfwbuilder/migration/0.8.7
+@dirrm share/libfwbuilder/migration/0.10.14
+@dirrm share/libfwbuilder/migration/0.10.13
+@dirrm share/libfwbuilder/migration/0.10.12
+@dirrm share/libfwbuilder/migration/0.10.11
+@dirrm share/libfwbuilder/migration/0.10.10
+@dirrm share/libfwbuilder/migration/0.10.9
+@dirrm share/libfwbuilder/migration/0.10.8
+@dirrm share/libfwbuilder/migration/0.10.7
 @dirrm share/libfwbuilder/migration/0.10.6
+@dirrm share/libfwbuilder/migration/0.10.5
+@dirrm share/libfwbuilder/migration/0.10.4
+@dirrm share/libfwbuilder/migration/0.10.3
+@dirrm share/libfwbuilder/migration/0.10.2
+@dirrm share/libfwbuilder/migration/0.10.1
+@dirrm share/libfwbuilder/migration/0.10.0
 @dirrm share/libfwbuilder/migration
 @dirrm share/libfwbuilder
-@unexec rmdir %D/share/doc/libfwbuilder-%%PORTVERSION%%/classref > /dev/null 2>&1 || true
-@dirrm share/doc/libfwbuilder-%%PORTVERSION%%
+@dirrm share/doc/libfwbuilder-1.0.0
+@dirrm include/fwcompiler
+@dirrm include/fwbuilder
diff --git a/security/libfwbuilder2/Makefile b/security/libfwbuilder2/Makefile
index 5908f3361e38..4715c5f932c6 100644
--- a/security/libfwbuilder2/Makefile
+++ b/security/libfwbuilder2/Makefile
@@ -5,28 +5,35 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-PORTVERSION=	0.10.7
+PORTVERSION=	1.0.0
+PORTREVISION=   RC2
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	fwbuilder
+MASTER_SITES=	ftp://downloads.fwbuilder.org/pub/fwbuilder/nightly_builds/current/ \
+		${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 
 MAINTAINER=	devnull@uptsoft.com
 COMMENT=	Firewall Builder API
 
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
+		automake:${PORTSDIR}/devel/automake
+
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xslt.1:${PORTSDIR}/textproc/libxslt \
-		sigc.1:${PORTSDIR}/devel/libsigc++
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
+		crypto.3:${PORTSDIR}/security/openssl \
+		netsnmp.5:${PORTSDIR}/net/net-snmp \
+		isc.1:${PORTSDIR}/net/bind9
 
+CONFIGURE_SCRIPT= autogen.sh
+CONFIGURE_ARGS=
+USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gtk12
+USE_GTK=	no
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
-.include <bsd.port.post.mk>
+post-patch:
+	@${ECHO_CMD} "===! Running aclocal"
+	@(cd ${WRKSRC}; aclocal)
+
+.include <bsd.port.mk>
diff --git a/security/libfwbuilder2/distinfo b/security/libfwbuilder2/distinfo
index d7c38195dffb..58105deed4d9 100644
--- a/security/libfwbuilder2/distinfo
+++ b/security/libfwbuilder2/distinfo
@@ -1 +1 @@
-MD5 (libfwbuilder-0.10.7.tar.gz) = 12e0817e202b89464dedf634d23461f1
+MD5 (libfwbuilder-1.0.0.tar.gz) = 7306aed2b2a10ffb4678cc43287d8651
diff --git a/security/libfwbuilder2/pkg-descr b/security/libfwbuilder2/pkg-descr
index ebf7ea9de767..9a2e7ce64dd5 100644
--- a/security/libfwbuilder2/pkg-descr
+++ b/security/libfwbuilder2/pkg-descr
@@ -1,4 +1,4 @@
-This is the library is an API for Firewall Builder.
+This is Firewall Builder API library.
 Firewall Builder consists of object-oriented GUI and set of policy compilers
 for various firewall platforms.
 
diff --git a/security/libfwbuilder2/pkg-plist b/security/libfwbuilder2/pkg-plist
index 42b6ed167f2a..752863d1007f 100644
--- a/security/libfwbuilder2/pkg-plist
+++ b/security/libfwbuilder2/pkg-plist
@@ -1,107 +1,118 @@
-include/fwbd/fwbd.h
+share/libfwbuilder/migration/0.9.5/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.4/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.3/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.2/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.1/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.9.0/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.8.7/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.14/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.13/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.12/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.11/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.10/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.9/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.8/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.7/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.6/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.5/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.4/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.3/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.2/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.1/FWObjectDatabase.xslt
+share/libfwbuilder/migration/0.10.0/FWObjectDatabase.xslt
+share/libfwbuilder/fwbuilder.dtd
+share/doc/libfwbuilder-1.0.0/README
+share/doc/libfwbuilder-1.0.0/INSTALL
+share/doc/libfwbuilder-1.0.0/Credits
+share/doc/libfwbuilder-1.0.0/ChangeLog
+share/doc/libfwbuilder-1.0.0/COPYING
+share/doc/libfwbuilder-1.0.0/AUTHORS
+lib/libfwcompiler.so.5
+lib/libfwcompiler.so
+lib/libfwcompiler.a
+lib/libfwbuilder.so.5
+lib/libfwbuilder.so
+lib/libfwbuilder.a
 include/fwcompiler/manifest.hh
-include/fwcompiler/Compiler.hh
+include/fwcompiler/RuleProcessor.hh
 include/fwcompiler/PolicyCompiler.hh
-include/fwcompiler/NATCompiler.hh
 include/fwcompiler/OSConfigurator.hh
-include/fwcompiler/RuleProcessor.hh
+include/fwcompiler/NATCompiler.hh
+include/fwcompiler/Compiler.hh
+include/fwbuilder/snmp.hh
+include/fwbuilder/physAddress.hh
 include/fwbuilder/libfwbuilder-config.h
-include/fwbuilder/Constants.hh
-include/fwbuilder/Tools.hh
-include/fwbuilder/XMLTools.hh
+include/fwbuilder/dns.hh
 include/fwbuilder/crypto.hh
-include/fwbuilder/FWException.hh
-include/fwbuilder/IPAddress.hh
+include/fwbuilder/XMLTools.hh
+include/fwbuilder/UDPService.hh
+include/fwbuilder/Tools.hh
 include/fwbuilder/ThreadTools.hh
-include/fwbuilder/dns.hh
-include/fwbuilder/snmp.hh
-include/fwbuilder/HostsFile.hh
-include/fwbuilder/Logger.hh
-include/fwbuilder/BackgroundOp.hh
+include/fwbuilder/TCPService.hh
 include/fwbuilder/SyncQueue.hh
-include/fwbuilder/Pool.hh
-include/fwbuilder/FWObjectDatabase.hh
-include/fwbuilder/FWReference.hh
-include/fwbuilder/FWServiceReference.hh
-include/fwbuilder/FWIntervalReference.hh
-include/fwbuilder/FWObjectReference.hh
-include/fwbuilder/FWObject.hh
-include/fwbuilder/Address.hh
+include/fwbuilder/ServiceGroup.hh
 include/fwbuilder/Service.hh
-include/fwbuilder/TCPService.hh
-include/fwbuilder/UDPService.hh
-include/fwbuilder/CustomService.hh
+include/fwbuilder/RuleSet.hh
+include/fwbuilder/RuleElement.hh
+include/fwbuilder/Rule.hh
+include/fwbuilder/Resources.hh
+include/fwbuilder/Pool.hh
+include/fwbuilder/Policy.hh
+include/fwbuilder/ObjectGroup.hh
+include/fwbuilder/Network.hh
+include/fwbuilder/NAT.hh
+include/fwbuilder/Management.hh
+include/fwbuilder/Logger.hh
+include/fwbuilder/IntervalGroup.hh
+include/fwbuilder/Interval.hh
+include/fwbuilder/InterfacePolicy.hh
+include/fwbuilder/Interface.hh
+include/fwbuilder/IPv4.hh
 include/fwbuilder/IPService.hh
+include/fwbuilder/IPAddress.hh
 include/fwbuilder/ICMPService.hh
-include/fwbuilder/Interval.hh
-include/fwbuilder/Management.hh
+include/fwbuilder/HostsFile.hh
 include/fwbuilder/Host.hh
-include/fwbuilder/Interface.hh
-include/fwbuilder/InterfacePolicy.hh
 include/fwbuilder/Group.hh
-include/fwbuilder/Rule.hh
-include/fwbuilder/RuleSet.hh
-include/fwbuilder/RuleElement.hh
-include/fwbuilder/FWOptions.hh
 include/fwbuilder/Firewall.hh
-include/fwbuilder/NAT.hh
-include/fwbuilder/Policy.hh
-include/fwbuilder/Network.hh
+include/fwbuilder/FWServiceReference.hh
+include/fwbuilder/FWReference.hh
+include/fwbuilder/FWOptions.hh
+include/fwbuilder/FWObjectReference.hh
+include/fwbuilder/FWObjectDatabase.hh
+include/fwbuilder/FWObject.hh
+include/fwbuilder/FWIntervalReference.hh
+include/fwbuilder/FWException.hh
+include/fwbuilder/CustomService.hh
+include/fwbuilder/Constants.hh
+include/fwbuilder/BackgroundOp.hh
 include/fwbuilder/AddressRange.hh
-include/fwbuilder/ObjectGroup.hh
-include/fwbuilder/ServiceGroup.hh
-include/fwbuilder/IntervalGroup.hh
-share/libfwbuilder/migration/0.8.7/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.1/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.2/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.3/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.4/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.5/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.1/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.2/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.3/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.4/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.5/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.6/FWObjectDatabase.xslt
-share/libfwbuilder/fwbuilder.dtd
+include/fwbuilder/Address.hh
 bin/libfwbuilder-config
-lib/libfwbuilder.so.2
-lib/libfwbuilder.so
-lib/libfwbuilder.la
-lib/libfwbuilder.a
-lib/libfwcompiler.so.2
-lib/libfwcompiler.so
-lib/libfwcompiler.la
-lib/libfwcompiler.a
-lib/libfwbd.so.2
-lib/libfwbd.so
-lib/libfwbd.la
-lib/libfwbd.a
-share/doc/libfwbuilder-%%PORTVERSION%%/AUTHORS
-share/doc/libfwbuilder-%%PORTVERSION%%/COPYING
-share/doc/libfwbuilder-%%PORTVERSION%%/ChangeLog
-share/doc/libfwbuilder-%%PORTVERSION%%/Credits
-share/doc/libfwbuilder-%%PORTVERSION%%/README
-@dirrm include/fwbd
-@dirrm include/fwbuilder
-@dirrm include/fwcompiler
-@dirrm share/libfwbuilder/migration/0.8.7
-@dirrm share/libfwbuilder/migration/0.9.0
-@dirrm share/libfwbuilder/migration/0.9.1
-@dirrm share/libfwbuilder/migration/0.9.2
-@dirrm share/libfwbuilder/migration/0.9.3
-@dirrm share/libfwbuilder/migration/0.9.4
 @dirrm share/libfwbuilder/migration/0.9.5
-@dirrm share/libfwbuilder/migration/0.10.0
-@dirrm share/libfwbuilder/migration/0.10.1
-@dirrm share/libfwbuilder/migration/0.10.2
-@dirrm share/libfwbuilder/migration/0.10.3
-@dirrm share/libfwbuilder/migration/0.10.4
-@dirrm share/libfwbuilder/migration/0.10.5
+@dirrm share/libfwbuilder/migration/0.9.4
+@dirrm share/libfwbuilder/migration/0.9.3
+@dirrm share/libfwbuilder/migration/0.9.2
+@dirrm share/libfwbuilder/migration/0.9.1
+@dirrm share/libfwbuilder/migration/0.9.0
+@dirrm share/libfwbuilder/migration/0.8.7
+@dirrm share/libfwbuilder/migration/0.10.14
+@dirrm share/libfwbuilder/migration/0.10.13
+@dirrm share/libfwbuilder/migration/0.10.12
+@dirrm share/libfwbuilder/migration/0.10.11
+@dirrm share/libfwbuilder/migration/0.10.10
+@dirrm share/libfwbuilder/migration/0.10.9
+@dirrm share/libfwbuilder/migration/0.10.8
+@dirrm share/libfwbuilder/migration/0.10.7
 @dirrm share/libfwbuilder/migration/0.10.6
+@dirrm share/libfwbuilder/migration/0.10.5
+@dirrm share/libfwbuilder/migration/0.10.4
+@dirrm share/libfwbuilder/migration/0.10.3
+@dirrm share/libfwbuilder/migration/0.10.2
+@dirrm share/libfwbuilder/migration/0.10.1
+@dirrm share/libfwbuilder/migration/0.10.0
 @dirrm share/libfwbuilder/migration
 @dirrm share/libfwbuilder
-@unexec rmdir %D/share/doc/libfwbuilder-%%PORTVERSION%%/classref > /dev/null 2>&1 || true
-@dirrm share/doc/libfwbuilder-%%PORTVERSION%%
+@dirrm share/doc/libfwbuilder-1.0.0
+@dirrm include/fwcompiler
+@dirrm include/fwbuilder