- Update to 1.0.2

While I'm here:
- Remove explicit automake/autoconf dependencing in BUILD_DEPENDS
- Avoid using version number in DOCSDIR name
- Re-sort pkg-plist
- Cosmetique fixes

PR:		59998
Submitted by:	maintainer

3 files changed, 100 insertions, 100 deletions

diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index ec945e0ff37..927f8192242 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	libfwbuilder
-PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTVERSION=	1.0.2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fwbuilder
@@ -14,24 +13,22 @@ MASTER_SITE_SUBDIR=	fwbuilder
 MAINTAINER=	vadim@fwbuilder.org
 COMMENT=	Firewall Builder API
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf \
-		aclocal:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
 		netsnmp.6:${PORTSDIR}/net/net-snmp \
 		crypto.3:${PORTSDIR}/security/openssl
 
-CONFIGURE_SCRIPT= autogen.sh
-#CONFIGURE_ARGS=
-USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GTK=	no
+USE_AUTOCONF=	yes
+WANT_AUTOMAKE_VER=	15
+CONFIGURE_SCRIPT=	autogen.sh
+CONFIGURE_ARGS=		--with-docdir=${DOCSDIR}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 post-patch:
-	@${ECHO_CMD} "===! Running aclocal"
-	@(cd ${WRKSRC}; aclocal)
+	@${ECHO_MSG} "===! Running aclocal"
+	cd ${WRKSRC} && aclocal
 
 .include <bsd.port.mk>
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index c3994f395c4..bc4eb47dc86 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1 +1 @@
-MD5 (libfwbuilder-1.0.1.tar.gz) = e292937c9435c4717ccdd7f317a3cefe
+MD5 (libfwbuilder-1.0.2.tar.gz) = bf814db35c53b17b5ef94e821993ba67
diff --git a/security/libfwbuilder/pkg-plist b/security/libfwbuilder/pkg-plist
index 47b2ae13b61..313a1b8308f 100644
--- a/security/libfwbuilder/pkg-plist
+++ b/security/libfwbuilder/pkg-plist
@@ -1,93 +1,95 @@
-share/libfwbuilder/migration/0.9.5/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.4/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.3/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.2/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.1/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.9.0/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.8.7/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.14/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.13/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.12/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.11/FWObjectDatabase.xslt
+@comment $FreeBSD$
+bin/libfwbuilder-config
+include/fwbuilder/Address.hh
+include/fwbuilder/AddressRange.hh
+include/fwbuilder/BackgroundOp.hh
+include/fwbuilder/Constants.hh
+include/fwbuilder/CustomService.hh
+include/fwbuilder/FWException.hh
+include/fwbuilder/FWIntervalReference.hh
+include/fwbuilder/FWObject.hh
+include/fwbuilder/FWObjectDatabase.hh
+include/fwbuilder/FWObjectReference.hh
+include/fwbuilder/FWOptions.hh
+include/fwbuilder/FWReference.hh
+include/fwbuilder/FWServiceReference.hh
+include/fwbuilder/Firewall.hh
+include/fwbuilder/Group.hh
+include/fwbuilder/Host.hh
+include/fwbuilder/HostsFile.hh
+include/fwbuilder/ICMPService.hh
+include/fwbuilder/IPAddress.hh
+include/fwbuilder/IPService.hh
+include/fwbuilder/IPv4.hh
+include/fwbuilder/Interface.hh
+include/fwbuilder/InterfacePolicy.hh
+include/fwbuilder/Interval.hh
+include/fwbuilder/IntervalGroup.hh
+include/fwbuilder/Logger.hh
+include/fwbuilder/Management.hh
+include/fwbuilder/NAT.hh
+include/fwbuilder/Network.hh
+include/fwbuilder/ObjectGroup.hh
+include/fwbuilder/Policy.hh
+include/fwbuilder/Pool.hh
+include/fwbuilder/Resources.hh
+include/fwbuilder/Rule.hh
+include/fwbuilder/RuleElement.hh
+include/fwbuilder/RuleSet.hh
+include/fwbuilder/Service.hh
+include/fwbuilder/ServiceGroup.hh
+include/fwbuilder/SyncQueue.hh
+include/fwbuilder/TCPService.hh
+include/fwbuilder/ThreadTools.hh
+include/fwbuilder/Tools.hh
+include/fwbuilder/UDPService.hh
+include/fwbuilder/XMLTools.hh
+include/fwbuilder/crypto.hh
+include/fwbuilder/dns.hh
+include/fwbuilder/libfwbuilder-config.h
+include/fwbuilder/physAddress.hh
+include/fwbuilder/snmp.hh
+include/fwcompiler/Compiler.hh
+include/fwcompiler/NATCompiler.hh
+include/fwcompiler/OSConfigurator.hh
+include/fwcompiler/PolicyCompiler.hh
+include/fwcompiler/RuleProcessor.hh
+include/fwcompiler/manifest.hh
+lib/libfwbuilder.so
+lib/libfwbuilder.so.5
+lib/libfwcompiler.so
+lib/libfwcompiler.so.5
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/ChangeLog
+%%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.9/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.8/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.7/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.6/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.5/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.4/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.3/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.1/FWObjectDatabase.xslt
-share/libfwbuilder/migration/0.10.0/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/fwbuilder.dtd
-share/doc/libfwbuilder-1.0.1/README
-share/doc/libfwbuilder-1.0.1/INSTALL
-share/doc/libfwbuilder-1.0.1/Credits
-share/doc/libfwbuilder-1.0.1/ChangeLog
-share/doc/libfwbuilder-1.0.1/COPYING
-share/doc/libfwbuilder-1.0.1/AUTHORS
-lib/libfwcompiler.so.5
-lib/libfwcompiler.so
-lib/libfwbuilder.so.5
-lib/libfwbuilder.so
-include/fwcompiler/manifest.hh
-include/fwcompiler/RuleProcessor.hh
-include/fwcompiler/PolicyCompiler.hh
-include/fwcompiler/OSConfigurator.hh
-include/fwcompiler/NATCompiler.hh
-include/fwcompiler/Compiler.hh
-include/fwbuilder/snmp.hh
-include/fwbuilder/physAddress.hh
-include/fwbuilder/libfwbuilder-config.h
-include/fwbuilder/dns.hh
-include/fwbuilder/crypto.hh
-include/fwbuilder/XMLTools.hh
-include/fwbuilder/UDPService.hh
-include/fwbuilder/Tools.hh
-include/fwbuilder/ThreadTools.hh
-include/fwbuilder/TCPService.hh
-include/fwbuilder/SyncQueue.hh
-include/fwbuilder/ServiceGroup.hh
-include/fwbuilder/Service.hh
-include/fwbuilder/RuleSet.hh
-include/fwbuilder/RuleElement.hh
-include/fwbuilder/Rule.hh
-include/fwbuilder/Resources.hh
-include/fwbuilder/Pool.hh
-include/fwbuilder/Policy.hh
-include/fwbuilder/ObjectGroup.hh
-include/fwbuilder/Network.hh
-include/fwbuilder/NAT.hh
-include/fwbuilder/Management.hh
-include/fwbuilder/Logger.hh
-include/fwbuilder/IntervalGroup.hh
-include/fwbuilder/Interval.hh
-include/fwbuilder/InterfacePolicy.hh
-include/fwbuilder/Interface.hh
-include/fwbuilder/IPv4.hh
-include/fwbuilder/IPService.hh
-include/fwbuilder/IPAddress.hh
-include/fwbuilder/ICMPService.hh
-include/fwbuilder/HostsFile.hh
-include/fwbuilder/Host.hh
-include/fwbuilder/Group.hh
-include/fwbuilder/Firewall.hh
-include/fwbuilder/FWServiceReference.hh
-include/fwbuilder/FWReference.hh
-include/fwbuilder/FWOptions.hh
-include/fwbuilder/FWObjectReference.hh
-include/fwbuilder/FWObjectDatabase.hh
-include/fwbuilder/FWObject.hh
-include/fwbuilder/FWIntervalReference.hh
-include/fwbuilder/FWException.hh
-include/fwbuilder/CustomService.hh
-include/fwbuilder/Constants.hh
-include/fwbuilder/BackgroundOp.hh
-include/fwbuilder/AddressRange.hh
-include/fwbuilder/Address.hh
-bin/libfwbuilder-config
+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
@@ -111,8 +113,9 @@ bin/libfwbuilder-config
 @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
-@dirrm share/doc/libfwbuilder-1.0.1
+@dirrm %%DOCSDIR%%
 @dirrm include/fwcompiler
 @dirrm include/fwbuilder