6 files changed, 67 insertions, 23 deletions

diff --git a/net-mgmt/ndpmon/Makefile b/net-mgmt/ndpmon/Makefile
index 5200df9c8efe..52b27f416c67 100644
--- a/net-mgmt/ndpmon/Makefile
+++ b/net-mgmt/ndpmon/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	ndpmon
-PORTVERSION=	1.3d
+PORTVERSION=	1.4.0
 CATEGORIES=	net-mgmt ipv6
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.3
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.4/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	janos.mohacsi@bsd.hu
diff --git a/net-mgmt/ndpmon/distinfo b/net-mgmt/ndpmon/distinfo
index 1f301460d93e..db82ea982b37 100644
--- a/net-mgmt/ndpmon/distinfo
+++ b/net-mgmt/ndpmon/distinfo
@@ -1,3 +1,3 @@
-MD5 (ndpmon-1.3d.tgz) = 82ff35019ad6e9c03fecb350147e7322
-SHA256 (ndpmon-1.3d.tgz) = d1bf47b133ab78d9e558104cfe09f8c40e8b9a37324383749a43f4d6f56747a1
-SIZE (ndpmon-1.3d.tgz) = 247919
+MD5 (ndpmon-1.4.0.tgz) = 4e9573a97b972e5a01de276cdabf3921
+SHA256 (ndpmon-1.4.0.tgz) = 132df9d8d3bfa263025131c713278026ae1ee0a423a91652b7a15259363efaeb
+SIZE (ndpmon-1.4.0.tgz) = 321695
diff --git a/net-mgmt/ndpmon/files/patch-config__ndpmon.xml b/net-mgmt/ndpmon/files/patch-config__ndpmon.xml
index 4cb27164e050..ed2bca6e57ef 100644
--- a/net-mgmt/ndpmon/files/patch-config__ndpmon.xml
+++ b/net-mgmt/ndpmon/files/patch-config__ndpmon.xml
@@ -13,16 +13,16 @@ $FreeBSD$
  	<syslog_facility>LOG_LOCAL1</syslog_facility>
 @@ -8,12 +8,12 @@
          <actions_low_pri>
-         	<sendmail>1</sendmail>
-         	<syslog>1</syslog>
--        	<exec_pipe_program>/usr/local/ndpmon/create_html_table.py</exec_pipe_program>
-+        	<exec_pipe_program>%%PREFIX%%/share/ndpmon/create_html_table.py</exec_pipe_program>
+             <sendmail>1</sendmail>
+             <syslog>1</syslog>
+-            <exec_pipe_program>/usr/local/ndpmon/create_html_table.py</exec_pipe_program>
++            <exec_pipe_program>%%PREFIX%%/share/ndpmon/create_html_table.py</exec_pipe_program>
          </actions_low_pri>
          <actions_high_pri>
-         	<sendmail>1</sendmail>
-         	<syslog>1</syslog>
--        	<exec_pipe_program>/usr/local/ndpmon/create_html_table.py</exec_pipe_program>
-+        	<exec_pipe_program>%%PREFIX%%/share/ndpmon/create_html_table.py</exec_pipe_program>
+             <sendmail>1</sendmail>
+             <syslog>1</syslog>
+-            <exec_pipe_program>/usr/local/ndpmon/create_html_table.py</exec_pipe_program>
++            <exec_pipe_program>%%PREFIX%%/share/ndpmon/create_html_table.py</exec_pipe_program>
          </actions_high_pri>
          <use_reverse_hostlookups>1</use_reverse_hostlookups>
-         <routers>
+     <routers>
diff --git a/net-mgmt/ndpmon/files/patch-config__ndpmon.xml.in b/net-mgmt/ndpmon/files/patch-config__ndpmon.xml.in
index a54c29b7e698..417495cc1b61 100644
--- a/net-mgmt/ndpmon/files/patch-config__ndpmon.xml.in
+++ b/net-mgmt/ndpmon/files/patch-config__ndpmon.xml.in
@@ -5,16 +5,16 @@ $FreeBSD$
 +++ config_ndpmon.xml.in
 @@ -8,12 +8,12 @@
          <actions_low_pri>
