2 files changed, 81 insertions, 74 deletions

diff --git a/multimedia/mplayer-skins/Makefile b/multimedia/mplayer-skins/Makefile
index c49dc31a54ac..8e945c9af421 100644
--- a/multimedia/mplayer-skins/Makefile
+++ b/multimedia/mplayer-skins/Makefile
@@ -28,6 +28,7 @@ NO_BUILD=	yes
 
 .include "${.CURDIR}/Makefile.options"
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/Makefile.skins"
@@ -42,26 +43,19 @@ post-extract:
 	@${FIND} ${WRKSRC} -type d \( -name '.svn' \) -delete
 
 pre-build:
-# Build and install all skins (rather expensive)
-.if (defined(BATCH) && !defined(_OPTIONS_READ)) || defined(WITH_SKIN_ALL)
-.for f in ${ALLSKINS}
-WITH_SKIN_${f}=	yes
-.endfor
-.endif # WITH_SKIN_ALL
+.if ${PORT_OPTIONS:MALL}
+PORT_OPTIONS+=	${ALLSKINS}
+.endif
 
 post-build-script:
 .for f in ${ALLSKINS}
-.ifdef(WITH_SKIN_${f})
+.if $(PORT_OPTIONS:M${f})
 PLIST_SUB+=	${f}="" WITHOUT_SKIN_${f}="@comment "
-HAVE_SKIN=	true
 DISTFILES+=	${${f}_FILE}${EXTRACT_SUFX}
 .else
 PLIST_SUB+=	${f}="@comment " WITHOUT_SKIN_${f}=""
 .endif
 .endfor
-.if !defined(HAVE_SKIN)
-IGNORE=	no skin selected
-.endif
 
 do-install:
 # both anotate and create target directories
diff --git a/multimedia/mplayer-skins/Makefile.options b/multimedia/mplayer-skins/Makefile.options
index 7d2652a3edb9..07f99ba86d36 100644
--- a/multimedia/mplayer-skins/Makefile.options
+++ b/multimedia/mplayer-skins/Makefile.options
@@ -3,66 +3,79 @@
 # $FreeBSD$
 #
 
