3 files changed, 37 insertions, 26 deletions

diff --git a/multimedia/mplayer-skins/Makefile b/multimedia/mplayer-skins/Makefile
index f8fa8247357a..5072924e302a 100644
--- a/multimedia/mplayer-skins/Makefile
+++ b/multimedia/mplayer-skins/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	mplayer
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.mplayerhq.hu/MPlayer/Skin/ \
-		http://ftp.lug.udel.edu/MPlayer/Skin/ \
-		ftp://ftp.mplayerhq.hu/MPlayer/Skin/ \
-		ftp://ftp.lug.udel.edu/MPlayer/Skin/
+MASTER_SITES=	http://www.mplayerhq.hu/MPlayer/Skin/:Skin \
+		http://ftp.lug.udel.edu/MPlayer/Skin/:Skin \
+		ftp://ftp.mplayerhq.hu/MPlayer/Skin/:Skin \
+		ftp://ftp.lug.udel.edu/MPlayer/Skin/:Skin \
+		${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%\/$/mplayerplug-in\/:mini/}
 PKGNAMESUFFIX=	-skins
 DISTFILES=
 EXTRACT_ONLY=
@@ -84,116 +85,124 @@ WITH_SKIN_TRIUM=yes
 WITH_SKIN_WINDOWSMEDIAPLAYER6=yes
 WITH_SKIN_XANIM=yes
 WITH_SKIN_XINE_LCD=yes
+WITH_SKIN_MINI=yes
 . endif # WITH_SKIN_ALL
 
 #
 # files to fetch
 #
-DISTFILES+=	default-1.7.tar.bz2
+DISTFILES+=	default-1.7.tar.bz2:Skin
 .ifdef(WITH_SKIN_DEFAULT)
 EXTRACT_ONLY+=	default-1.7.tar.bz2
 .endif
 
-DISTFILES+=	AlienMind-1.0.tar.bz2
+DISTFILES+=	AlienMind-1.0.tar.bz2:Skin
 .ifdef(WITH_SKIN_ALIENMIND)
 EXTRACT_ONLY+=	AlienMind-1.0.tar.bz2
 .endif
 
-DISTFILES+=	avifile-1.5.tar.bz2
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+DISTFILES+=	slim-1.0.tar.bz2:Skin
 .ifdef(WITH_SKIN_SLIM)
 EXTRACT_ONLY+=	slim-1.0.tar.bz2
 .endif
 
-DISTFILES+=	trium-1.0.tar.bz2
+DISTFILES+=	trium-1.0.tar.bz2:Skin
 .ifdef(WITH_SKIN_TRIUM)
 EXTRACT_ONLY+=	trium-1.0.tar.bz2
 .endif
 
-DISTFILES+=	WindowsMediaPlayer6-1.2.tar.bz2
+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
+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
+DISTFILES+=	xine-lcd-1.0.tar.bz2:Skin
 .ifdef(WITH_SKIN_XINE_LCD)
 EXTRACT_ONLY+=	xine-lcd-1.0.tar.bz2
 .endif
 
+DISTFILES+=	mini.tar.bz2:mini
+.ifdef(WITH_SKIN_MINI)
+EXTRACT_ONLY+=	mini.tar.bz2
+post-extract::
+	@${RM} -fr ${WRKDIR}/mini/.xvpics
+.endif
+
 # Automatically create PLIST
 # creates @dirrm entries
 # copies file entries
diff --git a/multimedia/mplayer-skins/distinfo b/multimedia/mplayer-skins/distinfo
index 9b5ec91a21de..30c36dfc6741 100644
--- a/multimedia/mplayer-skins/distinfo
+++ b/multimedia/mplayer-skins/distinfo
@@ -19,3 +19,4 @@ MD5 (mplayer/trium-1.0.tar.bz2) = 448459e3da802e42cf0215bce1c93527
 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/mini.tar.bz2) = 88ffb4b41928f5b063800bab46be1545
diff --git a/multimedia/mplayer-skins/scripts/choice b/multimedia/mplayer-skins/scripts/choice
index 8d57cedf0f04..33e471c34eb3 100644
--- a/multimedia/mplayer-skins/scripts/choice
+++ b/multimedia/mplayer-skins/scripts/choice
@@ -36,6 +36,7 @@ only the skins you really want. \n\n\
   "WindowsMediaPlayer6"	"no comment"				OFF \
   "Xanim"	"xanim \"feeling\""					OFF \
   "Xine-LCD"	"MPlayer conversion of Xine's LCD skin"		OFF \
+  "Mini"	"Mplayer-plugin for mozilla"			OFF \
 2> /tmp/mplayer-skins-checklist.$$
 
 retval=$?