Date: Tue, 9 Oct 2012 18:39:38 GMT From: Gabor Pali <pgj@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172545: [net-mgmt/ndpmon] OptionsNG Conversion Message-ID: <201210091839.q99Idc0H056725@red.freebsd.org> Resent-Message-ID: <201210092230.q99MUOHw043645@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172545
>Category: ports
>Synopsis: [net-mgmt/ndpmon] OptionsNG Conversion
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 09 22:30:24 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Gabor Pali
>Release: n/a
>Organization:
The FreeBSD Project
>Environment:
n/a
>Description:
- Convert options to OptionsNG format
>How-To-Repeat:
>Fix:
See the attached patch.
Patch attached with submission follows:
diff --git a/net-mgmt/ndpmon/Makefile b/net-mgmt/ndpmon/Makefile
index 01e6214..1a89afc 100644
--- a/net-mgmt/ndpmon/Makefile
+++ b/net-mgmt/ndpmon/Makefile
@@ -18,17 +18,20 @@ COMMENT= On-link icmpv6 message monitoring and reporting daemon
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-OPTIONS= PY4SUITE "Depend on py-4suite-xml (for generating HTML)" off \
- MACRESOLV "Enable MAC Manufacturer Resolution" off
+OPTIONS_DEFINE= PY4SUITE MACRESOLV
+OPTIONS_DEFAULT=
+
+PY4SUITE_DESC= Depend on py-4suite-xml (for generating HTML)
+MACRESOLV_DESC= Enable MAC Manufacturer Resolution
.include <bsd.port.options.mk>
-.if defined(WITHOUT_PY4SUITE)
-PLIST_SUB+= PY="@comment "
-.else
+.if ${PORT_OPTIONS:MPY4SUITE}
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Ft/Xml/Domlette.py:${PORTSDIR}/textproc/py-4suite-xml
USE_PYTHON= 2.6+
PLIST_SUB+= PY=""
+.else
+PLIST_SUB+= PY="@comment "
.endif
USE_GNOME= libxml2
@@ -44,8 +47,10 @@ CONFIGURE_ARGS= --with-var-datadir=${PREFIX}/var --with-confdir=${ETCDIR} \
MAN8= ndpmon.8
PORTDOCS= INSTALL README
-.if defined(WITH_MACRESOLV)
+.if ${PORT_OPTIONS:MMACRESOLV}
CONFIGURE_ARGS+=--enable-mac-resolv
+.else
+CONFIGURE_ARGS+=--disable-mac-resolv
.endif
post-patch:
@@ -65,7 +70,7 @@ do-install:
${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/*.dtd ${DATADIR}
${INSTALL_SCRIPT} ${WRKSRC}/demopipeprogram.pl.sample ${DATADIR}
-.if defined(WITH_PY4SUITE)
+.if ${PORT_OPTIONS:MPY4SUITE}
${INSTALL_SCRIPT} ${WRKSRC}/create_html_table.py ${DATADIR}
.endif
@@ -75,7 +80,7 @@ do-install:
${MKDIR} ${PREFIX}/var/ndpmon
${INSTALL_DATA} ${WRKSRC}/neighbor_list.xml ${PREFIX}/var/ndpmon/neighbor_list.xml
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
post-install:
${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210091839.q99Idc0H056725>