svn commit: r319616 - head/net/xorp

[Eitan Adler]

Author: eadler
Date: Sat Jun  1 23:28:05 2013
New Revision: 319616
URL: http://svnweb.freebsd.org/changeset/ports/319616

Log:
  - Convert to OptionsNG
  - Reset maintainer due to lack of input.
  - Clean up other constructs while here

Modified:
  head/net/xorp/Makefile

Modified: head/net/xorp/Makefile
==============================================================================
--- head/net/xorp/Makefile	Sat Jun  1 23:18:19 2013	(r319615)
+++ head/net/xorp/Makefile	Sat Jun  1 23:28:05 2013	(r319616)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xorp
-# Date created:		22nd September 2006
-# Whom:			Bruce M Simpson <bms at FreeBSD.org>
-#
+# Created by: Bruce M Simpson <bms at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xorp
 PORTVERSION=	1.6
@@ -14,17 +10,13 @@ MASTER_SITES=	http://www.xorp.org/releas
 		http://www5.xorp.org/releases/${PORTVERSION}/	\
 		http://www3.xorp.org/releases/${PORTVERSION}/
 
-MAINTAINER=	acc at hexadecagram.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	The eXtensible Open Router Platform
 
-OPTIONS=								\
-	    ADVMCAST	 "Build with Advanced Multicast API" On		\
-	    IPV6	 "Build with IPv6 support" On			\
-	    SNMP	 "Build with SNMP MIB support" Off		\
-	    OPTIMIZATION "Build with optimization" On			\
-	    CHECK	 "Build with regression test dependencies " Off	\
-	    DEBUGGING	 "Enable debugging" Off				\
-	    PROFILING	 "Enable profiling" Off
+OPTIONS_DEFINE=	ADVMCAST IPV6 SNMP OPTIMIZED_CFLAGS TEST DEBUG PROFILE
+OPTIONS_DEFAULT=	ADVMCAST IPV6 SNMP OPTIMIZED_CFLAGS TEST PROFILE
+
+ADVMCAST_DESC=	Build with Advanced Multicast API
 
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
@@ -34,7 +26,7 @@ CONFIGURE_ARGS=		--prefix=${PREFIX}/${PO
 			--with-comment='FreeBSD port: ${PKGNAME}'	\
 			--with-openssl=${OPENSSLBASE}
 
-CXXFLAGS="-Wno-uninitialized"
+CXXFLAGS+=	-Wno-uninitialized
 NOMAN=		defined
 
 XORP_GROUP=	xorp
@@ -42,17 +34,17 @@ USE_RC_SUBR=	xorp
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_ADVMCAST)
+.if ${PORT_OPTIONS:MADVMCAST}
 CONFIGURE_ARGS+=	--enable-advanced-mcast-api
 .endif
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if defined(WITH_SNMP)
+.if ${PORT_OPTIONS:MSNMP}
 BUILD_DEPENDS+=		${LOCALBASE}/sbin/snmpd:${PORTSDIR}/net-mgmt/net-snmp
 CONFIGURE_ARGS+=	--with-snmp					 \
 	--with-path-to-snmpd=${LOCALBASE}/sbin				 \
@@ -64,28 +56,26 @@ USE_LDCONFIG=		${PREFIX}/mibs
 PLIST_SUB+=		XORP_SNMP="@comment "
 .endif
 
-.if defined(WITH_OPTIMIZATION)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CONFIGURE_ARGS+=	--enable-optimize --disable-debug
 .endif
 
-# Bash and Python are only required if running the regression tests.
-.if defined(WITH_CHECK)
+.if ${PORT_OPTIONS:MTEST}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 .endif
 
-.if defined(WITH_DEBUGGING)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug-msgs --enable-debug-fnames
 .endif
 
-.if defined(WITH_PROFILING)
+.if ${PORT_OPTIONS:MPROFILE}
 CONFIGURE_ARGS+=	--enable-profile
 .endif
 
+NOT_FOR_ARCH=	sparc64
+
 .include <bsd.port.pre.mk>
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
 
 pre-everything::
 .if !defined(PREFIX) || ${PREFIX} == "/usr/local"