Attachment #125999 for bug #169716

View | Details | Raw Unified | Return to bug 169716
Collapse All | Expand All

Lines 3-9 Link Here

(-)ndpmon/Makefile (-3 / +15 lines)
3		3
4	PORTNAME= ndpmon	4	PORTNAME= ndpmon
5	PORTVERSION= 1.4.0	5	PORTVERSION= 1.4.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= net-mgmt ipv6	7	CATEGORIES= net-mgmt ipv6
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.4/	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.4/
9	EXTRACT_SUFX= .tgz	9	EXTRACT_SUFX= .tgz
Lines 18-24 Link Here
18	OPTIONS_DEFAULT=	18	OPTIONS_DEFAULT=
19		19
20	PY4SUITE_DESC= Depend on py-4suite-xml (for generating HTML)	20	PY4SUITE_DESC= Depend on py-4suite-xml (for generating HTML)
21	MACRESOLV_DESC= Enable MAC Manufacturer Resolution	21	MACRESOLV_DESC= Enable MAC Manufacturer Resolution (use p5-libwww)
22		22
23	.include <bsd.port.options.mk>	23	.include <bsd.port.options.mk>
24		24
Lines 45-52 Link Here
45		45
46	.if ${PORT_OPTIONS:MMACRESOLV}	46	.if ${PORT_OPTIONS:MMACRESOLV}
47	CONFIGURE_ARGS+=--enable-mac-resolv	47	CONFIGURE_ARGS+=--enable-mac-resolv
		48	BUILD_DEPENDS+= p5-libwww>=6.05:${PORTSDIR}/www/p5-libwww
		49	RUN_DEPENDS+= p5-libwww>=6.05:${PORTSDIR}/www/p5-libwww
		50	PLIST_SUB+= MACRESOLV=""
