Convert to new options framework left un converted ports in a* categories

While here trim headers
Convert some gnomehack to pathfix
Convert some pkgconfig to USE_PKGCONFIG=build

1 files changed, 165 insertions, 171 deletions

diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 6d94dbdb0d5f..7839909bc04b 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	deadbeef
-# Date created:		2010-01-17
-# Whom:			Gvozdikov Veniamin <g.veniamin@googlemail.com>
-#
+# Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	deadbeef
 PORTVERSION=	0.5.5
@@ -27,91 +23,86 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_ICONV=	yes
+USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--disable-alsa --disable-nullout \
 		CPPFLAGS="-I../dumb/dumb-kode54/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lexecinfo -lintl"
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
-SH=		${LOCALBASE}/bin/bash # Hack for detecting depends
-
-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
+CONFIGURE_ENV+=	CONFIG_SHELL="${LOCALBASE}/bin/bash"
+
+OPTIONS_DEFINE=	PULSEAUDIO GUI VFS LASTFM ART EQ SID FFAP VTX HOTKEYS VORBIS FFMPEG \
+		FLAC SNDFILE WAV CDDA GME DUMB NOTIFY MUSEPACK WILD TTA DCA AAC \
+		MMS SHN AO SHELLEXEC NLS M3U PSF ADP DSP MONO2STEREO CONVERTER VFS_ZIP
+OPTIONS_DEFAULT=	GUI VFS LASTFM ART EQ SID FFAP VTX HOSTKEYS VORBIS FFMPEG \
+			FLAC SNDFILE WAV CDDA GME DUMB NOTIFY MUSEPACK WILD TTA DCA \
+			AAC MMS SHN AO SHELLEXEC M3U PSF ADP DSP MONO2STEREO CONVERTER VFS_ZIP \
+			HOtKEYS
+PULSEAUDIO_DESC=	PulseAudio output plugin (unsupported)
+GUI_DESC=		standard GTK2 user interface plugin
+VFS_DESC=		HTTP streaming vfs plugin
+LASTFM_DESC=		last.fm/libre.fm scrobbler plugin
+ART_DESC=		album art loader plugin
+EQ_DESC=		SuperEQ DSP plugin
+SID_DESC=		SID music player plugin
+FFAP_DESC=		Monkey's Audio plugin
+VTX_DESC=		libayemy VTX ZX-Spectrum music player plugin
+ADP_DESC=		adplug plugin
+HOTKEYS_DESC=		global hotkeys plugin
+CDDA_DESC=		CD-Audio plugin
+GME_DESC=		Game Music Emu plugin
+DUMB_DESC=		D.U.M.B. plugin for MOD, S3M and other
+NOTIFY_DESC=		support for OSD notifications into GTKUI plugin
+WILD_DESC=		wildmidi plugin
+TTA_DESC=		tta plugin
+SHN_DESC=		shorten plugin
+AO_DESC=		audio overload plugin
+SHELLEXEC_DESC=		shell commands plugin
+M3U_DESC=		m3u plugin
+PSF_DESC=		AOSDK-based PSF(,QSF,SSF,DSF) plugin
+DSP_DESC=		libsamplerate (SRC) plugin
+MONO2STEREO_DESC=	mono2stereo DSP plugin
+CONVERTER_DESC=		Build converter
+VFS_ZIP_DESC=		ZIP support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_PULSE)
-CONFIGURE_ARGS+=	--disable-pulse
-PLIST_SUB+=	PULSE="@comment "
-.else
+.if ${PORT_OPTIONS:MPULSEAUDIO}
 PLIST_SUB+=	PULSE=""
 LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+.else
+CONFIGURE_ARGS+=	--disable-pulse
+PLIST_SUB+=	PULSE="@comment "
 .endif
 
-.if defined(WITHOUT_GUI)
+.if ${PORT_OPTIONS:MGUI}
+PLIST_SUB+=	GUI=""
+USE_GNOME=	gtk20 glib20
+.else
 CONFIGURE_ARGS+=	--disable-gtkui
 CONFIGURE_ARGS+=	--disable-gtk3
 PLIST_SUB+=	GUI="@comment "
-.else
-PLIST_SUB+=	GUI=""
-USE_GNOME=	gtk20 glib20
 .endif
 
-.if defined(WITHOUT_VFS)
-CONFIGURE_ARGS+=	--disable-vfs-curl
-PLIST_SUB+=	VFS="@comment "
-.else
+.if ${PORT_OPTIONS:MVFS}
 PLIST_SUB+=	VFS=""
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+.else
+CONFIGURE_ARGS+=	--disable-vfs-curl
+PLIST_SUB+=	VFS="@comment "
 .endif
 
