svn commit: r368538 - in head: . net-mgmt net-mgmt/ndpmon net-mgmt/ndpmon/files

Kurt Jaeger pi at FreeBSD.org
Fri Sep 19 05:16:38 UTC 2014 

Author: pi
Date: Fri Sep 19 05:16:36 2014
New Revision: 368538
URL: http://svnweb.freebsd.org/changeset/ports/368538
QAT: https://qat.redports.org/buildarchive/r368538/

Log:
  net-mgmt/ndpmon: resurrect staged ndpmon, take maintainership
  
  Reviewed by:	mat

Added:
  head/net-mgmt/ndpmon/
     - copied from r366684, head/net-mgmt/ndpmon/
  head/net-mgmt/ndpmon/files/patch-plugins__mac_resolv__Makefile.in   (contents, props changed)
  head/net-mgmt/ndpmon/files/patch-plugins__mac_resolv__make-manuf
     - copied unchanged from r366684, head/net-mgmt/ndpmon/files/patch-plugins_mac__resolv_make-manuf
Deleted:
  head/net-mgmt/ndpmon/files/patch-plugins_mac__resolv_make-manuf
Modified:
  head/MOVED
  head/net-mgmt/Makefile
  head/net-mgmt/ndpmon/Makefile
  head/net-mgmt/ndpmon/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri Sep 19 01:27:24 2014	(r368537)
+++ head/MOVED	Fri Sep 19 05:16:36 2014	(r368538)
@@ -6756,7 +6756,6 @@ net-mgmt/nagios-check_kumofs||2014-09-01
 net-mgmt/nagios-portaudit||2014-09-01|Not staged
 net-mgmt/nagios-silfreed-plugins||2014-09-01|Not staged
 net-mgmt/nagiostat||2014-09-01|Not staged
-net-mgmt/ndpmon||2014-09-01|Not staged
 net-mgmt/netams-front||2014-09-01|Not staged
 net-mgmt/openvmps||2014-09-01|Not staged
 net-mgmt/ramond||2014-09-01|Not staged

Modified: head/net-mgmt/Makefile
==============================================================================
--- head/net-mgmt/Makefile	Fri Sep 19 01:27:24 2014	(r368537)
+++ head/net-mgmt/Makefile	Fri Sep 19 05:16:36 2014	(r368538)
@@ -140,6 +140,7 @@
     SUBDIR += nat
     SUBDIR += nbtscan
     SUBDIR += ndoutils
+    SUBDIR += ndpmon
     SUBDIR += nedi
     SUBDIR += nefu
     SUBDIR += net-snmp

Modified: head/net-mgmt/ndpmon/Makefile
==============================================================================
--- head/net-mgmt/ndpmon/Makefile	Sat Aug 30 21:49:21 2014	(r366684)
+++ head/net-mgmt/ndpmon/Makefile	Fri Sep 19 05:16:36 2014	(r368538)
@@ -3,11 +3,11 @@
 
 PORTNAME=	ndpmon
 PORTVERSION=	1.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.4/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	pi at FreeBSD.org
 COMMENT=	On-link icmpv6 message monitoring and reporting daemon
 
 LICENSE=	LGPL21
@@ -19,7 +19,6 @@ OPTIONS_DEFAULT=	
 PY4SUITE_DESC=		Depend on py-4suite-xml (for generating HTML)
 MACRESOLV_DESC=		Enable MAC Manufacturer Resolution (use p5-libwww)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPY4SUITE}
@@ -40,7 +39,6 @@ CONFIGURE_ENV=	OSTYPE=FreeBSD
 CONFIGURE_ARGS=	--with-var-datadir=${PREFIX}/var --with-confdir=${ETCDIR} \
 		--with-libxml2=${LOCALBASE} --cache-file=/dev/null
 
-MAN8=		ndpmon.8
 PORTDOCS=	INSTALL README
 
 .if ${PORT_OPTIONS:MMACRESOLV}
