3 files changed, 59 insertions, 61 deletions

diff --git a/security/libfwbuilder2/Makefile b/security/libfwbuilder2/Makefile
index 927f81922428..7bfc7f844663 100644
--- a/security/libfwbuilder2/Makefile
+++ b/security/libfwbuilder2/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	libfwbuilder
 PORTVERSION=	1.0.2
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -18,17 +19,14 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		netsnmp.6:${PORTSDIR}/net/net-snmp \
 		crypto.3:${PORTSDIR}/security/openssl
 
+USE_GNOME=	glib12
+
 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}
+GNU_CONFIGURE=  yes
+CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
 INSTALLS_SHLIB=	yes
 
-post-patch:
-	@${ECHO_MSG} "===! Running aclocal"
-	cd ${WRKSRC} && aclocal
-
 .include <bsd.port.mk>
diff --git a/security/libfwbuilder2/distinfo b/security/libfwbuilder2/distinfo
index bc4eb47dc86a..983cb9a83dc9 100644
--- a/security/libfwbuilder2/distinfo
+++ b/security/libfwbuilder2/distinfo
@@ -1 +1 @@
-MD5 (libfwbuilder-1.0.2.tar.gz) = bf814db35c53b17b5ef94e821993ba67
+MD5 (libfwbuilder-1.0.2.tar.gz) = f5e50b8165b1dded26f461cf488553ea
diff --git a/security/libfwbuilder2/pkg-plist b/security/libfwbuilder2/pkg-plist
index 313a1b8308f0..381de374197c 100644
--- a/security/libfwbuilder2/pkg-plist
+++ b/security/libfwbuilder2/pkg-plist
@@ -65,57 +65,57 @@ lib/libfwcompiler.so.5
 %%DOCSDIR%%/Credits
 %%DOCSDIR%%/INSTALL
 %%DOCSDIR%%/README
-share/libfwbuilder/fwbuilder.dtd
-share/libfwbuilder/migration/0.10.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.1/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.10/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.11/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.12/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.13/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.14/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.2/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.3/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.4/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.5/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.6/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.7/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.8/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.9/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.8.7/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.1/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.2/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.3/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.4/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.5/FWObjectDatabase.xslt
-share/libfwbuilder/migration/1.0.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/1.0.1/FWObjectDatabase.xslt
-@dirrm share/libfwbuilder/migration/0.9.5
-@dirrm share/libfwbuilder/migration/0.9.4
-@dirrm share/libfwbuilder/migration/0.9.3
-@dirrm share/libfwbuilder/migration/0.9.2
-@dirrm share/libfwbuilder/migration/0.9.1
-@dirrm share/libfwbuilder/migration/0.9.0
-@dirrm share/libfwbuilder/migration/0.8.7
-@dirrm share/libfwbuilder/migration/0.10.14
-@dirrm share/libfwbuilder/migration/0.10.13
-@dirrm share/libfwbuilder/migration/0.10.12
-@dirrm share/libfwbuilder/migration/0.10.11
-@dirrm share/libfwbuilder/migration/0.10.10
-@dirrm share/libfwbuilder/migration/0.10.9
-@dirrm share/libfwbuilder/migration/0.10.8
-@dirrm share/libfwbuilder/migration/0.10.7
-@dirrm share/libfwbuilder/migration/0.10.6
-@dirrm share/libfwbuilder/migration/0.10.5
-@dirrm share/libfwbuilder/migration/0.10.4
-@dirrm share/libfwbuilder/migration/0.10.3
-@dirrm share/libfwbuilder/migration/0.10.2
-@dirrm share/libfwbuilder/migration/0.10.1
-@dirrm share/libfwbuilder/migration/0.10.0
-@dirrm share/libfwbuilder/migration/1.0.0
-@dirrm share/libfwbuilder/migration/1.0.1
-@dirrm share/libfwbuilder/migration
-@dirrm share/libfwbuilder
+%%DATADIR%%/fwbuilder.dtd
+%%DATADIR%%/migration/0.10.0/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.1/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.10/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.11/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.12/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.13/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.14/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.2/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.3/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.4/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.5/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.6/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.7/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.8/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.10.9/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.8.7/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.9.0/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.9.1/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.9.2/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.9.3/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.9.4/FWObjectDatabase.xslt
+%%DATADIR%%/migration/0.9.5/FWObjectDatabase.xslt
+%%DATADIR%%/migration/1.0.0/FWObjectDatabase.xslt
+%%DATADIR%%/migration/1.0.1/FWObjectDatabase.xslt
+@dirrm %%DATADIR%%/migration/0.9.5
+@dirrm %%DATADIR%%/migration/0.9.4
+@dirrm %%DATADIR%%/migration/0.9.3
+@dirrm %%DATADIR%%/migration/0.9.2
+@dirrm %%DATADIR%%/migration/0.9.1
+@dirrm %%DATADIR%%/migration/0.9.0
+@dirrm %%DATADIR%%/migration/0.8.7
+@dirrm %%DATADIR%%/migration/0.10.14
+@dirrm %%DATADIR%%/migration/0.10.13
+@dirrm %%DATADIR%%/migration/0.10.12
+@dirrm %%DATADIR%%/migration/0.10.11
+@dirrm %%DATADIR%%/migration/0.10.10
+@dirrm %%DATADIR%%/migration/0.10.9
+@dirrm %%DATADIR%%/migration/0.10.8
+@dirrm %%DATADIR%%/migration/0.10.7
+@dirrm %%DATADIR%%/migration/0.10.6
+@dirrm %%DATADIR%%/migration/0.10.5
+@dirrm %%DATADIR%%/migration/0.10.4
+@dirrm %%DATADIR%%/migration/0.10.3
+@dirrm %%DATADIR%%/migration/0.10.2
+@dirrm %%DATADIR%%/migration/0.10.1
+@dirrm %%DATADIR%%/migration/0.10.0
+@dirrm %%DATADIR%%/migration/1.0.0
+@dirrm %%DATADIR%%/migration/1.0.1
+@dirrm %%DATADIR%%/migration
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 @dirrm include/fwcompiler
 @dirrm include/fwbuilder