From owner-svn-ports-all@FreeBSD.ORG  Sun Oct 28 20:01:35 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D7428FD4;
 Sun, 28 Oct 2012 20:01:35 +0000 (UTC) (envelope-from pgj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id A71868FC0C;
 Sun, 28 Oct 2012 20:01:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9SK1ZpA088448;
 Sun, 28 Oct 2012 20:01:35 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9SK1Z0f088446;
 Sun, 28 Oct 2012 20:01:35 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201210282001.q9SK1Z0f088446@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sun, 28 Oct 2012 20:01:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306566 - head/net-mgmt/ndpmon
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Oct 2012 20:01:35 -0000

Author: pgj
Date: Sun Oct 28 20:01:35 2012
New Revision: 306566
URL: http://svn.freebsd.org/changeset/ports/306566

Log:
  - Convert options to the new format
  
  PR:		ports/172545
  Submitted by:	pgj
  Approved by:	maintainer
  Feature safe:	yes

Modified:
  head/net-mgmt/ndpmon/Makefile

Modified: head/net-mgmt/ndpmon/Makefile
==============================================================================
--- head/net-mgmt/ndpmon/Makefile	Sun Oct 28 19:57:43 2012	(r306565)
+++ head/net-mgmt/ndpmon/Makefile	Sun Oct 28 20:01:35 2012	(r306566)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ndpmon
-# Date created:				2006-12-17
-# Whom:					janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	ndpmon
 PORTVERSION=	1.4.0
@@ -18,17 +14,20 @@ COMMENT=	On-link icmpv6 message monitori
 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 +43,10 @@ CONFIGURE_ARGS=	--with-var-datadir=${PRE
 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 +66,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 +76,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}