27 files changed, 783 insertions, 537 deletions

diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index 16319db525ec..ff102eddff59 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -6,37 +6,32 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	0.8.7
-PORTREVISION=	1
+PORTVERSION=	1.0.10
+PORTREVISION=   RC5
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	ftp://downloads.fwbuilder.org/pub/fwbuilder/nightly_builds/current/ \
+		${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Firewall Builder GUI for IPFilter
+MAINTAINER=	devnull@uptsoft.com
+COMMENT=	Firewall Builder GUI and policy compilers
 
-LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
+LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
+		fwbuilder.5:${PORTSDIR}/security/libfwbuilder
 
+CONFIGURE_SCRIPT= autogen.sh
+# CONFIGURE_ARGS+=  --with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
+# USE_AUTOCONF=   yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomelibs
-WITHOUT_ESOUND=	yes
-CONFIGURE_ARGS+=	--with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
+USE_GTK=	yes
+INSTALLS_SHLIB=	yes
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+
+MAN1=		fwbuilder.1 fwblookup.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 \
+		fwb_pf.1 fwb_install.1
 
 post-extract:
-	@${PERL} -pi -e "s/lc_r/pthread/" ${WRKSRC}/configure ;\
-	${PERL} -pi -e "s|/usr/bin|${LOCALBASE}/bin|" ${WRKSRC}/etc/fwbuilder_prefs.xml.in
-.for i in compiler-framework/Makefile.in gui/gnome-wrappers/Makefile.in \
-	gui/Makefile.in ipchains/Makefile.in ipfilter/Makefile.in \
-	iptables/Makefile.in
-	@${PERL} -pi -e "s|^CFLAGS\s+=\s+-Wall\s+-g|CFLAGS = \@CFLAGS@ -Wall|" ${WRKSRC}/src/$i
-.endfor
+	@${ECHO_CMD} "===! Running aclocal"
+	cd ${WRKDIR}/fwbuilder-1.0.10; aclocal; autoconf
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
index 7e90b4806cb2..5ae1cea636a4 100644
--- a/security/fwbuilder-devel/distinfo
+++ b/security/fwbuilder-devel/distinfo
@@ -1 +1 @@
-MD5 (fwbuilder-0.8.7.tar.gz) = 3fb13778a5b998bf31b789d410587221
+MD5 (fwbuilder-1.0.10.tar.gz) = c6a09c040d9a2736cecea0c9053b484a
diff --git a/security/fwbuilder-devel/files/patch-aa b/security/fwbuilder-devel/files/patch-aa
deleted file mode 100644
index 8416f7694d3f..000000000000
--- a/security/fwbuilder-devel/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/compiler-framework/Makefile.in.orig	Sat Feb  3 23:11:36 2001
-+++ src/compiler-framework/Makefile.in	Sat Feb  3 23:11:57 2001
-@@ -11,7 +11,7 @@
- 
- CC= @CC@
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- XML_CFLAGS = @XML_CFLAGS@
-@@ -45,9 +45,9 @@
- 
- install: $(FWLIB) $(HEADERS)
- 	$(mkinstalldirs) $(libdir)
--	$(INSTALL_PROGRAM) $(FWLIB) $(libdir)
-+	$(INSTALL_DATA) $(FWLIB) $(libdir)
- 	$(mkinstalldirs) $(includedir)
--	$(INSTALL_PROGRAM) $(HEADERS) $(includedir)
-+	$(INSTALL_DATA) $(HEADERS) $(includedir)
- 
- 
- uninstall: 
diff --git a/security/fwbuilder-devel/files/patch-ab b/security/fwbuilder-devel/files/patch-ab
deleted file mode 100644
index baadcf884946..000000000000
--- a/security/fwbuilder-devel/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- examples/Makefile.in.orig	Sat Feb  3 23:01:10 2001
-+++ examples/Makefile.in	Sat Feb  3 23:01:36 2001
-@@ -13,7 +13,7 @@
- examplesdir = $(docdir)
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
-@@ -24,7 +24,7 @@
- 
- install:
- 	$(mkinstalldirs) $(examplesdir)
--	$(INSTALL_PROGRAM) -m 0644 $(EXAMPLES) $(examplesdir)
-+	$(INSTALL_DATA) $(EXAMPLES) $(examplesdir)
- 
- uninstall:
- 	list='$(EXAMPLES)'; for file in $$list; do \
diff --git a/security/fwbuilder-devel/files/patch-ac b/security/fwbuilder-devel/files/patch-ac
deleted file mode 100644
index 91181f8d26e1..000000000000
--- a/security/fwbuilder-devel/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig	Sat Feb  3 23:04:02 2001
-+++ doc/Makefile.in	Sat Feb  3 23:03:24 2001
-@@ -12,7 +12,7 @@
- docdir = @DOCDIR@/fwbuilder
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
-@@ -33,7 +33,7 @@
- 
- install:
- 	$(mkinstalldirs) $(docdir)
--	$(INSTALL_PROGRAM) -m 0644 $(DOCS) $(docdir)
-+	$(INSTALL_DATA) $(DOCS) $(docdir)
- 
- uninstall:
- 	list='$(DOCS)'; for file in $$list; do \
diff --git a/security/fwbuilder-devel/files/patch-ad b/security/fwbuilder-devel/files/patch-ad
deleted file mode 100644
index 4fefde3c0957..000000000000
--- a/security/fwbuilder-devel/files/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
---- etc/Makefile.in.orig	Sat Feb  3 23:10:14 2001
-+++ etc/Makefile.in	Sat Feb  3 23:10:40 2001
-@@ -11,7 +11,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
-+INSTALL_DATA = @INSTALL_DATA@ 
- 
- all: fwbuilder_prefs.xml
- 
-@@ -27,9 +27,9 @@
- 
- install: objects_init.xml fwbuilder_prefs.xml
- 	$(mkinstalldirs) $(datadir)
--	$(INSTALL_PROGRAM) objects_init.xml $(datadir)
--	$(INSTALL_PROGRAM) fwbuilder_prefs.xml $(datadir)
--	$(INSTALL_PROGRAM) fwbuilder.dtd $(datadir)
-+	$(INSTALL_DATA) objects_init.xml $(datadir)
-+	$(INSTALL_DATA) fwbuilder_prefs.xml $(datadir)
-+	$(INSTALL_DATA) fwbuilder.dtd $(datadir)
- 
- uninstall: 
- 	rm -f $(datadir)/objects_init.xml
diff --git a/security/fwbuilder-devel/files/patch-ae b/security/fwbuilder-devel/files/patch-ae
deleted file mode 100644
index 990955c205ca..000000000000
--- a/security/fwbuilder-devel/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/Makefile.in.orig	Wed Mar 21 01:56:07 2001
-+++ src/gui/Makefile.in	Wed Mar 21 01:58:19 2001
-@@ -9,7 +9,7 @@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
- sbindir = @sbindir@
--iconsdir = $(prefix)/share/pixmaps/fwbuilder
-+iconsdir = @datadir@/fwbuilder/pixmaps
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
diff --git a/security/fwbuilder-devel/pkg-descr b/security/fwbuilder-devel/pkg-descr
index e6968c1ca2bb..630225955878 100644
--- a/security/fwbuilder-devel/pkg-descr
+++ b/security/fwbuilder-devel/pkg-descr
@@ -15,6 +15,4 @@ Because of this, Firewall Builder can be used to manage firewalls built on
 variety of platforms including, but not limited to, Linux running ipchains or
 iptables and FreeBSD or Solaris running ipfilter. 
 
-WWW: http://www.crocodile.org/~vadim/fwbuilder/
-
-Roman Shterenzon <roman@xpert.com>
+WWW: http://www.fwbuilder.org/
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
index 421602f42d3f..cf5c84a4d772 100644
--- a/security/fwbuilder-devel/pkg-plist
+++ b/security/fwbuilder-devel/pkg-plist
@@ -1,53 +1,240 @@
-bin/fwb_ipchains
-bin/fwb_ipfilter
-bin/fwb_iptables
+share/pixmaps/fwbuilder/yes.png
+share/pixmaps/fwbuilder/warning.png
+share/pixmaps/fwbuilder/up-arrow.png
+share/pixmaps/fwbuilder/undo.png
+share/pixmaps/fwbuilder/uncheck.png
+share/pixmaps/fwbuilder/stop.png
+share/pixmaps/fwbuilder/service_16.png
+share/pixmaps/fwbuilder/service-udp.png
+share/pixmaps/fwbuilder/service-udp-ref.png
+share/pixmaps/fwbuilder/service-udp-neg.png
+share/pixmaps/fwbuilder/service-tcp.png
+share/pixmaps/fwbuilder/service-tcp-ref.png
+share/pixmaps/fwbuilder/service-tcp-neg.png
+share/pixmaps/fwbuilder/service-ip.png
+share/pixmaps/fwbuilder/service-ip-ref.png
+share/pixmaps/fwbuilder/service-ip-neg.png
+share/pixmaps/fwbuilder/service-icmp.png
+share/pixmaps/fwbuilder/service-icmp-ref.png
+share/pixmaps/fwbuilder/service-icmp-neg.png
+share/pixmaps/fwbuilder/service-custom.png
+share/pixmaps/fwbuilder/service-custom-ref.png
+share/pixmaps/fwbuilder/service-custom-neg.png
+share/pixmaps/fwbuilder/rules_druid_logo.png
+share/pixmaps/fwbuilder/right-arrow.png
+share/pixmaps/fwbuilder/reject.png
+share/pixmaps/fwbuilder/ref.png
+share/pixmaps/fwbuilder/redo.png
+share/pixmaps/fwbuilder/question.png
+share/pixmaps/fwbuilder/protect_net_and_dmz.png
+share/pixmaps/fwbuilder/protect_net.png
+share/pixmaps/fwbuilder/protect_host.png
+share/pixmaps/fwbuilder/physaddress_16.png
+share/pixmaps/fwbuilder/physaddress.png
+share/pixmaps/fwbuilder/physaddress-ref.png
+share/pixmaps/fwbuilder/physaddress-neg.png
+share/pixmaps/fwbuilder/outbound.png
+share/pixmaps/fwbuilder/options.png
+share/pixmaps/fwbuilder/ok.png
+share/pixmaps/fwbuilder/no.png
+share/pixmaps/fwbuilder/network_16.png
+share/pixmaps/fwbuilder/network.png
+share/pixmaps/fwbuilder/network-ref.png
+share/pixmaps/fwbuilder/network-neg.png
+share/pixmaps/fwbuilder/neg.png
+share/pixmaps/fwbuilder/log.png
+share/pixmaps/fwbuilder/left-arrow.png
+share/pixmaps/fwbuilder/key.png
+share/pixmaps/fwbuilder/interface_16.png
+share/pixmaps/fwbuilder/interface.png
+share/pixmaps/fwbuilder/interface-ref.png
+share/pixmaps/fwbuilder/interface-neg.png
+share/pixmaps/fwbuilder/info.png
+share/pixmaps/fwbuilder/inbound.png
+share/pixmaps/fwbuilder/host_64.png
+share/pixmaps/fwbuilder/host_16.png
+share/pixmaps/fwbuilder/host.png
+share/pixmaps/fwbuilder/host-ref.png
+share/pixmaps/fwbuilder/host-neg.png
+share/pixmaps/fwbuilder/group_16.png
+share/pixmaps/fwbuilder/group.png
+share/pixmaps/fwbuilder/group-ref.png
+share/pixmaps/fwbuilder/group-neg.png
+share/pixmaps/fwbuilder/generic.png
+share/pixmaps/fwbuilder/floppy.png
+share/pixmaps/fwbuilder/firewall_16.png
+share/pixmaps/fwbuilder/firewall.png
+share/pixmaps/fwbuilder/firewall-ref.png
+share/pixmaps/fwbuilder/firewall-neg.png
+share/pixmaps/fwbuilder/error.png
+share/pixmaps/fwbuilder/drag_object.png
+share/pixmaps/fwbuilder/down-arrow.png
+share/pixmaps/fwbuilder/deny.png
+share/pixmaps/fwbuilder/close.png
+share/pixmaps/fwbuilder/clock_16.png
+share/pixmaps/fwbuilder/clock.png
+share/pixmaps/fwbuilder/clock-ref.png
+share/pixmaps/fwbuilder/clock-neg.png
+share/pixmaps/fwbuilder/check.png
+share/pixmaps/fwbuilder/cert_druid_logo.png
+share/pixmaps/fwbuilder/cancel.png
+share/pixmaps/fwbuilder/both.png
+share/pixmaps/fwbuilder/blank_2x16.png
+share/pixmaps/fwbuilder/blank.png
+share/pixmaps/fwbuilder/binoculars64.png
+share/pixmaps/fwbuilder/big-up-arrow.png
+share/pixmaps/fwbuilder/big-right-arrow.png
+share/pixmaps/fwbuilder/big-left-arrow.png
+share/pixmaps/fwbuilder/big-down-arrow.png
+share/pixmaps/fwbuilder/apply.png
+share/pixmaps/fwbuilder/address_16.png
+share/pixmaps/fwbuilder/address.png
+share/pixmaps/fwbuilder/address-ref.png
+share/pixmaps/fwbuilder/address-neg.png
+share/pixmaps/fwbuilder/accept.png
+share/pixmaps/fwbuilder/accounting.png
+share/locale/ru/LC_MESSAGES/fwbuilder.mo
+share/locale/fr/LC_MESSAGES/fwbuilder.mo
+share/locale/de/LC_MESSAGES/fwbuilder.mo
+share/fwbuilder/gtkrc
+share/fwbuilder/fwbuilder_preferences.dtd
+share/fwbuilder/fwbuilder_prefs.xml
+share/fwbuilder/objects_init.xml
+share/fwbuilder/resources.xml
+share/fwbuilder/platform/unknown.xml
+share/fwbuilder/platform/pix.xml
+share/fwbuilder/platform/pf.xml
+share/fwbuilder/platform/iptables.xml
+share/fwbuilder/platform/ipf.xml
+share/fwbuilder/platform/ipfw.xml
+share/fwbuilder/os/unknown_os.xml
+share/fwbuilder/os/solaris.xml
+share/fwbuilder/os/pix_os.xml
+share/fwbuilder/os/openbsd.xml
+share/fwbuilder/os/linux24.xml
+share/fwbuilder/os/freebsd.xml
+share/fwbuilder/os/macosx.xml
+share/fwbuilder/modules/gui/lib_solaris_dlg.so
+share/fwbuilder/modules/gui/lib_pix_os_dlg.so
+share/fwbuilder/modules/gui/lib_pix_dlg.so
+share/fwbuilder/modules/gui/lib_pf_dlg.so
+share/fwbuilder/modules/gui/lib_openbsd_dlg.so
+share/fwbuilder/modules/gui/lib_linux24_dlg.so
+share/fwbuilder/modules/gui/lib_iptables_dlg.so
+share/fwbuilder/modules/gui/lib_ipf_dlg.so
+share/fwbuilder/modules/gui/lib_ipfw_dlg.so
+share/fwbuilder/modules/gui/lib_freebsd_dlg.so
+share/fwbuilder/modules/gui/lib_macosx_dlg.so
+share/fwbuilder/migration/1.0.9/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.8/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.7/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.6/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.5/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.4/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.3/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.2/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.1/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.0/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.9/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.8/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.7/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.6/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.5/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.4/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.3/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.2/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.1/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.0/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.8.7/FWBuilderPreferences.xslt
+share/fwbuilder/filters/print-policy.xs1
+share/fwbuilder/filters/print-nat.xs1
+share/fwbuilder/filters/policy-text.xsl
+share/fwbuilder/filters/policy-html.xsl
+share/doc/fwbuilder-1.0.10/examples/objects.xml
+share/doc/fwbuilder-1.0.10/examples/README.examples
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.9.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.9
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.8.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.8
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.7.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.7
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.6.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.6
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.5.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.5
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.4.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.4
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.3.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.3
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.2.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.2
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.10.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.10
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.1.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.1
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.0.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.0
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.9.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.9
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.8.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.8
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.7.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.7
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.6.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.6
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.5.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.5
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.4.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.4
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.3.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.3
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.2.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.2
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.1
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.0
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.8.7
+share/doc/fwbuilder-1.0.10/README.gui
+share/doc/fwbuilder-1.0.10/README.floppyfw
+share/doc/fwbuilder-1.0.10/README.compiler-framework
+share/doc/fwbuilder-1.0.10/README.api
+share/doc/fwbuilder-1.0.10/INSTALL
+share/doc/fwbuilder-1.0.10/FAQ.html
+share/doc/fwbuilder-1.0.10/FAQ
+share/doc/fwbuilder-1.0.10/Credits
+share/doc/fwbuilder-1.0.10/ChangeLog
+share/doc/fwbuilder-1.0.10/COPYING
+share/doc/fwbuilder-1.0.10/Build.html
+share/doc/fwbuilder-1.0.10/Build
+share/doc/fwbuilder-1.0.10/AUTHORS
 bin/fwbuilder
-include/fwcompiler.h
-lib/libfwcompiler.a
-share/doc/fwbuilder/AUTHORS
-share/doc/fwbuilder/COPYING
-share/doc/fwbuilder/ChangeLog
-share/doc/fwbuilder/Credits
-share/doc/fwbuilder/FAQ
-share/doc/fwbuilder/NEWS
-share/doc/fwbuilder/README.compiler-framework
-share/doc/fwbuilder/README.examples
-share/doc/fwbuilder/README.gui
-share/doc/fwbuilder/README.ipchains
-share/doc/fwbuilder/README.ipfilter
-share/doc/fwbuilder/Requirements
-share/doc/fwbuilder/objects.xml
-share/gnome/fwbuilder/fwbuilder.dtd
-share/gnome/fwbuilder/fwbuilder_prefs.xml
-share/gnome/fwbuilder/objects_init.xml
-share/gnome/fwbuilder/pixmaps/accept.png
-share/gnome/fwbuilder/pixmaps/blank.xpm
-share/gnome/fwbuilder/pixmaps/check.xpm
-share/gnome/fwbuilder/pixmaps/clock.png
-share/gnome/fwbuilder/pixmaps/deny.png
-share/gnome/fwbuilder/pixmaps/drag_object.xpm
-share/gnome/fwbuilder/pixmaps/error.png
-share/gnome/fwbuilder/pixmaps/firewall.png
-share/gnome/fwbuilder/pixmaps/firewall_64.png
-share/gnome/fwbuilder/pixmaps/folder.png
-share/gnome/fwbuilder/pixmaps/folder_64.png
-share/gnome/fwbuilder/pixmaps/generic.xpm
-share/gnome/fwbuilder/pixmaps/host.png
-share/gnome/fwbuilder/pixmaps/host_64.png
-share/gnome/fwbuilder/pixmaps/icmp.xpm
-share/gnome/fwbuilder/pixmaps/interface.xpm
-share/gnome/fwbuilder/pixmaps/ip.xpm
-share/gnome/fwbuilder/pixmaps/log.png
-share/gnome/fwbuilder/pixmaps/neg.xpm
-share/gnome/fwbuilder/pixmaps/net.png
-share/gnome/fwbuilder/pixmaps/net_64.png
-share/gnome/fwbuilder/pixmaps/question.png
-share/gnome/fwbuilder/pixmaps/ref.xpm
-share/gnome/fwbuilder/pixmaps/reject.png
-share/gnome/fwbuilder/pixmaps/tcp.xpm
-share/gnome/fwbuilder/pixmaps/udp.xpm
-share/gnome/fwbuilder/pixmaps/uncheck.xpm
-share/gnome/fwbuilder/pixmaps/warning.xpm
-@dirrm share/doc/fwbuilder
-@dirrm share/gnome/fwbuilder/pixmaps
-@dirrm share/gnome/fwbuilder
+bin/fwblookup
+bin/fwb_pf
+bin/fwb_ipt
+bin/fwb_ipf
+bin/fwb_ipfw
+bin/fwb_install
+@dirrm share/fwbuilder/modules/gui
+@dirrm share/fwbuilder/migration/1.0.9
+@dirrm share/fwbuilder/migration/1.0.8
+@dirrm share/fwbuilder/migration/1.0.7
+@dirrm share/fwbuilder/migration/1.0.6
+@dirrm share/fwbuilder/migration/1.0.5
+@dirrm share/fwbuilder/migration/1.0.4
+@dirrm share/fwbuilder/migration/1.0.3
+@dirrm share/fwbuilder/migration/1.0.2
+@dirrm share/fwbuilder/migration/1.0.1
+@dirrm share/fwbuilder/migration/1.0.0
+@dirrm share/fwbuilder/migration/0.9.9
+@dirrm share/fwbuilder/migration/0.9.8
+@dirrm share/fwbuilder/migration/0.9.7
+@dirrm share/fwbuilder/migration/0.9.6
+@dirrm share/fwbuilder/migration/0.9.5
+@dirrm share/fwbuilder/migration/0.9.4
+@dirrm share/fwbuilder/migration/0.9.3
+@dirrm share/fwbuilder/migration/0.9.2
+@dirrm share/fwbuilder/migration/0.9.1
+@dirrm share/fwbuilder/migration/0.9.0
+@dirrm share/fwbuilder/migration/0.8.7
+@dirrm share/fwbuilder/filters
+@dirrm share/doc/fwbuilder-1.0.10/examples
+@dirrm share/doc/fwbuilder-1.0.10
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 16319db525ec..ff102eddff59 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -6,37 +6,32 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	0.8.7
-PORTREVISION=	1
+PORTVERSION=	1.0.10
+PORTREVISION=   RC5
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	ftp://downloads.fwbuilder.org/pub/fwbuilder/nightly_builds/current/ \
+		${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Firewall Builder GUI for IPFilter
+MAINTAINER=	devnull@uptsoft.com
+COMMENT=	Firewall Builder GUI and policy compilers
 
-LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
+LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
+		fwbuilder.5:${PORTSDIR}/security/libfwbuilder
 
+CONFIGURE_SCRIPT= autogen.sh
+# CONFIGURE_ARGS+=  --with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
+# USE_AUTOCONF=   yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomelibs
-WITHOUT_ESOUND=	yes
-CONFIGURE_ARGS+=	--with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
+USE_GTK=	yes
+INSTALLS_SHLIB=	yes
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+
+MAN1=		fwbuilder.1 fwblookup.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 \
+		fwb_pf.1 fwb_install.1
 
 post-extract:
-	@${PERL} -pi -e "s/lc_r/pthread/" ${WRKSRC}/configure ;\
-	${PERL} -pi -e "s|/usr/bin|${LOCALBASE}/bin|" ${WRKSRC}/etc/fwbuilder_prefs.xml.in
-.for i in compiler-framework/Makefile.in gui/gnome-wrappers/Makefile.in \
-	gui/Makefile.in ipchains/Makefile.in ipfilter/Makefile.in \
-	iptables/Makefile.in
-	@${PERL} -pi -e "s|^CFLAGS\s+=\s+-Wall\s+-g|CFLAGS = \@CFLAGS@ -Wall|" ${WRKSRC}/src/$i
-.endfor
+	@${ECHO_CMD} "===! Running aclocal"
+	cd ${WRKDIR}/fwbuilder-1.0.10; aclocal; autoconf
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 7e90b4806cb2..5ae1cea636a4 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1 +1 @@
-MD5 (fwbuilder-0.8.7.tar.gz) = 3fb13778a5b998bf31b789d410587221
+MD5 (fwbuilder-1.0.10.tar.gz) = c6a09c040d9a2736cecea0c9053b484a
diff --git a/security/fwbuilder/files/patch-aa b/security/fwbuilder/files/patch-aa
deleted file mode 100644
index 8416f7694d3f..000000000000
--- a/security/fwbuilder/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/compiler-framework/Makefile.in.orig	Sat Feb  3 23:11:36 2001
-+++ src/compiler-framework/Makefile.in	Sat Feb  3 23:11:57 2001
-@@ -11,7 +11,7 @@
- 
- CC= @CC@
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- XML_CFLAGS = @XML_CFLAGS@
-@@ -45,9 +45,9 @@
- 
- install: $(FWLIB) $(HEADERS)
- 	$(mkinstalldirs) $(libdir)
--	$(INSTALL_PROGRAM) $(FWLIB) $(libdir)
-+	$(INSTALL_DATA) $(FWLIB) $(libdir)
- 	$(mkinstalldirs) $(includedir)
--	$(INSTALL_PROGRAM) $(HEADERS) $(includedir)
-+	$(INSTALL_DATA) $(HEADERS) $(includedir)
- 
- 
- uninstall: 
diff --git a/security/fwbuilder/files/patch-ab b/security/fwbuilder/files/patch-ab
deleted file mode 100644
index baadcf884946..000000000000
--- a/security/fwbuilder/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- examples/Makefile.in.orig	Sat Feb  3 23:01:10 2001
-+++ examples/Makefile.in	Sat Feb  3 23:01:36 2001
-@@ -13,7 +13,7 @@
- examplesdir = $(docdir)
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
-@@ -24,7 +24,7 @@
- 
- install:
- 	$(mkinstalldirs) $(examplesdir)
--	$(INSTALL_PROGRAM) -m 0644 $(EXAMPLES) $(examplesdir)
-+	$(INSTALL_DATA) $(EXAMPLES) $(examplesdir)
- 
- uninstall:
- 	list='$(EXAMPLES)'; for file in $$list; do \
diff --git a/security/fwbuilder/files/patch-ac b/security/fwbuilder/files/patch-ac
deleted file mode 100644
index 91181f8d26e1..000000000000
--- a/security/fwbuilder/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig	Sat Feb  3 23:04:02 2001
-+++ doc/Makefile.in	Sat Feb  3 23:03:24 2001
-@@ -12,7 +12,7 @@
- docdir = @DOCDIR@/fwbuilder
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
-@@ -33,7 +33,7 @@
- 
- install:
- 	$(mkinstalldirs) $(docdir)
--	$(INSTALL_PROGRAM) -m 0644 $(DOCS) $(docdir)
-+	$(INSTALL_DATA) $(DOCS) $(docdir)
- 
- uninstall:
- 	list='$(DOCS)'; for file in $$list; do \
diff --git a/security/fwbuilder/files/patch-ad b/security/fwbuilder/files/patch-ad
deleted file mode 100644
index 4fefde3c0957..000000000000
--- a/security/fwbuilder/files/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
---- etc/Makefile.in.orig	Sat Feb  3 23:10:14 2001
-+++ etc/Makefile.in	Sat Feb  3 23:10:40 2001
-@@ -11,7 +11,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
-+INSTALL_DATA = @INSTALL_DATA@ 
- 
- all: fwbuilder_prefs.xml
- 
-@@ -27,9 +27,9 @@
- 
- install: objects_init.xml fwbuilder_prefs.xml
- 	$(mkinstalldirs) $(datadir)
--	$(INSTALL_PROGRAM) objects_init.xml $(datadir)
--	$(INSTALL_PROGRAM) fwbuilder_prefs.xml $(datadir)
--	$(INSTALL_PROGRAM) fwbuilder.dtd $(datadir)
-+	$(INSTALL_DATA) objects_init.xml $(datadir)
-+	$(INSTALL_DATA) fwbuilder_prefs.xml $(datadir)
-+	$(INSTALL_DATA) fwbuilder.dtd $(datadir)
- 
- uninstall: 
- 	rm -f $(datadir)/objects_init.xml
diff --git a/security/fwbuilder/files/patch-ae b/security/fwbuilder/files/patch-ae
deleted file mode 100644
index 990955c205ca..000000000000
--- a/security/fwbuilder/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/Makefile.in.orig	Wed Mar 21 01:56:07 2001
-+++ src/gui/Makefile.in	Wed Mar 21 01:58:19 2001
-@@ -9,7 +9,7 @@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
- sbindir = @sbindir@
--iconsdir = $(prefix)/share/pixmaps/fwbuilder
-+iconsdir = @datadir@/fwbuilder/pixmaps
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
diff --git a/security/fwbuilder/pkg-descr b/security/fwbuilder/pkg-descr
index e6968c1ca2bb..630225955878 100644
--- a/security/fwbuilder/pkg-descr
+++ b/security/fwbuilder/pkg-descr
@@ -15,6 +15,4 @@ Because of this, Firewall Builder can be used to manage firewalls built on
 variety of platforms including, but not limited to, Linux running ipchains or
 iptables and FreeBSD or Solaris running ipfilter. 
 
-WWW: http://www.crocodile.org/~vadim/fwbuilder/
-
-Roman Shterenzon <roman@xpert.com>
+WWW: http://www.fwbuilder.org/
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index 421602f42d3f..cf5c84a4d772 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -1,53 +1,240 @@
-bin/fwb_ipchains
-bin/fwb_ipfilter
-bin/fwb_iptables
+share/pixmaps/fwbuilder/yes.png
+share/pixmaps/fwbuilder/warning.png
+share/pixmaps/fwbuilder/up-arrow.png
+share/pixmaps/fwbuilder/undo.png
+share/pixmaps/fwbuilder/uncheck.png
+share/pixmaps/fwbuilder/stop.png
+share/pixmaps/fwbuilder/service_16.png
+share/pixmaps/fwbuilder/service-udp.png
+share/pixmaps/fwbuilder/service-udp-ref.png
+share/pixmaps/fwbuilder/service-udp-neg.png
+share/pixmaps/fwbuilder/service-tcp.png
+share/pixmaps/fwbuilder/service-tcp-ref.png
+share/pixmaps/fwbuilder/service-tcp-neg.png
+share/pixmaps/fwbuilder/service-ip.png
+share/pixmaps/fwbuilder/service-ip-ref.png
+share/pixmaps/fwbuilder/service-ip-neg.png
+share/pixmaps/fwbuilder/service-icmp.png
+share/pixmaps/fwbuilder/service-icmp-ref.png
+share/pixmaps/fwbuilder/service-icmp-neg.png
+share/pixmaps/fwbuilder/service-custom.png
+share/pixmaps/fwbuilder/service-custom-ref.png
+share/pixmaps/fwbuilder/service-custom-neg.png
+share/pixmaps/fwbuilder/rules_druid_logo.png
+share/pixmaps/fwbuilder/right-arrow.png
+share/pixmaps/fwbuilder/reject.png
+share/pixmaps/fwbuilder/ref.png
+share/pixmaps/fwbuilder/redo.png
+share/pixmaps/fwbuilder/question.png
+share/pixmaps/fwbuilder/protect_net_and_dmz.png
+share/pixmaps/fwbuilder/protect_net.png
+share/pixmaps/fwbuilder/protect_host.png
+share/pixmaps/fwbuilder/physaddress_16.png
+share/pixmaps/fwbuilder/physaddress.png
+share/pixmaps/fwbuilder/physaddress-ref.png
+share/pixmaps/fwbuilder/physaddress-neg.png
+share/pixmaps/fwbuilder/outbound.png
+share/pixmaps/fwbuilder/options.png
+share/pixmaps/fwbuilder/ok.png
+share/pixmaps/fwbuilder/no.png
+share/pixmaps/fwbuilder/network_16.png
+share/pixmaps/fwbuilder/network.png
+share/pixmaps/fwbuilder/network-ref.png
+share/pixmaps/fwbuilder/network-neg.png
+share/pixmaps/fwbuilder/neg.png
+share/pixmaps/fwbuilder/log.png
+share/pixmaps/fwbuilder/left-arrow.png
+share/pixmaps/fwbuilder/key.png
+share/pixmaps/fwbuilder/interface_16.png
+share/pixmaps/fwbuilder/interface.png
+share/pixmaps/fwbuilder/interface-ref.png
+share/pixmaps/fwbuilder/interface-neg.png
+share/pixmaps/fwbuilder/info.png
+share/pixmaps/fwbuilder/inbound.png
+share/pixmaps/fwbuilder/host_64.png
+share/pixmaps/fwbuilder/host_16.png
+share/pixmaps/fwbuilder/host.png
+share/pixmaps/fwbuilder/host-ref.png
+share/pixmaps/fwbuilder/host-neg.png
+share/pixmaps/fwbuilder/group_16.png
+share/pixmaps/fwbuilder/group.png
+share/pixmaps/fwbuilder/group-ref.png
+share/pixmaps/fwbuilder/group-neg.png
+share/pixmaps/fwbuilder/generic.png
+share/pixmaps/fwbuilder/floppy.png
+share/pixmaps/fwbuilder/firewall_16.png
+share/pixmaps/fwbuilder/firewall.png
+share/pixmaps/fwbuilder/firewall-ref.png
+share/pixmaps/fwbuilder/firewall-neg.png
+share/pixmaps/fwbuilder/error.png
+share/pixmaps/fwbuilder/drag_object.png
+share/pixmaps/fwbuilder/down-arrow.png
+share/pixmaps/fwbuilder/deny.png
+share/pixmaps/fwbuilder/close.png
+share/pixmaps/fwbuilder/clock_16.png
+share/pixmaps/fwbuilder/clock.png
+share/pixmaps/fwbuilder/clock-ref.png
+share/pixmaps/fwbuilder/clock-neg.png
+share/pixmaps/fwbuilder/check.png
+share/pixmaps/fwbuilder/cert_druid_logo.png
+share/pixmaps/fwbuilder/cancel.png
+share/pixmaps/fwbuilder/both.png
+share/pixmaps/fwbuilder/blank_2x16.png
+share/pixmaps/fwbuilder/blank.png
+share/pixmaps/fwbuilder/binoculars64.png
+share/pixmaps/fwbuilder/big-up-arrow.png
+share/pixmaps/fwbuilder/big-right-arrow.png
+share/pixmaps/fwbuilder/big-left-arrow.png
+share/pixmaps/fwbuilder/big-down-arrow.png
+share/pixmaps/fwbuilder/apply.png
+share/pixmaps/fwbuilder/address_16.png
+share/pixmaps/fwbuilder/address.png
+share/pixmaps/fwbuilder/address-ref.png
+share/pixmaps/fwbuilder/address-neg.png
+share/pixmaps/fwbuilder/accept.png
+share/pixmaps/fwbuilder/accounting.png
+share/locale/ru/LC_MESSAGES/fwbuilder.mo
+share/locale/fr/LC_MESSAGES/fwbuilder.mo
+share/locale/de/LC_MESSAGES/fwbuilder.mo
+share/fwbuilder/gtkrc
+share/fwbuilder/fwbuilder_preferences.dtd
+share/fwbuilder/fwbuilder_prefs.xml
+share/fwbuilder/objects_init.xml
+share/fwbuilder/resources.xml
+share/fwbuilder/platform/unknown.xml
+share/fwbuilder/platform/pix.xml
+share/fwbuilder/platform/pf.xml
+share/fwbuilder/platform/iptables.xml
+share/fwbuilder/platform/ipf.xml
+share/fwbuilder/platform/ipfw.xml
+share/fwbuilder/os/unknown_os.xml
+share/fwbuilder/os/solaris.xml
+share/fwbuilder/os/pix_os.xml
+share/fwbuilder/os/openbsd.xml
+share/fwbuilder/os/linux24.xml
+share/fwbuilder/os/freebsd.xml
+share/fwbuilder/os/macosx.xml
+share/fwbuilder/modules/gui/lib_solaris_dlg.so
+share/fwbuilder/modules/gui/lib_pix_os_dlg.so
+share/fwbuilder/modules/gui/lib_pix_dlg.so
+share/fwbuilder/modules/gui/lib_pf_dlg.so
+share/fwbuilder/modules/gui/lib_openbsd_dlg.so
+share/fwbuilder/modules/gui/lib_linux24_dlg.so
+share/fwbuilder/modules/gui/lib_iptables_dlg.so
+share/fwbuilder/modules/gui/lib_ipf_dlg.so
+share/fwbuilder/modules/gui/lib_ipfw_dlg.so
+share/fwbuilder/modules/gui/lib_freebsd_dlg.so
+share/fwbuilder/modules/gui/lib_macosx_dlg.so
+share/fwbuilder/migration/1.0.9/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.8/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.7/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.6/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.5/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.4/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.3/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.2/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.1/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.0/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.9/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.8/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.7/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.6/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.5/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.4/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.3/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.2/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.1/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.0/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.8.7/FWBuilderPreferences.xslt
+share/fwbuilder/filters/print-policy.xs1
+share/fwbuilder/filters/print-nat.xs1
+share/fwbuilder/filters/policy-text.xsl
+share/fwbuilder/filters/policy-html.xsl
+share/doc/fwbuilder-1.0.10/examples/objects.xml
+share/doc/fwbuilder-1.0.10/examples/README.examples
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.9.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.9
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.8.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.8
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.7.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.7
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.6.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.6
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.5.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.5
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.4.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.4
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.3.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.3
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.2.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.2
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.10.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.10
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.1.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.1
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.0.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.0
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.9.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.9
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.8.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.8
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.7.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.7
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.6.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.6
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.5.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.5
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.4.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.4
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.3.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.3
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.2.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.2
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.1
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.0
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.8.7
+share/doc/fwbuilder-1.0.10/README.gui
+share/doc/fwbuilder-1.0.10/README.floppyfw
+share/doc/fwbuilder-1.0.10/README.compiler-framework
+share/doc/fwbuilder-1.0.10/README.api
+share/doc/fwbuilder-1.0.10/INSTALL
+share/doc/fwbuilder-1.0.10/FAQ.html
+share/doc/fwbuilder-1.0.10/FAQ
+share/doc/fwbuilder-1.0.10/Credits
+share/doc/fwbuilder-1.0.10/ChangeLog
+share/doc/fwbuilder-1.0.10/COPYING
+share/doc/fwbuilder-1.0.10/Build.html
+share/doc/fwbuilder-1.0.10/Build
+share/doc/fwbuilder-1.0.10/AUTHORS
 bin/fwbuilder
-include/fwcompiler.h
-lib/libfwcompiler.a
-share/doc/fwbuilder/AUTHORS
-share/doc/fwbuilder/COPYING
-share/doc/fwbuilder/ChangeLog
-share/doc/fwbuilder/Credits
-share/doc/fwbuilder/FAQ
-share/doc/fwbuilder/NEWS
-share/doc/fwbuilder/README.compiler-framework
-share/doc/fwbuilder/README.examples
-share/doc/fwbuilder/README.gui
-share/doc/fwbuilder/README.ipchains
-share/doc/fwbuilder/README.ipfilter
-share/doc/fwbuilder/Requirements
-share/doc/fwbuilder/objects.xml
-share/gnome/fwbuilder/fwbuilder.dtd
-share/gnome/fwbuilder/fwbuilder_prefs.xml
-share/gnome/fwbuilder/objects_init.xml
-share/gnome/fwbuilder/pixmaps/accept.png
-share/gnome/fwbuilder/pixmaps/blank.xpm
-share/gnome/fwbuilder/pixmaps/check.xpm
-share/gnome/fwbuilder/pixmaps/clock.png
-share/gnome/fwbuilder/pixmaps/deny.png
-share/gnome/fwbuilder/pixmaps/drag_object.xpm
-share/gnome/fwbuilder/pixmaps/error.png
-share/gnome/fwbuilder/pixmaps/firewall.png
-share/gnome/fwbuilder/pixmaps/firewall_64.png
-share/gnome/fwbuilder/pixmaps/folder.png
-share/gnome/fwbuilder/pixmaps/folder_64.png
-share/gnome/fwbuilder/pixmaps/generic.xpm
-share/gnome/fwbuilder/pixmaps/host.png
-share/gnome/fwbuilder/pixmaps/host_64.png
-share/gnome/fwbuilder/pixmaps/icmp.xpm
-share/gnome/fwbuilder/pixmaps/interface.xpm
-share/gnome/fwbuilder/pixmaps/ip.xpm
-share/gnome/fwbuilder/pixmaps/log.png
-share/gnome/fwbuilder/pixmaps/neg.xpm
-share/gnome/fwbuilder/pixmaps/net.png
-share/gnome/fwbuilder/pixmaps/net_64.png
-share/gnome/fwbuilder/pixmaps/question.png
-share/gnome/fwbuilder/pixmaps/ref.xpm
-share/gnome/fwbuilder/pixmaps/reject.png
-share/gnome/fwbuilder/pixmaps/tcp.xpm
-share/gnome/fwbuilder/pixmaps/udp.xpm
-share/gnome/fwbuilder/pixmaps/uncheck.xpm
-share/gnome/fwbuilder/pixmaps/warning.xpm
-@dirrm share/doc/fwbuilder
-@dirrm share/gnome/fwbuilder/pixmaps
-@dirrm share/gnome/fwbuilder
+bin/fwblookup
+bin/fwb_pf
+bin/fwb_ipt
+bin/fwb_ipf
+bin/fwb_ipfw
+bin/fwb_install
+@dirrm share/fwbuilder/modules/gui
+@dirrm share/fwbuilder/migration/1.0.9
+@dirrm share/fwbuilder/migration/1.0.8
+@dirrm share/fwbuilder/migration/1.0.7
+@dirrm share/fwbuilder/migration/1.0.6
+@dirrm share/fwbuilder/migration/1.0.5
+@dirrm share/fwbuilder/migration/1.0.4
+@dirrm share/fwbuilder/migration/1.0.3
+@dirrm share/fwbuilder/migration/1.0.2
+@dirrm share/fwbuilder/migration/1.0.1
+@dirrm share/fwbuilder/migration/1.0.0
+@dirrm share/fwbuilder/migration/0.9.9
+@dirrm share/fwbuilder/migration/0.9.8
+@dirrm share/fwbuilder/migration/0.9.7
+@dirrm share/fwbuilder/migration/0.9.6
+@dirrm share/fwbuilder/migration/0.9.5
+@dirrm share/fwbuilder/migration/0.9.4
+@dirrm share/fwbuilder/migration/0.9.3
+@dirrm share/fwbuilder/migration/0.9.2
+@dirrm share/fwbuilder/migration/0.9.1
+@dirrm share/fwbuilder/migration/0.9.0
+@dirrm share/fwbuilder/migration/0.8.7
+@dirrm share/fwbuilder/filters
+@dirrm share/doc/fwbuilder-1.0.10/examples
+@dirrm share/doc/fwbuilder-1.0.10
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index 16319db525ec..ff102eddff59 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -6,37 +6,32 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	0.8.7
-PORTREVISION=	1
+PORTVERSION=	1.0.10
+PORTREVISION=   RC5
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	ftp://downloads.fwbuilder.org/pub/fwbuilder/nightly_builds/current/ \
+		${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Firewall Builder GUI for IPFilter
+MAINTAINER=	devnull@uptsoft.com
+COMMENT=	Firewall Builder GUI and policy compilers
 
-LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
+LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
+		fwbuilder.5:${PORTSDIR}/security/libfwbuilder
 
+CONFIGURE_SCRIPT= autogen.sh
+# CONFIGURE_ARGS+=  --with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
+# USE_AUTOCONF=   yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomelibs
-WITHOUT_ESOUND=	yes
-CONFIGURE_ARGS+=	--with-iconsdir=${X11BASE}/share/gnome/fwbuilder/pixmaps/ --with-templatedir=${X11BASE}/share/gnome/fwbuilder
+USE_GTK=	yes
+INSTALLS_SHLIB=	yes
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+
+MAN1=		fwbuilder.1 fwblookup.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 \
+		fwb_pf.1 fwb_install.1
 
 post-extract:
-	@${PERL} -pi -e "s/lc_r/pthread/" ${WRKSRC}/configure ;\
-	${PERL} -pi -e "s|/usr/bin|${LOCALBASE}/bin|" ${WRKSRC}/etc/fwbuilder_prefs.xml.in
-.for i in compiler-framework/Makefile.in gui/gnome-wrappers/Makefile.in \
-	gui/Makefile.in ipchains/Makefile.in ipfilter/Makefile.in \
-	iptables/Makefile.in
-	@${PERL} -pi -e "s|^CFLAGS\s+=\s+-Wall\s+-g|CFLAGS = \@CFLAGS@ -Wall|" ${WRKSRC}/src/$i
-.endfor
+	@${ECHO_CMD} "===! Running aclocal"
+	cd ${WRKDIR}/fwbuilder-1.0.10; aclocal; autoconf
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/fwbuilder2/distinfo b/security/fwbuilder2/distinfo
index 7e90b4806cb2..5ae1cea636a4 100644
--- a/security/fwbuilder2/distinfo
+++ b/security/fwbuilder2/distinfo
@@ -1 +1 @@
-MD5 (fwbuilder-0.8.7.tar.gz) = 3fb13778a5b998bf31b789d410587221
+MD5 (fwbuilder-1.0.10.tar.gz) = c6a09c040d9a2736cecea0c9053b484a
diff --git a/security/fwbuilder2/files/patch-aa b/security/fwbuilder2/files/patch-aa
deleted file mode 100644
index 8416f7694d3f..000000000000
--- a/security/fwbuilder2/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/compiler-framework/Makefile.in.orig	Sat Feb  3 23:11:36 2001
-+++ src/compiler-framework/Makefile.in	Sat Feb  3 23:11:57 2001
-@@ -11,7 +11,7 @@
- 
- CC= @CC@
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- XML_CFLAGS = @XML_CFLAGS@
-@@ -45,9 +45,9 @@
- 
- install: $(FWLIB) $(HEADERS)
- 	$(mkinstalldirs) $(libdir)
--	$(INSTALL_PROGRAM) $(FWLIB) $(libdir)
-+	$(INSTALL_DATA) $(FWLIB) $(libdir)
- 	$(mkinstalldirs) $(includedir)
--	$(INSTALL_PROGRAM) $(HEADERS) $(includedir)
-+	$(INSTALL_DATA) $(HEADERS) $(includedir)
- 
- 
- uninstall: 
diff --git a/security/fwbuilder2/files/patch-ab b/security/fwbuilder2/files/patch-ab
deleted file mode 100644
index baadcf884946..000000000000
--- a/security/fwbuilder2/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- examples/Makefile.in.orig	Sat Feb  3 23:01:10 2001
-+++ examples/Makefile.in	Sat Feb  3 23:01:36 2001
-@@ -13,7 +13,7 @@
- examplesdir = $(docdir)
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
-@@ -24,7 +24,7 @@
- 
- install:
- 	$(mkinstalldirs) $(examplesdir)
--	$(INSTALL_PROGRAM) -m 0644 $(EXAMPLES) $(examplesdir)
-+	$(INSTALL_DATA) $(EXAMPLES) $(examplesdir)
- 
- uninstall:
- 	list='$(EXAMPLES)'; for file in $$list; do \
diff --git a/security/fwbuilder2/files/patch-ac b/security/fwbuilder2/files/patch-ac
deleted file mode 100644
index 91181f8d26e1..000000000000
--- a/security/fwbuilder2/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig	Sat Feb  3 23:04:02 2001
-+++ doc/Makefile.in	Sat Feb  3 23:03:24 2001
-@@ -12,7 +12,7 @@
- docdir = @DOCDIR@/fwbuilder
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_DATA=@INSTALL_DATA@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
-@@ -33,7 +33,7 @@
- 
- install:
- 	$(mkinstalldirs) $(docdir)
--	$(INSTALL_PROGRAM) -m 0644 $(DOCS) $(docdir)
-+	$(INSTALL_DATA) $(DOCS) $(docdir)
- 
- uninstall:
- 	list='$(DOCS)'; for file in $$list; do \
diff --git a/security/fwbuilder2/files/patch-ad b/security/fwbuilder2/files/patch-ad
deleted file mode 100644
index 4fefde3c0957..000000000000
--- a/security/fwbuilder2/files/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
---- etc/Makefile.in.orig	Sat Feb  3 23:10:14 2001
-+++ etc/Makefile.in	Sat Feb  3 23:10:40 2001
-@@ -11,7 +11,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
-+INSTALL_DATA = @INSTALL_DATA@ 
- 
- all: fwbuilder_prefs.xml
- 
-@@ -27,9 +27,9 @@
- 
- install: objects_init.xml fwbuilder_prefs.xml
- 	$(mkinstalldirs) $(datadir)
--	$(INSTALL_PROGRAM) objects_init.xml $(datadir)
--	$(INSTALL_PROGRAM) fwbuilder_prefs.xml $(datadir)
--	$(INSTALL_PROGRAM) fwbuilder.dtd $(datadir)
-+	$(INSTALL_DATA) objects_init.xml $(datadir)
-+	$(INSTALL_DATA) fwbuilder_prefs.xml $(datadir)
-+	$(INSTALL_DATA) fwbuilder.dtd $(datadir)
- 
- uninstall: 
- 	rm -f $(datadir)/objects_init.xml
diff --git a/security/fwbuilder2/files/patch-ae b/security/fwbuilder2/files/patch-ae
deleted file mode 100644
index 990955c205ca..000000000000
--- a/security/fwbuilder2/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/Makefile.in.orig	Wed Mar 21 01:56:07 2001
-+++ src/gui/Makefile.in	Wed Mar 21 01:58:19 2001
-@@ -9,7 +9,7 @@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
- sbindir = @sbindir@
--iconsdir = $(prefix)/share/pixmaps/fwbuilder
-+iconsdir = @datadir@/fwbuilder/pixmaps
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
diff --git a/security/fwbuilder2/pkg-descr b/security/fwbuilder2/pkg-descr
index e6968c1ca2bb..630225955878 100644
--- a/security/fwbuilder2/pkg-descr
+++ b/security/fwbuilder2/pkg-descr
@@ -15,6 +15,4 @@ Because of this, Firewall Builder can be used to manage firewalls built on
 variety of platforms including, but not limited to, Linux running ipchains or
 iptables and FreeBSD or Solaris running ipfilter. 
 
-WWW: http://www.crocodile.org/~vadim/fwbuilder/
-
-Roman Shterenzon <roman@xpert.com>
+WWW: http://www.fwbuilder.org/
diff --git a/security/fwbuilder2/pkg-plist b/security/fwbuilder2/pkg-plist
index 421602f42d3f..cf5c84a4d772 100644
--- a/security/fwbuilder2/pkg-plist
+++ b/security/fwbuilder2/pkg-plist
@@ -1,53 +1,240 @@
-bin/fwb_ipchains
-bin/fwb_ipfilter
-bin/fwb_iptables
+share/pixmaps/fwbuilder/yes.png
+share/pixmaps/fwbuilder/warning.png
+share/pixmaps/fwbuilder/up-arrow.png
+share/pixmaps/fwbuilder/undo.png
+share/pixmaps/fwbuilder/uncheck.png
+share/pixmaps/fwbuilder/stop.png
+share/pixmaps/fwbuilder/service_16.png
+share/pixmaps/fwbuilder/service-udp.png
+share/pixmaps/fwbuilder/service-udp-ref.png
+share/pixmaps/fwbuilder/service-udp-neg.png
+share/pixmaps/fwbuilder/service-tcp.png
+share/pixmaps/fwbuilder/service-tcp-ref.png
+share/pixmaps/fwbuilder/service-tcp-neg.png
+share/pixmaps/fwbuilder/service-ip.png
+share/pixmaps/fwbuilder/service-ip-ref.png
+share/pixmaps/fwbuilder/service-ip-neg.png
+share/pixmaps/fwbuilder/service-icmp.png
+share/pixmaps/fwbuilder/service-icmp-ref.png
+share/pixmaps/fwbuilder/service-icmp-neg.png
+share/pixmaps/fwbuilder/service-custom.png
+share/pixmaps/fwbuilder/service-custom-ref.png
+share/pixmaps/fwbuilder/service-custom-neg.png
+share/pixmaps/fwbuilder/rules_druid_logo.png
+share/pixmaps/fwbuilder/right-arrow.png
+share/pixmaps/fwbuilder/reject.png
+share/pixmaps/fwbuilder/ref.png
+share/pixmaps/fwbuilder/redo.png
+share/pixmaps/fwbuilder/question.png
+share/pixmaps/fwbuilder/protect_net_and_dmz.png
+share/pixmaps/fwbuilder/protect_net.png
+share/pixmaps/fwbuilder/protect_host.png
+share/pixmaps/fwbuilder/physaddress_16.png
+share/pixmaps/fwbuilder/physaddress.png
+share/pixmaps/fwbuilder/physaddress-ref.png
+share/pixmaps/fwbuilder/physaddress-neg.png
+share/pixmaps/fwbuilder/outbound.png
+share/pixmaps/fwbuilder/options.png
+share/pixmaps/fwbuilder/ok.png
+share/pixmaps/fwbuilder/no.png
+share/pixmaps/fwbuilder/network_16.png
+share/pixmaps/fwbuilder/network.png
+share/pixmaps/fwbuilder/network-ref.png
+share/pixmaps/fwbuilder/network-neg.png
+share/pixmaps/fwbuilder/neg.png
+share/pixmaps/fwbuilder/log.png
+share/pixmaps/fwbuilder/left-arrow.png
+share/pixmaps/fwbuilder/key.png
+share/pixmaps/fwbuilder/interface_16.png
+share/pixmaps/fwbuilder/interface.png
+share/pixmaps/fwbuilder/interface-ref.png
+share/pixmaps/fwbuilder/interface-neg.png
+share/pixmaps/fwbuilder/info.png
+share/pixmaps/fwbuilder/inbound.png
+share/pixmaps/fwbuilder/host_64.png
+share/pixmaps/fwbuilder/host_16.png
+share/pixmaps/fwbuilder/host.png
+share/pixmaps/fwbuilder/host-ref.png
+share/pixmaps/fwbuilder/host-neg.png
+share/pixmaps/fwbuilder/group_16.png
+share/pixmaps/fwbuilder/group.png
+share/pixmaps/fwbuilder/group-ref.png
+share/pixmaps/fwbuilder/group-neg.png
+share/pixmaps/fwbuilder/generic.png
+share/pixmaps/fwbuilder/floppy.png
+share/pixmaps/fwbuilder/firewall_16.png
+share/pixmaps/fwbuilder/firewall.png
+share/pixmaps/fwbuilder/firewall-ref.png
+share/pixmaps/fwbuilder/firewall-neg.png
+share/pixmaps/fwbuilder/error.png
+share/pixmaps/fwbuilder/drag_object.png
+share/pixmaps/fwbuilder/down-arrow.png
+share/pixmaps/fwbuilder/deny.png
+share/pixmaps/fwbuilder/close.png
+share/pixmaps/fwbuilder/clock_16.png
+share/pixmaps/fwbuilder/clock.png
+share/pixmaps/fwbuilder/clock-ref.png
+share/pixmaps/fwbuilder/clock-neg.png
+share/pixmaps/fwbuilder/check.png
+share/pixmaps/fwbuilder/cert_druid_logo.png
+share/pixmaps/fwbuilder/cancel.png
+share/pixmaps/fwbuilder/both.png
+share/pixmaps/fwbuilder/blank_2x16.png
+share/pixmaps/fwbuilder/blank.png
+share/pixmaps/fwbuilder/binoculars64.png
+share/pixmaps/fwbuilder/big-up-arrow.png
+share/pixmaps/fwbuilder/big-right-arrow.png
+share/pixmaps/fwbuilder/big-left-arrow.png
+share/pixmaps/fwbuilder/big-down-arrow.png
+share/pixmaps/fwbuilder/apply.png
+share/pixmaps/fwbuilder/address_16.png
+share/pixmaps/fwbuilder/address.png
+share/pixmaps/fwbuilder/address-ref.png
+share/pixmaps/fwbuilder/address-neg.png
+share/pixmaps/fwbuilder/accept.png
+share/pixmaps/fwbuilder/accounting.png
+share/locale/ru/LC_MESSAGES/fwbuilder.mo
+share/locale/fr/LC_MESSAGES/fwbuilder.mo
+share/locale/de/LC_MESSAGES/fwbuilder.mo
+share/fwbuilder/gtkrc
+share/fwbuilder/fwbuilder_preferences.dtd
+share/fwbuilder/fwbuilder_prefs.xml
+share/fwbuilder/objects_init.xml
+share/fwbuilder/resources.xml
+share/fwbuilder/platform/unknown.xml
+share/fwbuilder/platform/pix.xml
+share/fwbuilder/platform/pf.xml
+share/fwbuilder/platform/iptables.xml
+share/fwbuilder/platform/ipf.xml
+share/fwbuilder/platform/ipfw.xml
+share/fwbuilder/os/unknown_os.xml
+share/fwbuilder/os/solaris.xml
+share/fwbuilder/os/pix_os.xml
+share/fwbuilder/os/openbsd.xml
+share/fwbuilder/os/linux24.xml
+share/fwbuilder/os/freebsd.xml
+share/fwbuilder/os/macosx.xml
+share/fwbuilder/modules/gui/lib_solaris_dlg.so
+share/fwbuilder/modules/gui/lib_pix_os_dlg.so
+share/fwbuilder/modules/gui/lib_pix_dlg.so
+share/fwbuilder/modules/gui/lib_pf_dlg.so
+share/fwbuilder/modules/gui/lib_openbsd_dlg.so
+share/fwbuilder/modules/gui/lib_linux24_dlg.so
+share/fwbuilder/modules/gui/lib_iptables_dlg.so
+share/fwbuilder/modules/gui/lib_ipf_dlg.so
+share/fwbuilder/modules/gui/lib_ipfw_dlg.so
+share/fwbuilder/modules/gui/lib_freebsd_dlg.so
+share/fwbuilder/modules/gui/lib_macosx_dlg.so
+share/fwbuilder/migration/1.0.9/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.8/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.7/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.6/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.5/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.4/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.3/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.2/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.1/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.0/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.9/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.8/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.7/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.6/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.5/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.4/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.3/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.2/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.1/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.0/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.8.7/FWBuilderPreferences.xslt
+share/fwbuilder/filters/print-policy.xs1
+share/fwbuilder/filters/print-nat.xs1
+share/fwbuilder/filters/policy-text.xsl
+share/fwbuilder/filters/policy-html.xsl
+share/doc/fwbuilder-1.0.10/examples/objects.xml
+share/doc/fwbuilder-1.0.10/examples/README.examples
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.9.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.9
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.8.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.8
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.7.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.7
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.6.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.6
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.5.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.5
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.4.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.4
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.3.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.3
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.2.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.2
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.10.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.10
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.1.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.1
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.0.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_1.0.0
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.9.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.9
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.8.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.8
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.7.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.7
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.6.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.6
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.5.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.5
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.4.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.4
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.3.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.3
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.2.html
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.2
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.1
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.9.0
+share/doc/fwbuilder-1.0.10/ReleaseNotes_0.8.7
+share/doc/fwbuilder-1.0.10/README.gui
+share/doc/fwbuilder-1.0.10/README.floppyfw
+share/doc/fwbuilder-1.0.10/README.compiler-framework
+share/doc/fwbuilder-1.0.10/README.api
+share/doc/fwbuilder-1.0.10/INSTALL
+share/doc/fwbuilder-1.0.10/FAQ.html
+share/doc/fwbuilder-1.0.10/FAQ
+share/doc/fwbuilder-1.0.10/Credits
+share/doc/fwbuilder-1.0.10/ChangeLog
+share/doc/fwbuilder-1.0.10/COPYING
+share/doc/fwbuilder-1.0.10/Build.html
+share/doc/fwbuilder-1.0.10/Build
+share/doc/fwbuilder-1.0.10/AUTHORS
 bin/fwbuilder
-include/fwcompiler.h
-lib/libfwcompiler.a
-share/doc/fwbuilder/AUTHORS
-share/doc/fwbuilder/COPYING
-share/doc/fwbuilder/ChangeLog
-share/doc/fwbuilder/Credits
-share/doc/fwbuilder/FAQ
-share/doc/fwbuilder/NEWS
-share/doc/fwbuilder/README.compiler-framework
-share/doc/fwbuilder/README.examples
-share/doc/fwbuilder/README.gui
-share/doc/fwbuilder/README.ipchains
-share/doc/fwbuilder/README.ipfilter
-share/doc/fwbuilder/Requirements
-share/doc/fwbuilder/objects.xml
-share/gnome/fwbuilder/fwbuilder.dtd
-share/gnome/fwbuilder/fwbuilder_prefs.xml
-share/gnome/fwbuilder/objects_init.xml
-share/gnome/fwbuilder/pixmaps/accept.png
-share/gnome/fwbuilder/pixmaps/blank.xpm
-share/gnome/fwbuilder/pixmaps/check.xpm
-share/gnome/fwbuilder/pixmaps/clock.png
-share/gnome/fwbuilder/pixmaps/deny.png
-share/gnome/fwbuilder/pixmaps/drag_object.xpm
-share/gnome/fwbuilder/pixmaps/error.png
-share/gnome/fwbuilder/pixmaps/firewall.png
-share/gnome/fwbuilder/pixmaps/firewall_64.png
-share/gnome/fwbuilder/pixmaps/folder.png
-share/gnome/fwbuilder/pixmaps/folder_64.png
-share/gnome/fwbuilder/pixmaps/generic.xpm
-share/gnome/fwbuilder/pixmaps/host.png
-share/gnome/fwbuilder/pixmaps/host_64.png
-share/gnome/fwbuilder/pixmaps/icmp.xpm
-share/gnome/fwbuilder/pixmaps/interface.xpm
-share/gnome/fwbuilder/pixmaps/ip.xpm
-share/gnome/fwbuilder/pixmaps/log.png
-share/gnome/fwbuilder/pixmaps/neg.xpm
-share/gnome/fwbuilder/pixmaps/net.png
-share/gnome/fwbuilder/pixmaps/net_64.png
-share/gnome/fwbuilder/pixmaps/question.png
-share/gnome/fwbuilder/pixmaps/ref.xpm
-share/gnome/fwbuilder/pixmaps/reject.png
-share/gnome/fwbuilder/pixmaps/tcp.xpm
-share/gnome/fwbuilder/pixmaps/udp.xpm
-share/gnome/fwbuilder/pixmaps/uncheck.xpm
-share/gnome/fwbuilder/pixmaps/warning.xpm
-@dirrm share/doc/fwbuilder
-@dirrm share/gnome/fwbuilder/pixmaps
-@dirrm share/gnome/fwbuilder
+bin/fwblookup
+bin/fwb_pf
+bin/fwb_ipt
+bin/fwb_ipf
+bin/fwb_ipfw
+bin/fwb_install
+@dirrm share/fwbuilder/modules/gui
+@dirrm share/fwbuilder/migration/1.0.9
+@dirrm share/fwbuilder/migration/1.0.8
+@dirrm share/fwbuilder/migration/1.0.7
+@dirrm share/fwbuilder/migration/1.0.6
+@dirrm share/fwbuilder/migration/1.0.5
+@dirrm share/fwbuilder/migration/1.0.4
+@dirrm share/fwbuilder/migration/1.0.3
+@dirrm share/fwbuilder/migration/1.0.2
+@dirrm share/fwbuilder/migration/1.0.1
+@dirrm share/fwbuilder/migration/1.0.0
+@dirrm share/fwbuilder/migration/0.9.9
+@dirrm share/fwbuilder/migration/0.9.8
+@dirrm share/fwbuilder/migration/0.9.7
+@dirrm share/fwbuilder/migration/0.9.6
+@dirrm share/fwbuilder/migration/0.9.5
+@dirrm share/fwbuilder/migration/0.9.4
+@dirrm share/fwbuilder/migration/0.9.3
+@dirrm share/fwbuilder/migration/0.9.2
+@dirrm share/fwbuilder/migration/0.9.1
+@dirrm share/fwbuilder/migration/0.9.0
+@dirrm share/fwbuilder/migration/0.8.7
+@dirrm share/fwbuilder/filters
+@dirrm share/doc/fwbuilder-1.0.10/examples
+@dirrm share/doc/fwbuilder-1.0.10