@@ -63,32 +61,31 @@ post-patch:
 	(cd ${WRKSRC}; ${MAKE} clean)
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/ndpmon.8 ${PREFIX}/man/man8
-	${INSTALL_PROGRAM} ${WRKSRC}/ndpmon ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/ndpmon.8 ${STAGEDIR}${PREFIX}/man/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/ndpmon ${STAGEDIR}${PREFIX}/sbin
 
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.dtd ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/demopipeprogram.pl.sample ${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.dtd ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/demopipeprogram.pl.sample ${STAGEDIR}${DATADIR}
 .if ${PORT_OPTIONS:MPY4SUITE}
-	${INSTALL_SCRIPT} ${WRKSRC}/create_html_table.py ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/create_html_table.py ${STAGEDIR}${DATADIR}
 .endif
 .if ${PORT_OPTIONS:MMACRESOLV}
-	${MKDIR} ${DATADIR}/plugins/mac_resolv
-	${INSTALL_SCRIPT} ${WRKSRC}/plugins/mac_resolv/make-manuf ${DATADIR}/plugins/mac_resolv
-	${INSTALL_DATA} ${WRKSRC}/plugins/mac_resolv/*.tmpl ${DATADIR}/plugins/mac_resolv
-	${INSTALL_DATA} ${WRKSRC}/plugins/mac_resolv/manuf ${DATADIR}/plugins/mac_resolv
+	${MKDIR} ${STAGEDIR}${DATADIR}/plugins/mac_resolv
+	${INSTALL_SCRIPT} ${WRKSRC}/plugins/mac_resolv/make-manuf ${STAGEDIR}${DATADIR}/plugins/mac_resolv
+	${INSTALL_DATA} ${WRKSRC}/plugins/mac_resolv/*.tmpl ${STAGEDIR}${DATADIR}/plugins/mac_resolv
+	${INSTALL_DATA} ${WRKSRC}/plugins/mac_resolv/manuf ${STAGEDIR}${DATADIR}/plugins/mac_resolv
 .endif
 
-	${MKDIR} ${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/config_ndpmon.xml ${ETCDIR}/config_ndpmon.xml-dist
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/config_ndpmon.xml ${STAGEDIR}${ETCDIR}/config_ndpmon.xml-dist
 
-	${MKDIR} ${PREFIX}/var/ndpmon
-	${INSTALL_DATA} ${WRKSRC}/neighbor_list.xml ${PREFIX}/var/ndpmon/neighbor_list.xml
+	${MKDIR} ${STAGEDIR}${PREFIX}/var/ndpmon
+	${INSTALL_DATA} ${WRKSRC}/neighbor_list.xml ${STAGEDIR}${PREFIX}/var/ndpmon/neighbor_list.xml
 
 .if ${PORT_OPTIONS:MDOCS}
-post-install:
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MMACRESOLV}
 	@${CAT} ${PKGMESSAGE}.MACRESOLV

Added: head/net-mgmt/ndpmon/files/patch-plugins__mac_resolv__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/ndpmon/files/patch-plugins__mac_resolv__Makefile.in	Fri Sep 19 05:16:36 2014	(r368538)
@@ -0,0 +1,9 @@
+--- plugins/mac_resolv/Makefile.in.orig	2014-09-05 10:53:57 UTC
++++ plugins/mac_resolv/Makefile.in
+@@ -7,5 +7,5 @@
+ 	-rm -rf *~ *.o 
+ 
+ mac_resolv.o: mac_resolv.c
+-	-./make-manuf
++	-perl ./make-manuf
+ 	$(CC) $(FLAGS) `xml2-config  --cflags` -c mac_resolv.c -o mac_resolv.o

Copied: head/net-mgmt/ndpmon/files/patch-plugins__mac_resolv__make-manuf (from r366684, head/net-mgmt/ndpmon/files/patch-plugins_mac__resolv_make-manuf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/ndpmon/files/patch-plugins__mac_resolv__make-manuf	Fri Sep 19 05:16:36 2014	(r368538, copy of r366684, head/net-mgmt/ndpmon/files/patch-plugins_mac__resolv_make-manuf)
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/mac_resolv/make-manuf.orig
++++ plugins/mac_resolv/make-manuf
+@@ -27,7 +27,7 @@
+ $outfile  = "manuf";
+ $inheader = 1;
+ $ieee_url = "http://standards.ieee.org/regauth/oui/oui_public.txt";
+-$cb_url   = "http://www.cavebear.com/CaveBear/Ethernet/Ethernet.txt";
++$cb_url   = "http://www.cavebear.com/archive/cavebear/Ethernet/Ethernet.txt";
+ %oui_list = ();
+ $hp       = "[0-9a-fA-F]{2}";
+ $oui_re   = "$hp:$hp:$hp";

Modified: head/net-mgmt/ndpmon/pkg-plist
==============================================================================
--- head/net-mgmt/ndpmon/pkg-plist	Sat Aug 30 21:49:21 2014	(r366684)
+++ head/net-mgmt/ndpmon/pkg-plist	Fri Sep 19 05:16:36 2014	(r368538)
@@ -1,5 +1,6 @@
 %%ETCDIR%%/config_ndpmon.xml-dist
 sbin/ndpmon
+man/man8/ndpmon.8.gz
 %%DATADIR%%/config_ndpmon.dtd
 %%DATADIR%%/demopipeprogram.pl.sample
 %%DATADIR%%/neighbor_list.dtd
@@ -11,7 +12,7 @@ sbin/ndpmon
 var/ndpmon/neighbor_list.xml
 @dirrmtry var/ndpmon
 @dirrmtry var
- at dirrmtry %%DATADIR%%/plugins/mac_resolv
- at dirrmtry %%DATADIR%%/plugins
+%%MACRESOLV%%@dirrmtry %%DATADIR%%/plugins/mac_resolv
+%%MACRESOLV%%@dirrmtry %%DATADIR%%/plugins
 @dirrmtry %%DATADIR%%
 @dirrmtry %%ETCDIR%%

More information about the svn-ports-all mailing list