3 files changed, 34 insertions, 28 deletions

diff --git a/multimedia/mplayer-skins/Makefile b/multimedia/mplayer-skins/Makefile
index deae8b3c9fa8..05caec1508a1 100644
--- a/multimedia/mplayer-skins/Makefile
+++ b/multimedia/mplayer-skins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mplayer
-PORTVERSION=	1.0.5
-PORTREVISION=	2
+PORTVERSION=	1.1.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.mplayerhq.hu/MPlayer/Skin/:Skin \
 		http://ftp.lug.udel.edu/MPlayer/Skin/:Skin \
@@ -15,7 +14,29 @@ MASTER_SITES=	http://www.mplayerhq.hu/MPlayer/Skin/:Skin \
 		ftp://ftp.lug.udel.edu/MPlayer/Skin/:Skin \
 		http://www.stud.uni-karlsruhe.de/~uedc/mplayer/:mini
 PKGNAMESUFFIX=	-skins
-DISTFILES=
+DISTFILES=	default-1.7.tar.bz2:Skin \
+		AlienMind-1.1.tar.bz2:Skin \
+		avifile-1.5.tar.bz2:Skin \
+		BlueHeart-1.4.tar.bz2:Skin \
+		CornerMP-1.0.tar.bz2:Skin \
+		CornerMP-aqua-1.0.tar.bz2:Skin \
+		Cyrus-1.0.tar.bz2:Skin \
+		gnome-1.1.tar.bz2:Skin \
+		hayraphon-1.0.tar.bz2:Skin \
+		hwswskin-1.0.tar.bz2:Skin \
+		mentalic-1.1.tar.bz2:Skin \
+		MidnightLove-1.5.tar.bz2:Skin \
+		neutron-1.4.tar.bz2:Skin \
+		phony-1.0.tar.bz2:Skin \
+		plastic-1.1.1.tar.bz2:Skin \
+		proton-1.1.tar.bz2:Skin \
+		slim-1.0.tar.bz2:Skin \
+		trium-1.1.tar.bz2:Skin \
+		WindowsMediaPlayer6-1.2.tar.bz2:Skin \
+		xanim-1.5.tar.bz2:Skin \
+		xine-lcd-1.0.tar.bz2:Skin \
+		Orange-1.1.tar.bz2:Skin \
+		mini-0.1.tar.bz2:mini
 EXTRACT_ONLY=
 DIST_SUBDIR=	mplayer
 
@@ -48,7 +69,7 @@ WITH_SKIN_DEFAULT=yes
 .endif	# BATCH
 
 .if !defined(BATCH)
-pre-fetch:
+pre-everything::
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/choice
 
@@ -87,118 +108,101 @@ WITH_SKIN_TRIUM=yes
 WITH_SKIN_WINDOWSMEDIAPLAYER6=yes
 WITH_SKIN_XANIM=yes
 WITH_SKIN_XINE_LCD=yes
+WITH_SKIN_ORANGE=yes
 WITH_SKIN_MINI=yes
 . endif # WITH_SKIN_ALL
 
 #
-# files to fetch
+# files to extract
 #
-DISTFILES+=	default-1.7.tar.bz2:Skin
 .ifdef(WITH_SKIN_DEFAULT)
 EXTRACT_ONLY+=	default-1.7.tar.bz2
 .endif
 
-DISTFILES+=	AlienMind-1.1.tar.bz2:Skin
 .ifdef(WITH_SKIN_ALIENMIND)
 EXTRACT_ONLY+=	AlienMind-1.1.tar.bz2
 .endif
 
-DISTFILES+=	avifile-1.5.tar.bz2:Skin
 .ifdef(WITH_SKIN_AVIFILE)
 EXTRACT_ONLY+=	avifile-1.5.tar.bz2
 .endif
 
-DISTFILES+=	BlueHeart-1.4.tar.bz2:Skin
 .ifdef(WITH_SKIN_BLUEHEART)
 EXTRACT_ONLY+=	BlueHeart-1.4.tar.bz2
 .endif
 
-DISTFILES+=	CornerMP-1.0.tar.bz2:Skin
 .ifdef(WITH_SKIN_CORNERMP)
 EXTRACT_ONLY+=	CornerMP-1.0.tar.bz2
 .endif
 
-DISTFILES+=	CornerMP-aqua-1.0.tar.bz2:Skin
 .ifdef(WITH_SKIN_CORNERMP_AGUA)
 EXTRACT_ONLY+=	CornerMP-aqua-1.0.tar.bz2
 .endif
 
-DISTFILES+=	Cyrus-1.0.tar.bz2:Skin
 .ifdef(WITH_SKIN_CYRUS)
 EXTRACT_ONLY+=	Cyrus-1.0.tar.bz2
 .endif
 
-DISTFILES+=	gnome-1.1.tar.bz2:Skin
 .ifdef(WITH_SKIN_CYRUS)
 EXTRACT_ONLY+=	gnome-1.1.tar.bz2
 .endif
 
-DISTFILES+=	hayraphon-1.0.tar.bz2:Skin
 .ifdef(WITH_SKIN_CYRUS)
 EXTRACT_ONLY+=	hayraphon-1.0.tar.bz2
 .endif
 
-DISTFILES+=	hwswskin-1.0.tar.bz2:Skin
 .ifdef(WITH_SKIN_HWSW_SKIN)
 EXTRACT_ONLY+=	hwswskin-1.0.tar.bz2
 .endif
 
-DISTFILES+=	mentalic-1.1.tar.bz2:Skin
 .ifdef(WITH_SKIN_MENTALIC)
 EXTRACT_ONLY+=	mentalic-1.1.tar.bz2
 .endif
 
