3 files changed, 20 insertions, 4 deletions

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>