PR: 56405

Submitted by:	maintainer
Upgrade fwbuilder to v1.0.11: this is new upstream release

9 files changed, 207 insertions, 204 deletions

diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index 374138569deb..b655387d51c2 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	1.0.10
-PORTREVISION=	2
+PORTVERSION=	1.0.11
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	fwbuilder
 MAINTAINER=	vadim@fwbuilder.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
-BUILD_DEPENDS=  autoconf:${PORTSDIR}/devel/autoconf \
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
 		aclocal:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
@@ -28,15 +28,11 @@ 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
+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} >= 500000
-EXTRA_PATCHES=  ${FILESDIR}/CertDruidP30Dialog.cc-patch
-.endif
-
 post-patch:
 	@${ECHO_CMD} "===! Running aclocal"
 	@(cd ${WRKSRC}; aclocal; autoconf)
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
index 12a65c72b340..e3f726b08f7d 100644
--- a/security/fwbuilder-devel/distinfo
+++ b/security/fwbuilder-devel/distinfo
@@ -1 +1 @@
-MD5 (fwbuilder-1.0.10.tar.gz) = a2fbe778af33d0227af013d69c69411b
+MD5 (fwbuilder-1.0.11.tar.gz) = 03f013f0f02472c91845e3d6fd50720a
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
index cf5c84a4d772..e502fcc23c0f 100644
--- a/security/fwbuilder-devel/pkg-plist
+++ b/security/fwbuilder-devel/pkg-plist
@@ -125,6 +125,7 @@ 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.10/FWBuilderPreferences.xslt
 share/fwbuilder/migration/1.0.9/FWBuilderPreferences.xslt
 share/fwbuilder/migration/1.0.8/FWBuilderPreferences.xslt
 share/fwbuilder/migration/1.0.7/FWBuilderPreferences.xslt
@@ -150,69 +151,73 @@ 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
+share/doc/fwbuilder-1.0.11/examples/objects.xml
+share/doc/fwbuilder-1.0.11/examples/README.examples
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.9.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.9
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.8.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.8
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.7.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.7
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.6.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.6
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.5.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.5
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.4.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.4
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.3.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.3
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.2.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.2
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.10.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.10
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.11.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.11
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.1.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.1
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.0.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.0
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.9.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.9
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.8.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.8
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.7.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.7
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.6.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.6
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.5.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.5
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.4.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.4
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.3.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.3
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.2.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.2
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.1
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.0
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.8.7
+share/doc/fwbuilder-1.0.11/README.gui
+share/doc/fwbuilder-1.0.11/README.floppyfw
+share/doc/fwbuilder-1.0.11/README.compiler-framework
+share/doc/fwbuilder-1.0.11/README.api
+share/doc/fwbuilder-1.0.11/INSTALL
+share/doc/fwbuilder-1.0.11/FAQ.html
+share/doc/fwbuilder-1.0.11/FAQ
+share/doc/fwbuilder-1.0.11/Credits
+share/doc/fwbuilder-1.0.11/ChangeLog
+share/doc/fwbuilder-1.0.11/COPYING
+share/doc/fwbuilder-1.0.11/Build.html
+share/doc/fwbuilder-1.0.11/Build
+share/doc/fwbuilder-1.0.11/AUTHORS
 bin/fwbuilder
 bin/fwblookup
+bin/fwbedit
 bin/fwb_pf
 bin/fwb_ipt
 bin/fwb_ipf
 bin/fwb_ipfw
 bin/fwb_install
+bin/fwb_compile_all
 @dirrm share/fwbuilder/modules/gui
 @dirrm share/fwbuilder/migration/1.0.9
 @dirrm share/fwbuilder/migration/1.0.8
@@ -236,5 +241,5 @@ bin/fwb_install
 @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
+@dirrm share/doc/fwbuilder-1.0.11/examples
+@dirrm share/doc/fwbuilder-1.0.11
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 374138569deb..b655387d51c2 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	1.0.10
-PORTREVISION=	2
+PORTVERSION=	1.0.11
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	fwbuilder
 MAINTAINER=	vadim@fwbuilder.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
-BUILD_DEPENDS=  autoconf:${PORTSDIR}/devel/autoconf \
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
 		aclocal:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
@@ -28,15 +28,11 @@ 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
+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} >= 500000
-EXTRA_PATCHES=  ${FILESDIR}/CertDruidP30Dialog.cc-patch
-.endif
-
 post-patch:
 	@${ECHO_CMD} "===! Running aclocal"
 	@(cd ${WRKSRC}; aclocal; autoconf)
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index 12a65c72b340..e3f726b08f7d 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1 +1 @@
-MD5 (fwbuilder-1.0.10.tar.gz) = a2fbe778af33d0227af013d69c69411b
+MD5 (fwbuilder-1.0.11.tar.gz) = 03f013f0f02472c91845e3d6fd50720a
diff --git a/security/fwbuilder/pkg-plist b/security/fwbuilder/pkg-plist
index cf5c84a4d772..e502fcc23c0f 100644
--- a/security/fwbuilder/pkg-plist
+++ b/security/fwbuilder/pkg-plist
@@ -125,6 +125,7 @@ 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.10/FWBuilderPreferences.xslt
 share/fwbuilder/migration/1.0.9/FWBuilderPreferences.xslt
 share/fwbuilder/migration/1.0.8/FWBuilderPreferences.xslt
 share/fwbuilder/migration/1.0.7/FWBuilderPreferences.xslt