-DISTFILES+=	MidnightLove-1.5.tar.bz2:Skin
 .ifdef(WITH_SKIN_MIDNIGHTLOVE)
 EXTRACT_ONLY+=	MidnightLove-1.5.tar.bz2
 .endif
 
-DISTFILES+=	neutron-1.4.tar.bz2:Skin
 .ifdef(WITH_SKIN_NEUTRON)
 EXTRACT_ONLY+=	neutron-1.4.tar.bz2
 .endif
 
-DISTFILES+=	phony-1.0.tar.bz2:Skin
 .ifdef(WITH_SKIN_PHONY)
 EXTRACT_ONLY+=	phony-1.0.tar.bz2
 .endif
 
-DISTFILES+=	plastic-1.1.1.tar.bz2:Skin
 .ifdef(WITH_SKIN_PLASTIC)
 EXTRACT_ONLY+=	plastic-1.1.1.tar.bz2
 .endif
 
-DISTFILES+=	proton-1.1.tar.bz2:Skin
 .ifdef(WITH_SKIN_PROTON)
 EXTRACT_ONLY+=	proton-1.1.tar.bz2
 .endif
 
-DISTFILES+=	slim-1.0.tar.bz2:Skin
 .ifdef(WITH_SKIN_SLIM)
 EXTRACT_ONLY+=	slim-1.0.tar.bz2
 .endif
 
-DISTFILES+=	trium-1.1.tar.bz2:Skin
 .ifdef(WITH_SKIN_TRIUM)
 EXTRACT_ONLY+=	trium-1.1.tar.bz2
 .endif
 
-DISTFILES+=	WindowsMediaPlayer6-1.2.tar.bz2:Skin
 .ifdef(WITH_SKIN_WINDOWSMEDIAPLAYER6)
 EXTRACT_ONLY+=	WindowsMediaPlayer6-1.2.tar.bz2
 .endif
 
-DISTFILES+=	xanim-1.5.tar.bz2:Skin
 .ifdef(WITH_SKIN_XANIM)
 EXTRACT_ONLY+=	xanim-1.5.tar.bz2
 .endif
 
-DISTFILES+=	xine-lcd-1.0.tar.bz2:Skin
 .ifdef(WITH_SKIN_XINE_LCD)
 EXTRACT_ONLY+=	xine-lcd-1.0.tar.bz2
 .endif
 
-DISTFILES+=	mini-0.1.tar.bz2:mini
+.ifdef(WITH_SKIN_ORANGE)
+EXTRACT_ONLY+=	Orange-1.1.tar.bz2
+.endif
+
 .ifdef(WITH_SKIN_MINI)
 EXTRACT_ONLY+=	mini-0.1.tar.bz2
 .endif
diff --git a/multimedia/mplayer-skins/distinfo b/multimedia/mplayer-skins/distinfo
index 4be7b165c95f..93433e7be527 100644
--- a/multimedia/mplayer-skins/distinfo
+++ b/multimedia/mplayer-skins/distinfo
@@ -4,7 +4,7 @@ MD5 (mplayer/avifile-1.5.tar.bz2) = a18d2282e5945243862fa765146c1b32
 MD5 (mplayer/BlueHeart-1.4.tar.bz2) = c38e378f24b9f0e041c98305fbef4a5d
 MD5 (mplayer/CornerMP-1.0.tar.bz2) = 64a1f4f2064d6af7cab7f0dcfc0450e5
 MD5 (mplayer/CornerMP-aqua-1.0.tar.bz2) = 936f2aef3d5011b10b7610897074f409
-MD5 (mplayer/Cyrus-1.0.tar.bz2) = 029ef9e29aec05b73923ddb186c55e2c
+MD5 (mplayer/Cyrus-1.0.tar.bz2) = 2f5d57c972683217ed64eb2f702a9e80
 MD5 (mplayer/gnome-1.1.tar.bz2) = e7dbfbb2f433e82c91f4e2245c7114c3
 MD5 (mplayer/hayraphon-1.0.tar.bz2) = 1dcfa8830ebd967db0cc24a5cc7748a4
 MD5 (mplayer/hwswskin-1.0.tar.bz2) = cf8341b74a8b66e0acfaca5b5514d895
@@ -19,4 +19,5 @@ MD5 (mplayer/trium-1.1.tar.bz2) = 6f6edece793e373f3e33611d51b9321e
 MD5 (mplayer/WindowsMediaPlayer6-1.2.tar.bz2) = 6717e3f57e9c808777ce8cfc370d194e
 MD5 (mplayer/xanim-1.5.tar.bz2) = 11c50f9eb970f08b4955bed6e3159d39
 MD5 (mplayer/xine-lcd-1.0.tar.bz2) = 9e8a8ba86e46e714d1ef2e19d9a7e0cf
+MD5 (mplayer/Orange-1.1.tar.bz2) = 89c336d264cf4a58f10d7fec5d907e81
 MD5 (mplayer/mini-0.1.tar.bz2) = 2bd00a1202298e2b12021f5362649c7c
diff --git a/multimedia/mplayer-skins/scripts/choice b/multimedia/mplayer-skins/scripts/choice
index ee6b9094b317..ae41f20df232 100644
--- a/multimedia/mplayer-skins/scripts/choice
+++ b/multimedia/mplayer-skins/scripts/choice
@@ -36,6 +36,7 @@ Select the skins you want to install:" -1 -1 13 \
   "WindowsMediaPlayer6"	"no comment"				OFF \
   "Xanim"	"xanim \"feeling\""					OFF \
   "Xine-LCD"	"MPlayer conversion of Xine's LCD skin"		OFF \
+  "Orange"	"Very nice VCR lookalike skin"			OFF \
   "Mini"	"Mplayer-plugin for mozilla"			OFF \
 2> /tmp/mplayer-skins-checklist.$$