ports/153287: [PATCH] net-mgmt/ndpmon: [SUMMARIZE CHANGES]

[Geoffroy Desvernay]

>Number:         153287
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/ndpmon: [SUMMARIZE CHANGES]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 18 23:30:15 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Geoffroy Desvernay
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
Ecole Centrale de Marseille
>Environment:
System: FreeBSD dgeo.sysadm.ec-m.fr 8.1-STABLE FreeBSD 8.1-STABLE #0: Mon Nov 22 10:16:09 CET 2010
>Description:
create_html_table.py was unusable with a default install:
 - python path was /usr/bin/python
 - missing a dependency to textproc/py-4suite-xml in the package

This patch use options to:
 - not install create_html_table.py by default (and not depend on anything more)
 - do install it if wanted, with dependance for textproc/py-4suite-xml

Port maintainer (janos.mohacsi at bsd.hu) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
Install net-mgmt/ndpmon on a system without textproc/py-4suite-xml
Try to run /usr/local/share/ndpmon/create_html_table.py

>Fix:
--- ndpmon-1.4.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/Makefile /usr/ports/net-mgmt/ndpmon/Makefile
--- /usr/ports/net-mgmt/ndpmon.orig/Makefile	2010-05-31 01:55:30.000000000 +0200
+++ /usr/ports/net-mgmt/ndpmon/Makefile	2010-12-19 00:19:11.000000000 +0100
@@ -14,6 +14,18 @@
 MAINTAINER=	janos.mohacsi at bsd.hu
 COMMENT=	On-link icmpv6 message monitoring and reporting daemon
 
+OPTIONS=	PY4SUITE	"Depend on py-4suite-xml (for generating HTML)"	off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITHOUT_PY4SUITE)
+PLIST_SUB+=	PY="@comment "
+.else
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Ft/Xml/Domlette.py:${PORTSDIR}/textproc/py-4suite-xml
+USE_PYTHON=	2.6+
+PLIST_SUB+=	PY=""
+.endif
+
 USE_GNOME=	libxml2
 USE_PERL5_RUN=	yes
 USE_RC_SUBR=	ndpmonitor
@@ -33,15 +45,17 @@
 	(cd ${WRKSRC}; ${MAKE} clean)
 
 do-install:
+	${MKDIR} ${DATADIR}
+.if defined(WITH_PY4SUITE)
+	${INSTALL_SCRIPT} ${WRKSRC}/create_html_table.py \
+		${DATADIR}
+.endif
 	${INSTALL_MAN} ${WRKSRC}/ndpmon.8 ${PREFIX}/man/man8
 	${INSTALL_PROGRAM} ${WRKSRC}/ndpmon ${PREFIX}/sbin
-	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.dtd \
 		${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/demopipeprogram.pl.sample \
 		${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/create_html_table.py \
-		${DATADIR}
 	${MKDIR} ${PREFIX}/etc/ndpmon
 	${INSTALL_DATA} ${WRKSRC}/config_ndpmon.xml ${PREFIX}/etc/ndpmon/config_ndpmon.xml-dist
 	${MKDIR} ${PREFIX}/var/ndpmon
diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/distinfo /usr/ports/net-mgmt/ndpmon/distinfo
--- /usr/ports/net-mgmt/ndpmon.orig/distinfo	2010-05-31 01:55:30.000000000 +0200
+++ /usr/ports/net-mgmt/ndpmon/distinfo	2010-12-18 23:39:52.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (ndpmon-1.4.0.tgz) = 4e9573a97b972e5a01de276cdabf3921
 SHA256 (ndpmon-1.4.0.tgz) = 132df9d8d3bfa263025131c713278026ae1ee0a423a91652b7a15259363efaeb
 SIZE (ndpmon-1.4.0.tgz) = 321695
diff -ruN --exclude=CVS /usr/ports/net-mgmt/ndpmon.orig/files/patch-create__html__table.py /usr/ports/net-mgmt/ndpmon/files/patch-create__html__table.py
--- /usr/ports/net-mgmt/ndpmon.orig/files/patch-create__html__table.py	2007-10-26 15:33:43.000000000 +0200
+++ /usr/ports/net-mgmt/ndpmon/files/patch-create__html__table.py	2010-12-18 23:37:48.000000000 +0100
@@ -1,8 +1,14 @@
 
 $FreeBSD: ports/net-mgmt/ndpmon/files/patch-create__html__table.py,v 1.1 2007/10/26 13:33:43 pav Exp $
 
---- create_html_table.py.orig
-+++ create_html_table.py
+--- create_html_table.py.orig	2010-12-18 23:33:50.000000000 +0100
++++ create_html_table.py	2010-12-18 23:35:24.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!%%PREFIX%%/bin/python
+ 
+ # takes in input the alerts via the pipe
+ # write the alerts in a file in XML format
 @@ -11,7 +11,7 @@
  from xml.dom import Node
  
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	2008-02-03 09:14:58.000000000 +0100
+++ /usr/ports/net-mgmt/ndpmon/pkg-plist	2010-12-19 00:05:18.000000000 +0100
@@ -2,7 +2,7 @@
 %%DATADIR%%/config_ndpmon.dtd
 %%DATADIR%%/neighbor_list.dtd
 %%DATADIR%%/demopipeprogram.pl.sample
-%%DATADIR%%/create_html_table.py
+%%PY%%%%DATADIR%%/create_html_table.py
 @dirrmtry %%DATADIR%%
 var/ndpmon/neighbor_list.xml
 @dirrmtry var/ndpmon
--- ndpmon-1.4.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: