- Convert these to OPTIONng.

- Omit shlib major versions in LIB_DEPENDS to pet portlint.

1 files changed, 59 insertions, 48 deletions

diff --git a/multimedia/vdr-plugins/Makefile b/multimedia/vdr-plugins/Makefile
index 1c260c0bcf9c..a5dbf4b82747 100644
--- a/multimedia/vdr-plugins/Makefile
+++ b/multimedia/vdr-plugins/Makefile
@@ -18,103 +18,114 @@ COMMENT=	Video Disk Recorder - plugin metaport
 
 NO_BUILD=	yes
 
-OPTIONS=	CONTROL "telnet control" On \
-		EPGSEARCH "EPG search" On \
-		FEMON "frontend monitor" On \
-		INFOSATEPG "infosat EPG data via satellite" On \
-		IPTV "IP television" On \
-		OSDPIP "picture-in-picture" On \
-		OSDTELETEXT "OSD teletext" On \
-		REELSCAN "Reel channelscan" On \
-		REMOTE "non-lirc remote control (experimental)" On \
-		SKINENIGMANG "Enigma-NG skin" On \
-		STREAMDEV "stream device (server and client)" On \
-		TTXTSUBS "teletext subtitle plugin" On \
-		WIRBELSCAN "Wirbelscan" On \
-		XINELIBOUTPUT "xineliboutput plugin/viewer" On \
-		LIVE "live web plugin" On \
-		UPNP "UPnP/DLNA plugin (alpha!)" On \
-		SLEEPTIMER "sleep timer plugin" On \
-		XVDR "XVDR plugin (for connecting XBMC PVR)" On \
-		EEPG "extended EPG plugin (for UK/NL/etc.)" On \
-		VDRMANAGER "plugin for VDR-Manager Android clients" On \
-		SOFTHDDEVICE "softhddevice plugin" On \
-		VNSISERVER "VNSI server (for XBMC PVR branch - old)" Off \
-		SOFTDEVICE "softdevice (broken?)" Off \
-		MARKAD "MarkAd plugin" Off
+OPTIONS_DEFINE=	CONTROL EPGSEARCH FEMON INFOSATEPG IPTV OSDPIP \
+		OSDTELETEXT REELSCAN REMOTE SKINENIGMANG STREAMDEV \
+		TTXTSUBS WIRBELSCAN XINELIBOUTPUT LIVE UPNP \
+		SLEEPTIMER XVDR EEPG VDRMANAGER SOFTHDDEVICE \
+		VNSISERVER SOFTDEVICE MARKAD
+
+CONTROL_DESC=		telnet control
+EPGSEARCH_DESC=		EPG search
+FEMON_DESC=		frontend monitor
+INFOSATEPG_DESC=	infosat EPG data via satellite
+IPTV_DESC=		IP television
+OSDPIP_DESC=		picture-in-picture
+OSDTELETEXT_DESC=	OSD teletext
+REELSCAN_DESC=		Reel channelscan
+REMOTE_DESC=		"non-lirc remote control (experimental)"
+SKINENIGMANG_DESC=	Enigma-NG skin
+STREAMDEV_DESC=		"stream device (server and client)"
+TTXTSUBS_DESC=		teletext subtitle plugin
+WIRBELSCAN_DESC=	Wirbelscan
+XINELIBOUTPUT_DESC=	xineliboutput plugin/viewer
+LIVE_DESC=		live web plugin
+UPNP_DESC=		"UPnP/DLNA plugin (alpha!)"
+SLEEPTIMER_DESC=	sleep timer plugin
+XVDR_DESC=		"XVDR plugin (for connecting XBMC PVR)"
+EEPG_DESC=		"extended EPG plugin (for UK/NL/etc.)"
+VDRMANAGER_DESC=	plugin for VDR-Manager Android clients
+SOFTHDDEVICE_DESC=	softhddevice plugin
+VNSISERVER_DESC=	"VNSI server (for XBMC PVR branch - old)"
+SOFTDEVICE_DESC=	"softdevice (broken?)"
+MARKAD_DESC=		MarkAd plugin
+
+OPTIONS_DEFAULT=	CONTROL EPGSEARCH FEMON INFOSATEPG IPTV OSDPIP \
+		OSDTELETEXT REELSCAN REMOTE SKINENIGMANG STREAMDEV \
+		TTXTSUBS WIRBELSCAN XINELIBOUTPUT LIVE UPNP \
+		SLEEPTIMER XVDR EEPG VDRMANAGER SOFTHDDEVICE
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_CONTROL)
+.if ${PORT_OPTIONS:MCONTROL}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-control.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-control
 .endif
