3 files changed, 48 insertions, 267 deletions

diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index eda41e616c1d..6600fc64afd1 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTVERSION=	2.0.2
+PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -15,27 +15,33 @@ MASTER_SITE_SUBDIR=	fwbuilder
 MAINTAINER=	vadim@fwbuilder.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
-LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		fwbuilder.5:${PORTSDIR}/security/libfwbuilder
+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+LIB_DEPENDS=	fwbuilder.6:${PORTSDIR}/security/libfwbuilder
 
-USE_GNOME=	glib12 gtk12
+USE_QT_VER=	3
+
+QTDIR?=		${X11BASE}
+
+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}
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR} --with-qtdir=${QTDIR}
+MAKE_ARGS+=	QTDIR="${QTDIR}" \
+		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
-MAN1=		fwbuilder.1 fwblookup.1 fwbedit.1 fwb_ipt.1 fwb_ipf.1 fwb_ipfw.1 fwb_pf.1 \
-		fwb_install.1 fwb_compile_all.1
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
-.include <bsd.port.post.mk>
+MAN1=		fwbuilder.1 \
+		fwblookup.1 \
+		fwbedit.1 \
+		fwb_compile_all.1 \
+		fwb_install.1 \
+		fwb_ipt.1 \
+		fwb_ipf.1 \
+		fwb_ipfw.1 \
+		fwb_pf.1
+
+.include <bsd.port.mk>
diff --git a/security/fwbuilder2/distinfo b/security/fwbuilder2/distinfo
index 4db34e7dee7f..7c1b02ccdfe4 100644
--- a/security/fwbuilder2/distinfo
+++ b/security/fwbuilder2/distinfo
@@ -1,2 +1 @@
-MD5 (fwbuilder-1.1.2.tar.gz) = 54a57c9e82da151b59afe0a1c0e66586
-SIZE (fwbuilder-1.1.2.tar.gz) = 1720734
+MD5 (fwbuilder-2.0.2.tar.gz) = 1a31df4d7c6ddcbe9aa7ae861ea438d2
diff --git a/security/fwbuilder2/pkg-plist b/security/fwbuilder2/pkg-plist
index 58d1db22180a..5d4c94261b96 100644
--- a/security/fwbuilder2/pkg-plist
+++ b/security/fwbuilder2/pkg-plist
@@ -1,80 +1,30 @@
-bin/fwb_pf
+bin/fwb_compile_all
+bin/fwb_install
 bin/fwb_ipf
 bin/fwb_ipfw
 bin/fwb_ipt
-bin/fwbuilder
-bin/fwblookup
+bin/fwb_pf
 bin/fwbedit
-bin/fwb_install
-bin/fwb_compile_all
-%%DOCSDIR%%/examples/README.examples
-%%DOCSDIR%%/examples/objects.xml
+bin/fwblookup
+bin/fwbuilder
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/Credits
 %%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/FAQ
-%%DOCSDIR%%/FAQ.html
-%%DOCSDIR%%/Build
-%%DOCSDIR%%/Build.html
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/README.api
-%%DOCSDIR%%/README.gui
-%%DOCSDIR%%/README.compiler-framework
 %%DOCSDIR%%/README.floppyfw
