net/quagga: 0.99.22.3 -> .4, stagify, build-as-user, fix libdepends

ChangeLog:    http://download.savannah.gnu.org/releases/quagga/quagga-0.99.22.4.changelog.txt

Approved-by:  Boris Kovalenko <boris@tagnet.ru> (maintainer), jadawin (mentor)

3 files changed, 23 insertions, 21 deletions

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index d7919db8c507..f7f8169a9345 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	quagga
-PORTVERSION=	0.99.22.3
+PORTVERSION=	0.99.22.4
 CATEGORIES=	net ipv6
 MASTER_SITES=	SAVANNAH
 MASTER_SITE_SUBDIR=	quagga
@@ -16,15 +16,13 @@ LICENSE=	GPLv2
 
 CONFLICTS=	openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-re-[0-9]*
 
-USES=		gmake perl5
-USE_AUTOTOOLS=	libtool autoheader aclocal
+USES=		gmake perl5 libtool
+USE_AUTOTOOLS=	autoheader aclocal
 ACLOCAL_ARGS=	-I${LOCALBASE}/share/aclocal
 BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
-MAN1=		vtysh.1
-MAN8=		bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8 watchquagga.8
 INFO=		quagga
 
 OPTIONS_DEFINE=	ISISD PAM OSPF_OPAQUE_LSA RTADV SNMP TCPSOCKETS DLMALLOC \
@@ -39,10 +37,8 @@ DLMALLOC_DESC=		Use dlmalloc (makes bgpd much faster)
 NO_BGP_ANNOUNCE_DESC=	Turn off BGP route announcement
 OSPF_NEXTHOP_DESC=	Set ip next-hop in OSPF route maps
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-CFLAGS+=	-I${LOCALBASE}/include
 .if ${OSVERSION} >= 800000
 LDFLAGS+=	-fstack-protector
 .endif
@@ -103,7 +99,7 @@ CONFIGURE_ARGS+=--enable-rtadv
 
 .if ${PORT_OPTIONS:MSNMP}
 CONFIGURE_ARGS+=--enable-snmp
-LIB_DEPENDS+=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 .endif
 
 .if ${PORT_OPTIONS:MTCPSOCKETS}
@@ -111,7 +107,7 @@ CONFIGURE_ARGS+=--enable-tcp-zebra
 .endif
 
 .if ${PORT_OPTIONS:MDLMALLOC}
-LIB_DEPENDS+=	dlmalloc:${PORTSDIR}/devel/libdlmalloc
+LIB_DEPENDS+=	libdlmalloc.so:${PORTSDIR}/devel/libdlmalloc
 LDFLAGS+=	-ldlmalloc
 SUB_LIST=	RCLDCONFIG=ldconfig
 .else
@@ -148,12 +144,11 @@ pre-everything::
 	@${ECHO} "SYSCONF_DIR       Specify directory for Quagga configuration files"
 	@${ECHO} "LOCALSTATE_DIR    Specify directory for Quagga runtime files"
 
-post-install:
-	@${MKDIR} ${LOCALSTATE_DIR}
-	@${MKDIR} ${SYSCONF_DIR}
-	@${CHOWN} -R ${ENABLE_USER}:${ENABLE_GROUP} ${LOCALSTATE_DIR} \
-		${SYSCONF_DIR}
-	@${CAT} ${PKGMESSAGE}
+post-stage:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libospf.so.0.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libzebra.so.0.0.0
+	${MKDIR} ${STAGEDIR}${LOCALSTATE_DIR}
+	${MKDIR} ${STAGEDIR}${SYSCONF_DIR}
 
 .if !defined(BATCH)
 post-clean:
diff --git a/net/quagga/distinfo b/net/quagga/distinfo
index 952923bf184d..b6ab67710488 100644
--- a/net/quagga/distinfo
+++ b/net/quagga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (quagga-0.99.22.3.tar.gz) = 719c60a54345e281e467d1f523e136ecd76b6da005429ffd498dfae6795526a2
-SIZE (quagga-0.99.22.3.tar.gz) = 2363963
+SHA256 (quagga-0.99.22.4.tar.gz) = cbe48d5cc57bbaa07cfd8362ba598447dc94aa866ddc5794e57172709d36ba79
+SIZE (quagga-0.99.22.4.tar.gz) = 2352406
diff --git a/net/quagga/pkg-plist b/net/quagga/pkg-plist
index 6e9040c3975b..ae197ea8e720 100644
--- a/net/quagga/pkg-plist
+++ b/net/quagga/pkg-plist
@@ -10,17 +10,17 @@ sbin/watchquagga
 sbin/zebra
 bin/vtysh
 lib/libospf.a
-lib/libospf.la
 lib/libospf.so
 lib/libospf.so.0
+lib/libospf.so.0.0.0
 %%OSPFAPI%%lib/libospfapiclient.a
 %%OSPFAPI%%lib/libospfapiclient.la
 %%OSPFAPI%%lib/libospfapiclient.so
 %%OSPFAPI%%lib/libospfapiclient.so.0
 lib/libzebra.a
-lib/libzebra.la
 lib/libzebra.so
 lib/libzebra.so.0
+lib/libzebra.so.0.0.0
 include/quagga/buffer.h
 include/quagga/checksum.h
 include/quagga/command.h
@@ -79,11 +79,18 @@ include/quagga/zebra.h
 %%EXAMPLESDIR%%/ripngd.conf.sample
 %%EXAMPLESDIR%%/vtysh.conf.sample
 %%EXAMPLESDIR%%/zebra.conf.sample
+man/man1/vtysh.1.gz
+man/man8/bgpd.8.gz
+man/man8/ospf6d.8.gz
+man/man8/ospfd.8.gz
+man/man8/ripd.8.gz
+man/man8/ripngd.8.gz
+man/man8/watch%%ENABLE_USER%%.8.gz
+man/man8/zebra.8.gz
 @dirrm include/quagga/ospfd
 %%OSPFAPI%%@dirrm include/quagga/ospfapi
 @dirrm include/quagga
 @dirrm share/examples/quagga
 @dirrm etc/quagga
 @dirrmtry %%LOCALSTATE_DIR%%
-@exec mkdir -p %%LOCALSTATE_DIR%%
-@exec chown -R %%ENABLE_USER%%:%%ENABLE_GROUP%% %%LOCALSTATE_DIR%% %%SYSCONF_DIR%%
+@dirrmtry %%ETCDIR%%