svn commit: r489676 - head/net/quagga

[Kurt Jaeger]

Author: pi
Date: Tue Jan  8 12:47:04 2019
New Revision: 489676
URL: https://svnweb.freebsd.org/changeset/ports/489676

Log:
  net/quagga: fix EXAMPLES option
  
  PR:		234738
  Submitted by:	tobik

Modified:
  head/net/quagga/Makefile
  head/net/quagga/pkg-plist

Modified: head/net/quagga/Makefile
==============================================================================
--- head/net/quagga/Makefile	Tue Jan  8 12:23:10 2019	(r489675)
+++ head/net/quagga/Makefile	Tue Jan  8 12:47:04 2019	(r489676)
@@ -3,7 +3,7 @@
 
 PORTNAME=	quagga
 PORTVERSION=	1.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net ipv6
 MASTER_SITES=	SAVANNAH
 
@@ -20,7 +20,6 @@ CONFLICTS=	frr3 frr4 frr5 frr6 openbgpd pimd zebra
 USES=		compiler:c11 cpe gmake libtool makeinfo \
 		perl5 readline ssl
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-exampledir=${PREFIX}/share/examples/quagga
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 USE_PERL5=	build
@@ -64,6 +63,9 @@ CONFIGURE_ARGS=	--enable-user=${ENABLE_USER} \
 CONFIGURE_ARGS+=--enable-vty-group=${ENABLE_VTY_GROUP}
 .endif
 
+EXAMPLES_CONFIGURE_ON=	--enable-exampledir=${PREFIX}/share/examples/quagga
+EXAMPLES_CONFIGURE_OFF=	--disable-exampledir
+
 ISISD_CONFIGURE_ENABLE=	isisd
 ISIS_TOPOLOGY_CONFIGURE_ENABLE=	isis-topology
 PIMD_CONFIGURE_ENABLE=	pimd
@@ -102,8 +104,6 @@ pre-everything::
 	@${ECHO} "LOCALSTATE_DIR    Specify directory for Quagga runtime files"
 
 post-install:
-	${MKDIR} ${STAGEDIR}${LOCALSTATE_DIR} ${STAGEDIR}${SYSCONF_DIR} \
-		${STAGEDIR}${EXAMPLESDIR}
-	@${MV} ${STAGEDIR}${SYSCONF_DIR}/* ${STAGEDIR}${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${LOCALSTATE_DIR} ${STAGEDIR}${SYSCONF_DIR}
 
 .include <bsd.port.mk>

Modified: head/net/quagga/pkg-plist
==============================================================================
--- head/net/quagga/pkg-plist	Tue Jan  8 12:23:10 2019	(r489675)
+++ head/net/quagga/pkg-plist	Tue Jan  8 12:47:04 2019	(r489676)
@@ -95,15 +95,15 @@ sbin/ripd
 sbin/ripngd
 sbin/watchquagga
 sbin/zebra
-%%EXAMPLESDIR%%/bgpd.conf.sample
-%%EXAMPLESDIR%%/bgpd.conf.sample2
-%%ISISD%%%%EXAMPLESDIR%%/isisd.conf.sample
-%%EXAMPLESDIR%%/ospf6d.conf.sample
-%%EXAMPLESDIR%%/ospfd.conf.sample
-%%PIMD%%%%EXAMPLESDIR%%/pimd.conf.sample
-%%EXAMPLESDIR%%/ripd.conf.sample
-%%EXAMPLESDIR%%/ripngd.conf.sample
-%%EXAMPLESDIR%%/vtysh.conf.sample
-%%EXAMPLESDIR%%/zebra.conf.sample
+%%EXAMPLES%%%%EXAMPLESDIR%%/bgpd.conf.sample
+%%EXAMPLES%%%%EXAMPLESDIR%%/bgpd.conf.sample2
+%%EXAMPLES%%%%ISISD%%%%EXAMPLESDIR%%/isisd.conf.sample
+%%EXAMPLES%%%%EXAMPLESDIR%%/ospf6d.conf.sample
+%%EXAMPLES%%%%EXAMPLESDIR%%/ospfd.conf.sample
+%%EXAMPLES%%%%PIMD%%%%EXAMPLESDIR%%/pimd.conf.sample
+%%EXAMPLES%%%%EXAMPLESDIR%%/ripd.conf.sample
+%%EXAMPLES%%%%EXAMPLESDIR%%/ripngd.conf.sample
+%%EXAMPLES%%%%EXAMPLESDIR%%/vtysh.conf.sample
+%%EXAMPLES%%%%EXAMPLESDIR%%/zebra.conf.sample
 @dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%LOCALSTATE_DIR%%
 @dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%SYSCONF_DIR%%