-%%DOCSDIR%%/ReleaseNotes_0.8.7
-%%DOCSDIR%%/ReleaseNotes_0.9.0
-%%DOCSDIR%%/ReleaseNotes_0.9.1
-%%DOCSDIR%%/ReleaseNotes_0.9.2
-%%DOCSDIR%%/ReleaseNotes_0.9.2.html
-%%DOCSDIR%%/ReleaseNotes_0.9.3
-%%DOCSDIR%%/ReleaseNotes_0.9.3.html
-%%DOCSDIR%%/ReleaseNotes_0.9.4
-%%DOCSDIR%%/ReleaseNotes_0.9.4.html
-%%DOCSDIR%%/ReleaseNotes_0.9.5
-%%DOCSDIR%%/ReleaseNotes_0.9.5.html
-%%DOCSDIR%%/ReleaseNotes_0.9.6
-%%DOCSDIR%%/ReleaseNotes_0.9.6.html
-%%DOCSDIR%%/ReleaseNotes_0.9.7
-%%DOCSDIR%%/ReleaseNotes_0.9.7.html
-%%DOCSDIR%%/ReleaseNotes_0.9.8
-%%DOCSDIR%%/ReleaseNotes_0.9.8.html
-%%DOCSDIR%%/ReleaseNotes_0.9.9
-%%DOCSDIR%%/ReleaseNotes_0.9.9.html
-%%DOCSDIR%%/ReleaseNotes_1.0.0
-%%DOCSDIR%%/ReleaseNotes_1.0.0.html
-%%DOCSDIR%%/ReleaseNotes_1.0.1
-%%DOCSDIR%%/ReleaseNotes_1.0.1.html
-%%DOCSDIR%%/ReleaseNotes_1.0.2
-%%DOCSDIR%%/ReleaseNotes_1.0.2.html
-%%DOCSDIR%%/ReleaseNotes_1.0.3
-%%DOCSDIR%%/ReleaseNotes_1.0.3.html
-%%DOCSDIR%%/ReleaseNotes_1.0.4
-%%DOCSDIR%%/ReleaseNotes_1.0.4.html
-%%DOCSDIR%%/ReleaseNotes_1.0.5
-%%DOCSDIR%%/ReleaseNotes_1.0.5.html
-%%DOCSDIR%%/ReleaseNotes_1.0.6
-%%DOCSDIR%%/ReleaseNotes_1.0.6.html
-%%DOCSDIR%%/ReleaseNotes_1.0.7
-%%DOCSDIR%%/ReleaseNotes_1.0.7.html
-%%DOCSDIR%%/ReleaseNotes_1.0.8
-%%DOCSDIR%%/ReleaseNotes_1.0.8.html
-%%DOCSDIR%%/ReleaseNotes_1.0.9
-%%DOCSDIR%%/ReleaseNotes_1.0.9.html
-%%DOCSDIR%%/ReleaseNotes_1.0.10
-%%DOCSDIR%%/ReleaseNotes_1.0.11
-%%DOCSDIR%%/ReleaseNotes_1.0.10.html
-%%DOCSDIR%%/ReleaseNotes_1.0.11.html
-%%DOCSDIR%%/ReleaseNotes_1.1.0
-%%DOCSDIR%%/ReleaseNotes_1.1.0.html
-%%DOCSDIR%%/ReleaseNotes_1.1.1
-%%DOCSDIR%%/ReleaseNotes_1.1.1.html
-%%DOCSDIR%%/ReleaseNotes_1.1.2
-%%DOCSDIR%%/ReleaseNotes_1.1.2.html
-%%DATADIR%%/gtkrc
-%%DATADIR%%/fwbuilder_preferences.dtd
+%%DOCSDIR%%/README.ipf
+%%DOCSDIR%%/README.ipfw
+%%DOCSDIR%%/README.ipt
+%%DOCSDIR%%/README.pf
+%%DOCSDIR%%/ReleaseNotes_2_0.html
+%%DOCSDIR%%/ReleaseNotes_2_0.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.1.html
+%%DOCSDIR%%/ReleaseNotes_2.0.1.txt
+%%DOCSDIR%%/ReleaseNotes_2.0.2.html
+%%DOCSDIR%%/ReleaseNotes_2.0.2.txt
+%%DOCSDIR%%/PatchAcceptancePolicy.txt
 %%DATADIR%%/objects_init.xml
-%%DATADIR%%/fwbuilder_prefs.xml
+%%DATADIR%%/templates.xml
 %%DATADIR%%/resources.xml
 %%DATADIR%%/platform/iptables.xml
 %%DATADIR%%/platform/ipf.xml
@@ -83,192 +33,18 @@ bin/fwb_compile_all
 %%DATADIR%%/platform/pix.xml
 %%DATADIR%%/platform/unknown.xml
 %%DATADIR%%/os/linux24.xml
+%%DATADIR%%/os/linksys.xml
 %%DATADIR%%/os/macosx.xml
 %%DATADIR%%/os/freebsd.xml
 %%DATADIR%%/os/openbsd.xml
 %%DATADIR%%/os/solaris.xml
 %%DATADIR%%/os/pix_os.xml
 %%DATADIR%%/os/unknown_os.xml