-.if defined(WITHOUT_LASTFM)
-CONFIGURE_ARGS+=	--disable-lfm
-PLIST_SUB+=	LASTFM="@comment "
-.else
+.if ${PORT_OPTIONS:MLASTFM}
 PLIST_SUB+=	LASTFM=""
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+.else
+CONFIGURE_ARGS+=	--disable-lfm
+PLIST_SUB+=	LASTFM="@comment "
 .endif
 
-.if defined(WITHOUT_ART)
-CONFIGURE_ARGS+=	--disable-artwork
-PLIST_SUB+=	ART="@comment "
-.else
-.if !defined(WITHOUT_VFS)
+.if ${PORT_OPTIONS:MART}
+.if ${PORT_OPTIONS:MVFS}
 CONFIGURE_ARTS+=	--disable-artwork-imlib2
 PLIST_SUB+=	ART=""
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl \
@@ -119,243 +110,246 @@ LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl \
 .else
 BROKEN=		VFS plugin required for album art loader, please rerun 'make config' and either disable ART or enable VFS
 .endif
+.else
+CONFIGURE_ARGS+=	--disable-artwork
+PLIST_SUB+=	ART="@comment "
 .endif
 
-.if defined(WITHOUT_EQ)
+.if ${PORT_OPTIONS:MEQ}
+PLIST_SUB+=	EQ=""
+.else
 CONFIGURE_ARGS+=	--disable-supereq
 PLIST_SUB+=	EQ="@comment "
-.else
-PLIST_SUB+=	EQ=""
 .endif
 
-.if defined(WITHOUT_SID)
+.if ${PORT_OPTIONS:MSID}
+PLIST_SUB+=	SID=""
+.else
 CONFIGURE_ARGS+=	--disable-sid
 PLIST_SUB+=	SID="@comment "
-.else
-PLIST_SUB+=	SID=""
 .endif
 
-.if defined(WITHOUT_FFAP)
-CONFIGURE_ARGS+=	--disable-ffap
-PLIST_SUB+=	FFAP="@comment "
-.else
+.if ${PORT_OPTIONS:MFFAP}
 PLIST_SUB+=	FFAP=""
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
+.else
+CONFIGURE_ARGS+=	--disable-ffap
+PLIST_SUB+=	FFAP="@comment "
 .endif
 
-.if defined(WITHOUT_VTX)
+.if ${PORT_OPTIONS:MVTX}
+PLIST_SUB+=	VTX=""
+.else
 CONFIGURE_ARGS+=	--disable-vtx
 PLIST_SUB+=	VTX="@comment "
-.else
-PLIST_SUB+=	VTX=""
 .endif
 
-.if defined(WITHOUT_ADP)
+.if ${PORT_OPTIONS:MADP}
+PLIST_SUB+=	ADP=""
+.else
 CONFIGURE_ARGS+=	--disable-adplug
 PLIST_SUB+=	ADP="@comment "
-.else
-PLIST_SUB+=	ADP=""
 .endif
 
-.if defined(WITHOUT_HOTKEYS)
+.if ${PORT_OPTIONS:MHOTKEYS}
+PLIST_SUB+=	HOTKEYS=""
+.else
 CONFIGURE_ARGS+=	--disable-hotkeys
 PLIST_SUB+=	HOTKEYS="@comment "
-.else
-PLIST_SUB+=	HOTKEYS=""
 .endif
 
-.if defined(WITHOUT_OGG)
-CONFIGURE_ARGS+=	--disable-vorbis
-PLIST_SUB+=	OGG="@comment "
-.else
+.if ${PORT_OPTIONS:MOGG}
 LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	OGG=""
+.else
+CONFIGURE_ARGS+=	--disable-vorbis
+PLIST_SUB+=	OGG="@comment "
 .endif
 
-.if defined(WITHOUT_FFMPEG)
-CONFIGURE_ARGS+=	--disable-ffmpeg
-PLIST_SUB+=	FFMPEG="@comment "
-.else
+.if ${PORT_OPTIONS:MFFMPEG}
 PLIST_SUB+=	FFMPEG=""
 LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg \
 		avformat:${PORTSDIR}/multimedia/ffmpeg \
 		avutil:${PORTSDIR}/multimedia/ffmpeg
+.else
+CONFIGURE_ARGS+=	--disable-ffmpeg
+PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
-.if defined(WITHOUT_FLAC)
-CONFIGURE_ARGS+=	--disable-flac
-PLIST_SUB+=	FLAC="@comment "
-.else
+.if ${PORT_OPTIONS:MFLAC}
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
 PLIST_SUB+=	FLAC=""
