svn commit: r314853 - in head: astro/gpsd audio/deadbeef audio/decibel-audio-player audio/festival audio/liquidsoap audio/mma audio/moc audio/mp3blaster audio/mp3plot audio/mpc audio/mumble audio/m...
Baptiste Daroussin
bapt at FreeBSD.org
Thu Mar 21 17:32:36 UTC 2013
Author: bapt
Date: Thu Mar 21 17:32:34 2013
New Revision: 314853
URL: http://svnweb.freebsd.org/changeset/ports/314853
Log:
Convert to new options framework left un converted ports in a* categories
While here trim headers
Convert some gnomehack to pathfix
Convert some pkgconfig to USE_PKGCONFIG=build
Modified:
head/astro/gpsd/Makefile
head/audio/deadbeef/Makefile
head/audio/decibel-audio-player/Makefile
head/audio/festival/Makefile
head/audio/liquidsoap/Makefile
head/audio/mma/Makefile
head/audio/moc/Makefile
head/audio/mp3blaster/Makefile
head/audio/mp3plot/Makefile
head/audio/mpc/Makefile
head/audio/mumble/Makefile
head/audio/murmur/Makefile
head/audio/ncmpc/Makefile
head/audio/normalize/Makefile
head/audio/openal/Makefile
head/audio/pytone/Makefile
head/audio/qmpdclient/Makefile
head/audio/shoutcast/Makefile
head/audio/sox/Makefile
head/audio/streamripper/Makefile
head/audio/zynaddsubfx/Makefile
Modified: head/astro/gpsd/Makefile
==============================================================================
--- head/astro/gpsd/Makefile Thu Mar 21 16:02:03 2013 (r314852)
+++ head/astro/gpsd/Makefile Thu Mar 21 17:32:34 2013 (r314853)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gpsd
-# Date created: Jan, 10. 2006
-# Whom: Anton Karpov <toxa at toxahost.ru>
-#
+# Created by: Anton Karpov <toxa at toxahost.ru>
# $FreeBSD$
-#
PORTNAME= gpsd
PORTVERSION= 3.6
@@ -17,7 +13,8 @@ COMMENT= Daemon that monitors one or mor
BUILD_DEPENDS= docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
xsltproc:${PORTSDIR}/textproc/libxslt
-USE_GNOME= pkgconfig
+USES= pathfix
+USE_PKGCONFIG= build
USE_SCONS= yes
USE_RC_SUBR= gpsd
USE_PYTHON= yes
@@ -37,214 +34,217 @@ MAN5= srec.5 gpsd_json.5
MAN8= gpsd.8 gpsdctl.8
MANCOMPRESSED= no
-OPTIONS= AIVDM "Aivdm support" on \
- ASHTECH "Ashtech support" on \
- CPPBIND "Build C++ bindings" on \
- DBUS "DBUS support" off \
- EARTHMATE "DeLorme EarthMate Zodiac support" on \
- EVERMORE "Evermore binary support" on \
- FV18 "San Jose Navigation FV-18 support" on \
- GARMIN "Garmin kernel driver support" on \
- GARMINTXT "Garmin Simple Text support" on \
- GEOSTAR "Geostar Protocol support" on \
- GPSCLOCK "GPSclock support" on \
- GTK2 "Install py-gtk2 (required for xgps & xgpsspeed)" off \
- IP6 "IPv6 support" on \
- ITRAX "iTrax support" on \
- MTK "MTK-3301 support" on \
- NAVCOM "Navcom support" on \
- NETFEED "Build support for handling TCP/IP data sources" on \
- NCURSES "Build with ncurses(3)" off \
- NMEA "NMEA support" on \
- NTPSHM "NTP time hinting support" on \
- NTRIP "NTRIP support" on \
- OCEANSERVER "Oceanserver support" on \
- OLDPROTO "Old (pre-JSON) protocol support in client lib" on \
- ONCORE "Motorola OnCore chipset support" on \
- PASSTHROUGH "Build support for passing through JSON" on \
- PPS "PPS time syncing support" on \
- PPSONCTS "PPS pulse on CTS rather than DCD" off \
- PROFILING "Profiling support" off \
- RECONFIGURE "Allow gpsd to change device settings" on \
- RTCM104V2 "rtcm104v2 support" on \
- RTCM104V3 "rtcm104v3 support" on \
- SHMEXPORT "Enable export via shared memory" on \
- SIRF "SiRF chipset support" on \
- SOCKEXPORT "Enable export over sockets" on \
- SUPERSTARII "SuperStarII support" on \
- TIMING "Build latency timing support" on \
- TNT "True North Technologies support" on \
- TRIPMATE "DeLorme TripMate support" on \
- TSIP "Trimble TSIP support" on \
- QTBIND "build QT bindings" off \
- UBX "UBX protocol support" on \
- USB "libusb support for USB devices" on
+OPTIONS_DEFINE= AIVDM ASHTECH CPPBIND DBUS EARTHMATE EVERMORE FV18 GARMIN GARMINTXT \
+ GEOSTAR GPSCLOCK GTK2 IPV6 ITRAX MTK NAVCOM NETFEED NCURSES NMEA NTPSHM NTRIP \
+ OCEANSERVER OLDPROTO ONCORE PASSTHROUGH PPS PPSONCTS PROFILING RECONFIGURE \
+ RTCM104V2 RTCM104V3 SHMEXPORT SIRF SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE \
+ TSIP QTBIND UBX USB
+OPTIONS_DEFAULT= AIVDM ASHTECH CPPBIND EARTHMATE EVERMORE FV18 GARMIN GARMINTXT GEOSTAR \
+ GPSCLOCK ITRAX NAVCOM NETFEED NMEA NTPSHM NTRIP OCEANSERVER OLDPROTO \
+ ONCORE PASSTHROUGH PPS RECONFIGURE RTCM104V2 RTCM104V3 SHMEXPORT SIRF \
+ SOCKEXPORT SUPERSTARII TIMING TNT TRIPMATE TSIP UBX USB
+
+AIVDM_DESC= Aivdm support
+ASHTECH_DESC= Ashtech support
+CPPBIND_DESC= Build C++ bindings
+EARTHMATE_DESC= DeLorme EarthMate Zodiac support
+EVERMORE_DESC= Evermore binary support
+FV18_DESC= San Jose Navigation FV-18 support
+GARMIN_DESC= Garmin kernel driver support
+GARMINTXT_DESC= Garmin Simple Text support
+GEOSTAR_DESC= Geostar Protocol support
+GPSCLOCK_DESC= GPSclock support
+GTK2_DESC= Install py-gtk2 (required for xgps & xgpsspeed)
+ITRAX_DESC= iTrax support
+MTK_DESC= MTK-3301 support
+NAVCOM_DESC= Navcom support
+NCURSES_DESC= Build with ncurses(3)
+NETFEED_DESC= Build support for handling TCP/IP data sources
+NMEA_DESC= NMEA support
+NTPSHM_DESC= NTP time hinting support
+NTRIP_DESC= NTRIP support
+OCEANSERVER_DESC= Oceanserver support
+OLDPROTO_DESC= Old (pre-JSON) protocol support in client lib
+ONCORE_DESC= Motorola OnCore chipset support
+PASSTHROUGH_DESC= Build support for passing through JSON
+PPS_DESC= PPS time syncing support
+PPSONCTS_DESC= PPS pulse on CTS rather than DCD
+PROFILING_DESC= Profiling support
+RECONFIGURE_DESC= Allow gpsd to change device settings
+RTCM104V2_DESC= rtcm104v2 support
+RTCM104V3_DESC= rtcm104v3 support
+SHMEXPORT_DESC= Enable export via shared memory
+SIRF_DESC= SiRF chipset support
+SOCKEXPORT_DESC= Enable export over sockets
+SUPERSTARII_DESC= SuperStarII support
+TIMING_DESC= Build latency timing support
+TNT_DESC= True North Technologies support
+TRIPMATE_DESC= DeLorme TripMate support
+TSIP_DESC= Trimble TSIP support
+QTBIND_DESC= build QT bindings
+UBX_DESC= UBX protocol support
+USB_DESC= libusb support for USB devices
.include <bsd.port.options.mk>
-# Requires libusb.h available in 8.x
-.if ${OSVERSION} < 800069
-WITHOUT_USB= yes
-.endif
-
# Options related to GPS protocols
-.if defined(WITHOUT_NMEA)
+.if ! ${PORT_OPTIONS:MNMEA}
SCONS_ARGS+= nmea=no
.endif
-.if defined(WITHOUT_ASHTECH)
+.if ! ${PORT_OPTIONS:MASHTECH}
SCONS_ARGS+= ashtech=no
.endif
-.if defined(WITHOUT_EARTHMATE)
+.if ! ${PORT_OPTIONS:MEARTHMATE}
SCONS_ARGS+= earthmate=no
.endif
-.if defined(WITHOUT_EVERMORE)
+.if ! ${PORT_OPTIONS:MEVERMORE}
SCONS_ARGS+= evermore=no
.endif
-.if defined(WITHOUT_FV18)
+.if ! ${PORT_OPTIONS:MFV18}
SCONS_ARGS+= fv18=no
.endif
-.if defined(WITHOUT_GARMIN)
+.if ! ${PORT_OPTIONS:MGARMIN}
SCONS_ARGS+= garmin=no
.endif
-.if defined(WITHOUT_GARMINTXT)
+.if ! ${PORT_OPTIONS:MGARMINTXT}
SCONS_ARGS+= garmintxt=no
.endif
-.if defined(WITHOUT_GEOSTAR)
+.if ! ${PORT_OPTIONS:MGEOSTAR}
SCONS_ARGS+= geostar=no
.endif
-.if defined(WITHOUT_ITRAX)
+.if ! ${PORT_OPTIONS:MITRAX}
SCONS_ARGS+= itrax=no
.endif
-.if defined(WITHOUT_MTK)
+.if ! ${PORT_OPTIONS:MMTK}
SCONS_ARGS+= mtk3301=no
.endif
-.if defined(WITHOUT_NAVCOM)
+.if ! ${PORT_OPTIONS:MNAVCOM}
SCONS_ARGS+= navcom=no
.endif
-.if defined(WITHOUT_ONCORE)
+.if ! ${PORT_OPTIONS:MONCORE}
SCONS_ARGS+= oncore=no
.endif
-.if defined(WITHOUT_SIRF)
+.if ! ${PORT_OPTIONS:MSIRF}
SCONS_ARGS+= sirf=no
.endif
-.if defined(WITHOUT_SUPERSTARII)
+.if ! ${PORT_OPTIONS:MSUPERSTARII}
SCONS_ARGS+= superstar2=no
.endif
-.if defined(WITHOUT_TNT)
+.if ! ${PORT_OPTIONS:MTNT}
SCONS_ARGS+= tnt=no
.endif
-.if defined(WITHOUT_TRIPMATE)
+.if ! ${PORT_OPTIONS:MTRIPMATE}
SCONS_ARGS+= tripmate=no
.endif
-.if defined(WITHOUT_TSIP)
+.if ! ${PORT_OPTIONS:MTSIP}
SCONS_ARGS+= tsip=no
.endif
-.if defined(WITHOUT_UBX)
+.if ! ${PORT_OPTIONS:MUBX}
SCONS_ARGS+= ubx=no
.endif
# Options related to Non-GPS protocols
-.if defined(WITHOUT_AIVDM)
+.if ! ${PORT_OPTIONS:MAIVDM}
SCONS_ARGS+= aivdm=no
.endif
-.if defined(WITHOUT_GPSCLOCK)
+.if ! ${PORT_OPTIONS:MGPSCLOCK}
SCONS_ARGS+= gpsclock=no
.endif
-.if defined(WITHOUT_NTRIP)
+.if ! ${PORT_OPTIONS:MNTRIP}
SCONS_ARGS+= ntrip=no
.endif
-.if defined(WITHOUT_OCEANSERVER)
+.if ! ${PORT_OPTIONS:MOCEANSERVER}
SCONS_ARGS+= oceanserver=no
.endif
-.if defined(WITHOUT_RTCM104V2)
+.if ! ${PORT_OPTIONS:MRTCM104V2}
SCONS_ARGS+= rtcm104v2=no
.endif
-.if defined(WITHOUT_RTCM104V3)
+.if ! ${PORT_OPTIONS:MRTCM104V3}
SCONS_ARGS+= rtcm104v3=no
.endif
# Time service
-.if defined(WITHOUT_NTPSHM)
+.if ! ${PORT_OPTIONS:MNTPSHM}
SCONS_ARGS+= ntpshm=no
.endif
-.if defined(WITHOUT_PPS)
+.if ! ${PORT_OPTIONS:MPPS}
SCONS_ARGS+= pps=no
.else
-. if defined(WITHOUT_NTPSHM)
+. if ! ${PORT_OPTIONS:MNTPSHM}
IGNORE= PPS requires NTPSHM
. endif
.endif
-.if defined(WITH_PPSONCTS)
+.if ${PORT_OPTIONS:MPPSONCTS}
SCONS_ARGS+= pps_on_cts=yes
.endif
# Export methods
-.if defined(WITHOUT_SOCKEXPORT)
+.if ! ${PORT_OPTIONS:MSOCKEXPORT}
SCONS_ARGS+= socket_export=no
.endif
-.if defined(WITH_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
LIB_DEPENDS+= dbus:${PORTSDIR}/devel/dbus \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
SCONS_ARGS+= dbus_export=yes
.endif
-.if defined(WITHOUT_SHMEXPORT)
+.if ! ${PORT_OPTIONS:MSHMEXPORT}
SCONS_ARGS+= shm_export=no
.endif
# Communication
-.if defined(WITHOUT_USB)
+.if ! ${PORT_OPTIONS:MUSB}
SCONS_ARGS+= usb=no
.endif
-.if defined(WITHOUT_IPV6)
+.if ! ${PORT_OPTIONS:MIPV6}
SCONS_ARGS+= ipv6=no
.endif
-.if defined(WITHOUT_NETFEED)
+.if ! ${PORT_OPTIONS:MNETFEED}
SCONS_ARGS+= netfeed=no
.endif
-.if defined(WITHOUT_PASSTHROUGH)
+.if ! ${PORT_OPTIONS:MPASSTHROUGH}
SCONS_ARGS+= passthrough=no
.endif
# Other daemon options
-.if defined(WITHOUT_TIMING)
+.if ! ${PORT_OPTIONS:MTIMING}
SCONS_ARGS+= timing=no
.endif
# Client-side options
-.if defined(WITHOUT_OLDPROTO)
+.if ! ${PORT_OPTIONS:MOLDPROTO}
SCONS_ARGS+= oldstyle=no
.endif
-.if defined(WITH_QTBIND)
+.if ${PORT_OPTIONS:MQTBIND}
USE_QT4= network
SCONS_ARGS+= libQgpsmm=yes
PLIST_SUB+= QTBIND=""
@@ -253,23 +253,24 @@ SCONS_ARGS+= libQgpsmm=no
PLIST_SUB+= QTBIND="@comment "
.endif
-.if defined(WITHOUT_RECONFIGURE)
+.if ! ${PORT_OPTIONS:MRECONFIGURE}
SCONS_ARGS+= reconfigure=no
.endif
-.if defined(WITHOUT_CPPBIND)
+.if ! ${PORT_OPTIONS:MCPPBIND}
SCONS_ARGS+= libgpsmm=no
.endif
-.if defined(WITHOUT_NCURSES)
+.if ! ${PORT_OPTIONS:MNCURSES}
SCONS_ARGS+= ncurses=no
PLIST_SUB+= CURSES="@comment "
.else
PLIST_SUB+= CURSES=""
+USE_NCURSES= yes
.endif
# Build control
-.if defined(WITH_PROFILING)
+.if ${PORT_OPTIONS:MPROFILING}
SCONS_ARGS+= profiling=yes
.endif
Modified: head/audio/deadbeef/Makefile
==============================================================================
--- head/audio/deadbeef/Makefile Thu Mar 21 16:02:03 2013 (r314852)
+++ head/audio/deadbeef/Makefile Thu Mar 21 17:32:34 2013 (r314853)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: deadbeef
-# Date created: 2010-01-17
-# Whom: Gvozdikov Veniamin <g.veniamin at googlemail.com>
-#
+# Created by: Gvozdikov Veniamin <g.veniamin at googlemail.com>
# $FreeBSD$
-#
PORTNAME= deadbeef
PORTVERSION= 0.5.5
@@ -27,91 +23,86 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
USE_BZIP2= yes
USE_ICONV= yes
+USE_PKGCONFIG= build
CONFIGURE_ARGS= --disable-alsa --disable-nullout \
CPPFLAGS="-I../dumb/dumb-kode54/include -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lexecinfo -lintl"
WANT_GNOME= yes
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
-SH= ${LOCALBASE}/bin/bash # Hack for detecting depends
+CONFIGURE_ENV+= CONFIG_SHELL="${LOCALBASE}/bin/bash"
-OPTIONS= PULSE "PulseAudio output plugin (unsupported)" off\
- GUI "standard GTK2 user interface plugin" on\
- VFS "HTTP streaming vfs plugin" on\
- LASTFM "last.fm/libre.fm scrobbler plugin" on\
- ART "album art loader plugin" on\
- EQ "SuperEQ DSP plugin" on\
- SID "SID music player plugin" on\
- FFAP "Monkey's Audio plugin" on\
- VTX "libayemy VTX ZX-Spectrum music player plugin" on\
- ADP "adplug plugin" on\
- HOTKEYS "global hotkeys plugin" on\
- OGG "Ogg Vorbis player plugin" on\
- FFMPEG "FFMPEG plugin for WMA, MPC, TTA, etc" on\
- FLAC "FLAC player plugin" on\
- SNDFILE "libsndfile plugin for PCM wave files" on\
- WAV "wavpack plugin" on\
- CDDA "CD-Audio plugin" on\
- GME "Game Music Emu plugin" on\
- DUMB "D.U.M.B. plugin for MOD, S3M and other" on\
- NOTIFY "support for OSD notifications into GTKUI plugin" on\
- MUSEPACK "musepack plugin" on\
- WILD "wildmidi plugin" on\
- TTA "tta plugin" on\
- DCA "dca (DTS audio) plugin" on\
- AAC "AAC decoder based on FAAD2" on\
- MMS "MMS streaming vfs plugin" on\
- SHN "shorten plugin" on\
- AO "audio overload plugin" on\
- SHELLEXEC "shell commands plugin" on\
- NLS "Native Language Support" on\
- M3U "m3u plugin" on\
- PSF "AOSDK-based PSF(,QSF,SSF,DSF) plugin" on\
- DSP "libsamplerate (SRC) plugin" on\
- MONO2STEREO "mono2stereo DSP plugin" on\
- CONVERTER "Build converter" on\
- VFS_ZIP "ZIP support" on
+OPTIONS_DEFINE= PULSEAUDIO GUI VFS LASTFM ART EQ SID FFAP VTX HOTKEYS VORBIS FFMPEG \
+ FLAC SNDFILE WAV CDDA GME DUMB NOTIFY MUSEPACK WILD TTA DCA AAC \
+ MMS SHN AO SHELLEXEC NLS M3U PSF ADP DSP MONO2STEREO CONVERTER VFS_ZIP
+OPTIONS_DEFAULT= GUI VFS LASTFM ART EQ SID FFAP VTX HOSTKEYS VORBIS FFMPEG \
+ FLAC SNDFILE WAV CDDA GME DUMB NOTIFY MUSEPACK WILD TTA DCA \
+ AAC MMS SHN AO SHELLEXEC M3U PSF ADP DSP MONO2STEREO CONVERTER VFS_ZIP \
+ HOtKEYS
+PULSEAUDIO_DESC= PulseAudio output plugin (unsupported)
+GUI_DESC= standard GTK2 user interface plugin
+VFS_DESC= HTTP streaming vfs plugin
+LASTFM_DESC= last.fm/libre.fm scrobbler plugin
+ART_DESC= album art loader plugin
+EQ_DESC= SuperEQ DSP plugin
+SID_DESC= SID music player plugin
+FFAP_DESC= Monkey's Audio plugin
+VTX_DESC= libayemy VTX ZX-Spectrum music player plugin
+ADP_DESC= adplug plugin
+HOTKEYS_DESC= global hotkeys plugin
+CDDA_DESC= CD-Audio plugin
+GME_DESC= Game Music Emu plugin
+DUMB_DESC= D.U.M.B. plugin for MOD, S3M and other
+NOTIFY_DESC= support for OSD notifications into GTKUI plugin
+WILD_DESC= wildmidi plugin
+TTA_DESC= tta plugin
+SHN_DESC= shorten plugin
+AO_DESC= audio overload plugin
+SHELLEXEC_DESC= shell commands plugin
+M3U_DESC= m3u plugin
+PSF_DESC= AOSDK-based PSF(,QSF,SSF,DSF) plugin
+DSP_DESC= libsamplerate (SRC) plugin
+MONO2STEREO_DESC= mono2stereo DSP plugin
+CONVERTER_DESC= Build converter
+VFS_ZIP_DESC= ZIP support
.include <bsd.port.options.mk>
-.if defined(WITHOUT_PULSE)
-CONFIGURE_ARGS+= --disable-pulse
-PLIST_SUB+= PULSE="@comment "
-.else
+.if ${PORT_OPTIONS:MPULSEAUDIO}
PLIST_SUB+= PULSE=""
LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio
+.else
+CONFIGURE_ARGS+= --disable-pulse
+PLIST_SUB+= PULSE="@comment "
.endif
-.if defined(WITHOUT_GUI)
+.if ${PORT_OPTIONS:MGUI}
+PLIST_SUB+= GUI=""
+USE_GNOME= gtk20 glib20
+.else
CONFIGURE_ARGS+= --disable-gtkui
CONFIGURE_ARGS+= --disable-gtk3
PLIST_SUB+= GUI="@comment "
-.else
-PLIST_SUB+= GUI=""
-USE_GNOME= gtk20 glib20
.endif
-.if defined(WITHOUT_VFS)
-CONFIGURE_ARGS+= --disable-vfs-curl
-PLIST_SUB+= VFS="@comment "
-.else
+.if ${PORT_OPTIONS:MVFS}
PLIST_SUB+= VFS=""
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
+.else
+CONFIGURE_ARGS+= --disable-vfs-curl
+PLIST_SUB+= VFS="@comment "
.endif
-.if defined(WITHOUT_LASTFM)
-CONFIGURE_ARGS+= --disable-lfm
-PLIST_SUB+= LASTFM="@comment "
-.else
+.if ${PORT_OPTIONS:MLASTFM}
PLIST_SUB+= LASTFM=""
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
+.else
+CONFIGURE_ARGS+= --disable-lfm
+PLIST_SUB+= LASTFM="@comment "
.endif
-.if defined(WITHOUT_ART)
-CONFIGURE_ARGS+= --disable-artwork
-PLIST_SUB+= ART="@comment "
-.else
-.if !defined(WITHOUT_VFS)
+.if ${PORT_OPTIONS:MART}
+.if ${PORT_OPTIONS:MVFS}
CONFIGURE_ARTS+= --disable-artwork-imlib2
PLIST_SUB+= ART=""
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl \
@@ -119,243 +110,246 @@ LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
.else
BROKEN= VFS plugin required for album art loader, please rerun 'make config' and either disable ART or enable VFS
.endif
+.else
+CONFIGURE_ARGS+= --disable-artwork
+PLIST_SUB+= ART="@comment "
.endif
-.if defined(WITHOUT_EQ)
+.if ${PORT_OPTIONS:MEQ}
+PLIST_SUB+= EQ=""
+.else
CONFIGURE_ARGS+= --disable-supereq
PLIST_SUB+= EQ="@comment "
-.else
-PLIST_SUB+= EQ=""
.endif
-.if defined(WITHOUT_SID)
+.if ${PORT_OPTIONS:MSID}
+PLIST_SUB+= SID=""
+.else
CONFIGURE_ARGS+= --disable-sid
PLIST_SUB+= SID="@comment "
-.else
-PLIST_SUB+= SID=""
.endif
-.if defined(WITHOUT_FFAP)
-CONFIGURE_ARGS+= --disable-ffap
-PLIST_SUB+= FFAP="@comment "
-.else
+.if ${PORT_OPTIONS:MFFAP}
PLIST_SUB+= FFAP=""
BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
+.else
+CONFIGURE_ARGS+= --disable-ffap
+PLIST_SUB+= FFAP="@comment "
.endif
-.if defined(WITHOUT_VTX)
+.if ${PORT_OPTIONS:MVTX}
+PLIST_SUB+= VTX=""
+.else
CONFIGURE_ARGS+= --disable-vtx
PLIST_SUB+= VTX="@comment "
-.else
-PLIST_SUB+= VTX=""
.endif
-.if defined(WITHOUT_ADP)
+.if ${PORT_OPTIONS:MADP}
+PLIST_SUB+= ADP=""
+.else
CONFIGURE_ARGS+= --disable-adplug
PLIST_SUB+= ADP="@comment "
-.else
-PLIST_SUB+= ADP=""
.endif
-.if defined(WITHOUT_HOTKEYS)
+.if ${PORT_OPTIONS:MHOTKEYS}
+PLIST_SUB+= HOTKEYS=""
+.else
CONFIGURE_ARGS+= --disable-hotkeys
PLIST_SUB+= HOTKEYS="@comment "
-.else
-PLIST_SUB+= HOTKEYS=""
.endif
-.if defined(WITHOUT_OGG)
-CONFIGURE_ARGS+= --disable-vorbis
-PLIST_SUB+= OGG="@comment "
-.else
+.if ${PORT_OPTIONS:MOGG}
LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
PLIST_SUB+= OGG=""
+.else
+CONFIGURE_ARGS+= --disable-vorbis
+PLIST_SUB+= OGG="@comment "
.endif
-.if defined(WITHOUT_FFMPEG)
-CONFIGURE_ARGS+= --disable-ffmpeg
-PLIST_SUB+= FFMPEG="@comment "
-.else
+.if ${PORT_OPTIONS:MFFMPEG}
PLIST_SUB+= FFMPEG=""
LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg \
avformat:${PORTSDIR}/multimedia/ffmpeg \
avutil:${PORTSDIR}/multimedia/ffmpeg
+.else
+CONFIGURE_ARGS+= --disable-ffmpeg
+PLIST_SUB+= FFMPEG="@comment "
.endif
-.if defined(WITHOUT_FLAC)
-CONFIGURE_ARGS+= --disable-flac
-PLIST_SUB+= FLAC="@comment "
-.else
+.if ${PORT_OPTIONS:MFLAC}
LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac
PLIST_SUB+= FLAC=""
+.else
+CONFIGURE_ARGS+= --disable-flac
+PLIST_SUB+= FLAC="@comment "
.endif
-.if defined(WITHOUT_SNDFILE)
-CONFIGURE_ARGS+= --disable-sndfile
-PLIST_SUB+= SNDFILE="@comment "
-.else
+.if ${PORT_OPTIONS:MSNDFILE}
LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile
PLIST_SUB+= SNDFILE=""
+.else
+CONFIGURE_ARGS+= --disable-sndfile
+PLIST_SUB+= SNDFILE="@comment "
.endif
-.if defined(WITHOUT_WAV)
-CONFIGURE_ARGS+= --disable-wavpack
-PLIST_SUB+= WAV="@comment "
-.else
+.if ${PORT_OPTIONS:MWAV}
LIB_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack
PLIST_SUB+= WAV=""
+.else
+CONFIGURE_ARGS+= --disable-wavpack
+PLIST_SUB+= WAV="@comment "
.endif
-.if defined(WITHOUT_CDDA)
-CONFIGURE_ARGS+= --disable-cdda
-PLIST_SUB+= CDDA="@comment "
-.else
+.if ${PORT_OPTIONS:MCDDA}
PLIST_SUB+= CDDA=""
LIB_DEPENDS+= cdio:${PORTSDIR}/sysutils/libcdio \
cddb:${PORTSDIR}/audio/libcddb
+.else
+CONFIGURE_ARGS+= --disable-cdda
+PLIST_SUB+= CDDA="@comment "
.endif
-.if defined(WITHOUT_GME)
+.if ${PORT_OPTIONS:MGME}
+PLIST_SUB+= GME=""
+.else
CONFIGURE_ARGS+= --disable-gme
PLIST_SUB+= GME="@comment "
-.else
-PLIST_SUB+= GME=""
.endif
-.if defined(WITHOUT_DUMB)
+.if ${PORT_OPTIONS:MDUMB}
+PLIST_SUB+= DUMB=""
+.else
CONFIGURE_ARGS+= --disable-dumb
PLIST_SUB+= DUMB="@comment "
-.else
-PLIST_SUB+= DUMB=""
.endif
-.if defined(WITHOUT_NOTIFY)
-CONFIGURE_ARGS+= --disable-notify
-PLIST_SUB+= NOTIFY="@comment "
-.else
+.if ${PORT_OPTIONS:MNOTIFY}
PLIST_SUB+= NOTIFY=""
LIB_DEPENDS+= dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+.else
+CONFIGURE_ARGS+= --disable-notify
+PLIST_SUB+= NOTIFY="@comment "
.endif
-.if defined(WITHOUT_MUSEPACK)
+.if ${PORT_OPTIONS:MMUSEPACK}
+PLIST_SUB+= MUSEPACK=""
+.else
CONFIGURE_ARGS+= --disable-musepack
PLIST_SUB+= MUSEPACK="@comment "
-.else
-PLIST_SUB+= MUSEPACK=""
.endif
-.if defined(WITHOUT_WILD)
-CONFIGURE_ARGS+= --disable-wildmidi
-PLIST_SUB+= WILD="@comment "
-.else
+.if ${PORT_OPTIONS:MWILD}
RUN_DEPENDS+= ${LOCALBASE}/share/freepats/crude.cfg:${PORTSDIR}/audio/freepats
PLIST_SUB+= WILD=""
+.else
+CONFIGURE_ARGS+= --disable-wildmidi
+PLIST_SUB+= WILD="@comment "
.endif
-.if defined(WITHOUT_TTA)
+.if ${PORT_OPTIONS:MTTA}
+PLIST_SUB+= TTA=""
+.else
CONFIGURE_ARGS+= --disable-tta
PLIST_SUB+= TTA="@comment "
-.else
-PLIST_SUB+= TTA=""
.endif
-.if defined(WITHOUT_DCA)
+.if ${PORT_OPTIONS:MDCA}
+PLIST_SUB+= DCA=""
+.else
CONFIGURE_ARGS+= --disable-dca
PLIST_SUB+= DCA="@comment "
-.else
-PLIST_SUB+= DCA=""
.endif
-.if defined(WITHOUT_AAC)
-CONFIGURE_ARGS+= --disable-aac
-PLIST_SUB+= AAC="@comment "
-.else
+.if ${PORT_OPTIONS:MAAC}
PLIST_SUB+= AAC=""
LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad
+.else
+CONFIGURE_ARGS+= --disable-aac
+PLIST_SUB+= AAC="@comment "
.endif
-.if defined(WITHOUT_MMS)
+.if ${PORT_OPTIONS:MMMS}
+PLIST_SUB+= MMS=""
+.else
CONFIGURE_ARGS+= --disable-mms
PLIST_SUB+= MMS="@comment "
-.else
-PLIST_SUB+= MMS=""
.endif
-.if defined(WITHOUT_SHN)
+.if ${PORT_OPTIONS:MSHN}
+PLIST_SUB+= SHN=""
+.else
CONFIGURE_ARGS+= --disable-shn
PLIST_SUB+= SHN="@comment "
-.else
-PLIST_SUB+= SHN=""
.endif
-.if defined(WITHOUT_AO)
+.if ${PORT_OPTIONS:MAO}
+PLIST_SUB+= AO=""
+.else
CONFIGURE_ARGS+= --disable-ao
PLIST_SUB+= AO="@comment "
-.else
-PLIST_SUB+= AO=""
.endif
-.if defined(WITHOUT_SHELLEXEC)
+.if ${PORT_OPTIONS:MSHELLEXEC}
+PLIST_SUB+= SHELLEXEC=""
+.else
CONFIGURE_ARGS+= --disable-shellexec
PLIST_SUB+= SHELLEXEC="@comment "
-.else
-PLIST_SUB+= SHELLEXEC=""
.endif
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
+PLIST_SUB+= NLS=""
+.else
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
-.else
-PLIST_SUB+= NLS=""
.endif
-.if defined(WITHOUT_CONVERTER)
-CONFIGURE_ARGS+= --disable-converter
-PLIST_SUB+= CONVERTER="@comment "
-.else
-.if !defined(WITHOUT_GUI)
+.if ${PORT_OPTIONS:MCONVERTER}
+.if ${PORT_OPTIONS:MGUI}
PLIST_SUB+= CONVERTER=""
USE_GNOME= gtk20 glib20
.else
BROKEN= CONVERTER plugin required for gui, please rerun 'make config' and either disable CONVERTER or enable GUI
.endif
+.else
+CONFIGURE_ARGS+= --disable-converter
+PLIST_SUB+= CONVERTER="@comment "
.endif
-.if defined(WITHOUT_M3U)
+.if ${PORT_OPTIONS:MM3U}
+PLIST_SUB+= M3U=""
+.else
CONFIGURE_ARGS+= --disable-m3u
PLIST_SUB+= M3U="@comment "
-.else
-PLIST_SUB+= M3U=""
.endif
-.if defined(WITHOUT_PSF)
+.if ${PORT_OPTIONS:MPSF}
+PLIST_SUB+= PSF=""
+.else
CONFIGURE_ARGS+= --disable-psf
PLIST_SUB+= PSF="@comment "
-.else
-PLIST_SUB+= PSF=""
.endif
-.if defined(WITHOUT_DSP)
-CONFIGURE_ARGS+= --disable-src
-PLIST_SUB+= DSP="@comment "
-.else
+.if ${PORT_OPTIONS:MDSP}
PLIST_SUB+= DSP=""
LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate
+.else
+CONFIGURE_ARGS+= --disable-src
+PLIST_SUB+= DSP="@comment "
.endif
-.if defined(WITHOUT_MONO2STEREO)
+.if ${PORT_OPTIONS:MMONO2STEREO}
+PLIST_SUB+= MONO2STEREO=""
+.else
CONFIGURE_ARGS+= --disable-mono2stereo
PLIST_SUB+= MONO2STEREO="@comment "
-.else
-PLIST_SUB+= MONO2STEREO=""
.endif
-.if defined(WITHOUT_VFS_ZIP)
-CONFIGURE_ARGS+= --disable-vfs-zip
-PLIST_SUB+= VFS_ZIP="@comment "
-.else
+.if ${PORT_OPTIONS:MVFS_ZIP}
PLIST_SUB+= VFS_ZIP=""
LIB_DEPENDS+= zip:${PORTSDIR}/archivers/libzip
+.else
+CONFIGURE_ARGS+= --disable-vfs-zip
+PLIST_SUB+= VFS_ZIP="@comment "
.endif
post-patch:
Modified: head/audio/decibel-audio-player/Makefile
==============================================================================
--- head/audio/decibel-audio-player/Makefile Thu Mar 21 16:02:03 2013 (r314852)
+++ head/audio/decibel-audio-player/Makefile Thu Mar 21 17:32:34 2013 (r314853)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: decibel-audio-player
-# Date created: 2010-03-17
-# Whom: kipz <somicide at gmail.com>
-#
+# Created by: kipz <somicide at gmail.com>
# $FreeBSD$
-#
PORTNAME= decibel-audio-player
PORTVERSION= 1.08
@@ -27,57 +23,53 @@ NO_BUILD= yes
MAN1= decibel-audio-player.1 decibel-audio-player-remote.1
#Audio gstreamer plugins
-OPTIONS= AUDIOCD "AudioCD support" on \
- FLAC "FLAC support" on \
- MP3 "MP3 support" on \
- MPEG4IP "AAC/MP4P support" on \
- OGG "OGG support" on \
- SPEEX "OGG/Speex support" off \
- VORBIS "OGG/Vorbis support" on \
- WAVPACK "Wavpack support" on
-
-#A few extra requirements if we want to use some nifty plugins in decibel
-OPTIONS+= EXTRAS "Extra dependencies for plugins" on
+OPTIONS_DEFINE= AUDIOCD FLAC MP3 MPEG4IP OGG VORBIS SPEEX WAVPACK EXTRAS
+OPTIONS_DEFAULT= AUDIOCD FLAC MP3 MPEG4IP OGG VORBIS WAVPACK EXTRAS
+AUDIOCD_DESC= AudioCD support
+MPEG4IP_DESC= AAC/MP4P support
+#
+##A few extra requirements if we want to use some nifty plugins in decibel
+EXTRAS_DESC= Extra dependencies for plugins
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_AUDIOCD)
+.if ${PORT_OPTIONS:MAUDIOCD}
RUN_DEPENDS+= cd-discid>=0.9:${PORTSDIR}/audio/cd-discid \
py*-cddb>=1.4:${PORTSDIR}/audio/py-cddb \
gstreamer-plugins-cdio>=0.10.16:${PORTSDIR}/sysutils/gstreamer-plugins-cdio
.endif
-.if !defined(WITHOUT_EXTRAS)
+.if ${PORT_OPTIONS:MEXTRAS}
RUN_DEPENDS+= py*-imaging>=1.1.6:${PORTSDIR}/graphics/py-imaging \
py*-notify>=0.1.1:${PORTSDIR}/devel/py-notify
.endif
-.if !defined(WITHOUT_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
USE_GSTREAMER+= flac
.endif
-.if !defined(WITHOUT_MP3)
+.if ${PORT_OPTIONS:MMP3}
USE_GSTREAMER+= mp3
.endif
-.if !defined(WITHOUT_MPEG4IP)
+.if ${PORT_OPTIONS:MMPEG4IP}
LIB_DEPENDS+= mp4v2.10:${PORTSDIR}/multimedia/mp4v2
USE_GSTREAMER+= faad
.endif
-.if !defined(WITHOUT_OGG)
+.if ${PORT_OPTIONS:MOGG}
USE_GSTREAMER+= ogg
.endif
-.if !defined(WITHOUT_SPEEX)
+.if ${PORT_OPTIONS:MSPEEX}
USE_GSTREAMER+= speex
.endif
-.if !defined(WITHOUT_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
USE_GSTREAMER+= vorbis
.endif
-.if !defined(WITHOUT_WAVPACK)
+.if ${PORT_OPTIONS:MWAVPACK}
LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack
USE_GSTREAMER+= wavpack
.endif
@@ -86,4 +78,4 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/Makefile
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/audio/festival/Makefile
==============================================================================
--- head/audio/festival/Makefile Thu Mar 21 16:02:03 2013 (r314852)
+++ head/audio/festival/Makefile Thu Mar 21 17:32:34 2013 (r314853)
@@ -13,8 +13,9 @@ DISTFILES= ${DISTNAME}-beta.tar.gz \
MAINTAINER= mi at aldan.algebra.com
COMMENT= Multi-lingual speech synthesis system
-OPTIONS= NAS "Enable Network Audio System (NAS) backend" on \
- ESD "Enable ESound backend" on
+OPTIONS_DEFINE= NAS ESD
+OPTIONS_DEFAULT= NAS ESD
+ESD_DESC= ${ESOUND_DESC}
DIST_SUBDIR= festival
@@ -45,10 +46,10 @@ post-patch::
${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
${WRKSRC}/*/config/systems/default.mak
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.for m in nas esd
-. ifdef WITH_${m:U}
+. ifdef ${PORT_OPTIONS:M${m:U}}
LIB_DEPENDS+= ${m:nas=audio}:${PORTSDIR}/audio/${m:esd=esound}
post-patch::
${REINPLACE_CMD} -e 's,# INCLUDE_MODULES += ${m:U}_AUDIO,INCLUDE_MODULES += ${m:U}_AUDIO,' \
@@ -103,4 +104,4 @@ do-install:
${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/man/man1/festival_client.1
${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/audio/liquidsoap/Makefile
==============================================================================
--- head/audio/liquidsoap/Makefile Thu Mar 21 16:02:03 2013 (r314852)
+++ head/audio/liquidsoap/Makefile Thu Mar 21 17:32:34 2013 (r314853)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: liquidsoap
-# Date created: 4 Nov 2009
-# Whom: Mykola Dzham <i at levsha.me>
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list