- Update to 1.1.1

- Remove patches not needed anymore
- Add patch to respect LOCALBASE when searching for glib

While I'm here:
- Remove explicit automake/autoconf dependencies from BUILD_DEPENDS
  in favor of USE_AUTOCONF and WANT_AUTOMAKE_VER
- Utilize USE_GNOME for glib12, gtk12 and gdk-pixbuf dependencies
- Switch to DOCSDIR that doesn't contain a version number in the name
- Sort pkg-plist

PR:		59918
Submitted by:	maintainer

6 files changed, 268 insertions, 258 deletions

diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index b655387d51c..16ba559b877 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	1.0.11
+PORTVERSION=	1.1.1
 PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
@@ -15,26 +15,24 @@ MASTER_SITE_SUBDIR=	fwbuilder
 MAINTAINER=	vadim@fwbuilder.org
 COMMENT=	Firewall Builder GUI and policy compilers
 
-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 \
 		fwbuilder.5:${PORTSDIR}/security/libfwbuilder
 
-CONFIGURE_SCRIPT= autogen.sh
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	yes
+USE_AUTOCONF=	yes
+WANT_AUTOMAKE_VER=	15
+CONFIGURE_SCRIPT=	autogen.sh
+CONFIGURE_ARGS=		--with-docdir=${DOCSDIR}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_GNOME=	glib12 gtk12 gdkpixbuf
 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 \
+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>
-
 post-patch:
-	@${ECHO_CMD} "===! Running aclocal"
-	@(cd ${WRKSRC}; aclocal; autoconf)
+	@${ECHO_MSG} "===! Running aclocal"
+	cd ${WRKSRC} && aclocal && autoconf
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
index e3f726b08f7..2e708771eed 100644
--- a/security/fwbuilder-devel/distinfo
+++ b/security/fwbuilder-devel/distinfo
@@ -1 +1 @@
-MD5 (fwbuilder-1.0.11.tar.gz) = 03f013f0f02472c91845e3d6fd50720a
+MD5 (fwbuilder-1.1.1.tar.gz) = c0c86c5d0a2f6eeff388c66d49c63463
diff --git a/security/fwbuilder-devel/files/CertDruidP30Dialog.cc-patch b/security/fwbuilder-devel/files/CertDruidP30Dialog.cc-patch
deleted file mode 100644
index 5ff6ecb342c..00000000000
--- a/security/fwbuilder-devel/files/CertDruidP30Dialog.cc-patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gui/CertDruidP30Dialog.cc.orig	Wed Jun 11 07:28:35 2003
-+++ src/gui/CertDruidP30Dialog.cc	Wed Jun 11 07:30:23 2003
-@@ -25,8 +25,9 @@
- */
- 
- 
--
-+#if 0
- #define _XOPEN_SOURCE /* glibc2 needs this for strptime   --vk */
-+#endif
- 
- #include "config.h"
- #include "CertDruidP30Dialog.hh"
diff --git a/security/fwbuilder-devel/files/patch-aa b/security/fwbuilder-devel/files/patch-aa
deleted file mode 100644
index 7c91a3de3f6..00000000000
--- a/security/fwbuilder-devel/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
---- config.h.in.old	Sat May 31 14:40:22 2003
-+++ config.h.in	Sat May 31 14:40:40 2003
-@@ -33,6 +33,11 @@
- #undef HAVE_SETENV
- #undef HAVE_PUTENV
- 
-+#ifdef HAVE_GETOPT_H
-+#  define HAVE_DECL_GETOPT  HAVE_GETOPT_H
-+#endif
-+
-+
- /*
-  *  This is needed for Solaris
-  */
diff --git a/security/fwbuilder-devel/files/patch-configure.in b/security/fwbuilder-devel/files/patch-configure.in
new file mode 100644
index 00000000000..ef5c41d56a2
--- /dev/null
+++ b/security/fwbuilder-devel/files/patch-configure.in
@@ -0,0 +1,20 @@
+--- configure.in.old	Thu Dec 18 09:24:41 2003
++++ configure.in	Thu Dec 18 09:24:53 2003
+@@ -281,17 +281,6 @@
+ 
+ AC_DEFINE_UNQUOTED(LIBFWBUILDER_VERSION, "$LIBFWBUILDER_VERSION")
+ 
+-dnl
+-dnl On FreeBSD glib-config is called glib12-config, but standard AM_PATH_GLIB
+-dnl macro does not know it ...
+-dnl
+-case "$build_os" in
+-  freebsd*)
+-   GLIB_CONFIG=/usr/local/bin/glib12-config
+-   ;;
+-esac
+-
+-
+ dnl TODO: remove this once we get rid of the old iptables compiler 
+ dnl  all other modules do not need separate GLIB_CFLAGS and GLIB_LIBS 
+ dnl  macro because we supply the same parameters via libfwbuilder-config
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
index e502fcc23c0..a2d41ec6769 100644
--- a/security/fwbuilder-devel/pkg-plist
+++ b/security/fwbuilder-devel/pkg-plist
@@ -1,224 +1,243 @@
-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
+@comment $FreeBSD$
+bin/fwb_compile_all
+bin/fwb_install
+bin/fwb_ipf
+bin/fwb_ipfw
+bin/fwb_ipt
+bin/fwb_pf
+bin/fwbedit
+bin/fwblookup
+bin/fwbuilder
+share/bug-buddy/bugzilla/fwbuilder.bugzilla
+share/bug-buddy/fwbuilder-bug-buddy.png
+share/bug-buddy/fwbuilder-packages
+share/bug-buddy/fwbuilder.appmap
+share/bug-buddy/xml/fwbuilder.bts
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/Build
+%%DOCSDIR%%/Build.html
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/Credits
+%%DOCSDIR%%/FAQ
+%%DOCSDIR%%/FAQ.html
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/README.api
+%%DOCSDIR%%/README.compiler-framework
+%%DOCSDIR%%/README.floppyfw
+%%DOCSDIR%%/README.gui
+%%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.10
+%%DOCSDIR%%/ReleaseNotes_1.0.10.html
+%%DOCSDIR%%/ReleaseNotes_1.0.11
+%%DOCSDIR%%/ReleaseNotes_1.0.11.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.1.0
+%%DOCSDIR%%/ReleaseNotes_1.1.0.html
+%%DOCSDIR%%/ReleaseNotes_1.1.1
+%%DOCSDIR%%/ReleaseNotes_1.1.1.html
+%%DOCSDIR%%/examples/README.examples
+%%DOCSDIR%%/examples/objects.xml
+share/fwbuilder/filters/policy-html.xsl
+share/fwbuilder/filters/policy-text.xsl
+share/fwbuilder/filters/print-nat.xs1
+share/fwbuilder/filters/print-policy.xs1
 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/gtkrc
