svn commit: r316837 - in head/devel: bzr bzrtools c-unit cunit directfb distcc
Jason Helfman
jgh at FreeBSD.org
Mon Apr 29 18:47:59 UTC 2013
Author: jgh
Date: Mon Apr 29 18:47:57 2013
New Revision: 316837
URL: http://svnweb.freebsd.org/changeset/ports/316837
Log:
- adoption of optionsNG
Approved by: portmgr (bapt)
Modified:
head/devel/bzr/Makefile
head/devel/bzrtools/Makefile
head/devel/c-unit/Makefile
head/devel/cunit/Makefile
head/devel/directfb/Makefile
head/devel/distcc/Makefile
Modified: head/devel/bzr/Makefile
==============================================================================
--- head/devel/bzr/Makefile Mon Apr 29 18:44:48 2013 (r316836)
+++ head/devel/bzr/Makefile Mon Apr 29 18:47:57 2013 (r316837)
@@ -1,9 +1,5 @@
-# Ports collection makefile for: bzr
-# Date created: 10 October 2005
-# Whom: Ulf Lilleengen
-#
+# Created by: Ulf Lilleengen
# $FreeBSD$
-#
PORTNAME= bzr
PORTVERSION= 2.5.1
@@ -17,8 +13,10 @@ COMMENT= Distributed version control sys
# Often not needed, but it's cheap insurance
BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython
-OPTIONS= SFTP "Enable Paramiko for SFTP support" on \
- CA_BUNDLE "Include CA bundle for SSL cert validation" on
+OPTIONS_DEFINE= SFTP CA_BUNDLE
+SFTP_DESC= Paramiko for SFTP support
+CA_BUNDLE_DESC= Include CA bundle for SSL cert validation
+OPTIONS_DEFAULT= SFTP CA_BUNDLE
USE_PYTHON= 2.6+
USE_PYDISTUTILS= yes
@@ -27,13 +25,13 @@ USES= gettext
MAN1= bzr.1
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_SFTP)
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/paramiko/__init__.py:${PORTSDIR}/security/py-paramiko
+.if ${PORT_OPTIONS:MSFTP}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}>=0:${PORTSDIR}/security/py-paramiko
.endif
-.if !defined(WITHOUT_CA_BUNDLE)
+.if ${PORT_OPTIONS:MCA_BUNDLE}
RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
.endif
@@ -43,4 +41,4 @@ post-install:
test: build
cd ${WRKSRC} && ./bzr selftest
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/bzrtools/Makefile
==============================================================================
--- head/devel/bzrtools/Makefile Mon Apr 29 18:44:48 2013 (r316836)
+++ head/devel/bzrtools/Makefile Mon Apr 29 18:47:57 2013 (r316837)
@@ -1,9 +1,5 @@
-# Ports collection makefile for: bzrtools
-# Date created: 3 November 2005
-# Whom: Ulf Lilleengen
-#
+# Created by: Ulf Lilleengen
# $FreeBSD$
-#
PORTNAME= bzrtools
PORTVERSION= 2.5
@@ -16,8 +12,10 @@ COMMENT= Extensions to devel/bzr
RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr
-OPTIONS= GRAPHVIZ "Enable graphviz for graph-ancestry" off \
- RSYNC "Enable rsync for rspush" on
+OPTIONS_DEFINE= GRAPHVIZ RSYNC
+GRAPHVIZ_DESC= graphviz for graph-ancestry
+RSYNC_DESC= rsync for rspush
+OPTIONS_DEFAULT= RSYNC
WRKSRC= ${WRKDIR}/bzrtools
USE_PYTHON= 2.6+
@@ -25,14 +23,14 @@ USE_PYDISTUTILS= yes
PYDISTUTILS_PKGVERSION= 2.5.0
PYDISTUTILS_PKGNAME= BzrTools
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_GRAPHVIZ)
+.if ${PORT_OPTIONS:MGRAPHVIZ}
RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz
.endif
-.if !defined(WITHOUT_RSYNC)
+.if ${PORT_OPTIONS:MRSYNC}
RUN_DEPENDS+= rsync:${PORTSDIR}/net/rsync
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/c-unit/Makefile
==============================================================================
--- head/devel/c-unit/Makefile Mon Apr 29 18:44:48 2013 (r316836)
+++ head/devel/c-unit/Makefile Mon Apr 29 18:47:57 2013 (r316837)
@@ -1,7 +1,4 @@
-# New ports collection makefile for: c-unit
-# Date created: 14 Apr 2012
-# Whom: Takanori Sawada <tak.swd at gmail.com>
-#
+# Created by: Takanori Sawada <tak.swd at gmail.com>
# $FreeBSD$
PORTNAME= c-unit
@@ -10,7 +7,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= tak.swd at gmail.com
-COMMENT= A unit testing framework for C
+COMMENT= Unit testing framework for C
CONFLICTS= cunit-[0-9]*
@@ -21,15 +18,17 @@ USE_LDCONFIG= yes
MAN3= CUnit.3
-OPTIONS= DEB "Enable debug interface" Off \
- AUT "Enable automated(XML) interface" On \
- BAS "Enable basic interface" On \
- CON "Enable console interface" On \
- CUR "Enable curses interface" Off \
- EXA "Compile example programs" Off \
- ITE "Compile internal test program" Off \
- MEM "Enable internal memory tracking" Off
-# DEP "Enable use of deprecated v1.1 names" Off
+OPTIONS_DEFINE= DEB AUT BAS CON CUR EXA ITE MEM
+DEB_DESC= Debug interface
+AUT_DESC= Automated(XML) interface
+BAS_DESC= Basic interface
+CON_DESC= Console interface
+CUR_DESC= Curses interface
+EXA_DESC= Compile example programs
+ITE_DESC= Compile internal test program
+MEM_DESC= Internal memory tracking
+
+OPTIONS_DEFAULT= AUT BAS CON
post-patch:
@${REINPLACE_CMD} \
@@ -45,58 +44,55 @@ post-patch:
's|/@PACKAGE@/Examples/Curses|/examples/@PACKAGE@/Curses|g' \
${WRKSRC}/Examples/CursesTest/Makefile.in
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_DEB)
+.if ${PORT_OPTIONS:MDEB}
CONFIGURE_ARGS+= --enable-debug
.endif
-.if defined(WITHOUT_AUT)
-CONFIGURE_ARGS+= --disable-automated
-.else
+.if ${PORT_OPTIONS:MAUT}
PLIST_FILES+= include/CUnit/Automated.h
-.endif
-.if defined(WITHOUT_BAS)
-CONFIGURE_ARGS+= --disable-basic
.else
-PLIST_FILES+= include/CUnit/Basic.h
+CONFIGURE_ARGS+= --disable-automated
.endif
-.if defined(WITHOUT_CON)
-CONFIGURE_ARGS+= --disable-console
+.if ${PORT_OPTIONS:MBAS}
+PLIST_FILES+= include/CUnit/Basic.h
.else
+CONFIGURE_ARGS+= --disable-basic
+.endif
+.if ${PORT_OPTIONS:MCON}
PLIST_FILES+= include/CUnit/Console.h
+.else
+CONFIGURE_ARGS+= --disable-console
.endif
-.if defined(WITH_CUR)
+.if ${PORT_OPTIONS:MCUR}
CONFIGURE_ARGS+= --enable-curses
PLIST_FILES+= include/CUnit/CUCurses.h
.endif
-.if defined(WITH_EXA)
+.if ${PORT_OPTIONS:MEXA}
CONFIGURE_ARGS+= --enable-examples
-.if defined(WITH_AUT)
+.if ${PORT_OPTIONS:MAUT}
PLIST_FILES+= share/examples/CUnit/Automated/AutomatedTest \
share/examples/CUnit/Automated/README
.endif
-.if defined(WITH_BAS)
+.if ${PORT_OPTIONS:MBAS}
PLIST_FILES+= share/examples/CUnit/Basic/BasicTest \
share/examples/CUnit/Basic/README
.endif
-.if defined(WITH_CON)
+.if ${PORT_OPTIONS:MCON}
PLIST_FILES+= share/examples/CUnit/Console/ConsoleTest \
share/examples/CUnit/Console/README
.endif
-.if defined(WITH_CUR)
+.if ${PORT_OPTIONS:MCUR}
PLIST_FILES+= share/examples/CUnit/Curses/CursesTest \
share/examples/CUnit/Curses/README
.endif
.endif
-.if defined(WITH_ITE)
+.if ${PORT_OPTIONS:MITE}
CONFIGURE_ARGS+= --enable-test
PLIST_FILES+= share/CUnit/Test/test_cunit
.endif
-.if defined(WITH_MEM)
+.if ${PORT_OPTIONS:MMEM}
CONFIGURE_ARGS+= --enable-memtrace
.endif
-#.if defined(WITH_DEP)
-#CONFIGURE_ARGS+= --enable-deprecated
-#.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/cunit/Makefile
==============================================================================
--- head/devel/cunit/Makefile Mon Apr 29 18:44:48 2013 (r316836)
+++ head/devel/cunit/Makefile Mon Apr 29 18:47:57 2013 (r316837)
@@ -1,7 +1,4 @@
-# New ports collection makefile for: cunit
-# Date created: 26 Jul 2007
-# Whom: Stefan Pauly <stefan at fh-mainz.de>
-#
+# Created by: Stefan Pauly <stefan at fh-mainz.de>
# $FreeBSD$
PORTNAME= cunit
@@ -12,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/CUnit/2.1-0
DISTNAME= ${PORTNAME:S/^cu/CU/}-${DISTVERSION}-src
MAINTAINER= stefan at fh-mainz.de
-COMMENT= An automated unit testing framework for C
+COMMENT= Automated unit testing framework for C
CONFLICTS= c-unit-[0-9]*
@@ -25,15 +22,17 @@ USE_LDCONFIG= yes
MAN3= CUnit.3
-OPTIONS= DEB "Enable debug interface" Off \
- AUT "Enable automated(XML) interface" On \
- BAS "Enable basic interface" On \
- CON "Enable console interface" On \
- CUR "Enable curses interface" Off \
- EXA "Compile example programs" Off \
- ITE "Compile internal test program" Off \
- MEM "Enable internal memory tracking" Off
-# DEP "Enable use of deprecated v1.1 names" Off
+OPTIONS_DEFINE= DEB AUT BAS CON CUR EXA ITE MEM
+DEB_DESC= Debug interface
+AUT_DESC= Automated(XML) interface
+BAS_DESC= Basic interface
+CON_DESC= Console interface
+CUR_DESC= Curses interface
+EXA_DESC= Compile example programs
+ITE_DESC= Compile internal test program
+MEM_DESC= Internal memory tracking
+
+OPTIONS_DEFAULT= AUT BAS CON
post-patch:
@${REINPLACE_CMD} -e 's|/doc/@PACKAGE@|/share/doc/@PACKAGE@|g' ${WRKSRC}/doc/Makefile.in
@@ -46,58 +45,55 @@ post-patch:
${REINPLACE_CMD} -e 's|CUnit doc Man Share|CUnit Man Share|g' ${WRKSRC}/Makefile.in
.endif
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_DEB)
+.if ${PORT_OPTIONS:MDEB}
CONFIGURE_ARGS+= --enable-debug
.endif
-.if defined(WITHOUT_AUT)
-CONFIGURE_ARGS+= --disable-automated
-.else
+.if ${PORT_OPTIONS:MAUT}
PLIST_FILES+= include/CUnit/Automated.h
-.endif
-.if defined(WITHOUT_BAS)
-CONFIGURE_ARGS+= --disable-basic
.else
-PLIST_FILES+= include/CUnit/Basic.h
+CONFIGURE_ARGS+= --disable-automated
.endif
-.if defined(WITHOUT_CON)
-CONFIGURE_ARGS+= --disable-console
+.if ${PORT_OPTIONS:MBAS}
+PLIST_FILES+= include/CUnit/Basic.h
.else
+CONFIGURE_ARGS+= --disable-basic
+.endif
+.if ${PORT_OPTIONS:MCON}
PLIST_FILES+= include/CUnit/Console.h
+.else
+CONFIGURE_ARGS+= --disable-console
.endif
-.if defined(WITH_CUR)
+.if ${PORT_OPTIONS:MCUR}
CONFIGURE_ARGS+= --enable-curses
PLIST_FILES+= include/CUnit/CUCurses.h
.endif
-.if defined(WITH_EXA)
+.if ${PORT_OPTIONS:MEXA}
CONFIGURE_ARGS+= --enable-examples
-.if defined(WITH_AUT)
+.if ${PORT_OPTIONS:MAUT}
PLIST_FILES+= share/examples/CUnit/Automated/AutomatedTest \
share/examples/CUnit/Automated/README
.endif
-.if defined(WITH_BAS)
+.if ${PORT_OPTIONS:MBAS}
PLIST_FILES+= share/examples/CUnit/Basic/BasicTest \
share/examples/CUnit/Basic/README
.endif
-.if defined(WITH_CON)
+.if ${PORT_OPTIONS:MCON}
PLIST_FILES+= share/examples/CUnit/Console/ConsoleTest \
share/examples/CUnit/Console/README
.endif
-.if defined(WITH_CUR)
+.if ${PORT_OPTIONS:MCUR}
PLIST_FILES+= share/examples/CUnit/Curses/CursesTest \
share/examples/CUnit/Curses/README
.endif
.endif
-.if defined(WITH_ITE)
+.if ${PORT_OPTIONS:MITE}
CONFIGURE_ARGS+= --enable-test
PLIST_FILES+= share/CUnit/Test/test_cunit
.endif
-.if defined(WITH_MEM)
+.if ${PORT_OPTIONS:MMEM}
CONFIGURE_ARGS+= --enable-memtrace
.endif
-#.if defined(WITH_DEP)
-#CONFIGURE_ARGS+= --enable-deprecated
-#.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/directfb/Makefile
==============================================================================
--- head/devel/directfb/Makefile Mon Apr 29 18:44:48 2013 (r316836)
+++ head/devel/directfb/Makefile Mon Apr 29 18:47:57 2013 (r316837)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: DirectFB
-# Date created: 19 October 2002
-# Whom: Devaux Fabien <fab at gcu.info>
-#
+# Created by: Devaux Fabien <fab at gcu.info>
# $FreeBSD$
-#
PORTNAME= directfb
PORTVERSION= 1.4.13
@@ -15,17 +11,16 @@ DISTNAME= DirectFB-${PORTVERSION}
MAINTAINER= anatoly.borodin at gmail.com
COMMENT= Graphic development lightweight API
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png
-LICENSE= LGPL21
-LICENSE_FILE= ${WRKSRC}/COPYING
+OPTIONS_DEFINE= FREETYPE X11 SDL UNIQUE TEST
+UNIQUE_DESC= Unique (WM Module)
-OPTIONS= FREETYPE2 "Enable Freetype support" on \
- X11 "Enable X11 backend" on \
- SDL "Enable SDL backend" on \
- UNIQUE "Enable Unique (WM Module)" off \
- TESTS "Install test apps" off
+OPTIONS_DEFAULT= FREETYPE X11 SDL
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
USE_AUTOTOOLS= libtool
@@ -56,12 +51,12 @@ CONFIGURE_ARGS= --disable-osx --disable-
.include <bsd.port.options.mk>
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
BUILD_DEPENDS+= man2html:${PORTSDIR}/textproc/man2html
PORTDOCS= *
.endif
-.if defined(WITH_FREETYPE2)
+.if ${PORT_OPTIONS:MFREETYPE}
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
CONFIGURE_ARGS+= --enable-freetype
PLIST_SUB+= FREETYPE2=""
@@ -70,7 +65,7 @@ CONFIGURE_ARGS+= --disable-freetype
PLIST_SUB+= FREETYPE2="@comment "
.endif
-.if defined(WITH_X11)
+.if ${PORT_OPTIONS:MX11}
USE_XORG+= x11 xext xproto
CONFIGURE_ARGS+= --enable-x11
PLIST_SUB+= X11=""
@@ -79,7 +74,7 @@ CONFIGURE_ARGS+= --disable-x11
PLIST_SUB+= X11="@comment "
.endif
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
USE_SDL+= sdl
CONFIGURE_ARGS+= --enable-sdl
PLIST_SUB+= SDL=""
@@ -88,7 +83,7 @@ CONFIGURE_ARGS+= --disable-sdl
PLIST_SUB+= SDL="@comment "
.endif
-.if defined(WITH_UNIQUE)
+.if ${PORT_OPTIONS:MUNIQUE}
CONFIGURE_ARGS+= --enable-unique
PLIST_SUB+= UNIQUE=""
.else
@@ -96,7 +91,7 @@ CONFIGURE_ARGS+= --disable-unique
PLIST_SUB+= UNIQUE="@comment "
.endif
-.if defined(WITH_TESTS)
+.if ${PORT_OPTIONS:MTEST}
CONFIGURE_ARGS+= --with-tests
PLIST_SUB+= TESTS=""
.else
@@ -133,7 +128,7 @@ post-patch:
@${GREP} -lr alloca\.h ${WRKSRC} | ${XARGS} \
${REINPLACE_CMD} -e 's|<alloca\.h>|<stdlib.h>|g'
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
post-install:
${MKDIR} ${DOCSDIR}/html
.for f in AUTHORS ChangeLog NEWS README TODO fb.modes docs/README.screenshots docs/*.html
Modified: head/devel/distcc/Makefile
==============================================================================
--- head/devel/distcc/Makefile Mon Apr 29 18:44:48 2013 (r316836)
+++ head/devel/distcc/Makefile Mon Apr 29 18:47:57 2013 (r316837)
@@ -1,10 +1,6 @@
-# New ports collection makefile for: distcc
-# Date created: 25 June 2002
-# Whom: Frerich Raabe <frerich.raabe at gmx.de>
-#
+# Created by: Frerich Raabe <frerich.raabe at gmx.de>
# $FreeBSD$
# $MCom: ports/devel/distcc/Makefile,v 1.3 2007/10/21 02:46:13 ahze Exp $
-#
PORTNAME= distcc
PORTVERSION= 3.1
@@ -31,27 +27,30 @@ DISTCCD_PIDFILE=/var/run/distccd.pid
USE_RC_SUBR= distccd
SUB_LIST= DISTCCD_PIDFILE=${DISTCCD_PIDFILE}
-OPTIONS= GNOME "Build GUI monitor based on GNOME" Off \
- GTK "Build GUI monitor based on GTK" Off \
- RFC2553 "Enable IPv6 support" Off \
- AVAHI "Enable Avahi Zeroconf/mDNS/Bonjour support" Off \
- COMPILER_LINKS "Create symlinks to distcc" On
+OPTIONS_DEFINE= GNOME GTK IPV6 AVAHI COMPILER_LINKS
+GNOME_DESC= GUI monitor based on GNOME
+GTK_DESC= Build GUI monitor based on GTK
+AVAHI_DESC= Avahi Zeroconf/mDNS/Bonjour support
+COMPILER_LINKS= Create symlinks to distcc
+
+OPTIONS_DEFAULT= COMPILER_LINKS
.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITHOUT_AVAHI)
-CONFIGURE_ARGS+= --without-avahi
-.else
+.if ${PORT_OPTIONS:MAVAHI}
LIB_DEPENDS+= avahi-glib.1:${PORTSDIR}/net/avahi-app
+.else
+CONFIGURE_ARGS+= --without-avahi
.endif
-.if defined(WITHOUT_RFC2553)
-CONFIGURE_ARGS+= --disable-rfc2553
-.else
+.if ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+= --enable-rfc2553
+.else
+CONFIGURE_ARGS+= --disable-rfc2553
.endif
-.if defined(WITH_COMPILER_LINKS)
+.if ${PORT_OPTIONS:MCOMPILER_LINKS}
CCLINKDIR?= libexec/distcc
PLIST_DIRS= ${CCLINKDIR}
GNU_COMPILERS= 34 42 43 44 45 46 -ooo
@@ -66,12 +65,12 @@ DISTCC_COMPILERS+= ${EXTRA_COMPILERS}
PLIST_FILES+= ${DISTCC_COMPILERS:S|^|${CCLINKDIR}/|}
.endif
-.if defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGNOME}
USE_GNOME= libgnomeui
CONFIGURE_ARGS+= --with-gnome
PKGNAMESUFFIX= -gnome
PLIST_SUB+= WITH_GNOME=""
-.elif defined(WITH_GTK)
+.elif ${PORT_OPTIONS:MGTK}
USE_GNOME= gtk20
CONFIGURE_ARGS+= --with-gtk
PKGNAMESUFFIX= -gtk
@@ -89,20 +88,20 @@ do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/distcc ${PREFIX}/bin
@${INSTALL_PROGRAM} ${WRKSRC}/distccmon-text ${PREFIX}/bin
@${INSTALL_PROGRAM} ${WRKSRC}/lsdistcc ${PREFIX}/bin
-.if defined(WITH_GNOME) || defined(WITH_GTK)
+.if ${PORT_OPTIONS:MGNOME) || ${PORT_OPTIONS:MGTK}
@${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${PREFIX}/bin
.endif
@${INSTALL_PROGRAM} ${WRKSRC}/distccd ${PREFIX}/sbin
post-install:
@${TOUCH} ${DISTCCD_PIDFILE}
-.if defined(WITH_COMPILER_LINKS)
+.if ${PORT_OPTIONS:MCOMPILER_LINKS}
@${MKDIR} ${PREFIX}/${CCLINKDIR}
.for link in ${DISTCC_COMPILERS}
${LN} -sf ${PREFIX}/bin/distcc ${PREFIX}/${CCLINKDIR}/${link}
.endfor
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for FILE in ${DOC_FILES}
@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
More information about the svn-ports-all
mailing list