Fix some bugs in this port and work around the issue

of @exec'ing ldconfig after @cwd.  The latter is a hack
that should be revised.

PR:		ports/77194
Submitted by:	maintainer

3 files changed, 34 insertions, 34 deletions

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 2a047923b545..9bade5fabd5e 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quagga
 PORTVERSION=	0.98.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://quagga.net/download/
 
@@ -28,6 +28,7 @@ USE_PERL5_BUILD=	yes
 
 MAN1=		vtysh.1
 MAN8=		bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
+INFO=		quagga
 
 OPTIONS=	ISISD		"Enable experimental ISIS daemon"	off \
 		PAM		"PAM authentication for vtysh"	off \
@@ -48,7 +49,33 @@ CONFIGURE_ARGS+=--includedir=${PREFIX}/include --enable-exampledir=${PREFIX}/sha
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
-SCRIPTS_ENV=	PREFIX=${PREFIX} \
+.if !defined(ENABLE_USER)
+ENABLE_USER=quagga
+.endif
+.if !defined(ENABLE_GROUP)
+ENABLE_GROUP=quagga
+.endif
+
+CONFIGURE_ARGS+=--enable-user=${ENABLE_USER}
+CONFIGURE_ARGS+=--enable-group=${ENABLE_GROUP}
+
+.if !defined(SYSCONF_DIR)
+SYSCONF_DIR=${PREFIX}/etc/quagga
+.endif
+.if !defined(LOCALSTATE_DIR)
+LOCALSTATE_DIR=/var/run/quagga
+.endif
+
+CONFIGURE_ARGS+=--sysconfdir=${SYSCONF_DIR}
+CONFIGURE_ARGS+=--localstatedir=${LOCALSTATE_DIR}
+
+.if defined(ENABLE_VTY_GROUP)
+CONFIGURE_ARGS+=--enable-vty-group=${ENABLE_VTY_GROUP}
+.endif
+
+CONFIGURE_ARGS+=--enable-vtysh
+
+SCRIPTS_ENV=	PREFIX=${PREFIX} PKG_PREFIX=${PREFIX} \
 		SYSCONF_DIR=${SYSCONF_DIR} SYSSTATE_DIR=${SYSSTATE_DIR} \
 		ENABLE_USER=${ENABLE_USER} ENABLE_GROUP=${ENABLE_GROUP}
 
@@ -108,32 +135,6 @@ CONFIGURE_ARGS+=--enable-tcp-signature
 EXTRA_PATCHES+=${PATCHDIR}/extra-tcpmd5-patch-bgpd::bgp_network.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd::bgp_vty.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd::bgpd.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd::bgpd.h ${PATCHDIR}/extra-tcpmd5-patch-configure.ac ${PATCHDIR}/extra-tcpmd5-patch-lib::sockopt.c ${PATCHDIR}/extra-tcpmd5-patch-lib::sockopt.h
 .endif
 
-.if !defined(ENABLE_USER)
-ENABLE_USER=quagga
-.endif
-.if !defined(ENABLE_GROUP)
-ENABLE_GROUP=quagga
-.endif
-
-CONFIGURE_ARGS+=--enable-user=${ENABLE_USER}
-CONFIGURE_ARGS+=--enable-group=${ENABLE_GROUP}
-
-.if !defined(SYSCONF_DIR)
-SYSCONF_DIR=${PREFIX}/etc/quagga
-.endif
-.if !defined(LOCALSTATE_DIR)
-LOCALSTATE_DIR=/var/run/quagga
-.endif
-
-CONFIGURE_ARGS+=--sysconfdir=${SYSCONF_DIR}
-CONFIGURE_ARGS+=--localstatedir=${LOCALSTATE_DIR}
-
-.if defined(ENABLE_VTY_GROUP)
-CONFIGURE_ARGS+=--enable-vty-group=${ENABLE_VTY_GROUP}
-.endif
-
-CONFIGURE_ARGS+=--enable-vtysh
-
 .if ${OSVERSION} >= 500038
 RC_SUBR?=	${DESTDIR}/etc/rc.subr
 RC_DIR=		${DESTDIR}/etc/rc.d
@@ -155,7 +156,8 @@ PLIST_SUB+=	RC_DIR=${RC_DIR} \
 		RC_SUFX=${RC_SUFX} \
 		LOCALSTATE_DIR=${LOCALSTATE_DIR} \
 		ENABLE_USER=${ENABLE_USER} \
-		ENABLE_GROUP=${ENABLE_GROUP}
+		ENABLE_GROUP=${ENABLE_GROUP} \
+		CWD_TRICK=${PREFIX}
 
 pre-everything::
 	@${ECHO} "============================================================="
diff --git a/net/quagga/pkg-install b/net/quagga/pkg-install
index ffcfe38f8a97..87fe58302cfe 100644
--- a/net/quagga/pkg-install
+++ b/net/quagga/pkg-install
@@ -3,7 +3,7 @@
 PATH=/bin:/usr/sbin
 
 if [ -z "${SYSCONF_DIR}" ]; then
-    SYSCONF_DIR=${PREFIX}/etc/quagga
+    SYSCONF_DIR=${PKG_PREFIX}/etc/quagga
 fi
 
 if [ -z "${LOCALSTATE_DIR}" ]; then
@@ -26,7 +26,7 @@ case $2 in
 	    echo "You already have a group \"${ENABLE_GROUP}\", so I will use it."
 	else
 	    if pw groupadd ${ENABLE_GROUP} -g ${GID}; then
-		echo "Added group \"${ENABLE_GROUP}\."
+		echo "Added group \"${ENABLE_GROUP}\"."
 	    else
 		echo "Adding group \"${ENABLE_GROUP}\" failed."
 		exit 1
diff --git a/net/quagga/pkg-plist b/net/quagga/pkg-plist
index 84ae24b40bca..2fdffbcab82b 100644
--- a/net/quagga/pkg-plist
+++ b/net/quagga/pkg-plist
@@ -63,9 +63,6 @@ include/quagga/vty.h
 include/quagga/zassert.h
 include/quagga/zclient.h
 include/quagga/zebra.h
-info/quagga.info
-@unexec install-info --delete %D/info/quagga.info %D/info/dir
-@exec install-info %D/info/quagga.info %D/info/dir
 %%EXAMPLESDIR%%/bgpd.conf.sample
 %%EXAMPLESDIR%%/bgpd.conf.sample2
 %%ISISD_CONF%%
@@ -83,4 +80,5 @@ info/quagga.info
 @cwd %%RC_DIR%%
 quagga%%RC_SUFX%%
 watchquagga%%RC_SUFX%%
+@cwd %%CWD_TRICK%%
 @unexec rmdir %%LOCALSTATE_DIR%% 2>/dev/null || true