Index: astro/gpsd/Makefile =================================================================== --- astro/gpsd/Makefile (revision 314844) +++ astro/gpsd/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gpsd -# Date created: Jan, 10. 2006 -# Whom: Anton Karpov -# +# Created by: Anton Karpov # $FreeBSD$ -# PORTNAME= gpsd PORTVERSION= 3.6 @@ -17,7 +13,8 @@ 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 @@ 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 -# 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 @@ 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 Index: audio/deadbeef/Makefile =================================================================== --- audio/deadbeef/Makefile (revision 314844) +++ audio/deadbeef/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: deadbeef -# Date created: 2010-01-17 -# Whom: Gvozdikov Veniamin -# +# Created by: Gvozdikov Veniamin # $FreeBSD$ -# PORTNAME= deadbeef PORTVERSION= 0.5.5 @@ -27,91 +23,86 @@ 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 -.if defined(WITHOUT_PULSE) +.if ${PORT_OPTIONS:MPULSEAUDIO} +PLIST_SUB+= PULSE="" +LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio +.else CONFIGURE_ARGS+= --disable-pulse PLIST_SUB+= PULSE="@comment " -.else -PLIST_SUB+= PULSE="" -LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio .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) +.if ${PORT_OPTIONS:MVFS} +PLIST_SUB+= VFS="" +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +.else CONFIGURE_ARGS+= --disable-vfs-curl PLIST_SUB+= VFS="@comment " -.else -PLIST_SUB+= VFS="" -LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl .endif -.if defined(WITHOUT_LASTFM) +.if ${PORT_OPTIONS:MLASTFM} +PLIST_SUB+= LASTFM="" +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +.else CONFIGURE_ARGS+= --disable-lfm PLIST_SUB+= LASTFM="@comment " -.else -PLIST_SUB+= LASTFM="" -LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl .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 @@ .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) +.if ${PORT_OPTIONS:MFFAP} +PLIST_SUB+= FFAP="" +BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm +.else CONFIGURE_ARGS+= --disable-ffap PLIST_SUB+= FFAP="@comment " -.else -PLIST_SUB+= FFAP="" -BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .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) +.if ${PORT_OPTIONS:MOGG} +LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis +PLIST_SUB+= OGG="" +.else CONFIGURE_ARGS+= --disable-vorbis PLIST_SUB+= OGG="@comment " -.else -LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis -PLIST_SUB+= OGG="" .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) +.if ${PORT_OPTIONS:MFLAC} +LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac +PLIST_SUB+= FLAC="" +.else CONFIGURE_ARGS+= --disable-flac PLIST_SUB+= FLAC="@comment " -.else -LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac -PLIST_SUB+= FLAC="" .endif -.if defined(WITHOUT_SNDFILE) +.if ${PORT_OPTIONS:MSNDFILE} +LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile +PLIST_SUB+= SNDFILE="" +.else CONFIGURE_ARGS+= --disable-sndfile PLIST_SUB+= SNDFILE="@comment " -.else -LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile -PLIST_SUB+= SNDFILE="" .endif -.if defined(WITHOUT_WAV) +.if ${PORT_OPTIONS:MWAV} +LIB_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack +PLIST_SUB+= WAV="" +.else CONFIGURE_ARGS+= --disable-wavpack PLIST_SUB+= WAV="@comment " -.else -LIB_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack -PLIST_SUB+= WAV="" .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) +.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 " -.else -PLIST_SUB+= NOTIFY="" -LIB_DEPENDS+= dbus-glib-1:${PORTSDIR}/devel/dbus-glib .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) +.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 " -.else -RUN_DEPENDS+= ${LOCALBASE}/share/freepats/crude.cfg:${PORTSDIR}/audio/freepats -PLIST_SUB+= WILD="" .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) +.if ${PORT_OPTIONS:MAAC} +PLIST_SUB+= AAC="" +LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad +.else CONFIGURE_ARGS+= --disable-aac PLIST_SUB+= AAC="@comment " -.else -PLIST_SUB+= AAC="" -LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad .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) +.if ${PORT_OPTIONS:MDSP} +PLIST_SUB+= DSP="" +LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate +.else CONFIGURE_ARGS+= --disable-src PLIST_SUB+= DSP="@comment " -.else -PLIST_SUB+= DSP="" -LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate .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) +.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 " -.else -PLIST_SUB+= VFS_ZIP="" -LIB_DEPENDS+= zip:${PORTSDIR}/archivers/libzip .endif post-patch: Index: audio/decibel-audio-player/Makefile =================================================================== --- audio/decibel-audio-player/Makefile (revision 314844) +++ audio/decibel-audio-player/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: decibel-audio-player -# Date created: 2010-03-17 -# Whom: kipz -# +# Created by: kipz # $FreeBSD$ -# PORTNAME= decibel-audio-player PORTVERSION= 1.08 @@ -27,57 +23,53 @@ 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 +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 -#A few extra requirements if we want to use some nifty plugins in decibel -OPTIONS+= EXTRAS "Extra dependencies for plugins" on +.include -.include - -.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 @@ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/Makefile -.include +.include Index: audio/festival/Makefile =================================================================== --- audio/festival/Makefile (revision 314844) +++ audio/festival/Makefile (working copy) @@ -13,8 +13,9 @@ MAINTAINER= mi@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 @@ ${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/*/config/systems/default.mak -.include +.include .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 @@ ${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/man/man1/festival_client.1 ${CAT} ${PKGMESSAGE} -.include +.include Index: audio/liquidsoap/Makefile =================================================================== --- audio/liquidsoap/Makefile (revision 314844) +++ audio/liquidsoap/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: liquidsoap -# Date created: 4 Nov 2009 -# Whom: Mykola Dzham -# +# Created by: Mykola Dzham # $FreeBSD$ -# PORTNAME= liquidsoap PORTVERSION= 1.0.0 @@ -29,30 +25,30 @@ BUILD_DEPENDS+= p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM .endif -OPTIONS= AACPLUS "AAC+ encoding" On \ - AO "portable and stable, but it does only output" Off \ - CRY "streaming to icecast and compatible servers" On \ - DSSI "standard for synthesizer plugins (need LADSPA)" Off \ - FAAD "AAC decoding" On \ - FESTIVAL "speech synthesis (say)" On \ - FLAC "flac format decoding and encoding" Off \ - GAVL "converts from and to many formats" Off \ - GSTREAMER "used to provide V4l inputs" Off \ - JACK "audio connection kit, designed for low latency" On \ - LADSPA "audio plugins providing sound effects" Off \ - LO "OSC protocol to have external controls" Off \ - MAD "for MP3 decoding" On \ - OGG "ogg/vorbis and ogg/theora encoding and decoding" On \ - VOAACENC "AAC encoding" On \ - VORBIS "ogg/vorbis encoding and decoding (need OGG)" On \ - SCHROEDINGER "for ogg/dirac encoding and decoding (need OGG)" Off \ - SPEEX "ogg/speex encoding and decoding (need OGG)" Off \ - THEORA "ogg/theora encoding and decoding (need OGG)" Off \ - SAMPLERATE "for having better quality resampling" Off \ - SOUNDTOUCH "for changing pitch and tempo of sound" Off \ - PULSEAUDIO "cross-platform audio sound server" Off \ - TAGLIB "for MP3 ID3 tag reading" On \ - WGET "for downloading remote files (http, https, ftp)" On +OPTIONS_DEFINE= AACPLUS AO CRY DSSI FAAD FESTIVAL FLAC GAVL GSTREAMER JACK LADSPA LO \ + MAD OGG VOAACENC VORBIS SCHROEDINGER SPEEX THEORA SAMPLERATE PULSEAUDIO \ + TAGLIB WGET DOCS EXAMPLES +OPTIONS_DEFAULT= AACPLUS CRY FAAD FESTIVAL JACK MAD OGG VOAACENC VORBIS TAGLIB WGET +AACPLUS_DESC= AAC+ encoding +AO_DESC= portable and stable, but it does only output +CRY_DESC= streaming to icecast and compatible servers +DSSI_DESC= standard for synthesizer plugins (need LADSPA) +FESTIVAL_DESC= speech synthesis (say) +GAVL_DESC= converts from and to many formats +GSTREAMER_DESC= used to provide V4l inputs +JACK_DESC= audio connection kit, designed for low latency +LADSPA_DESC= audio plugins providing sound effects +LO_DESC= OSC protocol to have external controls +OGG_DESC= ogg/vorbis and ogg/theora encoding and decoding +VOAACENC_DESC= AAC encoding +VORBIS_DESC= ogg/vorbis encoding and decoding (need OGG) +SCHROEDINGER_DESC= ogg/dirac encoding and decoding (need OGG) +SPEEX_DESC= ogg/speex encoding and decoding (need OGG) +THEORA_DESC= ogg/theora encoding and decoding (need OGG) +SAMPLERATE_DESC= for having better quality resampling +SOUNDTOUCH_DESC= for changing pitch and tempo of sound +TAGLIB_DESC= for MP3 ID3 tag reading +WGET_DESC= for downloading remote files (http, https, ftp) # xmplapalylist disabled now: missing ocaml-xmlm port # XMLPLAYLIST "support various xml format (rss/podcast/etc)" Off \ @@ -81,13 +77,6 @@ CFLAGS+= -I${LOCALBASE}/${OCAML_LIBDIR} MAKE_ENV+= OCAMLMKLIB_FLAGS="-L${LOCALBASE}/lib" -.if defined(NOPORTDOCS) -MAKE_ENV+= PORTDOCS="@: " -.endif -.if defined(NOPORTEXAMPLES) -MAKE_ENV+= PORTEXAMPLES="@: " -.endif - MAN1= liquidsoap.1 LIQUIDSOAP_USER= liquidsoap @@ -105,8 +94,15 @@ .include -WITH_LAME= yes +.if ${PORT_OPTIONS:MDOCS} +MAKE_ENV+= PORTDOCS="@: " +.endif +.if ${PORT_OPTIONS:MEXAMPLES} +MAKE_ENV+= PORTEXAMPLES="@: " +.endif +PORT_OPTIONS+= LAME + # alsa and portaudio disabled permanently - alsa is linux only, portaudio broken _ALL_PACKAGES= aacplus alsa ao cry dssi faad flac gavl gstreamer ladspa lame lo mad ogg vorbis schroedinger speex theora samplerate soundtouch voaacenc portaudio pulseaudio taglib xmlplaylist lastfm @@ -132,36 +128,36 @@ LIB_DEPENDS_taglib= tag.1:${PORTSDIR}/audio/taglib LIB_DEPENDS_voaacenc= vo-aacenc.0:${PORTSDIR}/audio/vo-aacenc -.if defined(WITH_FESTIVAL) +.if ${PORT_OPTIONS:MFESTIVAL} RUN_DEPENDS+= ${LOCALBASE}/bin/festival:${PORTSDIR}/audio/festival .endif -.if defined(WITH_WGET) +.if ${PORT_OPTIONS:MWGET} RUN_DEPENDS+= ${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget .endif -.if defined(WITH_VORBIS) && !defined(WITH_OGG) +.if ${PORT_OPTIONS:MVORBIS} && ! ${PORT_OPTIONS:MDOCS} IGNORE= ogg required for vorbis. please rerun make config and select ogg .endif -.if defined(WITH_SPEEX) && !defined(WITH_OGG) +.if ${PORT_OPTIONS:MSPEEX} && ! ${PORT_OPTIONS:MOGG} IGNORE= ogg required for speex. please rerun make config and select ogg .endif -.if defined(WITH_THEORA) && ( !defined(WITH_OGG) || !defined(WITH_VORBIS) ) +.if ${PORT_OPTIONS:MTHEORA} && ( ! ${PORT_OPTIONS:MOGG} || ! ${PORT_OPTIONS:MVORBIS} ) IGNORE= ogg and vorbis required for theora. Please rerun make config and select ogg and vorbis .endif -.if defined(WITH_LASTFM) && !defined(WITH_XMLPLAYLIST) +.if ${PORT_OPTIONS:MLASTFM} && ${PORT_OPTIONS:MXMLPLAYLIST} IGNORE= xmlplaylist required for lastfm. please rerun make config and select xmlplaylist .endif -.if defined(WITH_DSSI) && !defined(WITH_LADSPA) +.if ${PORT_OPTIONS:MDSSI} && ! ${PORT_OPTIONS:MLADSPA} IGNORE= ladspa required for dssi. Please rerun make config and select ladspa .endif #Server is known as JACK, but module named ocaml-bjack -.if defined(WITH_JACK) +.if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack .else _DISABLE_SED_ARGS+= -e "s/^ocaml-bjack/\#ocaml-bjack/" @@ -169,7 +165,7 @@ .endif .for i in ${_ALL_PACKAGES} -.if defined(WITH_${i:U}) +.if ${PORT_OPTIONS:M${i:U}} .if defined(LIB_DEPENDS_${i}) LIB_DEPENDS+= ${LIB_DEPENDS_${i}} .endif @@ -182,7 +178,7 @@ .endif .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ALL_TARGET= all doc .endif Index: audio/mma/Makefile =================================================================== --- audio/mma/Makefile (revision 314844) +++ audio/mma/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mma -# Date created: 2007-03-10 -# Whom: Nicola Vitale -# +# Created by: Nicola Vitale # $FreeBSD$ -# PORTNAME= mma PORTVERSION= 12.02 @@ -17,9 +13,11 @@ USE_PYTHON= -2.7 -OPTIONS= TIMIDITY "Install timidity++ as MIDI player" Off \ - PLAYMIDI "Install playmidi as MIDI player" Off +OPTIONS_DEFINE= TIMIDITY PLAYMIDI DOCS EXAMPLES +TIMIDITY_DESC= Install timidity++ as MIDI player +PLAYMIDI_DESC= Install playmidi as MIDI player + REINPLACE_ARGS= -i.bak -e 's,%%DATADIR%%,${DATADIR},' WRKSRC= ${WRKDIR}/${PORTNAME}-bin-${DISTVERSION} @@ -32,10 +30,20 @@ MAN8= mma-libdoc.8 .endif -.if !defined (NOPORTDOCS) +.include + +.if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${PORTNAME}-pdf-${DISTVERSION:S,a,,}.tar.gz .endif +.if ${PORT_OPTIONS:MTIMIDITY} +RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity++ +.endif + +.if ${PORT_OPTIONS:MPLAYMIDI} +RUN_DEPENDS+= playmidi:${PORTSDIR}/audio/playmidi +.endif + post-patch: @${REINPLACE_CMD} ${WRKSRC}/mma.py @@ -48,10 +56,10 @@ .for d in lib includes MMA @cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR} .endfor -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} && cd ${WRKSRC}/egs && ${COPYTREE_SHARE} . ${EXAMPLESDIR} .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR}/pdf && ${CP} ${WRKDOC}/*.pdf ${DOCSDIR}/pdf/ && \ cd ${WRKSRC}/docs/html && ${COPYTREE_SHARE} . ${DOCSDIR}/html .endif @@ -63,14 +71,4 @@ post-install: ${MMABIN} -G -.include - -.if defined (WITH_TIMIDITY) -RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity++ -.endif - -.if defined (WITH_PLAYMIDI) -RUN_DEPENDS+= playmidi:${PORTSDIR}/audio/playmidi -.endif - -.include +.include Index: audio/moc/Makefile =================================================================== --- audio/moc/Makefile (revision 314844) +++ audio/moc/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: moc -# Date created: 24 July 2005 -# Whom: Revis Zinkov -# +# Created by: Revis Zinkov # $FreeBSD$ -# PORTNAME= moc PORTVERSION= 2.4.4 @@ -24,27 +20,20 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= JACK "JACK support" off \ - MP3 "MP3 support" on \ - FFMPEG "FFMPEG support" off \ - MUSEPACK "Musepack (mpc) support" off \ - VORBIS "Ogg Vorbis support" on \ - FLAC "FLAC support" off \ - SNDFILE "libsndfile support" off \ - SPEEX "Speex support" off \ - SAMPLERATE "libsamplerate support" off \ - CURL "curl support (Internet streams)" on \ - RCC "RCC support" off +OPTIONS_DEFINE= JACK MP3 FFMPEG MUSEPACK VORBIS FLAC SNDFILE SPEEX SAMPLERATE CURL RCC +OPTIONS_DEFAULT= MP3 VORBIS CURL +CURL_DESC= curl support (Internet streams) +RCC_DESC= RCC support -.include +.include -.if defined(WITH_JACK) +.if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack .else CONFIGURE_ARGS+= --without-jack .endif -.if defined(WITH_MP3) +.if ${PORT_OPTIONS:MMP3} LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad \ id3tag.0:${PORTSDIR}/audio/libid3tag PLIST_FILES+= lib/moc/decoder_plugins/libmp3_decoder.a \ @@ -54,7 +43,7 @@ CONFIGURE_ARGS+= --without-mp3 .endif -.if defined(WITH_MUSEPACK) +.if ${PORT_OPTIONS:MMUSEPACK} LIB_DEPENDS+= mpcdec.7:${PORTSDIR}/audio/musepack \ tag_c.0:${PORTSDIR}/audio/taglib PLIST_FILES+= lib/moc/decoder_plugins/libmusepack_decoder.a \ @@ -64,7 +53,7 @@ CONFIGURE_ARGS+= --without-musepack .endif -.if defined(WITH_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis PLIST_FILES+= lib/moc/decoder_plugins/libvorbis_decoder.a \ lib/moc/decoder_plugins/libvorbis_decoder.la \ @@ -73,7 +62,7 @@ CONFIGURE_ARGS+= --without-ogg .endif -.if defined(WITH_FLAC) +.if ${PORT_OPTIONS:MFLAC} LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac PLIST_FILES+= lib/moc/decoder_plugins/libflac_decoder.a \ lib/moc/decoder_plugins/libflac_decoder.la \ @@ -82,7 +71,7 @@ CONFIGURE_ARGS+= --without-flac .endif -.if defined(WITH_FFMPEG) +.if ${PORT_OPTIONS:MFFMPEG} LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg PLIST_FILES+= lib/moc/decoder_plugins/libffmpeg_decoder.a \ lib/moc/decoder_plugins/libffmpeg_decoder.la \ @@ -91,7 +80,7 @@ CONFIGURE_ARGS+= --without-ffmpeg .endif -.if defined(WITH_SNDFILE) +.if ${PORT_OPTIONS:MSNDFILE} LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile PLIST_FILES+= lib/moc/decoder_plugins/libsndfile_formats_decoder.a \ lib/moc/decoder_plugins/libsndfile_formats_decoder.la \ @@ -100,7 +89,7 @@ CONFIGURE_ARGS+= --without-sndfile .endif -.if defined(WITH_SPEEX) +.if ${PORT_OPTIONS:MSPEEX} LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex PLIST_FILES+= lib/moc/decoder_plugins/libspeex_decoder.a \ lib/moc/decoder_plugins/libspeex_decoder.la \ @@ -109,23 +98,23 @@ CONFIGURE_ARGS+= --without-speex .endif -.if defined(WITH_SAMPLERATE) +.if ${PORT_OPTIONS:MSAMPLERATE} LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate .else CONFIGURE_ARGS+= --without-samplerate .endif -.if defined(WITH_CURL) +.if ${PORT_OPTIONS:MCURL} LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl .else CONFIGURE_ARGS+= --without-curl .endif -.if defined(WITH_RCC) +.if ${PORT_OPTIONS:MRCC} LIB_DEPENDS+= rcc.2:${PORTSDIR}/devel/librcc \ rcd.1:${PORTSDIR}/devel/librcd .else CONFIGURE_ARGS+= --without-rcc .endif -.include +.include Index: audio/mp3blaster/Makefile =================================================================== --- audio/mp3blaster/Makefile (revision 314844) +++ audio/mp3blaster/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mp3blaster -# Date created: 5 January 2000 -# Whom: Michael Vasilenko -# +# Created by: Michael Vasilenko # $FreeBSD$ -# PORTNAME= mp3blaster PORTVERSION= 3.2.5 @@ -25,41 +21,41 @@ CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -OPTIONS= LIRC "LIRC support" off \ - SIDPLAY "Sidplayer support" on \ - VORBIS "Ogg Vorbis support" on +OPTIONS_DEFINE= LIRC SIDPLAY VORBIS DOCS +OPTIONS_DEFAULT= SIDPLAY VORBIS +SIDPLAY_DESC= Sidplayer support -.if !defined(NOPORTDOCS) +.include + +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= AUTHORS CREDITS ChangeLog FAQ README TODO .endif -.include - -.if defined(WITH_LIRC) +.if ${PORT_OPTIONS:MLIRC} LIB_DEPENDS+= lirc_client.2:${PORTSDIR}/comms/lirc CONFIGURE_ARGS+= --with-lirc .endif -.if !defined(WITHOUT_SIDPLAY) +.if ${PORT_OPTIONS:MSIDPLAY} LIB_DEPENDS+= sidplay.1:${PORTSDIR}/audio/libsidplay .else CONFIGURE_ARGS+= --without-sidplay .endif -.if defined(WITHOUT_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} +LIB_DEPENDS+= vorbisfile.6:${PORTSDIR}/audio/libvorbis +.else CONFIGURE_ARGS+= --without-oggvorbis -.else -LIB_DEPENDS+= vorbisfile.6:${PORTSDIR}/audio/libvorbis .endif -.if !defined(WITHOUT_SDL) +.if ${PORT_OPTIONS:MSDL} CONFIGURE_ARGS+= --with-sdl USE_SDL= yes .else CONFIGURE_ARGS+= --without-sdl .endif -.if defined(WITH_NAS) +.if ${PORT_OPTIONS:MNAS} CONFIGURE_ARGS+= --with-nas LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas LDFLAGS+= -laudio @@ -67,8 +63,9 @@ CONFIGURE_ARGS+= --without-nas .endif +.include .if ${HAVE_GNOME:Mesound} != "" -USE_GNOME+= esound +USE_GNOME+= esound CONFIGURE_ARGS+= --with-esd .else CONFIGURE_ARGS+= --without-esd @@ -80,7 +77,7 @@ ${WRKSRC}/doc/sample.mp3blasterrc post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} Index: audio/mp3plot/Makefile =================================================================== --- audio/mp3plot/Makefile (revision 314844) +++ audio/mp3plot/Makefile (working copy) @@ -12,8 +12,8 @@ LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs -OPTIONS= GD "Enable support for GD library" on \ - IMAGEMAGICK "Enable support for Magick++" off +OPTIONS_DEFINE= GD IMAGEMAGICK +OPTIONS_DEFAULT= GD LICENSE= GPLv2 @@ -28,15 +28,15 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -.include +.include -.if defined(WITHOUT_GD) +.if ${PORT_OPTIONS:MGD} +LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd +.else CONFIGURE_ARGS+= --disable-gd -.else -LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd .endif -.if defined(WITH_IMAGEMAGICK) +.if ${PORT_OPTIONS:MIMAGEMAGICK} LIB_DEPENDS+= Magick++.5:${PORTSDIR}/graphics/ImageMagick .else CONFIGURE_ARGS+= --disable-magick @@ -47,4 +47,4 @@ -e 's|^extra_LD.*||g' \ ${WRKSRC}/configure -.include +.include Index: audio/mpc/Makefile =================================================================== --- audio/mpc/Makefile (revision 314844) +++ audio/mpc/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mpc -# Date created: Oct 02 2003 -# Whom: Mark Reidel -# +# Created by: Mark Reidel # $FreeBSD$ -# PORTNAME= mpc PORTVERSION= 0.21 @@ -15,7 +11,9 @@ LIB_DEPENDS= mpdclient:${PORTSDIR}/audio/libmpdclient -OPTIONS= ICONV "Support for international characters" on +OPTIONS_DEFINE= EXAMPLES DOCS ICONV +OPTIONS_DEFAULT= ICONV +ICONV_DESC= Support for international characters USE_BZIP2= yes GNU_CONFIGURE= yes @@ -27,7 +25,9 @@ PLIST_FILES= bin/${PORTNAME} %%PORTEXAMPLES%%%%EXAMPLESDIR%%/${PORTNAME}-completion.bash -.ifndef(NOPORTEXAMPLES) +.include + +.if ${PORT_OPTIONS:MEXAMPLESDIR} PLIST_DIRS= %%EXAMPLESDIR%% .endif @@ -35,12 +35,10 @@ MAN1= ${PORTNAME}.1 .endif -.include - -.ifdef(WITHOUT_ICONV) +.if ${PORT_OPTIONS:MICONV} +USE_ICONV= yes +.else CONFIGURE_ARGS+=--disable-iconv -.else -USE_ICONV= yes .endif post-patch: @@ -48,13 +46,13 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/ -.ifndef(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif -.ifndef(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}-completion.bash ${EXAMPLESDIR} .endif @@ -62,4 +60,4 @@ ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/ .endif -.include +.include Index: audio/mumble/Makefile =================================================================== --- audio/mumble/Makefile (revision 314844) +++ audio/mumble/Makefile (working copy) @@ -28,26 +28,23 @@ CONFIG= no-server no-alsa no-speechd no-bundled-speex no-update \ no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations -OPTIONS= DBUS "Enable D-Bus support" on \ - BONJOUR "Enable Bonjour support" off \ - MUMBLE11X "Enable mumble 1.1 support" off \ - SYSCELT "Use system CELT libraries" off \ +OPTIONS_DEFINE= DBUS BONJOUR MUMBLE11X SYSCELT +OPTIONS_DEFAULT= DBUS +BONJOUR_DESC= Bonjour support +MUMBLE11X_DESC= mumble 1.1 support +SYSCELT_DESC= Use system CELT libraries MAN1= mumble.1 -.include +.include -.if ${OSVERSION} < 800000 -BROKEN= does not compile on FreeBSD 7.x -.endif - -.if defined(WITHOUT_DBUS) +.if ! ${PORT_OPTIONS:MDBUS} CONFIG+= no-dbus .else USE_QT4+= dbus .endif -.if defined(WITHOUT_SYSCELT) +.if ! ${PORT_OPTIONS:MSYSCELT} CONFIG+= bundled-celt PLIST_SUB+= BUNDLECELT="" .else @@ -56,13 +53,13 @@ LIB_DEPENDS+= celt0.2:${PORTSDIR}/audio/celt .endif -.if defined(WITHOUT_BONJOUR) +.if ! ${PORT_OPTIONS:MBONJOUR} CONFIG+= no-bonjour .else LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder .endif -.if defined(WITHOUT_MUMBLE11X) +.if ! ${PORT_OPTIONS:MMUMBLE11X} CONFIG+= no-11x PLIST_SUB+= MUMBLE11X="@comment " .else @@ -72,12 +69,12 @@ post-patch: @${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro # Fix with celt 0.11 -.if !defined(WITHOUT_SYSCELT) +.if ${PORT_OPTIONS:MSYSCELT} @${REINPLACE_CMD} -e 's/CELT_SET_VBR_RATE/CELT_SET_BITRATE/g' ${WRKSRC}/src/mumble/AudioInput.cpp .endif do-configure: -.if defined(WITHOUT_SYSCELT) +.if ! ${PORT_OPTIONS:MSYSCELT} cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}" .else cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}" "DEFINES+=FREEBSD_SYSTEM_CELT=1" @@ -85,11 +82,11 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${PREFIX}/bin -.if defined(WITHOUT_SYSCELT) +.if ! ${PORT_OPTIONS:MSYSCELT} ${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${PREFIX}/lib/libcelt-mumble.so.0.11.0 ${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.7.0 ${PREFIX}/lib/libcelt-mumble.so.0.7.0 .endif -.if !defined(WITHOUT_MUMBLE11X) +.if ${PORT_OPTIONS:MMUMBLE11X} ${INSTALL_PROGRAM} ${WRKSRC}/release/mumble11x ${PREFIX}/bin .endif ${MKDIR} ${PREFIX}/share/services @@ -103,4 +100,4 @@ ${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${PREFIX}/share/icons/hicolor/scalable/apps ${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${MANPREFIX}/man/man1 -.include +.include Index: audio/murmur/Makefile =================================================================== --- audio/murmur/Makefile (revision 314844) +++ audio/murmur/Makefile (working copy) @@ -23,25 +23,26 @@ MAN1= murmurd.1 USE_RC_SUBR= murmur -OPTIONS= ICE "Ice Support" on \ - DBUS "D-Bus Support" off \ - BONJOUR "Bonjour Support" on +OPTIONS_DEFINE= ICE DBUS BONJOUR DOCS +OPTIONS_DEFAULT= ICE BONJOUR +ICE_DESC= Ice Support +BONJOUR_DESC= Bonjour Support -.include +.include -.if defined(WITH_ICE) +.if ${PORT_OPTIONS:MICE} LIB_DEPENDS+= Ice.34:${PORTSDIR}/devel/ice .else CONFIG+= no-ice .endif -.if defined(WITH_DBUS) +.if ${PORT_OPTIONS:MDBUS} USE_QT4+= dbus .else CONFIG+= no-dbus .endif -.if defined(WITH_BONJOUR) +.if ${PORT_OPTIONS:MBONJOUR} LIB_DEPENDS+= dns_sd.1:${PORTSDIR}/net/mDNSResponder .else CONFIG+= no-bonjour @@ -69,7 +70,7 @@ ${CP} -p ${PREFIX}/etc/murmur.ini.sample ${PREFIX}/etc/murmur.ini; \ fi ${INSTALL_MAN} ${WRKSRC}/man/murmurd.1 ${MANPREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for f in CHANGES INSTALL LICENSE README README.Linux ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} @@ -79,4 +80,4 @@ post-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include +.include Index: audio/ncmpc/Makefile =================================================================== --- audio/ncmpc/Makefile (revision 314844) +++ audio/ncmpc/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ncmpc -# Date created: Apr 14 2004 -# Whom: Mark Reidel -# +# Created by: Mark Reidel # $FreeBSD$ -# PORTNAME= ncmpc PORTVERSION= 0.20 @@ -20,10 +16,11 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= NLS "Native language support" on \ - LYRICS "Compile with lyrics screen" on +OPTIONS_DEFINE= NLS LYRICS +OPTIONS_DEFAULT= LYRICS +LYRICS_DESC= Compile with lyrics screen -.include +.include USE_ICONV= yes PLIST_FILES= bin/ncmpc \ @@ -32,18 +29,17 @@ %%EXAMPLESDIR%%/ncmpc.lirc PLIST_DIRS=%%EXAMPLESDIR%% -.ifdef(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -.else +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes LANGUAGES=cs da de eo es fi fr gl he hu it ko nb nl pl pt_BR ru sk sv uk zh_CN .for language in ${LANGUAGES} PLIST_FILES+=share/locale/${language}/LC_MESSAGES/ncmpc.mo .endfor - +.else +CONFIGURE_ARGS+=--disable-nls .endif -.ifdef(WITH_LYRICS) +.if ${PORT_OPTIONS:MLYRICS} CONFIGURE_ARGS+=--enable-lyrics-screen PLIST_FILES+= lib/ncmpc/lyrics/10-hd.sh \ lib/ncmpc/lyrics/15-leoslyrics.sh \ @@ -68,13 +64,13 @@ ${INSTALL_DATA} ${WRKSRC}/doc/keys.sample ${EXAMPLESDIR}/keys ${INSTALL_DATA} ${WRKSRC}/doc/ncmpc.lirc ${EXAMPLESDIR}/ ${INSTALL_MAN} ${WRKSRC}/doc/ncmpc.1 ${MAN1PREFIX}/man/man1/ -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} .for language in ${LANGUAGES} ${MKDIR} ${LOCALBASE}/share/locale/${language}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/po/${language}.gmo ${PREFIX}/share/locale/${language}/LC_MESSAGES/ncmpc.mo .endfor .endif -.if !defined(WITHOUT_LYRICS) +.if ${PORT_OPTIONS:MLYRICS} ${MKDIR} ${PREFIX}/lib/ncmpc/lyrics ${INSTALL_SCRIPT} ${WRKSRC}/lyrics/10-hd.sh ${PREFIX}/lib/ncmpc/lyrics/10-hd.sh ${INSTALL_SCRIPT} ${WRKSRC}/lyrics/15-leoslyrics.sh ${PREFIX}/lib/ncmpc/lyrics/15-leoslyrics.sh @@ -82,4 +78,4 @@ ${INSTALL_SCRIPT} ${WRKSRC}/lyrics/30-leoslyrics.py ${PREFIX}/lib/ncmpc/lyrics/30-leoslyrics.py .endif -.include +.include Index: audio/normalize/Makefile =================================================================== --- audio/normalize/Makefile (revision 314844) +++ audio/normalize/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: normalize -# Date created: 31 January 2001 -# Whom: George Reid -# +# Created by: George Reid # $FreeBSD$ -# PORTNAME= normalize PORTVERSION= 0.7.7 @@ -24,14 +20,13 @@ MAN1= normalize.1 normalize-mp3.1 -OPTIONS= XMMS "Build XMMS plugin" off \ - MP3 "MP3 support" on \ - OGG "OGG support" off \ - FLAG "FLAC support" off +OPTIONS_DEFINE= XMMS MP3 OGG FLAC NLS +OPTIONS_DEFAULT= MP3 +XMMS_DESC= XMMS plugin -.include +.include -.if defined(WITH_XMMS) +.if ${PORT_OPTIONS:MXMMS} LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms PLIST_SUB+= XMMS="" .else @@ -39,20 +34,20 @@ PLIST_SUB+= XMMS="@comment " .endif -.if defined(WITH_MP3) +.if ${PORT_OPTIONS:MMP3} RUN_DEPENDS+= madplay:${PORTSDIR}/audio/madplay \ lame:${PORTSDIR}/audio/lame .endif -.if defined(WITH_OGG) +.if ${PORT_OPTIONS:MOGG} RUN_DEPENDS+= oggdec:${PORTSDIR}/audio/vorbis-tools .endif -.if defined(WITH_FLAC) +.if ${PORT_OPTIONS:MFLAC} RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else @@ -60,4 +55,4 @@ PLIST_SUB+= NLS="@comment " .endif -.include +.include Index: audio/openal/Makefile =================================================================== --- audio/openal/Makefile (revision 314844) +++ audio/openal/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: openal -# Date created: 25 September 2000 -# Whom: Thomas Gellekum -# +# Created by: Thomas Gellekum # $FreeBSD$ -# PORTNAME= openal PORTVERSION= 20060211 @@ -23,37 +19,35 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-capture USE_GMAKE= yes -USE_GNOME= pkgconfig gnomehack +USES= pathfix +USE_PKGCONFIG= build WANT_SDL= yes USE_LDCONFIG= yes -OPTIONS= ARTS "aRts backend" off \ - ESD "esd backend" off \ - SDL "SDL backend" off \ - VORBIS "vorbis support" off \ - SMPEG "smpeg support" off +OPTIONS_DEFINE= ARTS ESOUND SDL VORBIS SMPEG +SMPEG_DESC= smpeg support -.include +.include -.if defined(WITH_SMPEG) +.if ${PORT_OPTIONS:MSMPEG} WITH_SDL= yes # smpeg requires SDL .endif -.if defined(WITH_ARTS) +.if ${PORT_OPTIONS:MARTS} LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts CONFIGURE_ARGS+=--enable-arts .else CONFIGURE_ARGS+=--disable-arts .endif -.if defined(WITH_ESD) +.if ${PORT_OPTIONS:MESD} USE_GNOME+= esound CONFIGURE_ARGS+=--enable-esd .else CONFIGURE_ARGS+=--disable-esd .endif -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl CONFIGURE_ENV+= HAVESDL="${SDL_CONFIG}" CONFIGURE_ARGS+=--enable-sdl @@ -61,14 +55,14 @@ CONFIGURE_ARGS+=--disable-sdl .endif -.if defined(WITH_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= vorbisfile.6:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+=--enable-vorbis .else CONFIGURE_ARGS+=--disable-vorbis .endif -.if defined(WITH_SMPEG) +.if ${PORT_OPTIONS:MSMPEG} LIB_DEPENDS+= smpeg.1:${PORTSDIR}/multimedia/smpeg CONFIGURE_ARGS+=--enable-smpeg .else @@ -104,4 +98,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include +.include Index: audio/pytone/Makefile =================================================================== --- audio/pytone/Makefile (revision 314844) +++ audio/pytone/Makefile (working copy) @@ -21,38 +21,38 @@ USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= PyTone -OPTIONS= MAD "MPEG Audio Decoder (libmad) support" On \ - VORBIS "Ogg/Vorbis support" On \ - PYAO "Libao cross-platform audio library" Off \ - XMMS "Enable XMMS player engine" Off \ - MPG123 "Enable mpg123 player engine" Off \ - MPG321 "Enable mpg321 player engine" Off +OPTIONS_DEFINE= MAD VORBIS PYAO XMMS MPG123 MPG321 +OPTIONS_DEFAULT= MAD VORBIS +PYAO_DESC= ${AO_DESC} +XMMS_DESC= XMMS player engine +MPG123_DESC= mpg123 player engine +MPG321_DESC= mpg321 player engine -.include +.include CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -.if !defined(WITHOUT_MAD) +.if ${PORT_OPTIONS:MMAD} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/madmodule.so:${PORTSDIR}/audio/py-mad .endif -.if !defined(WITHOUT_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis .endif -.if defined(WITH_PYAO) +.if ${PORT_OPTIONS:MPYAO} BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/aomodule.so:${PORTSDIR}/audio/py-ao .endif -.if defined(WITH_XMMS) +.if ${PORT_OPTIONS:MXMMS} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xmms/xmmscontrol.so:${PORTSDIR}/audio/py-xmms .endif -.if defined(WITH_MPG123) +.if ${PORT_OPTIONS:MMPG123} RUN_DEPENDS+= ${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123 .endif -.if defined(WITH_MPG321) +.if ${PORT_OPTIONS:MMPG321} RUN_DEPENDS+= ${LOCALBASE}/bin/mpg321:${PORTSDIR}/audio/mpg321 .endif @@ -66,4 +66,4 @@ @${CP} ${WRKSRC}/conf/pytonerc ${PREFIX}/etc/pytonerc.sample @${CAT} ${PKGMESSAGE} -.include +.include Index: audio/qmpdclient/Makefile =================================================================== --- audio/qmpdclient/Makefile (revision 314844) +++ audio/qmpdclient/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: qmpdclient -# Date created: 4 June 2007 -# Whom: uyamba@gmail.com -# +# Created by: uyamba@gmail.com # $FreeBSD$ -# PORTNAME= qmpdclient PORTVERSION= 1.2.2 @@ -27,32 +23,31 @@ QMAKE_ARGS= ${QMAKE_PRO} QMAKE_PRO= ${PORTNAME}.pro -OPTIONS= DBUS "Enable D-BUS support" off \ - NLS "Enable National Language Support" on +OPTIONS_DEFINE= DBUS NLS DEBUG DATADIR= ${PREFIX}/share/QMPDClient WRKSRC= ${WRKDIR}/${PORTNAME} -.include +.include -.if defined(WITHOUT_NLS) +.if ! ${PORT_OPTIONS:MNLS} PLIST_SUB+= NLS="@comment " .else USE_QT4+= linguist_build PLIST_SUB+= NLS="" .endif -.if defined(WITH_DBUS) && !defined(WITHOUT_DBUS) +.if ${PORT_OPTIONS:MDBUS} USE_QT4+= dbus QMAKEFLAGS+= "CONFIG+=qdbus" .endif -.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} QMAKEFLAGS+= "CONFIG+=debug" .endif post-patch: -.if defined(WITHOUT_NLS) +.if ! ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e '/INSTALLS += translations/d' \ ${WRKSRC}/${QMAKE_PRO} .endif @@ -67,4 +62,4 @@ @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} \ ${QMAKEFLAGS} ${QMAKE_ARGS} -.include +.include Index: audio/shoutcast/Makefile =================================================================== --- audio/shoutcast/Makefile (revision 314844) +++ audio/shoutcast/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: shoutcast -# Date created: 15 January 2011 -# Whom: Jarrod Sayers -# +# Created by: Jarrod Sayers # $FreeBSD$ -# PORTNAME= shoutcast PORTVERSION= 2.0.0.29 @@ -27,7 +23,8 @@ NO_WRKSUBDIR= yes NO_BUILD= yes -OPTIONS= CONFIG_BUILDER "Install SHOUTcast Configuration Builder" off +OPTIONS_DEFINE= CONFIG_BUILDER DOCS EXAMPLE +CONFIG_BUILDER_DESC= SHOUTcast Configuration Builder SHOUTCASTUSER= ${PORTNAME} SHOUTCASTGROUP= ${PORTNAME} @@ -48,9 +45,9 @@ USERS= ${SHOUTCASTUSER} GROUPS= ${SHOUTCASTGROUP} -.include +.include -.if defined(WITH_CONFIG_BUILDER) +.if ${PORT_OPTIONS:MCONFIG_BUILDER} PLIST_SUB+= CONFIG_BUILDER="" .else PLIST_SUB+= CONFIG_BUILDER="@comment " @@ -62,7 +59,7 @@ -e 's#=.*/\([^\.]*.log\)#=${SHOUTCASTLDIR}/\1#g' \ -e 's#=control/#=${SHOUTCASTDIR}/#g' ${WRKSRC}/sc_serv_${_file}.conf .endfor -.if defined(WITH_CONFIG_BUILDER) +.if ${PORT_OPTIONS:MCONFIG_BUILDER} @${REINPLACE_CMD} -e 's#<[^>]*>Windows<[^>]*>##g' \ -e 's#<[^>]*>Macintosh<[^>]*>##g' ${WRKSRC}/config_builder/config_builder.html @${REINPLACE_CMD} -e 's#\(LogFile="\)\([^"/]*\)#\1${SHOUTCASTLDIR}/\2#g' \ @@ -74,7 +71,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sc_serv ${PREFIX}/sbin ${MKDIR} ${ETCDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/changes.txt ${DOCSDIR}/changes.txt ${INSTALL_DATA} ${WRKSRC}/docs/getting_started.txt ${DOCSDIR}/getting_started.txt @@ -84,7 +81,7 @@ ${INSTALL_DATA} ${WRKSRC}/docs/shoutcast_system_overview.txt ${DOCSDIR}/shoutcast_system_overview.txt ${INSTALL_DATA} ${WRKSRC}/tos.txt ${DOCSDIR}/tos.txt .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/docs/crossdomain.xml ${EXAMPLESDIR}/crossdomain.xml ${INSTALL_DATA} ${WRKSRC}/sc_serv_basic.conf ${EXAMPLESDIR}/sc_serv_basic.conf @@ -93,7 +90,7 @@ ${INSTALL_DATA} ${WRKSRC}/sc_serv_relay.conf ${EXAMPLESDIR}/sc_serv_relay.conf ${INSTALL_DATA} ${WRKSRC}/sc_serv_simple.conf ${EXAMPLESDIR}/sc_serv_simple.conf .endif -.if defined(WITH_CONFIG_BUILDER) +.if ${PORT_OPTIONS:MCONFIG_BUILDER} ${MKDIR} ${WWWDIR}/config_builder ${INSTALL_DATA} ${WRKSRC}/config_builder/config_builder.html ${WWWDIR}/config_builder/config_builder.html ${MKDIR} ${WWWDIR}/config_builder/db @@ -119,4 +116,4 @@ @${CHOWN} ${SHOUTCASTUSER}:wheel ${SHOUTCASTLDIR} @${CAT} ${PKGMESSAGE} -.include +.include Index: audio/sox/Makefile =================================================================== --- audio/sox/Makefile (revision 314844) +++ audio/sox/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sox - Sound Exchange -# Date created: 17 Oct 1994 -# Whom: torstenb -# +# Created by: torstenb # $FreeBSD$ -# PORTNAME= sox PORTVERSION= 14.3.2 @@ -28,37 +24,27 @@ USE_AUTOTOOLS= libltdl USE_PKGCONFIG= build +OPTIONS_DEFINE= ALSA AO AMRNB AMRWB FFMPEG FLAC GSM ID3TAG LADSPA LAME \ + MAD PNG SNDFILE VORBIS WAVPACK +OPTIONS_DEFAULT= AO FFMPEG FLAC GSM ID3TAG MAD PNG SNDFILE VORBIS # Default LAME to off for packages so we don't end up RESTRICTED -.if defined(PACKAGE_BUILDING) -_LAME= off -.else -_LAME= on +.if !defined(PACKAGE_BUILDING) +OPTIONS_DEFAULT= LAME .endif -OPTIONS= ALSA "ALSA output driver" off \ - AO "Enable libao output" on \ - AMRNB "AMR Speech Codec (Narrowband)" off \ - AMRWB "AMR Speech Codec (Wideband)" off \ - FFMPEG "Enable ffmpeg en/decoding" on \ - FLAC "Enable flac en/decoding with libflac" on \ - GSM "Use libgsm from ports (else use bundled lib)" on \ - ID3TAG "Enable mp3 tagging with libid3tag" on \ - LADSPA "Audio plugin support" off \ - LAME "Enable mp3 encoding with LAME" ${_LAME} \ - MAD "Enable mp3 decoding with MAD" on \ - PNG "Enable PNG spectrogram creation" on \ - SNDFILE "Enable libsndfile" on \ - VORBIS "Enable Ogg Vorbis support" on \ - WAVPACK "Enable Wavpack support" off +AMRNB_DESC= AMR Speech Codec (Narrowband) +AMRWB_DESC= AMR Speech Codec (Wideband) +GSM_DESC= Use libgsm from ports (else use bundled lib) +PNG_DESC= PNG spectrogram creation -.include +.include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig" CONFIGURE_ARGS+= --with-distro="${CONFIGURE_TARGET} ${PKGNAME}" -.if defined(WITH_ALSA) +.if ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins CONFIGURE_ARGS+= --with-alsa @@ -66,49 +52,49 @@ CONFIGURE_ARGS+= --without-alsa .endif -.if defined(WITH_AO) +.if ${PORT_OPTIONS:MAO} CONFIGURE_ARGS+= --with-ao LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao .else CONFIGURE_ARGS+= --without-ao .endif -.if defined(WITH_AMRNB) +.if ${PORT_OPTIONS:MAMRNB} CONFIGURE_ARGS+= --with-amrnb LIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrnb .else CONFIGURE_ARGS+= --without-amrnb .endif -.if defined(WITH_AMRWB) +.if ${PORT_OPTIONS:MAMRWB} CONFIGURE_ARGS+= --with-amrwb LIB_DEPENDS+= amrwb.3:${PORTSDIR}/audio/libamrwb .else CONFIGURE_ARGS+= --without-amrwb .endif -.if defined(WITH_FFMPEG) +.if ${PORT_OPTIONS:MFFMPEG} CONFIGURE_ARGS+= --with-ffmpeg LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg .else CONFIGURE_ARGS+= --without-ffmpeg .endif -.if defined(WITH_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} CONFIGURE_ARGS+= --with-oggvorbis LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis .else CONFIGURE_ARGS+= --without-oggvorbis .endif -.if defined(WITH_SNDFILE) +.if ${PORT_OPTIONS:MSNDFILE} CONFIGURE_ARGS+= --with-sndfile LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile .else CONFIGURE_ARGS+= --without-sndfile .endif -.if defined(WITH_LADSPA) +.if ${PORT_OPTIONS:MLADSPA} CONFIGURE_ARGS+= --with-ladspa RUN_DEPENDS+= ${LOCALBASE}/lib/ladspa/filter.so:${PORTSDIR}/audio/ladspa BUILD_DEPENDS+= ${LOCALBASE}/lib/ladspa/filter.so:${PORTSDIR}/audio/ladspa @@ -116,35 +102,35 @@ CONFIGURE_ARGS+= --without-ladspa .endif -.if defined(WITH_LAME) +.if ${PORT_OPTIONS:MLAME} CONFIGURE_ARGS+= --with-lame LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame .else CONFIGURE_ARGS+= --without-lame .endif -.if defined(WITH_FLAC) +.if ${PORT_OPTIONS:MFLAC} CONFIGURE_ARGS+= --with-flac LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac .else CONFIGURE_ARGS+= --without-flac .endif -.if defined(WITH_MAD) +.if ${PORT_OPTIONS:MMAD} CONFIGURE_ARGS+= --with-mad LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad .else CONFIGURE_ARGS+= --without-mad .endif -.if defined(WITH_PNG) +.if ${PORT_OPTIONS:MPNG} CONFIGURE_ARGS+= --with-png LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png .else CONFIGURE_ARGS+= --without-png .endif -.if defined(WITH_GSM) +.if ${PORT_OPTIONS:MGSM} CONFIGURE_ARGS+= --with-gsm LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm .else @@ -155,18 +141,18 @@ ac_cv_lib_gsm_gsm_create=no .endif -.if defined(WITH_ID3TAG) +.if ${PORT_OPTIONS:MID3TAG} CONFIGURE_ARGS+= --with-id3tag LIB_DEPENDS+= id3tag.0:${PORTSDIR}/audio/libid3tag .else CONFIGURE_ARGS+= --without-id3tag .endif -.if defined(WITH_WAVPACK) +.if ${PORT_OPTIONS:MWAVPACK} CONFIGURE_ARGS+= --with-wavpack LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack .else CONFIGURE_ARGS+= --without-wavpack .endif -.include +.include Index: audio/streamripper/Makefile =================================================================== --- audio/streamripper/Makefile (revision 314844) +++ audio/streamripper/Makefile (working copy) @@ -17,8 +17,8 @@ LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ tre.5:${PORTSDIR}/textproc/libtre -OPTIONS= FAAD "Include FAAD mpeg4 codec support" on \ - VORBIS "Include Ogg Vorbis codec support" on +OPTIONS_DEFINE= FAAD VORBIS +OPTIONS_DEFAULT= FAAD VORBIS LICENSE= GPLv2 @@ -39,15 +39,15 @@ CDK_VERSION= 5.0-20060507 -.include +.include -.if defined(WITHOUT_FAAD) +.if ! ${PORT_OPTIONS:MFAAD} CONFIGURE_ARGS+= ac_cv_lib_faad_NeAACDecDecode2=no .else LIB_DEPENDS+= faad.2:${PORTSDIR}/audio/faad .endif -.if defined(WITHOUT_VORBIS) +.if ! ${PORT_OPTIONS:MVORBIS} CONFIGURE_ARGS+= --without-ogg .else LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis @@ -73,4 +73,4 @@ ${INSTALL_PROGRAM} ${WRKSRC}/streamripper ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/streamripper.1 ${MANPREFIX}/man/man1 -.include +.include Index: audio/zynaddsubfx/Makefile =================================================================== --- audio/zynaddsubfx/Makefile (revision 314844) +++ audio/zynaddsubfx/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: zynaddsubfx -# Date created: 2007-01-25 -# Whom: trasz -# +# Created by: trasz # $FreeBSD$ -# PORTNAME= zynaddsubfx PORTVERSION= 2.4.1 @@ -27,26 +23,24 @@ CXXFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes -OPTIONS= ALSAMIDI "Enable midi input through ALSA" off \ - GUI "Enable graphical front-end" on \ - JACK "Enable sound output through JackAudio" off \ - PORTAUDIO "Enable sound output through PortAudio" off +OPTIONS_DEFINE= ALSAMIDI GUI +OPTIONS_DEFAULT= GUI +ALSAMIDI_DESC= midi input through ALSA +OPTIONS_RADIO= OUTPUT +OPTIONS_RADIO_OUTPUT= JACK PORTAUDIO +OUTPUT_DESC= Audio output type -.include +.include -.if defined(WITH_ALSAMIDI) +.if ${PORT_OPTIONS:MALSAMIDI} LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib .endif -.if (defined(WITH_JACK) && defined(WITH_PORTAUDIO)) -BROKEN= only one output type can be chosen -.endif - -.if defined(WITH_JACK) +.if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack .endif -.if defined(WITH_PORTAUDIO) +.if ${PORT_OPTIONS:MPORTAUDIO} LIB_DEPENDS+= portaudio.0:${PORTSDIR}/audio/portaudio .endif @@ -66,19 +60,19 @@ 's|LIBS= -lm -lmxml -lz|LIBS= -lm -lmxml -lz -L${LOCALBASE}/lib|g' \ ${WRKSRC}/Makefile -.if !defined(WITH_ALSAMIDI) +.if ! ${PORT_OPTIONS:MALSAMIDI} ${REINPLACE_CMD} -e 's|LINUX_MIDIIN=ALSA|LINUX_MIDIIN=OSS|g' \ ${WRKSRC}/Makefile.inc .endif -.if defined(WITH_JACK) +.if ${PORT_OPTIONS:MJACK} ${REINPLACE_CMD} -e 's|LINUX_AUDIOOUT=OSS|LINUX_AUDIOOUT=OSS_AND_JACK|g' \ ${WRKSRC}/Makefile.inc .endif -.if defined(WITH_PORTAUDIO) +.if ${PORT_OPTIONS:MPORTAUDIO} ${REINPLACE_CMD} -e 's|LINUX_AUDIOOUT=OSS|LINUX_AUDIOOUT=PA|g' \ ${WRKSRC}/Makefile.inc .endif -.if defined(WITHOUT_GUI) +.if ! ${PORT_OPTIONS:MGUI} ${REINPLACE_CMD} -e 's|DISABLE_GUI=NO|DISABLE_GUI=YES|g' \ ${WRKSRC}/Makefile.inc .endif @@ -91,4 +85,4 @@ cd ${WRKDIR}/${DISTNAME}/banks && ${FIND} . -type f \ -exec ${INSTALL_DATA} {} ${DATADIR}/banks/{} \; -.include +.include Index: benchmarks/nqueens/Makefile =================================================================== --- benchmarks/nqueens/Makefile (revision 314844) +++ benchmarks/nqueens/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: N-Queens -# Date Created: 2 March 2005 -# Whom: NAKAJI Hiroyuki -# +# Created by: NAKAJI Hiroyuki # $FreeBSD$ -# PORTNAME= nqueens PORTVERSION= 1.0 @@ -17,22 +13,22 @@ WRKSRC= ${WRKDIR}/version${PORTVERSION} -OPTIONS= MPI "Build distributed MPI version" off \ - STATIC "Link resulting binaries statically" off \ - OPTIMIZED_CFLAGS "Enable extra optimization options" off +OPTIONS_DEFINE= MPI STATIC OPTIMIZED_CFLAGS +MPI_DESC= Build distributed MPI version +STATIC_DESC= Link resulting binaries statically -.include +.include -.if defined(WITH_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O9 -pipe -s -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations .endif -.if defined(WITH_STATIC) +.if ${PORT_OPTIONS:MSTATIC} CFLAGS+= -static .endif PROGS= qn24b_base -.if defined(WITH_MPI) +.if ${PORT_OPTIONS:MMPI} MPICC?= ${LOCALBASE}/mpich/bin/mpicc BUILD_DEPENDS= ${MPICC}:${PORTSDIR}/net/mpich PROGS+= qn24b_mpi @@ -44,7 +40,7 @@ do-build: cd ${WRKSRC} && \ ${CC} ${CFLAGS} -o qn24b_base base/queens.c -.if defined(WITH_MPI) +.if ${PORT_OPTIONS:MMPI} cd ${WRKSRC} && \ ${MPICC} ${CFLAGS} -o qn24b_mpi mpi/main.c .endif @@ -56,4 +52,4 @@ ${INSTALL_PROGRAM} ${WRKSRC}/${p} ${PREFIX}/bin/ .endfor -.include +.include Index: benchmarks/polygraph31/Makefile =================================================================== --- benchmarks/polygraph31/Makefile (revision 314844) +++ benchmarks/polygraph31/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: polygraph -# Date created: 3 March 1999 -# Whom: Dima Sivachenko -# +# Created by: Dima Sivachenko # $FreeBSD$ -# PORTNAME= polygraph31 PORTVERSION= 3.1.5 @@ -23,10 +19,12 @@ CONFLICTS= ltrace-0* polygraph-[0-9]* -OPTIONS= GNUPLOT "gnuplot if you want full report functionality" ON \ - PERL "install Perl for polygraph tools" OFF +OPTIONS_DEFINE= GNUPLOT PERL +OPTIONS_DEFAULT= GNUPLOT +GNUPLOT_DESC= gnuplot if you want full report functionality +PERL_DESC= install Perl for polygraph tools -.include +.include .if ${OSVERSION} >= 900009 || (${OSVERSION} < 900000 && ${OSVERSION} >= 800503) BROKEN= does not build @@ -34,12 +32,12 @@ DATADIR:= ${DATADIR:S/31//} -.if !defined(WITHOUT_GNUPLOT) +.if ${PORT_OPTIONS:MGNUPLOT} RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot .endif -.if !defined(WITHOUT_PERL) +.if ${PORT_OPTIONS:MPERL} USE_PERL5_RUN= yes .endif -.include +.include Index: benchmarks/sipp/Makefile =================================================================== --- benchmarks/sipp/Makefile (revision 314844) +++ benchmarks/sipp/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sipp -# Date created: 15 Jun 2004 -# Whom: jesper@jdn.dk -# +# Created by: jesper@jdn.dk # $FreeBSD$ -# PORTNAME= sipp PORTVERSION= 3.3 @@ -26,13 +22,15 @@ CPPFLAGS+= ${CXXFLAGS} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -OPTIONS= OPENSSL "OpenSSL support (for digest auth and SIP over TLS)" on \ - GSL "GSL support (for statistical distributed pauses)" off \ - PCAPPLAY "RTP play support" off +OPTIONS_DEFINE= OPENSSL GSL PCAPPLAY +OPTIONS_DEFAULT= OPENSSL +OPENSSL_DESC= OpenSSL support (for digest auth and SIP over TLS) +GSL_DESC= GSL support (for statistical distributed pauses) +PCAPPLAY_DESC= RTP play support .include -.if defined(WITH_GSL) +.if ${PORT_OPTIONS:MGSL} LIB_DEPENDS+= gsl.16:${PORTSDIR}/math/gsl MAKE_ENV+= EXTRACPPFLAGS=-DHAVE_GSL \ @@ -40,7 +38,7 @@ EXTRALIBS='-lgsl -lgslcblas' .endif #defined(WITH_GSL) -.if defined(WITH_PCAPPLAY) +.if ${PORT_OPTIONS:MPCAPPLAY} PCAP_FILES= dtmf_2833_0.pcap dtmf_2833_1.pcap dtmf_2833_2.pcap \ dtmf_2833_3.pcap dtmf_2833_4.pcap dtmf_2833_5.pcap \ dtmf_2833_6.pcap dtmf_2833_7.pcap dtmf_2833_8.pcap \ @@ -55,20 +53,21 @@ .endfor .endif #defined(WITH_PCAPPLAY) -.if defined(WITHOUT_OPENSSL) +.if ${PORT_OPTIONS:MOPENSSL} -.if defined(WITH_PCAPPLAY) -ALL_TARGET= pcapplay -.endif #defined(WITH_PCAPPLAY) - -.else #!defined(WITHOUT_OPENSSL) - -.if defined(WITH_PCAPPLAY) +.if ${PORT_OPTIONS:MPCAPPLAY} ALL_TARGET= pcapplay_ossl .else ALL_TARGET= ossl .endif #defined(WITH_PCAPPLAY) +.else # ! ${PORT_OPTIONS:MOPENSSL} + +.if ${PORT_OPTIONS:MPCAPPLAY} +ALL_TARGET= pcapplay +.endif #defined(WITH_PCAPPLAY) + + .endif #defined(WITHOUT_OPENSSL) post-patch: @@ -76,7 +75,7 @@ @${REINPLACE_CMD} 's/^\(MFLAGS_ia64=\)\+DD64$$/\1/' ${WRKSRC}/Makefile .endif -.if defined(WITH_PCAPPLAY) +.if ${PORT_OPTIONS:MPCAPPLAY} @${REINPLACE_CMD} \ 's|\(\\"\)\(pcap/[^"]*\.pcap\\"\)|\1${DATADIR}/\2|' \ ${WRKSRC}/scenario.cpp @@ -86,7 +85,7 @@ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin ${INSTALL_MAN} ${FILESDIR}/sipp.1 ${PREFIX}/man/man1 -.if defined(WITH_PCAPPLAY) +.if ${PORT_OPTIONS:MPCAPPLAY} ${MKDIR} ${DATADIR}/pcap .for f in ${PCAP_FILES} @@ -95,4 +94,4 @@ .endif #defined(WITH_PCAPPLAY) -.include +.include Index: cad/salome/Makefile =================================================================== --- cad/salome/Makefile (revision 314844) +++ cad/salome/Makefile (working copy) @@ -14,19 +14,20 @@ MAINTAINER= devel@stasyan.com -OPTIONS= \ - GEOM "GEOM module" on \ - MED "MED module" on \ - SMESH "SMESH module (require MED & GEOM)" on \ - NETGENPLUGIN "Netgen-meser plugin" on \ - VISU "VISU module (require MED)" on \ - LIGHT "LIGHT module" on \ - YACS "Yacs module" on \ - MULTIPR "Multipr module" on \ - RANDOMIZER "Randomizer module" on \ - SIERPINSKY "Sierpinsky module" on \ - JOBMAN "Job manager module" on \ - MPI "build with support parrallel calculation" on +OPTIONS_DEFINE= GEOM MED SMESH NETGENPLUGIN VISU LIGHT YACS MULTIPR RANDOMIZER SIERPINSKY +OPTIONS_DEFAULT= GEOM MED SMESH NETGENPLUGIN VISU LIGHT YACS MULTIPR RANDOMIZER SIERPINSKY +GEOM_DESC= GEOM module +MED_DESC= MED module +SMESH_DESC= SMESH module (require MED & GEOM) +NETGENPLUGIN_DESC= Netgen-meser plugin +VISU_DESC= VISU module (require MED) +LIGHT_DESC= LIGHT module +YACS_DESC= Yacs module +MULTIPR_DESC= Multipr module +RANDOMIZER_DESC= Randomizer module +SIERPINSKY_DESC= Sierpinsky module +JOBMAN_DESC= Job manager module +MPI_DESC= build with support parrallel calculation RESOURCEDIR= ${PREFIX}/share/salome/resources @@ -47,37 +48,37 @@ RUN_DEPENDS+= ${RESOURCEDIR}/kernel:${PORTSDIR}/cad/salome-kernel \ ${RESOURCEDIR}/gui:${PORTSDIR}/cad/salome-gui -.if defined(WITH_GEOM) +.if ${PORT_OPTIONS:MGEOM} RUN_DEPENDS+= ${RESOURCEDIR}/geom:${PORTSDIR}/cad/salome-geom .endif -.if defined(WITH_LIGHT) +.if ${PORT_OPTIONS:MLIGHT} RUN_DEPENDS+= ${RESOURCEDIR}/light:${PORTSDIR}/cad/salome-light .endif -.if defined(WITH_YACS) +.if ${PORT_OPTIONS:MYACS} RUN_DEPENDS+= ${RESOURCEDIR}/yacs:${PORTSDIR}/cad/salome-yacs .endif -.if defined(WITH_RANDOMIZER) +.if ${PORT_OPTIONS:MRANDOMIZER} RUN_DEPENDS+= ${RESOURCEDIR}/randomizer:${PORTSDIR}/cad/salome-randomizer .endif -.if defined(WITH_VISU) +.if ${PORT_OPTIONS:MVISU} RUN_DEPENDS+= ${RESOURCEDIR}/visu:${PORTSDIR}/cad/salome-visu .endif -.if defined(WITH_MED) +.if ${PORT_OPTIONS:MMED} RUN_DEPENDS+= ${RESOURCEDIR}/med:${PORTSDIR}/cad/salome-med .endif -.if defined(WITH_SIERPINSKY) +.if ${PORT_OPTIONS:MSIERPINSKY} RUN_DEPENDS+= ${RESOURCEDIR}/sierpinsky:${PORTSDIR}/cad/salome-sierpinsky .endif -.if defined(WITH_SMESH) +.if ${PORT_OPTIONS:MSMESH} RUN_DEPENDS+= ${RESOURCEDIR}/smesh:${PORTSDIR}/cad/salome-smesh .endif -.if defined(WITH_NETGENPLUGIN) +.if ${PORT_OPTIONS:MNETGENPLUGIN} RUN_DEPENDS+= ${RESOURCEDIR}/netgenplugin:${PORTSDIR}/cad/salome-netgenplugin .endif -.if defined(WITH_MULTIPR) +.if ${PORT_OPTIONS:MMULTIPR} RUN_DEPENDS+= ${RESOURCEDIR}/multipr:${PORTSDIR}/cad/salome-multipr .endif -.if defined(WITH_JOBMAN) +.if ${PORT_OPTIONS:MJOBMAN} RUN_DEPENDS+= ${RESOURCEDIR}/jobmanager:${PORTSDIR}/cad/salome-jobmanager .endif Index: cad/salome/Makefile.ext =================================================================== --- cad/salome/Makefile.ext (revision 314844) +++ cad/salome/Makefile.ext (working copy) @@ -269,7 +269,7 @@ #turn off cppunit support .if ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "gui" || ${SAL_MODULE} == "yacs" || ${SAL_MODULE} == "med" -#.if defined(WITH_CPPUNIT) +#.if ${PORT_OPTIONS:MCPPUNIT} #CONFIGURE_ARGS+= --with-cppunit=${LOCALBASE} --with-cppunit_inc=${LOCALBASE}/include/cppunit #BUILD_DEPENDS+= cppunit-config:${PORTSDIR}/devel/cppunit #PLIST_SUB+= CPPUNIT="" @@ -281,7 +281,7 @@ #optionally dependency from mpich2 .if ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "med" -.if defined(WITH_MPI) +.if ${PORT_OPTIONS:MMPI} LIB_DEPENDS+= mpich.2:${PORTSDIR}/net/mpich2 CONFIGURE_ARGS+= --with-mpich=${LOCALBASE}/mpich2 --with-mpi=${LOCALBASE}/mpich2 PLIST_SUB+= MPI="" Index: chinese/ibus-pinyin/Makefile =================================================================== --- chinese/ibus-pinyin/Makefile (revision 314844) +++ chinese/ibus-pinyin/Makefile (working copy) @@ -27,13 +27,15 @@ PROJECTHOST= ibus -OPTIONS= ANDROID_DB "Build Android DB" on \ - OPENPHRASE_DB "Build Open Phrase DB" off \ - OPENCC "Use opencc" off +OPTIONS_DEFINE= ANDROID_DB OPENPHRASE_DB OPENCC NLS +OPTIONS_DEFAULT= ANDROID_DB +ANDROID_DB_DESC= Build Android DB +OPENPHRASE_DB_DESC= Build Open Phrase DB +OPENCC_DESC= Use opencc -.include +.include -.if defined(WITH_ANDROID_DB) +.if ${PORT_OPTIONS:MANDROID_DB} CONFIGURE_ARGS+= --enable-db-android PLIST_SUB+= ANDROID_DB="" .else @@ -44,7 +46,7 @@ OPENPHRASE_DBVER= 1.2.99 OPENPHRASE_DBFILE= pinyin-database-${OPENPHRASE_DBVER}.tar.bz2 -.if defined(WITH_OPENPHRASE_DB) +.if ${PORT_OPTIONS:MOPENPHRASE_DB} CONFIGURE_ARGS+= --enable-db-open-phrase DISTFILES+= ${OPENPHRASE_DBFILE} PLIST_SUB+= OPENPHRASE_DB="" @@ -53,14 +55,14 @@ PLIST_SUB+= OPENPHRASE_DB="@comment " .endif -.if defined(WITH_OPENCC) +.if ${PORT_OPTIONS:MOPENCC} CONFIGURE_ARGS+= --enable-opencc LIB_DEPENDS+= opencc.1:${PORTSDIR}/chinese/opencc .else CONFIGURE_ARGS+= --disable-opencc .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else @@ -69,11 +71,11 @@ .endif post-extract: -.if defined(WITH_OPENPHRASE_DB) +.if ${PORT_OPTIONS:MOPENPHRASE_DB} @${CP} ${DISTDIR}/${OPENPHRASE_DBFILE} ${WRKSRC}/data/db/open-phrase .endif post-patch: @${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|' ${WRKSRC}/configure -.include +.include Index: chinese/oxim/Makefile =================================================================== --- chinese/oxim/Makefile (revision 314844) +++ chinese/oxim/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: oxim -# Date created: Mar 19 2006 -# Whom: Rong-En Fan -# +# Created by: Rong-En Fan # $FreeBSD$ -# PORTNAME= oxim PORTVERSION= 1.2.2 @@ -17,9 +13,11 @@ RUN_DEPENDS= ${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:${PORTSDIR}/chinese/fireflyttf -OPTIONS= GTK2 "Enable GTK2 input method module" On \ - CHEWING "Enable Chewing input module" On \ - UNICODE "Enable Unicode input module" On +OPTIONS_DEFINE= GTK2 CHEWING UNICODE +OPTIONS_DEFAULT= GTK2 CHEWING UNICODE +GTK2_DESC= GTK2 input method module +CHEWING_DESC= Chewing input module +UNICODE_DESC= Unicode input module USE_ICONV= yes USE_XORG= x11 xft xpm xtst @@ -38,7 +36,7 @@ MAN1= oxim.1 -.include +.include .if defined(WITHOUT_GTK2) CONFIGURE_ARGS+= --disable-gtk-immodule @@ -49,7 +47,7 @@ PLIST_SUB+= GTK2="" .endif -.if !defined(WITHOUT_CHEWING) +.if ${PORT_OPTIONS:MCHEWING} # make sure we have the required libchewing BUILD_DEPENDS+= zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing RUN_DEPENDS+= zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing @@ -62,7 +60,7 @@ PLIST_SUB+= CHEWING="@comment " .endif -.if !defined(WITHOUT_UNICODE) +.if ${PORT_OPTIONS:MUNICODE} CONFIGURE_ARGS+= --enable-unicode-module PLIST_SUB+= UNICODE="" .else @@ -71,7 +69,7 @@ .endif # TODO WITHOUT_NLS knob -#.if !defined(WITHOUT_NLS) +#.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes LDFLAGS+= -lintl PLIST_SUB+= NLS="" @@ -85,10 +83,10 @@ ${WRKSRC}/src/gtk-immodule/gtkintl.h post-install: -.if !defined(WITHOUT_GTK2) +.if ${PORT_OPTIONS:MGTK2} @gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules .endif @${CAT} ${PKGMESSAGE} @${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME} -.include +.include Index: comms/fl_moxgen/Makefile =================================================================== --- comms/fl_moxgen/Makefile (revision 314844) +++ comms/fl_moxgen/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fl_moxgen -# Date created: 2012-05-15 -# Whom: Stephen Hurd -# +# Created by: Stephen Hurd # $FreeBSD$ -# PORTNAME= fl_moxgen PORTVERSION= 0.05 @@ -23,11 +19,13 @@ DESKTOP_ENTRIES= "Fl_MoxGen" "${COMMENT}" "" "${PORTNAME}" \ "Network;HamRadio;" "false" -OPTIONS= PDF "Enable PDF Writing (requires libharu)" on +OPTIONS_DEFINE= PDF +OPTIONS_DEFAULT= PDF +PDF_DESC= Enable PDF Writing (requires libharu) .include -.ifdef WITH_PDF +.if ${PORT_OPTIONS:MPDF} LIB_DEPENDS+= hpdf:${PORTSDIR}/print/libharu ALL_TARGET= fl_moxgen .else Index: databases/adodb/Makefile =================================================================== --- databases/adodb/Makefile (revision 314844) +++ databases/adodb/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: adodb -# Date created: 4 May 2001 -# Whom: abgoeree@uwnet.nl -# +# Created by: abgoeree@uwnet.nl # $FreeBSD$ -# PORTNAME= adodb PORTVERSION= 4.99.2 @@ -26,13 +22,14 @@ ADODB_SUBDIRS= contrib datadict drivers lang pear perf session xsl -OPTIONS= TESTS "Install tests" off +OPTIONS_DEFINE= TESTS DOCS +TESTS_DESC= Install tests -.include +.include SUB_FILES+= pkg-message -.if defined (WITH_TESTS) +.if ${PORT_OPTIONS:MTESTS} PLIST_SUB+= TESTS= .else PLIST_SUB+= TESTS="@comment " @@ -50,14 +47,14 @@ @cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type f \ -exec ${INSTALL_DATA} ${WRKSRC}/{} ${DATADIR}/{} \; -.if defined (WITH_TESTS) +.if ${PORT_OPTIONS:MTESTS} @${MKDIR} ${DATADIR}/tests @cd ${WRKSRC}; ${FIND} tests -type f \ -exec ${INSTALL_DATA} ${WRKSRC}/{} ${DATADIR}/{} \; .endif post-install: -.if !defined (NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${DOCSDIR}/cute_icons_for_site @cd ${WRKSRC}; ${FIND} . ! -path './*/*' -type f -name '*.txt' \ -exec ${INSTALL_MAN} ${WRKSRC}/{} ${DOCSDIR}/{} \; @@ -68,4 +65,4 @@ .endif @${CAT} ${PKGMESSAGE} -.include +.include Index: databases/dbconnect/Makefile =================================================================== --- databases/dbconnect/Makefile (revision 314844) +++ databases/dbconnect/Makefile (working copy) @@ -1,10 +1,5 @@ -# ex:ts=8 -# New ports collection makefile for: dbconnect -# Date created: Jul 23, 2001 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= dbconnect PORTVERSION= 0.3.5 @@ -23,14 +18,14 @@ CXXFLAGS+= ${PTHREAD_CFLAGS} -fPIC -DFREEBSD LDFLAG+= ${PTHREAD_LIBS} -OPTIONS= MYSQL "With MySQL driver" on \ - PGSQL "With PostgreSQL driver" off +OPTIONS_DEFINE= MYSQL PGSQL +OPTIONS_DEFAULT= MYSQL -.include +.include PLIST_SUB+= PORTVERSION=${PORTVERSION} -.if !defined(WITHOUT_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= YES CONFIGURE_ARGS+= --enable-mysql=yes \ --with-mysql_include=${LOCALBASE}/include/mysql \ @@ -40,7 +35,7 @@ PLIST_SUB+= MYSQL="@comment " .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --enable-pgsql=yes \ --with-pgsql_include=${LOCALBASE}/include \ @@ -65,4 +60,4 @@ $${libname}.so); \ done -.include +.include Index: databases/drizzle/Makefile =================================================================== --- databases/drizzle/Makefile (revision 314844) +++ databases/drizzle/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: drizzle -# Date created: 2010-04-22 -# Whom: Greg Larkin -# +# Created by: Greg Larkin # $FreeBSD$ -# PORTNAME= drizzle PORTVERSION= 2010.05.1561 @@ -34,7 +30,7 @@ # Replace token in the rc.d script SUB_LIST+= USERS=${USERS} -OPTIONS= DOCS "Build documentation with doxygen (very slow)" Off +OPTIONS_DEFINE= DOXYGEN NLS BUILD_DEPENDS+= libdrizzle>=0:${PORTSDIR}/databases/libdrizzle \ e2fsprogs-libuuid>=0:${PORTSDIR}/misc/e2fsprogs-libuuid \ @@ -57,22 +53,21 @@ USE_RC_SUBR= drizzle-server -.include +.include .if ${ARCH} == "i386" CONFIGURE_ARGS+=--disable-64bit .endif -.if defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.else CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " -.else -USE_GETTEXT= yes -PLIST_SUB+= NLS="" .endif -.if !defined(NOPORTDOCS) -.if defined(WITH_DOCS) +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS+= doxygen>=0:${PORTSDIR}/devel/doxygen \ ${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz ALL_TARGET= all doxygen @@ -84,6 +79,5 @@ .else PLIST_SUB+= PORTDOCS="@comment " .endif -.endif -.include +.include Index: databases/freetds/Makefile =================================================================== --- databases/freetds/Makefile (revision 314844) +++ databases/freetds/Makefile (working copy) @@ -1,7 +1,4 @@ -# New ports collection makefile for: freetds -# Date created: 02 Nov 1999 -# Whom: Domas Mituzas -# +# Created by: Domas Mituzas # $FreeBSD$ PORTNAME= freetds @@ -30,35 +27,34 @@ MAN1= datacopy.1 freebcp.1 tsql.1 bsqldb.1 defncopy.1 -OPTIONS= OPENSSL "Use openssl" off \ - GNUTLS "Use GNUTLS" off \ - IODBC "Use iodbc (Mutually Exclusive)" off \ - UNIXODBC "Use unixodbc (Mutually Exclusive)" off \ - MSDBLIB "MS SQL Server support (breaks databases/sybtcl)" off +OPTIONS_DEFINE= OPENSSL GNUTLS MSDBLIB DOCS +OPTIONS_RADIO= ODBC +OPTIONS_RADIO_ODBC= IODBC UNIXODBC +MSDBLIB_DESC= MS SQL Server support (breaks databases/sybtcl) -.include +.include -.if defined(WITH_OPENSSL) +.if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif -.if defined(WITH_GNUTLS) +.if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+=--with-gnutls .endif -.if defined(WITH_IODBC) +.if ${PORT_OPTIONS:MIODBC} LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc CONFIGURE_ARGS+= --with-iodbc=${LOCALBASE} .endif -.if defined(WITH_UNIXODBC) +.if ${PORT_OPTIONS:MUNIXODBC} LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-unixodbc=${LOCALBASE} .endif -.if defined(WITH_IODBC) || defined(WITH_UNIXODBC) +.if ${PORT_OPTIONS:MIODBC) || defined(WITH_UNIXODBC} PLIST_SUB+= ODBC="" .else PLIST_SUB+= ODBC="@comment " @@ -66,7 +62,7 @@ # We cannot use msdblib-style by default, because port databases/sybtcl # relies on sybase-style dblib -.if defined(WITH_MSDBLIB) +.if ${PORT_OPTIONS:MMSDBLIB} CONFIGURE_ARGS+= --enable-msdblib .endif @@ -84,7 +80,7 @@ s| common.h||g' post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${DOCSDIR} @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc ${DOCSDIR} .endif @@ -93,4 +89,4 @@ @${ECHO_CMD} "Sample configuration files have been installed in ${PREFIX}/etc" @${ECHO_CMD} "You should edit them and remove the .dist-suffix from their names" -.include +.include Index: databases/gdbm/Makefile =================================================================== --- databases/gdbm/Makefile (revision 314844) +++ databases/gdbm/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gdbm -# Date created: 8 Apr 1996 -# Whom: Brent J. Nordquist -# +# Created by: Brent J. Nordquist # $FreeBSD$ -# PORTNAME= gdbm PORTVERSION= 1.9.1 @@ -13,7 +9,8 @@ MAINTAINER= gabor@FreeBSD.org COMMENT= The GNU database manager -OPTIONS= COMPAT "dbm/ndbm compatibility" off +OPTIONS_DEFINE= COMPAT +COMPAT_DESC= dbm/ndbm compatibility GNU_CONFIGURE= yes USE_AUTOTOOLS= libtool @@ -25,7 +22,7 @@ .include -.if defined(WITH_COMPAT) +.if ${PORT_OPTIONS:MCOMPAT} CONFIGURE_ARGS+=--enable-libgdbm-compat PLIST_SUB= GDBM_COMPAT="" .else @@ -33,10 +30,10 @@ .endif pre-everything:: -.if !defined(WITH_COMPAT) +.if ! ${PORT_OPTIONS:MCOMPAT} @${ECHO_MSG} @${ECHO_MSG} "If you need UNIX dbm/ndbm compatibility functions," - @${ECHO_MSG} "use \"make WITH_COMPAT=yes\"" + @${ECHO_MSG} "use \"make WITH=COMPAT\"" @${ECHO_MSG} .endif Index: databases/libdbi-drivers/Makefile =================================================================== --- databases/libdbi-drivers/Makefile (revision 314844) +++ databases/libdbi-drivers/Makefile (working copy) @@ -1,9 +1,5 @@ -# Ports collection makefile for: libdbi-drivers -# Date created: Oct 30, 2003 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= libdbi-drivers DISTVERSION= 0.8.3-1 @@ -22,23 +18,15 @@ --with-dbi-incdir=${LOCALBASE}/include/dbi DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} -OPTIONS= MYSQL "With MySQL Driver" on \ - MSQL "With MSQL Driver" off \ - PGSQL "With PostgreSQL Driver" on \ - SQLITE2 "With SQLite 2 Driver" off \ - SQLITE3 "With SQLite 3 Driver" on \ - FIREBIRD "With Firebird Driver (BROKEN)" off \ - FREETDS "With FreeTDS Driver" off +OPTIONS_MULTI= DRIVER +OPTIONS_MULTI_DRIVER= MYSQL MSQL PGSQL SQLITE2 SQLITE3 FIREBIRD FREETDS -.include +OPTIONS_DEFAULT= MYSQL PGSQL SQLITE3 +SQLITE2_DESC= SQLite 2 Database -.if defined(WITHOUT_MYSQL) && defined(WITHOUT_MSQL) && defined(WITHOUT_PGSQL) \ - && defined(WITHOUT_SQLITE2) && defined(WITHOUT_SQLITE3) \ - && defined(WITHOUT_FIREBIRD) && defined(WITHOUT_FREETDS) -IGNORE= choose at least one driver -.endif +.include -.if !defined(WITHOUT_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql PLIST_SUB+= MYSQL="" @@ -46,7 +34,7 @@ PLIST_SUB+= MYSQL="@comment " .endif -.if defined(WITH_MSQL) +.if ${PORT_OPTIONS:MMSQL} LIB_DEPENDS+= msql.1:${PORTSDIR}/databases/msql CONFIGURE_ARGS+= --with-msql PLIST_SUB+= MSQL="" @@ -54,7 +42,7 @@ PLIST_SUB+= MSQL="@comment " .endif -.if !defined(WITHOUT_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql PLIST_SUB+= PGSQL="" @@ -62,7 +50,7 @@ PLIST_SUB+= PGSQL="@comment " .endif -.if defined(WITH_SQLITE2) +.if ${PORT_OPTIONS:MSQLITE2} LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --with-sqlite PLIST_SUB+= SQLITE2="" @@ -70,7 +58,7 @@ PLIST_SUB+= SQLITE2="@comment " .endif -.if !defined(WITHOUT_SQLITE3) +.if ${PORT_OPTIONS:MSQLITE3} LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 CONFIGURE_ARGS+= --with-sqlite3 PLIST_SUB+= SQLITE3="" @@ -78,7 +66,7 @@ PLIST_SUB+= SQLITE3="@comment " .endif -.if defined(WITH_FIREBIRD) +.if ${PORT_OPTIONS:MFIREBIRD} LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird20-client CONFIGURE_ARGS+= --with-firebird PLIST_SUB+= FIREBIRD="" @@ -86,7 +74,7 @@ PLIST_SUB+= FIREBIRD="@comment " .endif -.if defined(WITH_FREETDS) +.if ${PORT_OPTIONS:MFREETDS} LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+= --with-freetds PLIST_SUB+= FREETDS="" @@ -102,4 +90,4 @@ -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure @${TOUCH} ${WRKSRC}/drivers/*/dbd_*/* -.include +.include Index: databases/libdrizzle/Makefile =================================================================== --- databases/libdrizzle/Makefile (revision 314844) +++ databases/libdrizzle/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: libdrizzle -# Date created: 2010-03-03 -# Whom: Greg Larkin -# +# Created by: Greg Larkin # $FreeBSD$ -# PORTNAME= libdrizzle PORTVERSION= 0.8 @@ -17,7 +13,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 -OPTIONS= DOCS "Build documentation with doxygen" Off +OPTIONS_DEFINE= DOXYGEN EXAMPLES USE_GCC= 4.2+ GNU_CONFIGURE= yes @@ -28,10 +24,9 @@ SAMPLE_PROGS= client pipe_query proxy server simple \ simple_multi sqlite_server -.include +.include -.if !defined(NOPORTDOCS) -.if defined(WITH_DOCS) +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEB} BUILD_DEPENDS+= doxygen>=0:${PORTSDIR}/devel/doxygen ALL_TARGET= all doxygen PLIST_SUB+= PORTDOCS="" @@ -42,9 +37,8 @@ .else PLIST_SUB+= PORTDOCS="@comment " .endif -.endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} post-install:: @${INSTALL} -d ${EXAMPLESDIR} .for i in ${SAMPLE_PROGS} Index: databases/mysql2odbc/Makefile =================================================================== --- databases/mysql2odbc/Makefile (revision 314844) +++ databases/mysql2odbc/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mysql2odbc -# Date created: 8 Aug 2005 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= mysql2odbc PORTVERSION= 0.99.2 @@ -14,25 +10,18 @@ MAINTAINER= fjoe@FreeBSD.org COMMENT= Openlink MySQL-ODBC Gateway -OPTIONS= UNIXODBC "Build with unixODBC" on \ - IODBC "Build with iODBC" off \ +OPTIONS_SINGLE= ODBC +OPTIONS_SINGLE_ODBC= UNIXODBC IODBC +OPTIONS_DEFAULT= UNIXODBC -.include +.include -.if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC) -WITH_UNIXODBC= yes -.endif - -.if defined(WITH_UNIXODBC) && defined(WITH_IODBC) -BROKEN= UNIXODBC and IODBC options are mutually exclusive -.endif - -.if defined(WITH_UNIXODBC) +.if ${PORT_OPTIONS:MUNIXODBC} LIB_DEPENDS= odbc:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS= --with-unixodbc=${LOCALBASE} .endif -.if defined(WITH_IODBC) +.if ${PORT_OPTIONS:MIODBC} LIB_DEPENDS= iodbc:${PORTSDIR}/databases/libiodbc CONFIGURE_ARGS= --with-iodbc .endif @@ -44,4 +33,4 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -.include +.include Index: databases/opendbx/Makefile =================================================================== --- databases/opendbx/Makefile (revision 314844) +++ databases/opendbx/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: opendbx -# Date Created: 17 March 2006 -# Whom: tremere@cainites.net -# +# Created by: tremere@cainites.net # $FreeBSD$ -# PORTNAME= opendbx PORTVERSION= 1.4.5 @@ -23,20 +19,17 @@ USE_LDCONFIG= ${PREFIX}/lib/opendbx -OPTIONS= MYSQL "Support for the MySQL database" on \ - PGSQL "Support for the PostgreSQL database" off \ - SQLITE "Support for the SQLite 2 database" off \ - SQLITE3 "Support for the SQLite 3 database" off \ - MSSQL "Support for the MSSQL database" off \ - SYBASE "Support for the Sybase database" off +OPTIONS_DEFINE= NLS +OPTIONS_MULTI= DRIVER +OPTIONS_MULTI_DRIVER= MYSQL PGSQL SQLITE2 MSSQL SYBASE +OPTIONS_DEFAULT= MYSQL +SQLITE2_DESC= SQLite 2 database +SYBASE_DESC= Sybase database +DRIVER_DESC= Database drivers -.include +.include -.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE) && !defined(WITH_SQLITE3) && !defined(WITH_MSSQL) && !defined(WITH_SYBASE) -IGNORE= needs at least one database backend -.endif - -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL?= YES CONFIGURE_MODULES+= "mysql" CPPFLAGS+= -I${LOCALBASE}/include/mysql @@ -46,7 +39,7 @@ PLIST_SUB+= WITHMYSQL="@comment " .endif -.if !defined(WITHOUT_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL?= YES CONFIGURE_MODULES+= "pgsql" PLIST_SUB+= WITHPGSQL="" @@ -54,7 +47,7 @@ PLIST_SUB+= WITHPGSQL="@comment " .endif -.if defined(WITH_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_MODULES+= "sqlite" PLIST_SUB+= WITHSQLITE="" @@ -62,7 +55,7 @@ PLIST_SUB+= WITHSQLITE="@comment " .endif -.if defined(WITH_SQLITE3) +.if ${PORT_OPTIONS:MSQLITE3} LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 CONFIGURE_MODULES+= "sqlite3" PLIST_SUB+= WITHSQLITE3="" @@ -70,7 +63,7 @@ PLIST_SUB+= WITHSQLITE3="@comment " .endif -.if defined(WITH_MSSQL) +.if ${PORT_OPTIONS:MMSSQL} LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds CONFIGURE_MODULES+= "mssql" PLIST_SUB+= WITHMSSQL="" @@ -78,7 +71,7 @@ PLIST_SUB+= WITHMSSQL="@comment " .endif -.if defined(WITH_SYBASE) +.if ${PORT_OPTIONS:MSYBASE} LIB_DEPENDS+= ct.4:${PORTSDIR}/databases/freetds CONFIGURE_MODULES+= "sybase" PLIST_SUB+= WITHSYBASE="" @@ -86,12 +79,12 @@ PLIST_SUB+= WITHSYBASE="@comment " .endif -.if defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " -.else -USE_GETTEXT= yes -PLIST_SUB+= NLS="" .endif -.include +.include Index: databases/p5-DBD-mysql/Makefile =================================================================== --- databases/p5-DBD-mysql/Makefile (revision 314844) +++ databases/p5-DBD-mysql/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: DBD::mysql -# Date created: 27 Nov 2001 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= DBD-mysql PORTVERSION= 4.021 @@ -29,11 +25,11 @@ MAN3= Bundle::DBD::mysql.3 DBD::mysql.3 DBD::mysql::INSTALL.3 -OPTIONS= SSL "build with OpenSSL support" off +OPTIONS_DEFINE= SSL .include -.if defined(WITH_SSL) +.if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --ssl RUN_DEPENDS+= p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay .endif Index: databases/p5-DBIx-Simple/Makefile =================================================================== --- databases/p5-DBIx-Simple/Makefile (revision 314844) +++ databases/p5-DBIx-Simple/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: DBIx::Simple -# Date created: 10 December 2005 -# Whom: Parv -# +# Created by: Parv # $FreeBSD$ -# PORTNAME= DBIx-Simple PORTVERSION= 1.35 @@ -16,10 +12,11 @@ RUN_DEPENDS= p5-DBI>=1.21:${PORTSDIR}/databases/p5-DBI -OPTIONS= SQL_INTERP "Interpolate Perl variables into SQL" off \ - SQL_ABSTRACT "Generate SQL from Perl data structures" off \ - DBIX_XHTML_TABLE "Create XHTML tables from SQL queries" off \ - TEXT_TABLE "Create plain text table from data" off +OPTIONS_DEFINE= SQL_INTERP SQL_ABSTRACT DBIX_XHTML_TABLE TEXT_TABLE +SQL_INTERP_DESC= Interpolate Perl variables into SQL +SQL_ABSTRACT_DESC= Generate SQL from Perl data structures +DBIX_XHTML_TABLE_DESC= Create XHTML tables from SQL queries +TEXT_TABLE_DESC= Create plain text table from data PERL_CONFIGURE= yes @@ -28,22 +25,22 @@ DBIx::Simple::Comparison.3 \ DBIx::Simple::Result::RowObject.3 -.include +.include -.if defined(WITH_SQL_INTERP) +.if ${PORT_OPTIONS:MSQL_INTERP} RUN_DEPENDS+= p5-SQL-Interp>=0:${PORTSDIR}/databases/p5-SQL-Interp .endif -.if defined(WITH_SQL_ABSTRACT) +.if ${PORT_OPTIONS:MSQL_ABSTRACT} RUN_DEPENDS+= p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract .endif -.if defined(WITH_DBIX_XHTML_TABLE) +.if ${PORT_OPTIONS:MDBIX_XHTML_TABLE} RUN_DEPENDS+= p5-DBIx-XHTML_Table>=0:${PORTSDIR}/databases/p5-DBIx-XHTML_Table .endif -.if defined(WITH_TEXT_TABLE) +.if ${PORT_OPTIONS:MTEXT_TABLE} RUN_DEPENDS+= p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table .endif -.include +.include Index: databases/pxlib/Makefile =================================================================== --- databases/pxlib/Makefile (revision 314844) +++ databases/pxlib/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: pxlib -# Date created: 10 December 2005 -# Whom: Sergey Matveychuk -# +# Created by: Sergey Matveychuk # $FreeBSD$ -# PORTNAME= pxlib PORTVERSION= 0.6.3 @@ -27,11 +23,12 @@ USE_LDCONFIG= yes -OPTIONS= DOCS "Build and install documentation" off +OPTIONS_DEFINE= MAN +MAN_DESC= Build and install manpages -.include +.include -.if defined(WITH_DOCS) +.if ${PORT_OPTIONS:MMAN} BUILD_DEPENDS+= docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \ docbook2man:${PORTSDIR}/textproc/docbook-utils @@ -58,4 +55,4 @@ ${REINPLACE_CMD} -e 's/^DOCDIR =.*/DOCDIR =/' ${WRKSRC}/Makefile .endif -.include +.include Index: databases/rrdtool/Makefile =================================================================== --- databases/rrdtool/Makefile (revision 314844) +++ databases/rrdtool/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rrdtool -# Date created: 20 July 1999 -# Whom: Dmitry Sivachenko -# +# Created by: Dmitry Sivachenko # $FreeBSD$ -# PORTNAME= rrdtool PORTVERSION= 1.4.7 @@ -38,16 +34,18 @@ PORTEXAMPLES= 4charts.pl bigtops.pl cgi-demo.cgi minmax.pl perftest.pl \ piped-demo.pl shared-demo.pl stripes.pl -OPTIONS= DEJAVU "Use DejaVu fonts (requires X11)" off \ - JSON "Support of json export" off \ - MMAP "Use mmap in rrd_update" on \ - PERL_MODULE "Build PERL module" on \ - PYTHON_MODULE "Build PYTHON bindings" off \ - RUBY_MODULE "Build RUBY bindings" off +OPTIONS_DEFINE= DEJAVU JSON MMAP PERL_MODULE PYTHON_MODULE RUBY_MODULE EXAMPLES DOCS +OPTIONS_DEFAULT= MMAP PERL_MODULE +DEJAVU_DESC= Use DejaVu fonts (requires X11) +JSON_DESC= Support of json export +MMAP_DESC= Use mmap in rrd_update +PERL_MODULE_DESC= Build PERL module +PYTHON_MODULE_DESC= Build PYTHON bindings +RUBY_MODULE_DESC= Build RUBY bindings .include -.if defined(WITH_PYTHON_MODULE) +.if ${PORT_OPTIONS:MPYTHON_MODULE} USE_PYTHON= yes INSTALLS_EGGINFO=yes PYDISTUTILS_EGGINFO=py_rrdtool-0.2.1-${PYTHON_VERSION:S/thon//}.egg-info @@ -59,7 +57,7 @@ PLIST_SUB+= WITH_PYTHON="@comment " .endif -.if defined(WITH_RUBY_MODULE) +.if ${PORT_OPTIONS:MRUBY_MODULE} USE_RUBY= yes .include "${PORTSDIR}/Mk/bsd.ruby.mk" PLIST_SUB+= WITH_RUBY="" @@ -69,7 +67,7 @@ PLIST_SUB+= WITH_RUBY="@comment " .endif -.if !defined(WITHOUT_PERL_MODULE) +.if ${PORT_OPTIONS:MPERL_MODULE} USE_PERL5= yes CONFIGURE_ARGS+= --enable-perl --enable-perl-site-install PLIST_SUB+= WITH_PERL="" @@ -78,15 +76,15 @@ PLIST_SUB+= WITH_PERL="@comment " .endif -.if defined(WITHOUT_MMAP) +.if ! ${PORT_OPTIONS:MMMAP} CONFIGURE_ARGS+= --disable-mmap .endif -.if defined(WITH_JSON) +.if ${PORT_OPTIONS:MJSON} EXTRA_PATCHES+= ${FILESDIR}/thirdparty-json.diff .endif -.if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || defined(WITH_DEJAVU) +.if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || ${PORT_OPTIONS:MDEJAVU} RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu .endif @@ -102,26 +100,26 @@ rrdresize.1 rrdrestore.1 rrdthreads.1 rrdtool.1 rrdtune.1 \ rrdtutorial.1 rrdupdate.1 rrdxport.1 -.if !defined(WITHOUT_PERL_MODULE) +.if ${PORT_OPTIONS:MPERL_MODULE} MAN3= RRDp.3 RRDs.3 MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} .endif post-extract: @${REINPLACE_CMD} -e 's/^POD3/#POD3/' ${WRKSRC}/doc/Makefile.in -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's/[[:space:]]install-idocDATA//g' \ -e 's/[[:space:]]install-ihtmlDATA//g' \ -e 's/^[[:space:]].*cd .* rrdtool.html index.html/ #/' \ ${WRKSRC}/doc/Makefile.in .endif -.if defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \ ${WRKSRC}/Makefile.in .endif post-install: -.if !defined(BATCH) && !defined(NOPORTEXAMPLES) +.if !defined(BATCH) && ${PORT_OPTIONS:MEXAMPLES} @${ECHO_MSG} "" @${ECHO_MSG} "############################################################################" @${ECHO_MSG} "# See ${EXAMPLESDIR} for some demonstration code #" Index: databases/rrdtool10/Makefile =================================================================== --- databases/rrdtool10/Makefile (revision 314844) +++ databases/rrdtool10/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rrdtool -# Date created: 20 July 1999 -# Whom: Dmitry Sivachenko -# +# Created by: Dmitry Sivachenko # $FreeBSD$ -# PORTNAME= rrdtool PORTVERSION= 1.0.50 @@ -37,11 +33,12 @@ MAN3= RRDp.3 RRDs.3 MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} -OPTIONS= LATIN2 "ISO-8859-2 fonts support" off +OPTIONS_DEFINE= LATIN2 +LATIN2_DESC= ISO-8859-2 fonts support -.include +.include -.if defined(WITH_LATIN2) +.if ${PORT_OPTIONS:MLATIN2} CONFIGURE_ARGS+=--enable-latin2 .endif @@ -54,7 +51,7 @@ .endif post-extract: -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's/install-idocDATA install-ihtmlDATA//g' \ ${WRKSRC}/doc/Makefile.in .endif @@ -67,4 +64,4 @@ @${ECHO_MSG} "############################################################################" .endif -.include +.include Index: databases/slony1/Makefile =================================================================== --- databases/slony1/Makefile (revision 314844) +++ databases/slony1/Makefile (working copy) @@ -23,13 +23,14 @@ SUB_FILES= pkg-message slon-mkservice.sh SUB_LIST+= NAME=slon -OPTIONS= PERLTOOLS "Install perl configuration tools" Off +OPTIONS_DEFINE= PERLTOOLS DOCS +PERLTOOLS_DESC= Install perl configuration tools CONFLICTS?= slony1v2-2* -.include +.include -.if defined(WITH_PERLTOOLS) +.if ${PORT_OPTIONS:MPERLTOOLS} USE_PERL5= yes CONFIGURE_ARGS+= --with-perltools=${LOCALBASE}/sbin RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg @@ -55,7 +56,7 @@ .endif post-install: -.if ! defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR}/adminguide ${MKDIR} ${DOCSDIR}/howto @@ -70,4 +71,4 @@ @${INSTALL_DATA} ${FILESDIR}/slon.conf-sample ${PREFIX}/etc/ @${CAT} ${PKGMESSAGE} -.include +.include Index: databases/sqlite-ext-mobigroup/Makefile =================================================================== --- databases/sqlite-ext-mobigroup/Makefile (revision 314844) +++ databases/sqlite-ext-mobigroup/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sqlite-ext-mobigroup -# Date created: 28 Jul 2010 -# Whom: Pavel Volkov -# +# Created by: Pavel Volkov # $FreeBSD$ -# PORTNAME= sqlite-ext-mobigroup PORTVERSION= 3.7.5.1 @@ -22,10 +18,11 @@ USE_LDCONFIG= ${PREFIX}/libexec/${DIST_SUBDIR} -OPTIONS= COMPRESS "compress content into a blob using libz" off \ - ENV "implements the getenv" off \ - INET "provide the ipv4 functions in SQL queries" on \ - MD5 "implements the MD5 message-digest algorithm" off +OPTIONS_DEFINE= COMPRESS ENV INET MD5 EXAMPLES DOCS +COMPRESS_DESC= compress content into a blob using libz +ENV_DESC= implements the getenv +INET_DESC= provide the ipv4 functions in SQL queries +MD5_DESC= implements the MD5 message-digest algorithm PLIST_DIRS= libexec/${DIST_SUBDIR} PORTDOCS= * @@ -33,74 +30,74 @@ .include -.ifdef WITH_COMPRESS +.if ${PORT_OPTIONS:MCOMPRESS} PLIST_FILES+= libexec/${DIST_SUBDIR}/libsqlitecompress.so .endif -.ifdef WITH_INET +.if ${PORT_OPTIONS:MINET} PLIST_FILES+= libexec/${DIST_SUBDIR}/libsqliteipv4.so .endif -.ifdef WITH_ENV +.if ${PORT_OPTIONS:MENV} PLIST_FILES+= libexec/${DIST_SUBDIR}/libsqliteenv.so .endif -.ifdef WITH_MD5 +.if ${PORT_OPTIONS:MMD5} PLIST_FILES+= libexec/${DIST_SUBDIR}/libsqlitemd5.so .endif CFLAGS+= -I${PREFIX}/include -fPIC -lm -shared do-build: -.ifdef WITH_COMPRESS +.if ${PORT_OPTIONS:MCOMPRESS} @cd ${WRKSRC}/ext/_compress && \ ${CC} -lz ${CFLAGS} compress.c -o libsqlitecompress.so .endif -.ifdef WITH_INET +.if ${PORT_OPTIONS:MINET} @cd ${WRKSRC}/ext/inet && \ ${CC} ${CFLAGS} ipv4-ext.c -o libsqliteipv4.so .endif -.ifdef WITH_ENV +.if ${PORT_OPTIONS:MENV} @cd ${WRKSRC}/ext/env && \ ${CC} ${CFLAGS} env.c -o libsqliteenv.so .endif -.ifdef WITH_MD5 +.if ${PORT_OPTIONS:MMD5} @cd ${WRKSRC}/ext/md5 && \ ${CC} ${CFLAGS} md5.c -o libsqlitemd5.so .endif do-install: @${MKDIR} ${PREFIX}/libexec/${DIST_SUBDIR} -.ifndef NOPORTDOCS +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .endif -.ifndef NOPORTEXAMPLES +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} .endif -.ifdef WITH_COMPRESS +.if ${PORT_OPTIONS:MCOMPRESS} @${INSTALL_PROGRAM} ${WRKSRC}/ext/_compress/libsqlitecompress.so ${PREFIX}/libexec/${DIST_SUBDIR} .endif -.ifdef WITH_INET +.if ${PORT_OPTIONS:MINET} @${INSTALL_PROGRAM} ${WRKSRC}/ext/inet/libsqliteipv4.so ${PREFIX}/libexec/${DIST_SUBDIR} -. ifndef NOPORTDOCS +. if ${PORT_OPTIONS:MDOCS} @${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/ext/inet/ipv4-ext.c > ${WRKSRC}/ext/inet/README-ipv4.txt @${INSTALL_DATA} ${WRKSRC}/ext/inet/README-ipv4.txt ${DOCSDIR} . endif -. ifndef NOPORTEXAMPLES +. if ${PORT_OPTIONS:MEXAMPLES} @${INSTALL_DATA} ${WRKSRC}/ext/inet/ipv4-ext.sql ${EXAMPLESDIR} . endif .endif -.ifdef WITH_ENV +.if ${PORT_OPTIONS:MENV} @${INSTALL_PROGRAM} ${WRKSRC}/ext/env/libsqliteenv.so ${PREFIX}/libexec/${DIST_SUBDIR} -. ifndef NOPORTDOCS +. if ${PORT_OPTIONS:MDOCS} @${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/ext/env/env.c > ${WRKSRC}/ext/env/README-env.txt @${INSTALL_DATA} ${WRKSRC}/ext/env/README-env.txt ${DOCSDIR} . endif .endif -.ifdef WITH_MD5 +.if ${PORT_OPTIONS:MMD5} @${INSTALL_PROGRAM} ${WRKSRC}/ext/md5/libsqlitemd5.so ${PREFIX}/libexec/${DIST_SUBDIR} -. ifndef NOPORTDOCS +. if ${PORT_OPTIONS:MDOCS} @${SED} '/\/\*/d;/\*\//,$$d' ${WRKSRC}/ext/md5/md5.c > ${WRKSRC}/ext/md5/README-md5.txt @${INSTALL_DATA} ${WRKSRC}/ext/md5/README-md5.txt ${DOCSDIR} . endif -. ifndef NOPORTEXAMPLES +. if ${PORT_OPTIONS:MEXAMPLES} @${INSTALL_DATA} ${WRKSRC}/ext/md5/md5.sql ${EXAMPLESDIR} . endif .endif Index: databases/sqlite3/Makefile =================================================================== --- databases/sqlite3/Makefile (revision 314844) +++ databases/sqlite3/Makefile (working copy) @@ -17,29 +17,32 @@ CONFLICTS= sqlite34-[0-9]* sqlcipher-* -USE_GNOME= pkgconfig +USE_PKGCONFIG= build USE_LDCONFIG= YES GNU_CONFIGURE= YES MAKE_JOBS_UNSAFE= yes # Compilation Options For SQLite http://www.sqlite.org/compile.html -OPTIONS= \ - FTS3 "Enable FTS3/4 (Full Text Search) module" on \ - ICU "Enable built with ICU" off \ - RTREE "Enable R*Tree module (${RTREE_INT})" off \ - RAMTABLE "Store temporary tables in RAM = ${TEMP_STORE}" off \ - UPD_DEL_LIMIT "ORDER BY and LIMIT on UPDATE and DELETE" off \ - URI "Enable use the URI filename" on \ - SOUNDEX "Enables the soundex() SQL function" off \ - METADATA "Enable column metadata" on \ - STAT3 "Help SQLite to chose a better query plan" off \ - DIRECT_READ "File is read directly from disk" off \ - MEMMAN "Allows it to release unused memory" off \ - SECURE_DELETE "Overwrite deleted information with zeros" on \ - UNLOCK_NOTIFY "Enable notification on unlocking" on \ - THREADSAFE "Build thread-safe library" on \ - EXTENSION "Allow loadable extensions" on \ +OPTIONS_DEFINE= FTS3 ICU RTREE RAMTABLE UPD_DEL_LIMIT URI SOUNDEX METADATA \ + STAT3 DIRECT_READ MEMMAN SECURE_DELETE UNLOCK_NOTIFY THREADSAFE \ + EXTENSION +OPTIONS_DEFAULT= FTS3 SECURE_DELETE THREADSAFE EXTENSION +FTS3_DESC= Enable FTS3/4 (Full Text Search) module +ICU_DESC= Enable built with ICU +RTREE_DESC= Enable R*Tree module (${RTREE_INT}) +RAMTABLE_DESC= Store temporary tables in RAM = ${TEMP_STORE} +UPD_DEL_LIMIT_DESC= ORDER BY and LIMIT on UPDATE and DELETE +URI_DESC= Enable use the URI filename +SOUNDEX_DESC= Enables the soundex() SQL function +METADATA_DESC= Enable column metadata +STAT3_DESC= Help SQLite to chose a better query plan +DIRECT_READ_DESC= File is read directly from disk +MEMMAN_DESC= Allows it to release unused memory +SECURE_DELETE_DESC= Overwrite deleted information with zeros +UNLOCK_NOTIFY_DESC= Enable notification on unlocking +THREADSAFE_DESC= Build thread-safe library +EXTENSION_DESC= Allow loadable extensions .include @@ -55,7 +58,7 @@ # Some devices are compelled to use an older file system with 8+3 filename # restrictions for backwards compatibility, or due to other non-technical factors. # http://www.sqlite.org/shortnames.html -.if defined(WITH_NAME83) +.if ${PORT_OPTIONS:MNAME83} CPPFLAGS+= -DSQLITE_ENABLE_8_3_NAMES=1 .endif @@ -72,35 +75,35 @@ CPPFLAGS+= -DSQLITE_DEFAULT_TEMP_CACHE_SIZE=${TEMP_CACHE_SIZE} .endif -.if defined(WITH_MEMMAN) +.if ${PORT_OPTIONS:MMEMMAN} CPPFLAGS+= -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 .endif -.if defined(WITH_UPD_DEL_LIMIT) +.if ${PORT_OPTIONS:MUPD_DEL_LIMIT} CPPFLAGS+= -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 .endif -.if defined(WITH_URI) +.if ${PORT_OPTIONS:MURI} CPPFLAGS+= -DSQLITE_USE_URI=1 .endif -.if defined(WITH_SOUNDEX) +.if ${PORT_OPTIONS:MSOUNDEX} CPPFLAGS+= -DSQLITE_SOUNDEX=1 .endif -.if defined(WITH_STAT3) +.if ${PORT_OPTIONS:MSTAT3} CPPFLAGS+= -DSQLITE_ENABLE_STAT3=1 .endif -.if defined(WITH_DIRECT_READ) +.if ${PORT_OPTIONS:MDIRECT_READ} CPPFLAGS+= -DSQLITE_DIRECT_OVERFLOW_READ=1 .endif -.if defined(WITH_FTS3) +.if ${PORT_OPTIONS:MFTS3} CPPFLAGS+= -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 .endif -.if defined(WITH_RTREE) +.if ${PORT_OPTIONS:MRTREE} CPPFLAGS+= -DSQLITE_ENABLE_RTREE=1 .ifdef RTREE_INT CPPFLAGS+= -DSQLITE_RTREE_INT_ONLY=1 @@ -110,7 +113,7 @@ .endif .endif -.if defined(WITH_ICU) +.if ${PORT_OPTIONS:MICU} BUILD_DEPENDS+= ${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu LIB_DEPENDS+= icudata:${PORTSDIR}/devel/icu CPPFLAGS+= -DSQLITE_ENABLE_ICU=1 @@ -120,41 +123,39 @@ # Use an in-ram database for temporary tables (never,no,yes,always), # which is equivalent of TEMP_STORE=[0,1,2,3], default = 1. -.if defined(WITH_RAMTABLE) +.if ${PORT_OPTIONS:MRAMTABLE} TEMP_STORE?= 2 CPPFLAGS+= -DSQLITE_TEMP_STORE=${TEMP_STORE} .endif -.if defined(WITH_SECURE_DELETE) +.if ${PORT_OPTIONS:MSECURE_DELETE} CPPFLAGS+= -DSQLITE_SECURE_DELETE=1 .endif -.if defined(WITH_UNLOCK_NOTIFY) +.if ${PORT_OPTIONS:MUNLOCK_NOTIFY} CPPFLAGS+= -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 .endif -.if !defined(WITHOUT_METADATA) +.if ${PORT_OPTIONS:MMETADATA} CPPFLAGS+= -DSQLITE_ENABLE_COLUMN_METADATA=1 .endif -.if !defined(WITHOUT_THREADSAFE) +.if ${PORT_OPTIONS:MTHREADSAFE} CONFIGURE_ARGS+= --enable-threadsafe LDFLAGS+= ${PTHREAD_LIBS} .else CONFIGURE_ARGS+= --disable-threadsafe .endif -.if !defined(WITHOUT_EXTENSION) +.if ${PORT_OPTIONS:MEXTENSION} CONFIGURE_ARGS+= --enable-dynamic-extensions .else CONFIGURE_ARGS+= --disable-dynamic-extensions .endif -.include - post-install: .if !defined(NO_INSTALL_MANPAGES) @${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1 .endif -.include +.include Index: databases/sqlrelay/Makefile =================================================================== --- databases/sqlrelay/Makefile (revision 314844) +++ databases/sqlrelay/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: SQL Relay -# Date created: 2 July 2001 -# Whom: Akinori MUSHA aka knu -# +# Created by: Akinori MUSHA aka knu # $FreeBSD$ -# PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} @@ -36,18 +32,13 @@ .include "${.CURDIR}/Makefile.common" -OPTIONS= MSQL "Build MSQL connection" off \ - MYSQL "Build MySQL connection" off \ - ODBC "Build ODBC connection" off \ - POSTGRESQL "Build PostgreSQL connection" off \ - SQLITE "Build SQLite connection" off \ - FREETDS "Build FreeTDS connection" off \ - INTERBASE "Build Interbase connection" off \ - GTK "Build GTK configuration tool" off +OPTIONS_DEFINE= MSQL MYSQL ODBC PGSQL SQLITE2 FREETDS INTERBASE GTK1 DOCS +SQLITE2_DESC= SQLite 2 database +INTERBASE_DESC= Interbase database -.include +.include -.if defined(WITH_SQLITE) && ${WITH_SQLITE:L} != no +.if ${PORT_OPTIONS:MSQLITE2} LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm \ sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --with-gdbm-prefix="${LOCALBASE}" \ @@ -59,7 +50,7 @@ IF_SQLITE= "@comment " .endif -.if defined(WITH_MYSQL) && ${WITH_MYSQL:L} != no +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql-prefix="${LOCALBASE}" IF_MYSQL= "" @@ -68,7 +59,7 @@ IF_MYSQL= "@comment " .endif -.if defined(WITH_INTERBASE) && ${WITH_INTERBASE:L} != no +.if ${PORT_OPTIONS:MINTERBASE} USE_FIREBIRD= yes CONFIGURE_ARGS+= --with-interbase-prefix="${LOCALBASE}" IF_INTERBASE= "" @@ -77,7 +68,7 @@ IF_INTERBASE= "@comment " .endif -.if defined(WITH_MSQL) && ${WITH_MSQL:L} != no +.if ${PORT_OPTIONS:MMSQL} LIB_DEPENDS+= msql.1:${PORTSDIR}/databases/msql CONFIGURE_ARGS+= --with-msql-prefix="${LOCALBASE}" IF_MSQL= "" @@ -86,7 +77,7 @@ IF_MSQL= "@comment " .endif -.if defined(WITH_POSTGRESQL) && ${WITH_POSTGRESQL:L} != no +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql-prefix="${LOCALBASE}" IF_POSTGRESQL= "" @@ -95,7 +86,7 @@ IF_POSTGRESQL= "@comment " .endif -.if defined(WITH_[BODBC) && ${WITH_ODBC:L} != no +.if ${PORT_OPTIONS:MODBC} LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-odbc-prefix="${LOCALBASE}" IF_ODBC= "" @@ -104,7 +95,7 @@ IF_ODBC= "@comment " .endif -.if defined(WITH_FREETDS) && ${WITH_FREETDS:L} != no +.if ${PORT_OPTIONS:MFREETDS} LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+= --with-freetds-prefix="${LOCALBASE}" IF_FREETDS= "" @@ -113,7 +104,7 @@ IF_FREETDS= "@comment " .endif -.if defined(WITH_GTK) && ${WITH_GTK:L} != no +.if ${PORT_OPTIONS:MGTK1} USE_GNOME+= gtk12 CONFIGURE_ARGS+= --with-gtk-prefix="${LOCALBASE}" IF_GTK= "" @@ -147,8 +138,8 @@ @${REINPLACE_CMD} -e '/EXAMPLEDIR/d' ${WRKSRC}/etc/Makefile ${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \ -e 's#-release \$$\(SQLR_VERSION\)##g;' -.ifdef NOPORTDOCS +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} '/$$(MAKE) -C doc/d' ${WRKSRC}/Makefile .endif -.include +.include Index: databases/tdb/Makefile =================================================================== --- databases/tdb/Makefile (revision 314844) +++ databases/tdb/Makefile (working copy) @@ -27,7 +27,8 @@ PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} -OPTIONS= PYTHON "Python bindings" on +OPTIONS_DEFINE= PYTHON +OPTIONS_DEFAULT= PYTHON .include @@ -58,7 +59,7 @@ .endif .endif -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON_RUN= yes PLIST_FILES+= %%PYTHON_SITELIBDIR%%/tdb.so PLIST_DIRSTRY+= %%PYTHON_SITELIBDIR%% \ Index: databases/tokyocabinet/Makefile =================================================================== --- databases/tokyocabinet/Makefile (revision 314844) +++ databases/tokyocabinet/Makefile (working copy) @@ -1,5 +1,5 @@ +# Created by: Gea-Suan Lin # $FreeBSD$ -# Created by: Gea-Suan Lin PORTNAME= tokyocabinet PORTVERSION= 1.4.48 @@ -17,9 +17,6 @@ USE_GMAKE= yes USE_LDCONFIG= yes -.if defined(NOPORTDOCS) -EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.in -.endif MAN1= tcamgr.1 tcamttest.1 tcatest.1 tcbmgr.1 tcbmttest.1 tcbtest.1 \ tcfmgr.1 tcfmttest.1 tcftest.1 \ @@ -29,54 +26,61 @@ tcmdb.3 tcmpool.3 tcutil.3 tcxstr.3 tokyocabinet.3 tctree.3 \ tctdb.3 -OPTIONS= DEBUG "Debugging support" off \ - DEVEL "Development build" off \ - FASTEST "Fastest run" off \ - LZMA "Enable LZMA codec" off \ - LZO "Enable LZO codec" off \ - PTHREAD "Enable POSIX thread support" on \ - PROFILE "Profiling build" off \ - SHARED "Shared build" on \ - SWAB "Swapping byte-orders build" off \ - UYIELD "Detecting race conditions" off +OPTIONS_DEFINE= DEBUG DEVEL FASTEST LZMA LZO PTHREAD PROFILE SHARED SWAB UYIELD DOCS +OPTIONS_DEFAULT= PTHREAD SHARED +DEBUG_DESC= Debugging support +DEVEL_DESC= Development build +FASTEST_DESC= Fastest run +LZMA_DESC= LZMA codec +LZO_DESC= LZO codec +PTHREAD_DESC= Enable POSIX thread support +PROFILE_DESC= Profiling build +SHARED_DESC= Shared build +SWAB_DESC= Swapping byte-orders build +UYIELD_DESC= Detecting race conditions -.include +.include -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} +EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.in PORTDOCS= * .endif -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif -.if defined(WITH_DEVEL) +.if ${PORT_OPTIONS:MDEVEL} CONFIGURE_ARGS+= --enable-devel .endif -.if defined(WITH_FASTEST) +.if ${PORT_OPTIONS:MFASTEST} CONFIGURE_ARGS+= --enable-fastest .endif # liblzma on 9-current does not have liblzma.h file. -.if defined(WITH_LZMA) || exists(${LOCALBASE}/include/liblzma.h) +.if ${PORT_OPTIONS:MLZMA} CONFIGURE_ARGS+= --enable-exlzma LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/lzmalib +.else +CONFIGURE_ARGS+= --disable-exlzma .endif -.if defined(WITH_LZO) || exists(${LOCALBASE}/lib/liblzo2.so) +.if ${PORT_OPTIONS:MLZO} CONFIGURE_ARGS+= --enable-exlzo LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2 +.else +CONFIGURE_ARGS+= --disable-exlzo .endif -.if defined(WITHOUT_PTHREAD) +.if ! ${PORT_OPTIONS:MPTHREAD} CONFIGURE_ARGS+= --disable-pthread .endif -.if defined(WITH_PROFILE) +.if ${PORT_OPTIONS:MPROFILE} CONFIGURE_ARGS+= --enable-profile .endif -.if defined(WITHOUT_SHARED) +.if ! ${PORT_OPTIONS:MSHARED} CONFIGURE_ARGS+= --disable-shared .endif -.if defined(WITH_SWAB) +.if ${PORT_OPTIONS:MSWAB} CONFIGURE_ARGS+= --enable-swab .endif -.if defined(WITH_UYIELD) +.if ${PORT_OPTIONS:MUYIELD} CONFIGURE_ARGS+= --enable-uyield .endif @@ -92,4 +96,4 @@ -e 's|@datarootdir@|@datarootdir@/doc|' \ ${WRKSRC}/Makefile.in -.include +.include Index: databases/tokyotyrant/Makefile =================================================================== --- databases/tokyotyrant/Makefile (revision 314844) +++ databases/tokyotyrant/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: tokyotyrant -# Date created: 2009-03-09 -# Whom: Gea-Suan Lin -# +# Created by: Gea-Suan Lin # $FreeBSD$ -# PORTNAME= tokyotyrant PORTVERSION= 1.1.41 @@ -25,14 +21,14 @@ MAN3= tcrdb.3 tculog.3 ttutil.3 MAN8= ttservctl.8 -OPTIONS= LUA "Enable LUA support" off +OPTIONS_DEFINE= LUA LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include -.include +.include -.if defined(WITH_LUA) +.if ${PORT_OPTIONS:MLUA} CONFIGURE_ARGS+= --enable-lua LDFLAGS+= -L${LUA_LIBDIR} CFLAGS+= -I${LUA_INCDIR} @@ -47,4 +43,4 @@ ${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g' \ ${WRKSRC}/Makefile.in -.include +.include Index: databases/virtuoso/Makefile =================================================================== --- databases/virtuoso/Makefile (revision 314844) +++ databases/virtuoso/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: virtuoso -# Date created: Jul 08, 2006 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= virtuoso PORTVERSION= 6.1.6 @@ -47,9 +43,7 @@ CHECK_PORT= /usr/bin/nc -z localhost $$\1 2>\&1 -OPTIONS= IMAGEMAGICK "ImageMagick support" off\ - KERBEROS "Kerberos extension" off\ - OPENLDAP "OpenLDAP support" off +OPTIONS_DEFINE= IMAGEMAGICK KERBEROS LDAP # PERL "Perl hosting" off # PYTHON "Python hosting" off # MONO "Mono extension" off\ @@ -73,9 +67,9 @@ check: ${SETENV} -u HOST ${MAKE_ENV} ${MAKE} -C ${WRKSRC} check -.include +.include -.if defined(WITH_IMAGEMAGICK) +.if ${PORT_OPTIONS:MIMAGEMAGICK} CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE} LIB_DEPENDS+= MagickWand:${PORTSDIR}/graphics/ImageMagick PLIST_SUB+= WITH_IMAGEMAGICK="" @@ -84,47 +78,47 @@ PLIST_SUB+= WITH_IMAGEMAGICK="@comment " .endif -.if defined(WITH_KERBEROS) +.if ${PORT_OPTIONS:MKERBEROS} CONFIGURE_ARGS+=--enable-krb=${LOCALBASE} LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 .endif # XXX broken (does not build, requires gc.h) -#.if defined(WITH_MONO) +#.if ${PORT_OPTIONS:MMONO} #CONFIGURE_ARGS+=--enable-mono #.endif -.if defined(WITH_OPENLDAP) +.if ${PORT_OPTIONS:MOPENLDAP} CONFIGURE_ARGS+=--enable-openldap=${LOCALBASE} USE_OPENLDAP= yes .endif # XXX broken (requires perl to be built with -Dusemultiplicity) -#.if defined(WITH_PERL) +#.if ${PORT_OPTIONS:MPERL} #CONFIGURE_ARGS+=--enable-perl #USE_PERL5= yes #.endif # XXX broken (no libphp) -#.if defined(WITH_PHP4) +#.if ${PORT_OPTIONS:MPHP4} #CONFIGURE_ARGS+=--enable-php4 #.endif # XXX broken (no libphp) -#.if defined(WITH_PHP5) +#.if ${PORT_OPTIONS:MPHP5} #CONFIGURE_ARGS+=--enable-php5 #.endif # XXX broken (USE_PYTHON does not work with OPTIONS) -#.if defined(WITH_PYTHON) +#.if ${PORT_OPTIONS:MPYTHON} #CONFIGURE_ARGS+=--enable-python #USE_PYTHON= yes #.endif # XXX broken (USE_LIBRUBY does not work with OPTIONS) -#.if defined(WITH_RUBY) +#.if ${PORT_OPTIONS:MRUBY} #CONFIGURE_ARGS+=--enable-ruby #USE_LIBRUBY= yes #.endif -.include +.include