-         	<sendmail>1</sendmail>
-         	<syslog>1</syslog>
--        	<exec_pipe_program>/usr/local/ndpmon/create_html_table.py</exec_pipe_program>
-+        	<exec_pipe_program>@prefix@/share/ndpmon/create_html_table.py</exec_pipe_program>
+             <sendmail>1</sendmail>
+             <syslog>1</syslog>
+-            <exec_pipe_program>/usr/local/ndpmon/create_html_table.py</exec_pipe_program>
++            <exec_pipe_program>%%PREFIX%%/share/ndpmon/create_html_table.py</exec_pipe_program>
          </actions_low_pri>
          <actions_high_pri>
-         	<sendmail>1</sendmail>
-         	<syslog>1</syslog>
--        	<exec_pipe_program>/usr/local/ndpmon/create_html_table.py</exec_pipe_program>
-+        	<exec_pipe_program>@prefix@/share/ndpmon/create_html_table.py</exec_pipe_program>
+             <sendmail>1</sendmail>
+             <syslog>1</syslog>
+-            <exec_pipe_program>/usr/local/ndpmon/create_html_table.py</exec_pipe_program>
++            <exec_pipe_program>%%PREFIX%%/share/ndpmon/create_html_table.py</exec_pipe_program>
          </actions_high_pri>
          <use_reverse_hostlookups>1</use_reverse_hostlookups>
-         <routers>
+     <routers>
diff --git a/net-mgmt/ndpmon/files/patch-parser.c b/net-mgmt/ndpmon/files/patch-parser.c
new file mode 100644
index 000000000000..e75b8ef02d74
--- /dev/null
+++ b/net-mgmt/ndpmon/files/patch-parser.c
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- parser.c.orig
++++ parser.c
+@@ -77,8 +77,8 @@
+ 		write_proc("/proc/sys/net/ipv6/conf/all/accept_ra_defrtr",flag);
+ 		write_proc("/proc/sys/net/ipv6/conf/all/accept_ra_pinfo",flag);
+ 		write_proc("/proc/sys/net/ipv6/conf/all/accept_redirects",flag);
+-	}
+ #endif
++	}
+ 	xmlXPathFreeObject (xmlobject);
+ 	return;
+ }
diff --git a/net-mgmt/ndpmon/files/patch-routers.c b/net-mgmt/ndpmon/files/patch-routers.c
new file mode 100644
index 000000000000..8b4ba6eb6c0a
--- /dev/null
+++ b/net-mgmt/ndpmon/files/patch-routers.c
@@ -0,0 +1,29 @@
+
+$FreeBSD$
+
+--- routers.c.orig
++++ routers.c
+@@ -261,9 +261,11 @@
+ 		if (tmp->param_flags_reserved&ND_RA_FLAG_OTHER) {
+ 			fprintf(stderr,"OTHER ");
+ 		}
++/* no support for home agent in FreeBSD
+ 		if (tmp->param_flags_reserved&ND_RA_FLAG_HOME_AGENT) {
+ 			fprintf(stderr,"HOME_AGENT ");
+ 		}
++*/
+ 		fprintf(stderr,"]\n");
+ 		fprintf(stderr,"        router lifetime: %u\n", tmp->param_router_lifetime);
+ 		fprintf(stderr,"        reachable timer: %u\n", tmp->param_reachable_timer);
+@@ -297,9 +299,11 @@
+ 			if (ptmp->param_flags_reserved&ND_OPT_PI_FLAG_AUTO) {
+ 				fprintf(stderr,"AUTO ");
+ 			}
++/* No suuportin FreeBSD yet
+ 			if (ptmp->param_flags_reserved&ND_OPT_PI_FLAG_RADDR) {
+ 				fprintf(stderr,"RADDR ");
+ 			}
++*/
+ 			fprintf(stderr,"]\n");
+ 			fprintf(stderr,"            valid time:     %u\n", ptmp->param_valid_time);
+ 			fprintf(stderr,"            preferred time: %u\n", ptmp->param_preferred_time);