+.else
+CONFIGURE_ARGS+=	--disable-flac
+PLIST_SUB+=	FLAC="@comment "
 .endif
 
-.if defined(WITHOUT_SNDFILE)
-CONFIGURE_ARGS+=	--disable-sndfile
-PLIST_SUB+=	SNDFILE="@comment "
-.else
+.if ${PORT_OPTIONS:MSNDFILE}
 LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
 PLIST_SUB+=	SNDFILE=""
+.else
+CONFIGURE_ARGS+=	--disable-sndfile
+PLIST_SUB+=	SNDFILE="@comment "
 .endif
 
-.if defined(WITHOUT_WAV)
-CONFIGURE_ARGS+=	--disable-wavpack
-PLIST_SUB+=	WAV="@comment "
-.else
+.if ${PORT_OPTIONS:MWAV}
 LIB_DEPENDS+=	wavpack:${PORTSDIR}/audio/wavpack
 PLIST_SUB+=	WAV=""
+.else
+CONFIGURE_ARGS+=	--disable-wavpack
+PLIST_SUB+=	WAV="@comment "
 .endif
 
-.if defined(WITHOUT_CDDA)
-CONFIGURE_ARGS+=	--disable-cdda
-PLIST_SUB+=	CDDA="@comment "
-.else
+.if ${PORT_OPTIONS:MCDDA}
 PLIST_SUB+=	CDDA=""
 LIB_DEPENDS+=	cdio:${PORTSDIR}/sysutils/libcdio \
 		cddb:${PORTSDIR}/audio/libcddb
+.else
+CONFIGURE_ARGS+=	--disable-cdda
+PLIST_SUB+=	CDDA="@comment "
 .endif
 
-.if defined(WITHOUT_GME)
+.if ${PORT_OPTIONS:MGME}
+PLIST_SUB+=	GME=""
+.else
 CONFIGURE_ARGS+=	--disable-gme
 PLIST_SUB+=	GME="@comment "
-.else
-PLIST_SUB+=	GME=""
 .endif
 
-.if defined(WITHOUT_DUMB)
+.if ${PORT_OPTIONS:MDUMB}
+PLIST_SUB+=	DUMB=""
+.else
 CONFIGURE_ARGS+=	--disable-dumb
 PLIST_SUB+=	DUMB="@comment "
-.else
-PLIST_SUB+=	DUMB=""
 .endif
 
-.if defined(WITHOUT_NOTIFY)
-CONFIGURE_ARGS+=	--disable-notify
-PLIST_SUB+=	NOTIFY="@comment "
-.else
+.if ${PORT_OPTIONS:MNOTIFY}
 PLIST_SUB+=	NOTIFY=""
 LIB_DEPENDS+=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+.else
+CONFIGURE_ARGS+=	--disable-notify
+PLIST_SUB+=	NOTIFY="@comment "
 .endif
 
-.if defined(WITHOUT_MUSEPACK)
+.if ${PORT_OPTIONS:MMUSEPACK}
+PLIST_SUB+=	MUSEPACK=""
+.else
 CONFIGURE_ARGS+=	--disable-musepack
 PLIST_SUB+=	MUSEPACK="@comment "
-.else
-PLIST_SUB+=	MUSEPACK=""
 .endif
 
-.if defined(WITHOUT_WILD)
-CONFIGURE_ARGS+=	--disable-wildmidi
-PLIST_SUB+=	WILD="@comment "
-.else
+.if ${PORT_OPTIONS:MWILD}
 RUN_DEPENDS+=	${LOCALBASE}/share/freepats/crude.cfg:${PORTSDIR}/audio/freepats
 PLIST_SUB+=	WILD=""
+.else
+CONFIGURE_ARGS+=	--disable-wildmidi
+PLIST_SUB+=	WILD="@comment "
 .endif
 
-.if defined(WITHOUT_TTA)
+.if ${PORT_OPTIONS:MTTA}
+PLIST_SUB+=	TTA=""
+.else
 CONFIGURE_ARGS+=	--disable-tta
 PLIST_SUB+=	TTA="@comment "
-.else
-PLIST_SUB+=	TTA=""
 .endif
 
-.if defined(WITHOUT_DCA)
+.if ${PORT_OPTIONS:MDCA}
+PLIST_SUB+=	DCA=""
+.else
 CONFIGURE_ARGS+=	--disable-dca
 PLIST_SUB+=	DCA="@comment "
-.else
-PLIST_SUB+=	DCA=""
 .endif
 
-.if defined(WITHOUT_AAC)
-CONFIGURE_ARGS+=	--disable-aac
-PLIST_SUB+=	AAC="@comment "
-.else
+.if ${PORT_OPTIONS:MAAC}
 PLIST_SUB+=	AAC=""
 LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
