Attachment #84205 for bug #120163

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




#

PORTNAME=	ndpmon
PORTVERSION=	1.3d
CATEGORIES=	net-mgmt ipv6
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}


GNU_CONFIGURE=	yes
CONFIGURE_ENV=	OSTYPE=FreeBSD
CONFIGURE_ARGS=	--with-var-datadir=${PREFIX}/var --with-confdir=${PREFIX}/etc

MAN8=		ndpmon.8
PORTDOCS=	INSTALL README

post-patch:
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
		${WRKSRC}/ndpmon.8 \
		${WRKSRC}/config_ndpmon.xml \
		${WRKSRC}/create_html_table.py \
		${WRKSRC}/demopipeprogram.pl.sample
	(cd ${WRKSRC}; ${MAKE} clean)

		${DATADIR}
	${MKDIR} ${PREFIX}/etc/ndpmon
	${INSTALL_DATA} ${WRKSRC}/config_ndpmon.xml ${PREFIX}/etc/ndpmon/config_ndpmon.xml-dist
	${MKDIR} ${PREFIX}/var/ndpmon
	${INSTALL_DATA} ${WRKSRC}/neighbor_list.xml ${PREFIX}/var/ndpmon/neighbor_list.xml

.if !defined(NOPORTDOCS)
post-install:

Lines 1-3 Link Here

(-)/usr/ports/net-mgmt/ndpmon/distinfo (-3 / +3 lines)
1	MD5 (ndpmon-1.3a.tgz) = 3f0532fa61a0ac5bd5123eab2e95c9c2	1	MD5 (ndpmon-1.3d.tgz) = 82ff35019ad6e9c03fecb350147e7322
2	SHA256 (ndpmon-1.3a.tgz) = 0425914ac03c9915ba8d3d54f2d93d6103f4d5346d9b544ce6fbe26203764675	2	SHA256 (ndpmon-1.3d.tgz) = d1bf47b133ab78d9e558104cfe09f8c40e8b9a37324383749a43f4d6f56747a1
3	SIZE (ndpmon-1.3a.tgz) = 298651	3	SIZE (ndpmon-1.3d.tgz) = 247919

Lines 12-18 Link Here

(-)/usr/ports/net-mgmt/ndpmon/files/ndpmonitor.in (-1 / +1 lines)
12	rcvar=`set_rcvar`	12	rcvar=`set_rcvar`
13		13
14	command="%%PREFIX%%/sbin/ndpmon"	14	command="%%PREFIX%%/sbin/ndpmon"
15	required_files=%%PREFIX%%/etc/config_ndpmon.xml	15	required_files=%%PREFIX%%/etc/ndpmon/config_ndpmon.xml
16		16
17	load_rc_config $name	17	load_rc_config $name
18		18





$FreeBSD$

--- ndpmon_defs.h.in.orig
+++ 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_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"
+#define _CACHE_DTD_PATH_ "@prefix@/share/ndpmon/neighbor_list.dtd"
 #define _DISCOVERY_HISTORY_PATH_ "@VARDATADIR@/ndpmon/discovery_history.dat"
-#define _MANUF_PATH_ "@prefix@/ndpmon/plugins/mac_resolv/manuf"
+#define _MANUF_PATH_ "@prefix@/share/ndpmon/plugins/mac_resolv/manuf"
 
 extern int DEBUG;
 extern int learning;





$FreeBSD$

--- neighbor_list.xml.in.orig
+++ neighbor_list.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <?xml-stylesheet type="text/xsl" href="neighbor.xsl" ?>
 <!DOCTYPE neighbor_list
-SYSTEM "@VARDATADIR@/ndpmon/neighbor_list.dtd">
+SYSTEM "@prefix@/share/ndpmon/neighbor_list.dtd">
 <neighbor_list>
 </neighbor_list>

Lines 4-10 Link Here

(-)/usr/ports/net-mgmt/ndpmon/pkg-plist (-1 / +2 lines)
4	%%DATADIR%%/demopipeprogram.pl.sample	4	%%DATADIR%%/demopipeprogram.pl.sample
5	%%DATADIR%%/create_html_table.py	5	%%DATADIR%%/create_html_table.py
6	@dirrmtry %%DATADIR%%	6	@dirrmtry %%DATADIR%%
7	var/ndpmon_neighbor_list.xml	7	var/ndpmon/neighbor_list.xml
		8	@dirrmtry var/ndpmon
8	@dirrmtry var	9	@dirrmtry var
9	etc/ndpmon/config_ndpmon.xml-dist	10	etc/ndpmon/config_ndpmon.xml-dist
10	@dirrmtry etc/ndpmon	11	@dirrmtry etc/ndpmon

Return to bug 120163

Lines 6-12 Link Here

