Attachment 84205 Details for Bug 120163 – ndpmon-1.3d.patch

[patch] ndpmon-1.3d.patch

ndpmon-1.3d.patch (text/plain), 5.01 KB, created by Janos Mohacsi on 2008-01-30 18:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Janos Mohacsi

Created: 2008-01-30 18:20:01 UTC

Size: 5.01 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/Makefile /usr/ports/net-mgmt/ndpmon/Makefile
>--- /usr/ports/net-mgmt/ndpmon.orig/Makefile	2007-10-26 15:33:43.000000000 +0200
>+++ /usr/ports/net-mgmt/ndpmon/Makefile	2008-01-30 19:01:28.000000000 +0100
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	ndpmon
>-PORTVERSION=	1.3a
>+PORTVERSION=	1.3d
> CATEGORIES=	net-mgmt ipv6
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -21,7 +21,7 @@
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	OSTYPE=FreeBSD
>-CONFIGURE_ARGS=	--with-var-datadir=${PREFIX}/var
>+CONFIGURE_ARGS=	--with-var-datadir=${PREFIX}/var --with-confdir=${PREFIX}/etc
> 
> MAN8=		ndpmon.8
> PORTDOCS=	INSTALL README
>@@ -29,7 +29,6 @@
> 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)
>@@ -46,8 +45,8 @@
> 		${DATADIR}
> 	${MKDIR} ${PREFIX}/etc/ndpmon
> 	${INSTALL_DATA} ${WRKSRC}/config_ndpmon.xml ${PREFIX}/etc/ndpmon/config_ndpmon.xml-dist
>-	${MKDIR} ${PREFIX}/var
>-	${INSTALL_DATA} ${WRKSRC}/neighbor_list.xml ${PREFIX}/var/ndpmon_neighbor_list.xml
>+	${MKDIR} ${PREFIX}/var/ndpmon
>+	${INSTALL_DATA} ${WRKSRC}/neighbor_list.xml ${PREFIX}/var/ndpmon/neighbor_list.xml
> 
> .if !defined(NOPORTDOCS)
> post-install:
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/distinfo /usr/ports/net-mgmt/ndpmon/distinfo
>--- /usr/ports/net-mgmt/ndpmon.orig/distinfo	2007-10-25 23:36:44.000000000 +0200
>+++ /usr/ports/net-mgmt/ndpmon/distinfo	2008-01-29 19:23:29.000000000 +0100
>@@ -1,3 +1,3 @@
>-MD5 (ndpmon-1.3a.tgz) = 3f0532fa61a0ac5bd5123eab2e95c9c2
>-SHA256 (ndpmon-1.3a.tgz) = 0425914ac03c9915ba8d3d54f2d93d6103f4d5346d9b544ce6fbe26203764675
>-SIZE (ndpmon-1.3a.tgz) = 298651
>+MD5 (ndpmon-1.3d.tgz) = 82ff35019ad6e9c03fecb350147e7322
>+SHA256 (ndpmon-1.3d.tgz) = d1bf47b133ab78d9e558104cfe09f8c40e8b9a37324383749a43f4d6f56747a1
>+SIZE (ndpmon-1.3d.tgz) = 247919
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/ndpmonitor.in /usr/ports/net-mgmt/ndpmon/files/ndpmonitor.in
>--- /usr/ports/net-mgmt/ndpmon.orig/files/ndpmonitor.in	2007-08-29 10:32:26.000000000 +0200
>+++ /usr/ports/net-mgmt/ndpmon/files/ndpmonitor.in	2008-01-30 19:04:51.000000000 +0100
>@@ -12,7 +12,7 @@
> rcvar=`set_rcvar`
> 
> command="%%PREFIX%%/sbin/ndpmon"
>-required_files=%%PREFIX%%/etc/config_ndpmon.xml
>+required_files=%%PREFIX%%/etc/ndpmon/config_ndpmon.xml
> 
> load_rc_config $name
> 
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/patch-ndpmon__defs.h.in /usr/ports/net-mgmt/ndpmon/files/patch-ndpmon__defs.h.in
>--- /usr/ports/net-mgmt/ndpmon.orig/files/patch-ndpmon__defs.h.in	2007-10-26 15:33:43.000000000 +0200
>+++ /usr/ports/net-mgmt/ndpmon/files/patch-ndpmon__defs.h.in	2008-01-30 18:50:42.000000000 +0100
>@@ -1,17 +1,20 @@
> 
>-$FreeBSD: ports/net-mgmt/ndpmon/files/patch-ndpmon__defs.h.in,v 1.1 2007/10/26 13:33:43 pav Exp $
>+$FreeBSD$
> 
> --- ndpmon_defs.h.in.orig
> +++ ndpmon_defs.h.in
>-@@ -10,9 +10,9 @@
>+@@ -10,11 +10,11 @@
>  #endif
>  
>- #define _CONFIG_PATH_ "@prefix@/etc/ndpmon/config_ndpmon.xml"
>--#define _CONFIG_DTD_PATH_ "@prefix@/etc/ndpmon/config_ndpmon.dtd"
>+ #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;
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/patch-neighbor__list.xml.in /usr/ports/net-mgmt/ndpmon/files/patch-neighbor__list.xml.in
>--- /usr/ports/net-mgmt/ndpmon.orig/files/patch-neighbor__list.xml.in	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/net-mgmt/ndpmon/files/patch-neighbor__list.xml.in	2008-01-30 19:08:59.000000000 +0100
>@@ -0,0 +1,13 @@
>+
>+$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>
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/pkg-plist /usr/ports/net-mgmt/ndpmon/pkg-plist
>--- /usr/ports/net-mgmt/ndpmon.orig/pkg-plist	2007-10-26 00:33:32.000000000 +0200
>+++ /usr/ports/net-mgmt/ndpmon/pkg-plist	2008-01-30 18:58:26.000000000 +0100
>@@ -4,7 +4,8 @@
> %%DATADIR%%/demopipeprogram.pl.sample
> %%DATADIR%%/create_html_table.py
> @dirrmtry %%DATADIR%%
>-var/ndpmon_neighbor_list.xml
>+var/ndpmon/neighbor_list.xml
>+@dirrmtry var/ndpmon
> @dirrmtry var
> etc/ndpmon/config_ndpmon.xml-dist
> @dirrmtry etc/ndpmon

Actions: View | Diff

Attachments on bug 120163: 84205