+share/fwbuilder/migration/0.8.7/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.0/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.1/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.2/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.3/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.4/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.5/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.6/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.7/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.8/FWBuilderPreferences.xslt
+share/fwbuilder/migration/0.9.9/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.0/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.1/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.10/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.11/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.12/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.2/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.3/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.4/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.5/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.6/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.7/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.8/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.0.9/FWBuilderPreferences.xslt
+share/fwbuilder/migration/1.1.0/FWBuilderPreferences.xslt
+share/fwbuilder/modules/gui/lib_freebsd_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_iptables_dlg.so
+share/fwbuilder/modules/gui/lib_linux24_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
-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.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
+share/fwbuilder/modules/gui/lib_openbsd_dlg.so
+share/fwbuilder/modules/gui/lib_pf_dlg.so
+share/fwbuilder/modules/gui/lib_pix_dlg.so
+share/fwbuilder/modules/gui/lib_pix_os_dlg.so
+share/fwbuilder/modules/gui/lib_solaris_dlg.so
+share/fwbuilder/objects_init.xml
+share/fwbuilder/os/freebsd.xml
+share/fwbuilder/os/linux24.xml
+share/fwbuilder/os/macosx.xml
+share/fwbuilder/os/openbsd.xml
+share/fwbuilder/os/pix_os.xml
+share/fwbuilder/os/solaris.xml
+share/fwbuilder/os/unknown_os.xml
+share/fwbuilder/platform/ipf.xml
+share/fwbuilder/platform/ipfw.xml
+share/fwbuilder/platform/iptables.xml
+share/fwbuilder/platform/pf.xml
+share/fwbuilder/platform/pix.xml
+share/fwbuilder/platform/unknown.xml
+share/fwbuilder/resources.xml
+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/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/key.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 share/fwbuilder/modules/gui
+@dirrm share/fwbuilder/migration/1.1.0
+@dirrm share/fwbuilder/migration/1.0.12
+@dirrm share/fwbuilder/migration/1.0.11
+@dirrm share/fwbuilder/migration/1.0.10
 @dirrm share/fwbuilder/migration/1.0.9
 @dirrm share/fwbuilder/migration/1.0.8
 @dirrm share/fwbuilder/migration/1.0.7
@@ -241,5 +260,5 @@ bin/fwb_compile_all
 @dirrm share/fwbuilder/migration/0.9.0
 @dirrm share/fwbuilder/migration/0.8.7
 @dirrm share/fwbuilder/filters
-@dirrm share/doc/fwbuilder-1.0.11/examples
-@dirrm share/doc/fwbuilder-1.0.11
+@dirrm %%DOCSDIR%%/examples
+@dirrm %%DOCSDIR%%