Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 May 2014 00:26:40 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r355762 - head/security/fwbuilder
Message-ID:  <201405300026.s4U0Qe60010327@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Fri May 30 00:26:39 2014
New Revision: 355762
URL: http://svnweb.freebsd.org/changeset/ports/355762
QAT: https://qat.redports.org/buildarchive/r355762/

Log:
  Stagify. Modernize.

Modified:
  head/security/fwbuilder/Makefile
  head/security/fwbuilder/pkg-plist

Modified: head/security/fwbuilder/Makefile
==============================================================================
--- head/security/fwbuilder/Makefile	Fri May 30 00:11:07 2014	(r355761)
+++ head/security/fwbuilder/Makefile	Fri May 30 00:26:39 2014	(r355762)
@@ -27,8 +27,8 @@ CONFLICTS=	fwbuilder-[234].* fwbuilder-d
 CONFLICTS=	fwbuilder-[234].* fwbuilder-devel-* \
 		libfwbuilder-[234].* libfwbuilder-devel-*
 .endif
-LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt \
-		netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
+		libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 
 PLIST_SUB=	BUILD_VERSION=${DISTVERSION}.${BUILD}
 USE_QT4=	corelib \
@@ -46,33 +46,26 @@ USE_QT4=	corelib \
 QTDIR?=		${QT_PREFIX}
 
 USE_OPENSSL=	yes
-USES=		gmake
-USE_AUTOTOOLS=	autoconf aclocal libtool
+USES=		gmake libtool
+USE_AUTOTOOLS=	autoconf aclocal
 CONFIGURE_SCRIPT=	autogen.sh
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
+		INSTALL_ROOT=${STAGEDIR}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--with-docdir=${DOCSDIR} --with-qtdir=${QTDIR}
+CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} --with-qtdir=${QTDIR} \
+		--prefix=${PREFIX}
 MAKE_ARGS+=	QTDIR="${QTDIR}" \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+MAKE_ENV=	INSTALL_ROOT=${STAGEDIR}
 USE_LDCONFIG=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
-MAN1=		fwbuilder.1 \
-		fwbedit.1 \
-		fwb_iosacl.1 \
-		fwb_ipt.1 \
-		fwb_ipf.1 \
-		fwb_ipfw.1 \
-		fwb_pix.1 \
-		fwb_pf.1
-
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 800107
@@ -85,7 +78,7 @@ RUN_DEPENDS=	rcs:${PORTSDIR}/devel/rcs57
 .endif
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/fwbuilder
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fwbuilder
 	@${ECHO} If you are upgrading from a previous version of fwbuilder,
 	@${ECHO} please make sure to backup your fwbuilder database files
 	@${ECHO} prior to invoking fwbuilder for the first time.

Modified: head/security/fwbuilder/pkg-plist
==============================================================================
--- head/security/fwbuilder/pkg-plist	Fri May 30 00:11:07 2014	(r355761)
+++ head/security/fwbuilder/pkg-plist	Fri May 30 00:26:39 2014	(r355762)
@@ -7,6 +7,14 @@ bin/fwb_pix
 bin/fwbedit
 bin/fwbuilder
 bin/fwb_procurve_acl
+man/man1/fwbuilder.1.gz
+man/man1/fwbedit.1.gz
+man/man1/fwb_iosacl.1.gz
+man/man1/fwb_ipt.1.gz
+man/man1/fwb_ipf.1.gz
+man/man1/fwb_ipfw.1.gz
+man/man1/fwb_pix.1.gz
+man/man1/fwb_pf.1.gz
 share/applications/fwbuilder.desktop
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/bridge_interface
 share/fwbuilder-%%BUILD_VERSION%%/configlets/bsd/bridge_port



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405300026.s4U0Qe60010327>