svn commit: r314144 - in head: databases/mysqldumper games/linux-defcon games/linux-uplink-demo games/liquidwar science/meep sysutils/autojump sysutils/hdup sysutils/nvclock sysutils/pdsh sysutils/...
Martin Wilke
miwi at FreeBSD.org
Thu Mar 14 11:20:57 UTC 2013
Author: miwi
Date: Thu Mar 14 11:20:54 2013
New Revision: 314144
URL: http://svnweb.freebsd.org/changeset/ports/314144
Log:
- Convert to Optionsng
- While here trim header
Modified:
head/databases/mysqldumper/Makefile (contents, props changed)
head/games/linux-defcon/Makefile (contents, props changed)
head/games/linux-uplink-demo/Makefile (contents, props changed)
head/games/liquidwar/Makefile (contents, props changed)
head/science/meep/Makefile (contents, props changed)
head/sysutils/autojump/Makefile (contents, props changed)
head/sysutils/hdup/Makefile
head/sysutils/nvclock/Makefile (contents, props changed)
head/sysutils/pdsh/Makefile (contents, props changed)
head/sysutils/volman/Makefile (contents, props changed)
Modified: head/databases/mysqldumper/Makefile
==============================================================================
--- head/databases/mysqldumper/Makefile Thu Mar 14 10:11:34 2013 (r314143)
+++ head/databases/mysqldumper/Makefile Thu Mar 14 11:20:54 2013 (r314144)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: mysqldumper
-# Date created: 8 January 2011
-# Whom: Marek Holienka <marekholienka at gmail.com>
-#
+# Created by: Marek Holienka <marekholienka at gmail.com>
# $FreeBSD$
-#
PORTNAME= mysqldumper
PORTVERSION= 1.24.2
@@ -17,8 +13,8 @@ COMMENT= MySQLDumper is tool for backing
RUN_DEPENDS= p5-DBI>=1.48:${PORTSDIR}/databases/p5-DBI \
-OPTIONS= APACHE "Enable Apache Support" on \
- LIGHTTPD "Enable Lighttpd Support" off
+OPTIONS_DEFINE= APACHE LIGHTTPD
+OPTIONS_DEFAULT= APACHE
USE_ZIP= yes
NO_BUILD= yes
@@ -31,10 +27,10 @@ WWWGRP= ${WWWOWN}
.include <bsd.port.options.mk>
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
USE_APACHE_RUN= 22+
.endif
-.if defined(WITH_LIGHTTPD)
+.if ${PORT_OPTIONS:MLIGHTTPD}
RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd
.endif
Modified: head/games/linux-defcon/Makefile
==============================================================================
--- head/games/linux-defcon/Makefile Thu Mar 14 10:11:34 2013 (r314143)
+++ head/games/linux-defcon/Makefile Thu Mar 14 11:20:54 2013 (r314144)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: linux-defcon
-# Date created: 24 May 2007
-# Whom: Marcus von Appen <mva at sysfault.org
-#
+# Created by: Marcus von Appen <mva at sysfault.org
# $FreeBSD$
-#
PORTNAME= defcon
PORTVERSION= 1.42
@@ -24,11 +20,12 @@ NO_BUILD= yes
DATADIR= ${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME}
SUB_FILES= defcon
-OPTIONS= NVIDIA "Install support for nvidia" off
+OPTIONS_DEFINE= NVIDIA
+NVIDIA_DESC= support for nvidia
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_NVIDIA)
+.if ${PORT_OPTIONS:MNVIDIA}
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
USE_LINUX_APPS+=libglu
.else
@@ -53,4 +50,4 @@ do-install:
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/games/linux-uplink-demo/Makefile
==============================================================================
--- head/games/linux-uplink-demo/Makefile Thu Mar 14 10:11:34 2013 (r314143)
+++ head/games/linux-uplink-demo/Makefile Thu Mar 14 11:20:54 2013 (r314144)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: linux-uplink-demo
-# Date created: 25 May 2007
-# Whom: Marcus von Appen <mva at sysfault.org>
-#
+# Created by: Marcus von Appen <mva at sysfault.org>
# $FreeBSD$
-#
PORTNAME= uplink-demo
PORTVERSION= 1.55
@@ -29,11 +25,12 @@ SUB_FILES= uplink
SUB_LIST= LINUXBASE=${LINUXBASE}
DOCFILES= license.txt mods.txt Readme-UplinkSupport.txt readme.txt
-OPTIONS= NVIDIA "Install support for nvidia" off
+OPTIONS_DEFINE= NVIDIA
+NVIDIA_DESC= support for nvidia
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_NVIDIA)
+.if ${PORT_OPTIONS:MNVIDIA}
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
USE_LINUX_APPS+=libglu
.else
@@ -64,4 +61,4 @@ do-install:
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/games/liquidwar/Makefile
==============================================================================
--- head/games/liquidwar/Makefile Thu Mar 14 10:11:34 2013 (r314143)
+++ head/games/liquidwar/Makefile Thu Mar 14 11:20:54 2013 (r314144)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: liquidwar
-# Date created: 9 October 2005
-# Whom: Edwin Groothuis <edwin at mavetju.org>
-#
+# Created by: Edwin Groothuis <edwin at mavetju.org>
# $FreeBSD$
-#
PORTNAME= liquidwar
PORTVERSION= 5.6.4
@@ -31,12 +27,12 @@ MAN6= liquidwar.6 \
liquidwar-server.6 \
liquidwar-mapgen.6
-OPTIONS= ASM "Disable assembly code (if it crashes)" OFF
+OPTIONS_DEFINE= ASM
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_ASM)
+.if ! ${PORT_OPTIONS:MASM}
CONFIGURE_ARGS+= --disable-asm
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/science/meep/Makefile
==============================================================================
--- head/science/meep/Makefile Thu Mar 14 10:11:34 2013 (r314143)
+++ head/science/meep/Makefile Thu Mar 14 11:20:54 2013 (r314144)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: science/meep
-# Date created: 26 Dec 2009
-# Whom: Stas Timokhin <devel at stasyan.com>
-#
+# Created by: Stas Timokhin <devel at stasyan.com>
# $FreeBSD$
-#
PORTNAME= meep
PORTVERSION= 1.1.1
@@ -35,11 +31,13 @@ LD_LIBRARY_PATH= -L${LOCALBASE}/lib -L/u
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
-OPTIONS= OPENMPI "Enable MPI support using openmpi" On
+OPTIONS_DEFINE= OPENMPI
+OPTIONS_DEFAULT= OPENMPI
+OPENMPI_DESC= MPI support
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_OPENMPI)
+.if ${PORT_OPTIONS:MOPENMPI}
BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpiCC:${PORTSDIR}/net/openmpi
RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
CONFIGURE_ARGS+=--with-mpi
@@ -54,4 +52,4 @@ post-patch:
${REINPLACE_CMD} -e 's+\#\! /bin/sh+\#\! ${PREFIX}/bin/bash+' \
-e s+\$$\(SHELL\)+${PREFIX}/bin/bash+ ${WRKSRC}/configure
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/sysutils/autojump/Makefile
==============================================================================
--- head/sysutils/autojump/Makefile Thu Mar 14 10:11:34 2013 (r314143)
+++ head/sysutils/autojump/Makefile Thu Mar 14 11:20:54 2013 (r314144)
@@ -31,11 +31,12 @@ PLIST_FILES= bin/autojump \
share/autojump/icon.png
MAN1= autojump.1
-OPTIONS= ZSH "Install zsh version as well." On
+OPTIONS_DEFINE= ZSH
+OPTIONS_DEFAULT= ZSH
.include <bsd.port.options.mk>
-.if defined(WITH_ZSH)
+.if ${PORT_OPTIONS:MZSH}
RUN_DEPENDS+= ${LOCALBASE}/bin/zsh:${PORTSDIR}/shells/zsh
PLIST_FILES+= share/zsh/site-functions/_j
.endif
@@ -48,7 +49,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr$$|${PREFIX}|' -e 's|/usr/local|${PREFIX}|' -e 's|/bin/zsh|${PREFIX}/bin/zsh|' ${WRKSRC}/install.zsh
do-install:
-.if defined(WITH_ZSH)
+.if ${PORT_OPTIONS:MZSH}
@(cd ${INSTALL_WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./install.zsh )
.else
@(cd ${INSTALL_WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./install.sh )
Modified: head/sysutils/hdup/Makefile
==============================================================================
--- head/sysutils/hdup/Makefile Thu Mar 14 10:11:34 2013 (r314143)
+++ head/sysutils/hdup/Makefile Thu Mar 14 11:20:54 2013 (r314144)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: hdup
-# Date created: 6 March 2005
-# Whom: Sergey Matveychuk <sem at FreeBSD.org>
-#
+# Created by: Sergey Matveychuk <sem at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= hdup
PORTVERSION= 2.0.14
@@ -17,7 +13,8 @@ COMMENT= The little, spiffy, backup tool
#WRKSRC= ${WRKDIR}/hdup2
-OPTIONS= GNUTAR_PORT "Build with the newest GNU tar from ports" no
+OPTIONS_DEFINE= GNUTAR_PORT DOCS
+GNUTAR_PORT_DESC= GNU tar from ports
BUILD_DEPENDS= mcrypt:${PORTSDIR}/security/mcrypt
RUN_DEPENDS= mcrypt:${PORTSDIR}/security/mcrypt \
@@ -34,9 +31,9 @@ USE_AUTOTOOLS= autoconf
MAN1= hdup.1
MAN5= hdup.conf.5
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_GNUTAR_PORT)
+.if ${PORT_OPTIONS:MGNUTAR_PORT}
BUILD_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar
RUN_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar
GNUTAR= ${LOCALBASE}/bin/gtar
@@ -49,7 +46,7 @@ post-configure:
@${REINPLACE_CMD} -e 's#%%GNUTAR%%#${GNUTAR}#g' ${WRKSRC}/src/hdup.h
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}; \
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}; \
${INSTALL_DATA} ${WRKSRC}/doc/FAQ.html ${DOCSDIR}; \
@@ -57,4 +54,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/sysutils/nvclock/Makefile
==============================================================================
--- head/sysutils/nvclock/Makefile Thu Mar 14 10:11:34 2013 (r314143)
+++ head/sysutils/nvclock/Makefile Thu Mar 14 11:20:54 2013 (r314144)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: NVClock
-# Date created: August 4, 2003
-# Whom: Samy Al Bahra <samy at kerneled.com>
-#
+# Created by: Samy Al Bahra <samy at kerneled.com>
# $FreeBSD$
-#
PORTNAME= nvclock
DISTVERSION= 0.8b4
@@ -24,27 +20,28 @@ PLIST_FILES= bin/nvclock bin/smartdimmer
MAN1= nvclock.1
PORTDOCS= ABOUT AUTHORS ChangeLog FAQ README
-OPTIONS= NVCONTROL "Enable NV-CONTROL support" on \
- GTK "Build GTK+ user interface" on \
- QT "Build Qt 3.x user interface" off
+OPTIONS_DEFINE= NVCONTROL GTK2 QT
+OPTIONS_DEFAULT= NVCONTROL GTK2
+NVCONTROL_DESC= NV-CONTROL support
+QT_DESC= Qt 3 toolkit
.include <bsd.port.options.mk>
-.if defined(WITH_NVCONTROL)
+.if ${PORT_OPTIONS:MNVCONTROL}
USE_XORG= xext
USE_GNOME= pkgconfig
.else
CONFIGURE_ARGS+= --disable-nvcontrol
.endif
-.if defined(WITH_GTK)
+.if ${PORT_OPTIONS:MGTK2}
USE_GNOME= gtk20
PLIST_FILES+= bin/nvclock_gtk
.else
CONFIGURE_ARGS+= --disable-gtk
.endif
-.if defined(WITH_QT)
+.if ${PORT_OPTIONS:MQT}
USE_QT_VER= 3
CONFIGURE_ARGS+= --enable-qt --with-qtdir=${LOCALBASE}
PLIST_FILES+= bin/nvclock_qt
Modified: head/sysutils/pdsh/Makefile
==============================================================================
--- head/sysutils/pdsh/Makefile Thu Mar 14 10:11:34 2013 (r314143)
+++ head/sysutils/pdsh/Makefile Thu Mar 14 11:20:54 2013 (r314144)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: sysutils/pdsh
-# Date created: 2010-03-09
-# Whom: Mykola Dzham <i at levsha.me>
-#
+# Created by: Mykola Dzham <i at levsha.me>
# $FreeBSD$
-#
PORTNAME= pdsh
PORTVERSION= 2.28
@@ -19,15 +15,15 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_PERL5_BUILD=yes
-OPTIONS= SSH "Enable SSH support" On \
- DSHGROUPS "Enable DSH groups" On \
- NETGROUP "Enable NIS Netgroup support" Off \
- READLINE "Enable GNU readline support" Off \
- RSH "Enable RSH support" Off
+OPTIONS_DEFINE= SSH DSHGROUPS NETGROUP READLINE RSH
+OPTIONS_DEFAULT= SSH DSHGROUPS
+DSHGROUPS_DESC= DSH groups supprt
+NETGROUP_DESC= NIS Netgroup support
+RSH_DESC= RSH support
.include <bsd.port.options.mk>
-.if defined(WITH_SSH)
+.if ${PORT_OPTIONS:MSSH}
CONFIGURE_ARGS+= --with-ssh
PLIST_SUB+= SSH=""
.else
@@ -35,7 +31,7 @@ CONFIGURE_ARGS+= --without-ssh
PLIST_SUB+= SSH="@comment "
.endif
-.if defined(WITH_DSHGROUPS)
+.if ${PORT_OPTIONS:MDSHGROUPS}
CONFIGURE_ARGS+= --with-dshgroups
PLIST_SUB+= DSH=""
.else
@@ -43,7 +39,7 @@ CONFIGURE_ARGS+= --without-dshgroups
PLIST_SUB+= DSH="@comment "
.endif
-.if defined(WITH_NETGROUP)
+.if ${PORT_OPTIONS:MNETGROUP}
CONFIGURE_ARGS+= --with-netgroup
PLIST_SUB+= NETGROUP=""
.else
@@ -51,14 +47,14 @@ CONFIGURE_ARGS+= --without-netgroup
PLIST_SUB+= NETGROUP="@comment "
.endif
-.if defined(WITH_READLINE)
+.if ${PORT_OPTIONS:MREADLINE}
CONFIGURE_ARGS+= --with-readline
LIB_DEPENDS+= readline:${PORTSDIR}/devel/readline
.else
CONFIGURE_ARGS+= --without-readline
.endif
-.if defined(WITH_RSH)
+.if ${PORT_OPTIONS:MRSH}
CONFIGURE_ARGS+= --with-rsh
PLIST_SUB+= RSH=""
.else
Modified: head/sysutils/volman/Makefile
==============================================================================
--- head/sysutils/volman/Makefile Thu Mar 14 10:11:34 2013 (r314143)
+++ head/sysutils/volman/Makefile Thu Mar 14 11:20:54 2013 (r314144)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: volman
-# Date created: 2012-01-06
-# Whom: Aragon Gouveia <aragon at phat.za.net>
-#
+# Created by: Aragon Gouveia <aragon at phat.za.net>
# $FreeBSD$
-#
PORTNAME= volman
PORTVERSION= 0.7
@@ -18,12 +14,13 @@ USE_XZ= yes
USE_RC_SUBR= volmand
VM_SUB_FILES= vmount volmand
-OPTIONS= OPENBOX "Install Openbox pipemenu script" off \
- NTFS3G "Use fusefs-ntfs extensions" off
+OPTIONS_DEFINE= OPENBOX NTFS3G
+OPENBOX_DESC= Openbox pipemenu script
+NTFS3G_DESC= Use fusefs-ntfs extensions
.include <bsd.port.options.mk>
-.if defined(WITH_OPENBOX)
+.if ${PORT_OPTIONS:MOPENBOX}
VM_SUB_FILES+= obvolman
RUN_DEPENDS+= ${LOCALBASE}/bin/xmessage:${PORTSDIR}/x11/xmessage
PLIST_SUB+= OPENBOX=""
@@ -31,7 +28,7 @@ PLIST_SUB+= OPENBOX=""
PLIST_SUB+= OPENBOX="@comment "
.endif
-.if defined(WITH_NTFS3G)
+.if ${PORT_OPTIONS:MNTFS3G}
RUN_DEPENDS+= ${LOCALBASE}/bin/ntfs-3g:${PORTSDIR}/sysutils/fusefs-ntfs
SUB_LIST+= RCFUSEFS=" fusefs"
.else
More information about the svn-ports-head
mailing list