Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Sep 2014 12:21:39 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368171 - head/net/quagga
Message-ID:  <201409141221.s8ECLdJa080873@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sun Sep 14 12:21:39 2014
New Revision: 368171
URL: http://svnweb.freebsd.org/changeset/ports/368171
QAT: https://qat.redports.org/buildarchive/r368171/

Log:
  - Convert to INSTALL_TARGET=install-strip
  - Remove USE_AUTOTOOLS
  - Let user decide about stack protector

Modified:
  head/net/quagga/Makefile

Modified: head/net/quagga/Makefile
==============================================================================
--- head/net/quagga/Makefile	Sun Sep 14 12:05:03 2014	(r368170)
+++ head/net/quagga/Makefile	Sun Sep 14 12:21:39 2014	(r368171)
@@ -15,12 +15,14 @@ COMMENT=	Free RIPv1, RIPv2, OSPFv2, BGP4
 
 LICENSE=	GPLv2
 
+BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+
 CONFLICTS=	openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-re-[0-9]*
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-exampledir=${PREFIX}/share/examples/quagga
+INSTALL_TARGET=	install-strip
 USES=		gmake libtool makeinfo perl5 readline
-USE_AUTOTOOLS=	autoheader aclocal
-ACLOCAL_ARGS=	-I${LOCALBASE}/share/aclocal
-BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
@@ -38,16 +40,6 @@ DLMALLOC_DESC=		Use dlmalloc (makes bgpd
 NO_BGP_ANNOUNCE_DESC=	Turn off BGP route announcement
 OSPF_NEXTHOP_DESC=	Set ip next-hop in OSPF route maps
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800000
-LDFLAGS+=	-fstack-protector
-.endif
-CONFIGURE_ARGS+=--includedir=${PREFIX}/include --enable-exampledir=${PREFIX}/share/examples/quagga
-CONFIGURE_ENV+=	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		LIBTOOL_VERSION=${LIBTOOL_VERSION}
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 ENABLE_USER?=	quagga
 ENABLE_GROUP?=	quagga
 
@@ -73,6 +65,8 @@ SCRIPTS_ENV=	PREFIX=${PREFIX} PKG_PREFIX
 		SYSCONF_DIR=${SYSCONF_DIR} SYSSTATE_DIR=${SYSSTATE_DIR} \
 		ENABLE_USER=${ENABLE_USER} ENABLE_GROUP=${ENABLE_GROUP}
 
+.include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MISISD}
 CONFIGURE_ARGS+=--enable-isisd
 MAN8+=		isisd.8
@@ -145,12 +139,7 @@ pre-everything::
 	@${ECHO} "SYSCONF_DIR       Specify directory for Quagga configuration files"
 	@${ECHO} "LOCALSTATE_DIR    Specify directory for Quagga runtime files"
 
-post-stage:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libospf.so.0.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libzebra.so.0.0.0
-.if ${PORT_OPTIONS:MOSPF_OPAQUE_LSA}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libospfapiclient.so.0.0.0
-.endif
+post-install:
 	${MKDIR} ${STAGEDIR}${LOCALSTATE_DIR}
 	${MKDIR} ${STAGEDIR}${SYSCONF_DIR}
 
@@ -159,4 +148,4 @@ post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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