-.if defined(WITH_EPGSEARCH)
+.if ${PORT_OPTIONS:MEPGSEARCH}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-epgsearch.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-epgsearch
 .endif
-.if defined(WITH_FEMON)
+.if ${PORT_OPTIONS:MFEMON}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-femon.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-femon
 .endif
-.if defined(WITH_INFOSATEPG)
+.if ${PORT_OPTIONS:MINFOSATEPG}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-infosatepg.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-infosatepg
 .endif
-.if defined(WITH_IPTV)
+.if ${PORT_OPTIONS:MIPTV}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-iptv.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-iptv
 .endif
-.if defined(WITH_OSDPIP)
+.if ${PORT_OPTIONS:MOSDPIP}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-osdpip.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-osdpip
 .endif
-.if defined(WITH_OSDTELETEXT)
+.if ${PORT_OPTIONS:MOSDTELETEXT}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-osdteletext.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-osdteletext
 .endif
-.if defined(WITH_REELSCAN)
+.if ${PORT_OPTIONS:MREELSCAN}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-reelchannelscan.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-reelchannelscan
 .endif
-.if defined(WITH_REMOTE)
+.if ${PORT_OPTIONS:MREMOTE}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-remote.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-remote
 .endif
-.if defined(WITH_SKINENIGMANG)
+.if ${PORT_OPTIONS:MSKINENIGMANG}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-skinenigmang.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-skinenigmang
 .endif
-.if defined(WITH_STREAMDEV)
+.if ${PORT_OPTIONS:MSTREAMDEV}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-streamdev-server.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-streamdev
 .endif
-.if defined(WITH_TTXTSUBS)
+.if ${PORT_OPTIONS:MTTXTSUBS}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-ttxtsubs.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-ttxtsubs
 .endif
-.if defined(WITH_WIRBELSCAN)
+.if ${PORT_OPTIONS:MWIRBELSCAN}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-wirbelscan.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-wirbelscan
 .endif
-.if defined(WITH_XINELIBOUTPUT)
+.if ${PORT_OPTIONS:MXINELIBOUTPUT}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-xineliboutput.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-xineliboutput
 .endif
-.if defined(WITH_LIVE)
+.if ${PORT_OPTIONS:MLIVE}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-live.so.${PORTVERSION}:${PORTSDIR}/www/vdr-plugin-live
 .endif
-.if defined(WITH_UPNP)
+.if ${PORT_OPTIONS:MUPNP}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-upnp.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-upnp
 .endif
-.if defined(WITH_SLEEPTIMER)
+.if ${PORT_OPTIONS:MSLEEPTIMER}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-sleeptimer.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-sleeptimer
 .endif
-.if defined(WITH_SOFTDEVICE)
+.if ${PORT_OPTIONS:MSOFTDEVICE}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-softdevice.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-softdevice
 .endif
-.if defined(WITH_XVDR)
+.if ${PORT_OPTIONS:MXVDR}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-xvdr.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-xvdr
 .endif
-.if defined(WITH_EEPG)
+.if ${PORT_OPTIONS:MEEPG}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-eepg.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-eepg
 .endif
-.if defined(WITH_VNSISERVER)
+.if ${PORT_OPTIONS:MVNSISERVER}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-vnsiserver.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-vnsiserver
 .endif
-.if defined(WITH_MARKAD)
+.if ${PORT_OPTIONS:MMARKAD}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-markad.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-markad
 .endif
-.if defined(WITH_VDRMANAGER)
+.if ${PORT_OPTIONS:MVDRMANAGER}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-vdrmanager.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-vdrmanager
 .endif
-.if defined(WITH_SOFTHDDEVICE)
+.if ${PORT_OPTIONS:MSOFTHDDEVICE}
 RUN_DEPENDS+=	${LOCALBASE}/lib/vdr/libvdr-softhddevice.so.${PORTVERSION}:${PORTSDIR}/multimedia/vdr-plugin-softhddevice
 .endif