Date: Sat, 6 Oct 2012 21:59:19 GMT From: Chris Petrik <c.petrik.sosa@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172414: [PATCH] Convert my ports to OptionsNG Message-ID: <201210062159.q96LxJWu014366@red.freebsd.org> Resent-Message-ID: <201210062200.q96M0RHt014292@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172414
>Category: ports
>Synopsis: [PATCH] Convert my ports to OptionsNG
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 06 22:00:27 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Chris Petrik
>Release: FreeBSD 10-CURRENT
>Organization:
none
>Environment:
FreeBSD slappy.nohost 10.0-CURRENT FreeBSD 10.0-CURRENT #2 r241200: Fri Oct 5 23:40:41 CDT 2012 root@slappy.nohost:/usr/obj/usr/src/sys/devbox amd64
>Description:
Update my ports to OptionsNG
ftp/bareftp
multimedia/mplayerxp
x11-wm/waimea (deprecated)
x11-wm/waimea-devel (deprecated)
>How-To-Repeat:
N/A
>Fix:
Patch supplied.
Patch attached with submission follows:
Index: bareftp/Makefile
===================================================================
--- bareftp/Makefile (revision 305401)
+++ bareftp/Makefile (working copy)
@@ -25,11 +25,13 @@
MAN1= bareftp.1
-OPTIONS= KEYRING "Support for Gnome Keyring" on
+OPTIONS_DEFINE= GNOMEKEYRING
+OPTIONS_DEFAULT= GNOMEKEYRING
+
.include <bsd.port.options.mk>
-.if defined(WITHOUT_KEYRING)
+.if ${PORT_OPTIONS:MGNOMEKEYRING}
CONFIGURE_ARGS+= --without-gnomekeyring
.else
KEYRING_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-keyring-sharp-1.0.pc
Index: waimea/Makefile
===================================================================
--- waimea/Makefile (revision 305401)
+++ waimea/Makefile (working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: waimea
-# Date created: 27 May 2002
-# Whom: Alexey Dokuchaev <danfe@regency.nsu.ru>
-#
+# Created by: Alexey Dokuchaev <danfe@regency.nsu.ru>
# $FreeBSD$
-#
PORTNAME= waimea
PORTVERSION= 0.4.0
@@ -27,16 +23,18 @@
MAN1= waimea.1
-OPTIONS= PIXMAP "Build with pixmap textures support" on \
- DITHER "Enable ordered pseudocolor dithering" off
+OPTIONS_DEFINE= PIXMAP DITHER
+PIXMAP_DESC= Build with pixmap textures support
+DITHER_DESC= Enable ordered pseudocolor dithering
+OPTIONS_DEFAULT= PIXMAP
.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_PIXMAP)
+.if ${PORT_OPTIONS:MPIXMAP}
USE_EFL+= imlib2
.endif
-.if defined(WITH_DITHER)
+.if ${PORT_OPTIONS:MDITHER}
CONFIGURE_ARGS+= --enable-ordered-pseudo
.endif
Index: waimea-devel/Makefile
===================================================================
--- waimea-devel/Makefile (revision 305401)
+++ waimea-devel/Makefile (working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: Waimea
-# Date created: 03 Mar 2005
-# Whom: Alexey Dokuchaev <danfe@FreeBSD.org>
-#
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= waimea
PORTVERSION= 0.5.1
@@ -32,19 +28,18 @@
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS= PNG "Enable PNG support" On \
- SVG "Enable SVG support" On \
- THREAD "Enable threading support" Off
+OPTIONS_DEFINE= PNG SVG THREADS
+OPTIONS_DEFAULT= PNG SVG
.include <bsd.port.pre.mk>
-.if defined(WITH_PNG)
+.if ${PORT_OPTIONS:MPNG}
LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.else
CONFIGURE_ARGS+= --disable-png
.endif
-.if defined(WITH_SVG)
+.if ${PORT_OPTIONS:MSVG}
LIB_DEPENDS+= svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
.else
CONFIGURE_ARGS+= --disable-svg
@@ -52,7 +47,7 @@
LDFLAGS="-L${LOCALBASE}/lib"
.endif
-.if defined(WITH_THREAD)
+.if ${PORT_OPTIONS:MTHREADS}
CONFIGURE_ARGS+= --enable-thread
.endif
Index: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile (revision 305401)
+++ mplayerxp/Makefile (working copy)
@@ -15,14 +15,13 @@
vcdinfo.2:${PORTSDIR}/multimedia/vcdimager
RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts
-OPTIONS= DVDNAV "Enable libdvdnav support" off \
- DVDPLAY "Enable libdvdplay support" off \
- CDPARANOIA "Enable CDDA support" off \
- OCFLAGS "Use optimized compiler flags" off \
- SDL "Enable SDL video output" off \
- TERMCAP "Enable termcap key support" off \
- WIN32 "Enable win32 codec set" on
+OPTIONS_DEFINE= DVDNAV DVDPLAY CDPARANOIA OPTIMIZED_CFLAGS SDL TERMCAP WIN32
+DVDNAV_DESC=Enable libdvdnav support
+DVDPLAY_DESC=Enable libdvdplay support
+TERMCAP_DESC=Enable termcap key support
+WIN32_DESC=Enable win32 codec set
+OPTIONS_DEFAULT= WIN32
ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
@@ -63,7 +62,7 @@
##
# cdda support
-.if defined(WITH_CDPARANOIA)
+.if ${PORT_OPTIONS:MCDPARANOIA}
LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
CONFIGURE_ARGS+= --enable-cdparanoia
@@ -71,7 +70,7 @@
CONFIGURE_ARGS+= --disable-cdparanoia
.endif
# dvd support
-.if defined(WITH_DVDNAV) || defined(WITH_DVDPLAY)
+.if ${PORT_OPTIONS:MDVDNAV} || ${PORT_OPTIONS:MWITH_DVDPLAY}
LIB_DEPENDS+= dvdread.4:${PORTSDIR}/multimedia/libdvdread
CONFIGURE_ARGS+= --enable-libdvdread
@@ -79,7 +78,7 @@
CONFIGURE_ARGS+= --disable-libdvdread
.endif
# xine libdvdnav
-.if defined(WITH_DVDNAV)
+.if ${PORT_OPTIONS:MDVDNAV}
LIB_DEPENDS+= dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
CONFIGURE_ARGS+= --enable-libdvdnav
@@ -87,7 +86,7 @@
CONFIGURE_ARGS+= --disable-libdvdnav
.endif
# ogle's libdvdplay
-.if defined(WITH_DVDPLAY)
+.if ${PORT_OPTIONS:MDVDPLAY}
LIB_DEPENDS+= dvdplay.0:${PORTSDIR}/multimedia/libdvdplay
CONFIGURE_ARGS+= --enable-libdvdplay
@@ -95,13 +94,13 @@
CONFIGURE_ARGS+= --disable-libdvdplay
.endif
# compilation optimizations
-.if defined(WITH_OCFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
CFLAGS+= -O3 -ffast-math
.else
MAKE_ARGS+= OPTFLAGS="${CFLAGS}" SHCFLAGS="${CFLAGS} -PIC"
.endif
# sdl
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
USE_SDL= image sdl
CONFIGURE_ARGS+= --enable-sdl --enable-sdl-image
.else
@@ -109,13 +108,13 @@
.endif
# termcap key support
# mplayerxp does not clean up after itself yet
-.if defined(WITH_TERMCAP)
+.if ${PORT_OPTIONS:MTERMCAP}
CONFIGURE_ARGS+= --enable-termcap
.else
CONFIGURE_ARGS+= --disable-termcap
.endif
# win32 binary dll codecs
-.if !defined(WITHOUT_WIN32)
+.if ${PORT_OPTIONS:MWIN32}
RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210062159.q96LxJWu014366>