(-)/usr/ports/net-mgmt/ndpmon/Makefile (-5 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= ndpmon	8	PORTNAME= ndpmon
9	PORTVERSION= 1.3a	9	PORTVERSION= 1.3d
10	CATEGORIES= net-mgmt ipv6	10	CATEGORIES= net-mgmt ipv6
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 21-27 Link Here
21		21
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23	CONFIGURE_ENV= OSTYPE=FreeBSD	23	CONFIGURE_ENV= OSTYPE=FreeBSD
24	CONFIGURE_ARGS= --with-var-datadir=${PREFIX}/var	24	CONFIGURE_ARGS= --with-var-datadir=${PREFIX}/var --with-confdir=${PREFIX}/etc
25		25
26	MAN8= ndpmon.8	26	MAN8= ndpmon.8
27	PORTDOCS= INSTALL README	27	PORTDOCS= INSTALL README
Lines 29-35 Link Here
29	post-patch:	29	post-patch:
30	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' \	30	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' \
31	${WRKSRC}/ndpmon.8 \	31	${WRKSRC}/ndpmon.8 \
32	${WRKSRC}/config_ndpmon.xml \
33	${WRKSRC}/create_html_table.py \	32	${WRKSRC}/create_html_table.py \
34	${WRKSRC}/demopipeprogram.pl.sample	33	${WRKSRC}/demopipeprogram.pl.sample
35	(cd ${WRKSRC}; ${MAKE} clean)	34	(cd ${WRKSRC}; ${MAKE} clean)
Lines 46-53 Link Here
46	${DATADIR}	45	${DATADIR}
47	${MKDIR} ${PREFIX}/etc/ndpmon	46	${MKDIR} ${PREFIX}/etc/ndpmon
48	${INSTALL_DATA} ${WRKSRC}/config_ndpmon.xml ${PREFIX}/etc/ndpmon/config_ndpmon.xml-dist	47	${INSTALL_DATA} ${WRKSRC}/config_ndpmon.xml ${PREFIX}/etc/ndpmon/config_ndpmon.xml-dist
49	${MKDIR} ${PREFIX}/var	48	${MKDIR} ${PREFIX}/var/ndpmon
50	${INSTALL_DATA} ${WRKSRC}/neighbor_list.xml ${PREFIX}/var/ndpmon_neighbor_list.xml	49	${INSTALL_DATA} ${WRKSRC}/neighbor_list.xml ${PREFIX}/var/ndpmon/neighbor_list.xml
51		50
52	.if !defined(NOPORTDOCS)	51	.if !defined(NOPORTDOCS)
53	post-install:	52	post-install:

Lines 1-17 Link Here

(-)/usr/ports/net-mgmt/ndpmon/files/patch-ndpmon__defs.h.in (-4 / +7 lines)
1		1
2	$FreeBSD: ports/net-mgmt/ndpmon/files/patch-ndpmon__defs.h.in,v 1.1 2007/10/26 13:33:43 pav Exp $	2	$FreeBSD$
3		3
4	--- ndpmon_defs.h.in.orig	4	--- ndpmon_defs.h.in.orig
5	+++ ndpmon_defs.h.in	5	+++ ndpmon_defs.h.in
6	@@ -10,9 +10,9 @@	6	@@ -10,11 +10,11 @@
7	#endif	7	#endif
8		8
9	#define _CONFIG_PATH_ "@prefix@/etc/ndpmon/config_ndpmon.xml"	9	#define _CONFIG_PATH_ "@CONFDIR@/ndpmon/config_ndpmon.xml"
10	-#define _CONFIG_DTD_PATH_ "@prefix@/etc/ndpmon/config_ndpmon.dtd"	10	-#define _CONFIG_DTD_PATH_ "@CONFDIR@/ndpmon/config_ndpmon.dtd"
11	+#define _CONFIG_DTD_PATH_ "@prefix@/share/ndpmon/config_ndpmon.dtd"	11	+#define _CONFIG_DTD_PATH_ "@prefix@/share/ndpmon/config_ndpmon.dtd"
12	#define _CACHE_PATH_ "@VARDATADIR@/ndpmon/neighbor_list.xml"	12	#define _CACHE_PATH_ "@VARDATADIR@/ndpmon/neighbor_list.xml"
13	-#define _CACHE_DTD_PATH_ "@VARDATADIR@/ndpmon/neighbor_list.dtd"	13	-#define _CACHE_DTD_PATH_ "@VARDATADIR@/ndpmon/neighbor_list.dtd"
14	+#define _CACHE_DTD_PATH_ "@prefix@/share/ndpmon/neighbor_list.dtd"	14	+#define _CACHE_DTD_PATH_ "@prefix@/share/ndpmon/neighbor_list.dtd"
15	#define _DISCOVERY_HISTORY_PATH_ "@VARDATADIR@/ndpmon/discovery_history.dat"	15	#define _DISCOVERY_HISTORY_PATH_ "@VARDATADIR@/ndpmon/discovery_history.dat"
		16	-#define _MANUF_PATH_ "@prefix@/ndpmon/plugins/mac_resolv/manuf"
		17	+#define _MANUF_PATH_ "@prefix@/share/ndpmon/plugins/mac_resolv/manuf"
16		18
17	extern int DEBUG;	19	extern int DEBUG;
		20	extern int learning;

Line 0 Link Here

(-)/usr/ports/net-mgmt/ndpmon/files/patch-neighbor__list.xml.in (+13 lines)
	1
	2	$FreeBSD$
	3
	4	--- neighbor_list.xml.in.orig
	5	+++ neighbor_list.xml.in
	6	@@ -1,6 +1,6 @@
	7	<?xml version="1.0" encoding="ISO-8859-1"?>
	8	<?xml-stylesheet type="text/xsl" href="neighbor.xsl" ?>
	9	<!DOCTYPE neighbor_list
	10	-SYSTEM "@VARDATADIR@/ndpmon/neighbor_list.dtd">
	11	+SYSTEM "@prefix@/share/ndpmon/neighbor_list.dtd">
	12	<neighbor_list>
	13	</neighbor_list>