-OPTIONS=	SKIN_ALL "all skins" off
-OPTIONS+=	SKIN_DEFAULT "the default MPlayer skin" on
-OPTIONS+=	SKIN_DEFAULT_SMALL "compact version of the default skin" off
-OPTIONS+=	SKIN_ABYSS "beautiful MPlayer skin" off
-OPTIONS+=	SKIN_ALIENMIND "AlienMind XMMS" off
-OPTIONS+=	SKIN_AVIFILE "aviplay look" off
-OPTIONS+=	SKIN_ATERFILE "dark, cool-looking" off
-OPTIONS+=	SKIN_BLUECURVE "bluecurve" off
-OPTIONS+=	SKIN_BLUEHEART "BlueHeart XMMS" off
-OPTIONS+=	SKIN_CANARY "small, compact" off
-OPTIONS+=	SKIN_CLEARLOOKS "modern Clearlooks" off
-OPTIONS+=	SKIN_CORELIAN "plain look" off
-OPTIONS+=	SKIN_CORNERMP "WinAMP corner" off
-OPTIONS+=	SKIN_CORNERMP_AQUA "WinAMP corner aqua" off
-OPTIONS+=	SKIN_CUBICPLAYER "CubicPlayer" off
-OPTIONS+=	SKIN_CYRUS "Cyrus XMMS" off
-OPTIONS+=	SKIN_DISAPPEARER "very slim" off
-OPTIONS+=	SKIN_DIVXPLAYER "Divx" off
-OPTIONS+=	SKIN_DUSHKU "Eliza Dushku" off
-OPTIONS+=	SKIN_DVDPLAYER "hardware player lookalike" off
-OPTIONS+=	SKIN_GNOME "based on the GNOME logo" off
-OPTIONS+=	SKIN_HANDHELD "remote control look" off
-OPTIONS+=	SKIN_HAYRAPHON "Hayraphon" off
-OPTIONS+=	SKIN_HWSW "simplistic" off
-OPTIONS+=	SKIN_INDUSTRIAL "Industrial GTK theme" off
-OPTIONS+=	SKIN_ICY "Nero ShowTime skin" off
-OPTIONS+=	SKIN_ITUNES "iTunes" off
-OPTIONS+=	SKIN_ITUNES_MINI "iTunes mini" off
-OPTIONS+=	SKIN_PCLAND "blue waves" off
-OPTIONS+=	SKIN_JIMPLAYER "round and colorful" off
-OPTIONS+=	SKIN_KDE "uses KDE images" off
-OPTIONS+=	SKIN_KRYSTAL "very colorful" off
-OPTIONS+=	SKIN_MENTALIC "sharp and shiny" off
-OPTIONS+=	SKIN_MIDNIGHTLOVE "XMMS skin of Rei Ayanami" off
-OPTIONS+=	SKIN_MINI "MPlayer-plugin for mozilla" off
-OPTIONS+=	SKIN_MOONPHASE "MoonPhase" off
-OPTIONS+=	SKIN_MPLAYER_RED "MPlayer RED" off
-OPTIONS+=	SKIN_NATIVE_RED "red and black" off
-OPTIONS+=	SKIN_NETSCAPE4 "Netscape \"unatkozok\"" off
-OPTIONS+=	SKIN_NEUTRON "futuristic look" off
-OPTIONS+=	SKIN_NEWAGE "clean and simple" off
-OPTIONS+=	SKIN_ORANGE "clean, good looking" off
-OPTIONS+=	SKIN_OSXBRUSHED "iTunes lookalike" off
-OPTIONS+=	SKIN_OSXMOD "QuickTime player lookalike" off
-OPTIONS+=	SKIN_PHONY "desktop DVD player" off
-OPTIONS+=	SKIN_PLASTIC "plastic remote control" off
-OPTIONS+=	SKIN_POWERPLAYER "PowerDVD lookalike" off
-OPTIONS+=	SKIN_PROTON "silver, shiny" off
-OPTIONS+=	SKIN_QPLAYER "playful look" off
-OPTIONS+=	SKIN_QUICKSILVER "QuickSilver" off
-OPTIONS+=	SKIN_SESSENE "Sessene" off
-OPTIONS+=	SKIN_SLIM "small and cute" off
-OPTIONS+=	SKIN_SOFTGRIP "strange design" off
-OPTIONS+=	SKIN_TERMINATOR3 "inspired by Terminator 3" off
-OPTIONS+=	SKIN_TRIUM "based on a mobile phone" off
-OPTIONS+=	SKIN_TVISOR "simple, well-designed" off
-OPTIONS+=	SKIN_ULTRAFINA "XMMS ultrafina" off
-OPTIONS+=	SKIN_WEBBY "Webby" off
-OPTIONS+=	SKIN_WINDOWSMEDIAPLAYER6 "Windows Media Player 6" off
-OPTIONS+=	SKIN_XANIM "XAnim feeling" off
-OPTIONS+=	SKIN_XFCE4 "default XFce4 theme" off
-OPTIONS+=	SKIN_XINE_LCD "xine LCD skin" off
-OPTIONS+=	SKIN_XMMPLAYER "XMMS lookalike" off
+OPTIONS_MULTI=	SKIN
+OPTIONS_MULTI_SKIN=	ALL DEFAULT DEFAULT_SMALL ABYSS ALIENMIND AVIFILE ATERFILE BLUECURVE \
+		BLUEHEART CANARY CLEARLOOKS CORELIAN CORNERMP CORNERMP \
+		CUBICPLAYER CYRUS DISAPPEARER DIVXPLAYER DUSHKU DVDPLAYER \
+		GNOME HANDHELD HAYRAPHON HWSW INDUSTRIAL ICY ITUNES \
+		PCLAND JIMPLAYER KDE KRYSTAL MENTALIC MIDNIGHTLOVE \
+		MINI MOONPHASE MPLAYER NATIVE NETSCAPE4 NEUTRON NEWAGE \
+		ORANGE OSXBRUSHED OSXMOD PHONY PLASTIC POWERPLAYER \
+		PROTON QPLAYER QUICKSILVER SESSENE SLIM SOFTGRIP \
+		TERMINATOR3 TRIUM TVISOR ULTRAFINA WEBBY \
+		WINDOWSMEDIAPLAYER6 XANIM XFCE4 XINE XMMPLAYER
+ALL_DESC=	All skins
+DEFAULT_DESC=	The default MPlayer skin
+DEFAULT_SMALL_DESC=	Compact version of the default skin
+ABYSS_DESC=	Beautiful MPlayer skin
+ALIENMIND_DESC=	AlienMind XMMS
+AVIFILE_DESC=	Aviplay look
+ATERFILE_DESC=	Dark, cool-looking
+BLUECURVE_DESC=	Bluecurve
+BLUEHEART_DESC=	BlueHeart XMMS
+CANARY_DESC=	Small, compact
+CLEARLOOKS_DESC=	Modern Clearlooks
+CORELIAN_DESC=	plain look
+CORNERMP_DESC=	WinAMP corner
+CORNERMP_AQUA_DESC=	WinAMP corner aqua
+CUBICPLAYER_DESC=	CubicPlayer
+CYRUS_DESC=	Cyrus XMMS
+DISAPPEARER_DESC=	very slim
+DIVXPLAYER_DESC=	Divx
+DUSHKU_DESC=	Eliza Dushku
+DVDPLAYER_DESC=	hardware player lookalike
+GNOME_DESC=	based on the GNOME logo
+HANDHELD_DESC=	remote control look
+HAYRAPHON_DESC=	Hayraphon
+HWSW_DESC=	simplistic
+INDUSTRIAL_DESC=	Industrial GTK theme
+ICY_DESC=	Nero ShowTime skin
+ITUNES_DESC=	iTunes
+ITUNES_MINI_DESC=	iTunes mini
+PCLAND_DESC=	blue waves
+JIMPLAYER_DESC=	round and colorful
+KDE_DESC=	uses KDE images
+KRYSTAL_DESC=	very colorful
+MENTALIC_DESC=	sharp and shiny
+MIDNIGHTLOVE_DESC=	XMMS skin of Rei Ayanami
+MINI_DESC=	MPlayer-plugin for mozilla
+MOONPHASE_DESC=	MoonPhase
+MPLAYER_RED_DESC=	MPlayer RED
+NATIVE_RED_DESC=	red and black
+NETSCAPE4_DESC=	Netscape \"unatkozok\"
+NEUTRON_DESC=	futuristic look
+NEWAGE_DESC=	clean and simple
+ORANGE_DESC=	clean, good looking
+OSXBRUSHED_DESC=	iTunes lookalike
+OSXMOD_DESC=	QuickTime player lookalike
+PHONY_DESC=	desktop DVD player
+PLASTIC_DESC=	plastic remote control
+POWERPLAYER_DESC=	PowerDVD lookalike
+PROTON_DESC=	silver, shiny
+QPLAYER_DESC=	playful look
+QUICKSILVER_DESC=	QuickSilver
+SESSENE_DESC=	Sessene
+SLIM_DESC=	small and cute
+SOFTGRIP_DESC=	strange design
+TERMINATOR3_DESC=	inspired by Terminator 3
+TRIUM_DESC=	based on a mobile phone
+TVISOR_DESC=	simple, well-designed
+ULTRAFINA_DESC=	XMMS ultrafina
+WEBBY_DESC=	Webby
+WINDOWSMEDIAPLAYER6_DESC=	Windows Media Player 6
+XANIM_DESC=	XAnim feeling
+XFCE4_DESC=	default XFce4 theme
+XINE_LCD_DESC=	xine LCD skin
+XMMPLAYER_DESC=	XMMS lookalike
+
+OPTIONS_DEFAULT=	DEFAULT