@@ -150,69 +151,73 @@ 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
+share/doc/fwbuilder-1.0.11/examples/objects.xml
+share/doc/fwbuilder-1.0.11/examples/README.examples
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.9.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.9
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.8.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.8
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.7.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.7
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.6.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.6
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.5.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.5
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.4.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.4
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.3.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.3
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.2.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.2
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.10.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.10
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.11.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.11
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.1.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.1
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.0.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.0
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.9.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.9
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.8.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.8
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.7.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.7
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.6.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.6
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.5.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.5
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.4.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.4
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.3.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.3
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.2.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.2
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.1
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.0
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.8.7
+share/doc/fwbuilder-1.0.11/README.gui
+share/doc/fwbuilder-1.0.11/README.floppyfw
+share/doc/fwbuilder-1.0.11/README.compiler-framework
+share/doc/fwbuilder-1.0.11/README.api
+share/doc/fwbuilder-1.0.11/INSTALL
+share/doc/fwbuilder-1.0.11/FAQ.html
+share/doc/fwbuilder-1.0.11/FAQ
+share/doc/fwbuilder-1.0.11/Credits
+share/doc/fwbuilder-1.0.11/ChangeLog
+share/doc/fwbuilder-1.0.11/COPYING
+share/doc/fwbuilder-1.0.11/Build.html
+share/doc/fwbuilder-1.0.11/Build
+share/doc/fwbuilder-1.0.11/AUTHORS
 bin/fwbuilder
 bin/fwblookup
+bin/fwbedit
 bin/fwb_pf
 bin/fwb_ipt
 bin/fwb_ipf
 bin/fwb_ipfw
 bin/fwb_install
+bin/fwb_compile_all
 @dirrm share/fwbuilder/modules/gui
 @dirrm share/fwbuilder/migration/1.0.9
 @dirrm share/fwbuilder/migration/1.0.8
@@ -236,5 +241,5 @@ bin/fwb_install
 @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
+@dirrm share/doc/fwbuilder-1.0.11/examples
+@dirrm share/doc/fwbuilder-1.0.11
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index 374138569deb..b655387d51c2 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	1.0.10
-PORTREVISION=	2
+PORTVERSION=	1.0.11
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	fwbuilder
 MAINTAINER=	vadim@fwbuilder.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
-BUILD_DEPENDS=  autoconf:${PORTSDIR}/devel/autoconf \
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
 		aclocal:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
@@ -28,15 +28,11 @@ 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
+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} >= 500000
-EXTRA_PATCHES=  ${FILESDIR}/CertDruidP30Dialog.cc-patch
-.endif
-
 post-patch:
 	@${ECHO_CMD} "===! Running aclocal"
 	@(cd ${WRKSRC}; aclocal; autoconf)
diff --git a/security/fwbuilder2/distinfo b/security/fwbuilder2/distinfo
index 12a65c72b340..e3f726b08f7d 100644
--- a/security/fwbuilder2/distinfo
+++ b/security/fwbuilder2/distinfo
@@ -1 +1 @@
-MD5 (fwbuilder-1.0.10.tar.gz) = a2fbe778af33d0227af013d69c69411b
+MD5 (fwbuilder-1.0.11.tar.gz) = 03f013f0f02472c91845e3d6fd50720a
diff --git a/security/fwbuilder2/pkg-plist b/security/fwbuilder2/pkg-plist
index cf5c84a4d772..e502fcc23c0f 100644
--- a/security/fwbuilder2/pkg-plist
+++ b/security/fwbuilder2/pkg-plist
@@ -125,6 +125,7 @@ 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.10/FWBuilderPreferences.xslt
 share/fwbuilder/migration/1.0.9/FWBuilderPreferences.xslt
 share/fwbuilder/migration/1.0.8/FWBuilderPreferences.xslt
 share/fwbuilder/migration/1.0.7/FWBuilderPreferences.xslt
@@ -150,69 +151,73 @@ 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
+share/doc/fwbuilder-1.0.11/examples/objects.xml
+share/doc/fwbuilder-1.0.11/examples/README.examples
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.9.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.9
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.8.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.8
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.7.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.7
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.6.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.6
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.5.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.5
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.4.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.4
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.3.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.3
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.2.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.2
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.10.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.10
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.11.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.11
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.1.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.1
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.0.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_1.0.0
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.9.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.9
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.8.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.8
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.7.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.7
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.6.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.6
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.5.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.5
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.4.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.4
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.3.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.3
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.2.html
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.2
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.1
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.9.0
+share/doc/fwbuilder-1.0.11/ReleaseNotes_0.8.7
+share/doc/fwbuilder-1.0.11/README.gui
+share/doc/fwbuilder-1.0.11/README.floppyfw
+share/doc/fwbuilder-1.0.11/README.compiler-framework
+share/doc/fwbuilder-1.0.11/README.api
+share/doc/fwbuilder-1.0.11/INSTALL
+share/doc/fwbuilder-1.0.11/FAQ.html
+share/doc/fwbuilder-1.0.11/FAQ
+share/doc/fwbuilder-1.0.11/Credits
+share/doc/fwbuilder-1.0.11/ChangeLog
+share/doc/fwbuilder-1.0.11/COPYING
+share/doc/fwbuilder-1.0.11/Build.html
+share/doc/fwbuilder-1.0.11/Build
+share/doc/fwbuilder-1.0.11/AUTHORS
 bin/fwbuilder
 bin/fwblookup
+bin/fwbedit
 bin/fwb_pf
 bin/fwb_ipt
 bin/fwb_ipf
 bin/fwb_ipfw
 bin/fwb_install
+bin/fwb_compile_all
 @dirrm share/fwbuilder/modules/gui
 @dirrm share/fwbuilder/migration/1.0.9
 @dirrm share/fwbuilder/migration/1.0.8
@@ -236,5 +241,5 @@ bin/fwb_install
 @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
+@dirrm share/doc/fwbuilder-1.0.11/examples
+@dirrm share/doc/fwbuilder-1.0.11