-%%DATADIR%%/filters/policy-text.xsl
-%%DATADIR%%/filters/policy-html.xsl
-%%DATADIR%%/filters/print-policy.xs1
-%%DATADIR%%/filters/print-nat.xs1
-%%DATADIR%%/migration/0.8.7/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/0.9.0/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/0.9.1/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/0.9.2/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/0.9.3/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/0.9.4/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/0.9.5/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/0.9.6/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/0.9.7/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/0.9.8/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/0.9.9/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.0/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.1/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.2/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.3/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.4/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.5/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.6/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.7/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.8/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.9/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.10/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.11/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.0.12/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.1.0/FWBuilderPreferences.xslt
-%%DATADIR%%/migration/1.1.1/FWBuilderPreferences.xslt
-%%DATADIR%%/modules/gui/lib_pf_dlg.so
-%%DATADIR%%/modules/gui/lib_ipf_dlg.so
-%%DATADIR%%/modules/gui/lib_ipfw_dlg.so
-%%DATADIR%%/modules/gui/lib_freebsd_dlg.so
-%%DATADIR%%/modules/gui/lib_macosx_dlg.so
-%%DATADIR%%/modules/gui/lib_openbsd_dlg.so
-%%DATADIR%%/modules/gui/lib_solaris_dlg.so
-%%DATADIR%%/modules/gui/lib_iptables_dlg.so
-%%DATADIR%%/modules/gui/lib_linux24_dlg.so
-%%DATADIR%%/modules/gui/lib_pix_dlg.so
-%%DATADIR%%/modules/gui/lib_pix_os_dlg.so
-share/bug-buddy/bugzilla/fwbuilder.bugzilla
-share/bug-buddy/xml/fwbuilder.bts
-share/bug-buddy/fwbuilder-bug-buddy.png
-share/bug-buddy/fwbuilder-packages
-share/bug-buddy/fwbuilder.appmap
-share/locale/br/LC_MESSAGES/fwbuilder.mo
-share/locale/de/LC_MESSAGES/fwbuilder.mo
-share/locale/fr/LC_MESSAGES/fwbuilder.mo
-share/locale/ru/LC_MESSAGES/fwbuilder.mo
-share/locale/tr/LC_MESSAGES/fwbuilder.mo
-share/pixmaps/fwbuilder/accept.png
-share/pixmaps/fwbuilder/accounting.png
-share/pixmaps/fwbuilder/address-neg.png
-share/pixmaps/fwbuilder/address-ref.png
-share/pixmaps/fwbuilder/address.png
-share/pixmaps/fwbuilder/address_16.png
-share/pixmaps/fwbuilder/apply.png
-share/pixmaps/fwbuilder/big-down-arrow.png
-share/pixmaps/fwbuilder/big-left-arrow.png
-share/pixmaps/fwbuilder/big-right-arrow.png
-share/pixmaps/fwbuilder/big-up-arrow.png
-share/pixmaps/fwbuilder/binoculars64.png
-share/pixmaps/fwbuilder/blank.png
-share/pixmaps/fwbuilder/blank_2x16.png
-share/pixmaps/fwbuilder/both.png
-share/pixmaps/fwbuilder/cancel.png
-share/pixmaps/fwbuilder/cert_druid_logo.png
-share/pixmaps/fwbuilder/check.png
-share/pixmaps/fwbuilder/clock-neg.png
-share/pixmaps/fwbuilder/clock-ref.png
-share/pixmaps/fwbuilder/clock.png
-share/pixmaps/fwbuilder/clock_16.png
-share/pixmaps/fwbuilder/close.png
-share/pixmaps/fwbuilder/deny.png
-share/pixmaps/fwbuilder/down-arrow.png
-share/pixmaps/fwbuilder/drag_object.png
-share/pixmaps/fwbuilder/error.png
-share/pixmaps/fwbuilder/firewall-neg.png
-share/pixmaps/fwbuilder/firewall-ref.png
-share/pixmaps/fwbuilder/firewall.png
-share/pixmaps/fwbuilder/firewall_16.png
-share/pixmaps/fwbuilder/floppy.png
-share/pixmaps/fwbuilder/generic.png
-share/pixmaps/fwbuilder/group-neg.png
-share/pixmaps/fwbuilder/group-ref.png
-share/pixmaps/fwbuilder/group.png
-share/pixmaps/fwbuilder/group_16.png
-share/pixmaps/fwbuilder/host-neg.png
-share/pixmaps/fwbuilder/host-ref.png
-share/pixmaps/fwbuilder/host.png
-share/pixmaps/fwbuilder/host_16.png
-share/pixmaps/fwbuilder/host_64.png
-share/pixmaps/fwbuilder/key.png
-share/pixmaps/fwbuilder/inbound.png
-share/pixmaps/fwbuilder/info.png
-share/pixmaps/fwbuilder/interface-neg.png
-share/pixmaps/fwbuilder/interface-ref.png
-share/pixmaps/fwbuilder/interface.png
-share/pixmaps/fwbuilder/interface_16.png
-share/pixmaps/fwbuilder/left-arrow.png
-share/pixmaps/fwbuilder/log.png
-share/pixmaps/fwbuilder/neg.png
-share/pixmaps/fwbuilder/network-neg.png
-share/pixmaps/fwbuilder/network-ref.png
-share/pixmaps/fwbuilder/network.png
-share/pixmaps/fwbuilder/network_16.png
-share/pixmaps/fwbuilder/no.png
-share/pixmaps/fwbuilder/ok.png
-share/pixmaps/fwbuilder/options.png
-share/pixmaps/fwbuilder/outbound.png
-share/pixmaps/fwbuilder/physaddress-neg.png
-share/pixmaps/fwbuilder/physaddress-ref.png
-share/pixmaps/fwbuilder/physaddress.png
-share/pixmaps/fwbuilder/physaddress_16.png
-share/pixmaps/fwbuilder/protect_host.png
-share/pixmaps/fwbuilder/protect_net.png
-share/pixmaps/fwbuilder/protect_net_and_dmz.png
-share/pixmaps/fwbuilder/question.png
-share/pixmaps/fwbuilder/redo.png
-share/pixmaps/fwbuilder/ref.png
-share/pixmaps/fwbuilder/reject.png
-share/pixmaps/fwbuilder/right-arrow.png
-share/pixmaps/fwbuilder/rules_druid_logo.png
-share/pixmaps/fwbuilder/service-custom-neg.png
-share/pixmaps/fwbuilder/service-custom-ref.png
-share/pixmaps/fwbuilder/service-custom.png
-share/pixmaps/fwbuilder/service-icmp-neg.png
-share/pixmaps/fwbuilder/service-icmp-ref.png
-share/pixmaps/fwbuilder/service-icmp.png
-share/pixmaps/fwbuilder/service-ip-neg.png
-share/pixmaps/fwbuilder/service-ip-ref.png
-share/pixmaps/fwbuilder/service-ip.png
-share/pixmaps/fwbuilder/service-tcp-neg.png
-share/pixmaps/fwbuilder/service-tcp-ref.png
-share/pixmaps/fwbuilder/service-tcp.png
-share/pixmaps/fwbuilder/service-udp-neg.png
-share/pixmaps/fwbuilder/service-udp-ref.png
-share/pixmaps/fwbuilder/service-udp.png
-share/pixmaps/fwbuilder/service_16.png
-share/pixmaps/fwbuilder/stop.png
-share/pixmaps/fwbuilder/uncheck.png
-share/pixmaps/fwbuilder/undo.png
-share/pixmaps/fwbuilder/up-arrow.png
-share/pixmaps/fwbuilder/warning.png
-share/pixmaps/fwbuilder/yes.png
-@dirrm %%DOCSDIR%%/examples
+%%DATADIR%%/locale/fwbuilder_fr.qm
+%%DATADIR%%/locale/fwbuilder_ru.qm
+%%DATADIR%%/locale/fwbuilder_vi.qm
 @dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/platform
 @dirrm %%DATADIR%%/os
