6 files changed, 29 insertions, 13 deletions

diff --git a/net-mgmt/ndpmon/Makefile b/net-mgmt/ndpmon/Makefile
index ebeba1d701ce..fa827a18481f 100644
--- a/net-mgmt/ndpmon/Makefile
+++ b/net-mgmt/ndpmon/Makefile
@@ -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 @@ USE_RC_SUBR=	ndpmonitor
 
 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 @@ 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)
@@ -46,8 +45,8 @@ do-install:
 		${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 --git a/net-mgmt/ndpmon/distinfo b/net-mgmt/ndpmon/distinfo
index ec17f9df936d..1f301460d93e 100644
--- a/net-mgmt/ndpmon/distinfo
+++ b/net-mgmt/ndpmon/distinfo
@@ -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 --git a/net-mgmt/ndpmon/files/ndpmonitor.in b/net-mgmt/ndpmon/files/ndpmonitor.in
index 02989d32bd9d..f885bb185575 100644
--- a/net-mgmt/ndpmon/files/ndpmonitor.in
+++ b/net-mgmt/ndpmon/files/ndpmonitor.in
@@ -12,7 +12,7 @@ name="ndpmonitor"
 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 --git a/net-mgmt/ndpmon/files/patch-ndpmon__defs.h.in b/net-mgmt/ndpmon/files/patch-ndpmon__defs.h.in
index 68373c9d6cd9..77aaf9cf9730 100644
--- a/net-mgmt/ndpmon/files/patch-ndpmon__defs.h.in
+++ b/net-mgmt/ndpmon/files/patch-ndpmon__defs.h.in
@@ -3,15 +3,18 @@ $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 --git a/net-mgmt/ndpmon/files/patch-neighbor__list.xml.in b/net-mgmt/ndpmon/files/patch-neighbor__list.xml.in
new file mode 100644
index 000000000000..e494b4170071
--- /dev/null
+++ b/net-mgmt/ndpmon/files/patch-neighbor__list.xml.in
@@ -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 --git a/net-mgmt/ndpmon/pkg-plist b/net-mgmt/ndpmon/pkg-plist
index b7e317dbd014..fe4be9167efb 100644
--- a/net-mgmt/ndpmon/pkg-plist
+++ b/net-mgmt/ndpmon/pkg-plist
@@ -4,7 +4,8 @@ sbin/ndpmon
 %%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