- Update 1.1.2

While I'm here:
- Use %%DATADIR%% and %%DOCSDIR%%

PR:                 61510
Sybmitted by:       Vadim Kurland <vadim@fwbuilder.org> (maintainer)
Approved by:        erwin (mentor) (implicitly)

4 files changed, 127 insertions, 140 deletions

diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
index 16ba559b8773..09b00024e6a1 100644
--- a/security/fwbuilder2/Makefile
+++ b/security/fwbuilder2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fwbuilder
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}/fwbuilder/
@@ -16,23 +16,20 @@ 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
 
+USE_GNOME=	glib12 gtk12
 USE_GMAKE=	yes
 USE_LIBTOOL=	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
+GNU_CONFIGURE=  yes
+CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR}
 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
 
-post-patch:
-	@${ECHO_MSG} "===! Running aclocal"
-	cd ${WRKSRC} && aclocal && autoconf
-
 .include <bsd.port.mk>
diff --git a/security/fwbuilder2/distinfo b/security/fwbuilder2/distinfo
index 2e708771eed0..d494dbd28e80 100644
--- a/security/fwbuilder2/distinfo
+++ b/security/fwbuilder2/distinfo
@@ -1 +1 @@
-MD5 (fwbuilder-1.1.1.tar.gz) = c0c86c5d0a2f6eeff388c66d49c63463
+MD5 (fwbuilder-1.1.2.tar.gz) = 54a57c9e82da151b59afe0a1c0e66586
diff --git a/security/fwbuilder2/files/patch-configure.in b/security/fwbuilder2/files/patch-configure.in
deleted file mode 100644
index ef5c41d56a26..000000000000
--- a/security/fwbuilder2/files/patch-configure.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/fwbuilder2/pkg-plist b/security/fwbuilder2/pkg-plist
index a2d41ec67694..58d1db22180a 100644
--- a/security/fwbuilder2/pkg-plist
+++ b/security/fwbuilder2/pkg-plist
@@ -1,31 +1,27 @@
-@comment $FreeBSD$
-bin/fwb_compile_all
-bin/fwb_install
+bin/fwb_pf
 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
+bin/fwblookup
+bin/fwbedit
+bin/fwb_install
+bin/fwb_compile_all
+%%DOCSDIR%%/examples/README.examples
+%%DOCSDIR%%/examples/objects.xml
 %%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/Build
-%%DOCSDIR%%/Build.html
 %%DOCSDIR%%/COPYING
-%%DOCSDIR%%/ChangeLog
 %%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%%/README.gui
 %%DOCSDIR%%/ReleaseNotes_0.8.7
 %%DOCSDIR%%/ReleaseNotes_0.9.0
 %%DOCSDIR%%/ReleaseNotes_0.9.1
@@ -49,10 +45,6 @@ share/bug-buddy/xml/fwbuilder.bts
 %%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
@@ -69,70 +61,80 @@ share/bug-buddy/xml/fwbuilder.bts
 %%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%%/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/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_iptables_dlg.so
-share/fwbuilder/modules/gui/lib_linux24_dlg.so
-share/fwbuilder/modules/gui/lib_macosx_dlg.so
-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
+%%DOCSDIR%%/ReleaseNotes_1.1.2
+%%DOCSDIR%%/ReleaseNotes_1.1.2.html
+%%DATADIR%%/gtkrc
+%%DATADIR%%/fwbuilder_preferences.dtd
+%%DATADIR%%/objects_init.xml
+%%DATADIR%%/fwbuilder_prefs.xml
+%%DATADIR%%/resources.xml
+%%DATADIR%%/platform/iptables.xml
+%%DATADIR%%/platform/ipf.xml
+%%DATADIR%%/platform/pf.xml
+%%DATADIR%%/platform/ipfw.xml
+%%DATADIR%%/platform/pix.xml
+%%DATADIR%%/platform/unknown.xml
+%%DATADIR%%/os/linux24.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
@@ -180,13 +182,13 @@ 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/key.png
 share/pixmaps/fwbuilder/left-arrow.png
 share/pixmaps/fwbuilder/log.png
 share/pixmaps/fwbuilder/neg.png
@@ -233,32 +235,40 @@ 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
-@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 %%DOCSDIR%%/examples
 @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%%
+@dirrm share/bug-buddy/bugzilla/fwbuilder
+@dirrm share/pixmaps/fwbuilder