-@dirrm %%DATADIR%%/filters
-@dirrm %%DATADIR%%/migration/0.8.7
-@dirrm %%DATADIR%%/migration/0.9.0
-@dirrm %%DATADIR%%/migration/0.9.1
-@dirrm %%DATADIR%%/migration/0.9.2
-@dirrm %%DATADIR%%/migration/0.9.3
-@dirrm %%DATADIR%%/migration/0.9.4
-@dirrm %%DATADIR%%/migration/0.9.5
-@dirrm %%DATADIR%%/migration/0.9.6
-@dirrm %%DATADIR%%/migration/0.9.7
-@dirrm %%DATADIR%%/migration/0.9.8
-@dirrm %%DATADIR%%/migration/0.9.9
-@dirrm %%DATADIR%%/migration/1.0.0
-@dirrm %%DATADIR%%/migration/1.0.1
-@dirrm %%DATADIR%%/migration/1.0.2
-@dirrm %%DATADIR%%/migration/1.0.3
-@dirrm %%DATADIR%%/migration/1.0.4
-@dirrm %%DATADIR%%/migration/1.0.5
-@dirrm %%DATADIR%%/migration/1.0.6
-@dirrm %%DATADIR%%/migration/1.0.7
-@dirrm %%DATADIR%%/migration/1.0.8
-@dirrm %%DATADIR%%/migration/1.0.9
-@dirrm %%DATADIR%%/migration/1.0.10
-@dirrm %%DATADIR%%/migration/1.0.11
-@dirrm %%DATADIR%%/migration/1.0.12
-@dirrm %%DATADIR%%/migration/1.1.0
-@dirrm %%DATADIR%%/migration/1.1.1
-@dirrm %%DATADIR%%/migration
-@dirrm %%DATADIR%%/modules/gui
-@dirrm %%DATADIR%%/modules
+@dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%
-@dirrm share/bug-buddy/bugzilla/fwbuilder
-@dirrm share/pixmaps/fwbuilder