48	.else	51	.else
49	CONFIGURE_ARGS+=--disable-mac-resolv	52	PLIST_SUB+= MACRESOLV="@comment "
50	.endif	53	.endif
51		54
52	post-patch:	55	post-patch:
Lines 69-74 Link Here
69	.if ${PORT_OPTIONS:MPY4SUITE}	72	.if ${PORT_OPTIONS:MPY4SUITE}
70	${INSTALL_SCRIPT} ${WRKSRC}/create_html_table.py ${DATADIR}	73	${INSTALL_SCRIPT} ${WRKSRC}/create_html_table.py ${DATADIR}
71	.endif	74	.endif
		75	.if ${PORT_OPTIONS:MMACRESOLV}
		76	${MKDIR} ${DATADIR}/plugins/mac_resolv
		77	${INSTALL_SCRIPT} ${WRKSRC}/plugins/mac_resolv/make-manuf ${DATADIR}/plugins/mac_resolv
		78	${INSTALL_DATA} ${WRKSRC}/plugins/mac_resolv/*.tmpl ${DATADIR}/plugins/mac_resolv
		79	${INSTALL_DATA} ${WRKSRC}/plugins/mac_resolv/manuf ${DATADIR}/plugins/mac_resolv
		80	.endif
72		81
73	${MKDIR} ${ETCDIR}	82	${MKDIR} ${ETCDIR}
74	${INSTALL_DATA} ${WRKSRC}/config_ndpmon.xml ${ETCDIR}/config_ndpmon.xml-dist	83	${INSTALL_DATA} ${WRKSRC}/config_ndpmon.xml ${ETCDIR}/config_ndpmon.xml-dist
Lines 81-85 Link Here
81	${MKDIR} ${DOCSDIR}	90	${MKDIR} ${DOCSDIR}
82	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}	91	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
83	.endif	92	.endif
		93	.if ${PORT_OPTIONS:MMACRESOLV}
		94	@${CAT} ${PKGMESSAGE}.MACRESOLV
		95	.endif
84		96
85	.include <bsd.port.mk>	97	.include <bsd.port.mk>

Lines 1-8 Link Here

(-)ndpmon/files/patch-config__ndpmon.xml.in (-5 / +10 lines)
1		1	--- config_ndpmon.xml.in.orig 2009-08-13 11:22:21.000000000 +0200
2	$FreeBSD: head/net-mgmt/ndpmon/files/patch-config__ndpmon.xml.in 300897 2012-07-14 14:29:18Z beat $	2	+++ config_ndpmon.xml.in 2013-06-10 00:36:17.000000000 +0200
3		3	@@ -1,6 +1,6 @@
4	--- config_ndpmon.xml.in.orig	4	<?xml version="1.0" encoding="ISO-8859-1"?>
5	+++ config_ndpmon.xml.in	5	<?xml-stylesheet type="text/xsl" href="config.xsl" ?>
		6	-<!DOCTYPE config_ndpmon SYSTEM "@CONFDIR@/ndpmon/config_ndpmon.dtd">
		7	+<!DOCTYPE config_ndpmon SYSTEM "%%PREFIX%%/share/ndpmon/config_ndpmon.dtd">
		8	<config_ndpmon>
		9	<ignor_autoconf>1</ignor_autoconf>
		10	<syslog_facility>LOG_LOCAL1</syslog_facility>
6	@@ -8,12 +8,12 @@	11	@@ -8,12 +8,12 @@
7	<actions_low_pri>	12	<actions_low_pri>
8	<sendmail>1</sendmail>	13	<sendmail>1</sendmail>




--- ndpmon_defs.h.in.orig	2009-08-13 11:22:21.000000000 +0200
+++ ndpmon_defs.h.in	2013-06-09 22:25:30.000000000 +0200
@@ -9,12 +9,12 @@
 #include "./plugins/mac_resolv/mac_resolv.h"
+++ ndpmon_defs.h.in
@@ -10,11 +10,11 @@
 #endif
 
-#define _CONFIG_PATH_ "@CONFDIR@/ndpmon/config_ndpmon.xml"
-#define _CONFIG_DTD_PATH_ "@CONFDIR@/ndpmon/config_ndpmon.dtd"
+#define _CONFIG_PATH_ "@prefix@/etc/ndpmon/config_ndpmon.xml"
+#define _CONFIG_DTD_PATH_ "@prefix@/share/ndpmon/config_ndpmon.dtd"
 #define _CACHE_PATH_ "@VARDATADIR@/ndpmon/neighbor_list.xml"
-#define _CACHE_DTD_PATH_ "@VARDATADIR@/ndpmon/neighbor_list.dtd"

Line 0 Link Here

(-)ndpmon/pkg-message.MACRESOLV (+10 lines)
	1
	2	*****************************************************************
	3	* *
	4	* To update to local MAC database run the following commands: *
	5	* *
	6	* cd /usr/local/share/ndpmon/plugins/mac_resolv/ *
	7	* ./make-manuf *
	8	* /usr/local/etc/rc.d/ndpmonitor restart *
	9	* *
	10	*****************************************************************

Lines 4-11 Link Here

(-)ndpmon/pkg-plist (+6 lines)
4	%%DATADIR%%/demopipeprogram.pl.sample	4	%%DATADIR%%/demopipeprogram.pl.sample
5	%%DATADIR%%/neighbor_list.dtd	5	%%DATADIR%%/neighbor_list.dtd
6	%%PY%%%%DATADIR%%/create_html_table.py	6	%%PY%%%%DATADIR%%/create_html_table.py
		7	%%MACRESOLV%%%%DATADIR%%/plugins/mac_resolv/make-manuf
		8	%%MACRESOLV%%%%DATADIR%%/plugins/mac_resolv/manuf.tmpl
		9	%%MACRESOLV%%%%DATADIR%%/plugins/mac_resolv/wka.tmpl
		10	%%MACRESOLV%%%%DATADIR%%/plugins/mac_resolv/manuf
7	var/ndpmon/neighbor_list.xml	11	var/ndpmon/neighbor_list.xml
8	@dirrmtry var/ndpmon	12	@dirrmtry var/ndpmon
9	@dirrmtry var	13	@dirrmtry var
		14	@dirrmtry %%DATADIR%%/plugins/mac_resolv
		15	@dirrmtry %%DATADIR%%/plugins
10	@dirrmtry %%DATADIR%%	16	@dirrmtry %%DATADIR%%
11	@dirrmtry %%ETCDIR%%	17	@dirrmtry %%ETCDIR%%

Return to bug 169716

Lines 1-13 Link Here

(-)ndpmon/files/patch-ndpmon__defs.h.in (-7 / +6 lines)
1		1	--- ndpmon_defs.h.in.orig 2009-08-13 11:22:21.000000000 +0200
2	$FreeBSD: head/net-mgmt/ndpmon/files/patch-ndpmon__defs.h.in 300897 2012-07-14 14:29:18Z beat $	2	+++ ndpmon_defs.h.in 2013-06-09 22:25:30.000000000 +0200
3		3	@@ -9,12 +9,12 @@
4	--- ndpmon_defs.h.in.orig	4	#include "./plugins/mac_resolv/mac_resolv.h"
5	+++ ndpmon_defs.h.in
6	@@ -10,11 +10,11 @@
7	#endif	5	#endif
8		6
9	#define _CONFIG_PATH_ "@CONFDIR@/ndpmon/config_ndpmon.xml"	7	-#define _CONFIG_PATH_ "@CONFDIR@/ndpmon/config_ndpmon.xml"
10	-#define _CONFIG_DTD_PATH_ "@CONFDIR@/ndpmon/config_ndpmon.dtd"	8	-#define _CONFIG_DTD_PATH_ "@CONFDIR@/ndpmon/config_ndpmon.dtd"
		9	+#define _CONFIG_PATH_ "@prefix@/etc/ndpmon/config_ndpmon.xml"
11	+#define _CONFIG_DTD_PATH_ "@prefix@/share/ndpmon/config_ndpmon.dtd"	10	+#define _CONFIG_DTD_PATH_ "@prefix@/share/ndpmon/config_ndpmon.dtd"
12	#define _CACHE_PATH_ "@VARDATADIR@/ndpmon/neighbor_list.xml"	11	#define _CACHE_PATH_ "@VARDATADIR@/ndpmon/neighbor_list.xml"
13	-#define _CACHE_DTD_PATH_ "@VARDATADIR@/ndpmon/neighbor_list.dtd"	12	-#define _CACHE_DTD_PATH_ "@VARDATADIR@/ndpmon/neighbor_list.dtd"