+.else
+CONFIGURE_ARGS+=	--disable-aac
+PLIST_SUB+=	AAC="@comment "
 .endif
 
-.if defined(WITHOUT_MMS)
+.if ${PORT_OPTIONS:MMMS}
+PLIST_SUB+=	MMS=""
+.else
 CONFIGURE_ARGS+=	--disable-mms
 PLIST_SUB+=	MMS="@comment "
-.else
-PLIST_SUB+=	MMS=""
 .endif
 
-.if defined(WITHOUT_SHN)
+.if ${PORT_OPTIONS:MSHN}
+PLIST_SUB+=	SHN=""
+.else
 CONFIGURE_ARGS+=	--disable-shn
 PLIST_SUB+=	SHN="@comment "
-.else
-PLIST_SUB+=	SHN=""
 .endif
 
-.if defined(WITHOUT_AO)
+.if ${PORT_OPTIONS:MAO}
+PLIST_SUB+=	AO=""
+.else
 CONFIGURE_ARGS+=	--disable-ao
 PLIST_SUB+=	AO="@comment "
-.else
-PLIST_SUB+=	AO=""
 .endif
 
-.if defined(WITHOUT_SHELLEXEC)
+.if ${PORT_OPTIONS:MSHELLEXEC}
+PLIST_SUB+=	SHELLEXEC=""
+.else
 CONFIGURE_ARGS+=	--disable-shellexec
 PLIST_SUB+=	SHELLEXEC="@comment "
-.else
-PLIST_SUB+=	SHELLEXEC=""
 .endif
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
+PLIST_SUB+=	NLS=""
+.else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
-.else
-PLIST_SUB+=	NLS=""
 .endif
 
-.if defined(WITHOUT_CONVERTER)
-CONFIGURE_ARGS+=	--disable-converter
-PLIST_SUB+=	CONVERTER="@comment "
-.else
-.if !defined(WITHOUT_GUI)
+.if ${PORT_OPTIONS:MCONVERTER}
+.if ${PORT_OPTIONS:MGUI}
 PLIST_SUB+=	CONVERTER=""
 USE_GNOME=	gtk20 glib20
 .else
 BROKEN=		CONVERTER plugin required for gui, please rerun 'make config' and either disable CONVERTER or enable GUI
 .endif
+.else
+CONFIGURE_ARGS+=	--disable-converter
+PLIST_SUB+=	CONVERTER="@comment "
 .endif
 
-.if defined(WITHOUT_M3U)
+.if ${PORT_OPTIONS:MM3U}
+PLIST_SUB+=	M3U=""
+.else
 CONFIGURE_ARGS+=	--disable-m3u
 PLIST_SUB+=	M3U="@comment "
-.else
-PLIST_SUB+=	M3U=""
 .endif
 
-.if defined(WITHOUT_PSF)
+.if ${PORT_OPTIONS:MPSF}
+PLIST_SUB+=	PSF=""
+.else
 CONFIGURE_ARGS+=	--disable-psf
 PLIST_SUB+=	PSF="@comment "
-.else
-PLIST_SUB+=	PSF=""
 .endif
 
-.if defined(WITHOUT_DSP)
-CONFIGURE_ARGS+=	--disable-src
-PLIST_SUB+=	DSP="@comment "
-.else
+.if ${PORT_OPTIONS:MDSP}
 PLIST_SUB+=	DSP=""
 LIB_DEPENDS+=	samplerate:${PORTSDIR}/audio/libsamplerate
+.else
+CONFIGURE_ARGS+=	--disable-src
+PLIST_SUB+=	DSP="@comment "
 .endif
 
-.if defined(WITHOUT_MONO2STEREO)
+.if ${PORT_OPTIONS:MMONO2STEREO}
+PLIST_SUB+=	MONO2STEREO=""
+.else
 CONFIGURE_ARGS+=	--disable-mono2stereo
 PLIST_SUB+=	MONO2STEREO="@comment "
-.else
-PLIST_SUB+=	MONO2STEREO=""
 .endif
 
-.if defined(WITHOUT_VFS_ZIP)
-CONFIGURE_ARGS+=	--disable-vfs-zip
-PLIST_SUB+=	VFS_ZIP="@comment "
-.else
+.if ${PORT_OPTIONS:MVFS_ZIP}
 PLIST_SUB+=	VFS_ZIP=""
 LIB_DEPENDS+=	zip:${PORTSDIR}/archivers/libzip
+.else
+CONFIGURE_ARGS+=	--disable-vfs-zip
+PLIST_SUB+=	VFS_ZIP="@comment "
 .endif
 
 post-patch: