4 files changed, 94 insertions, 19 deletions

diff --git a/multimedia/mplayer-skins/Makefile b/multimedia/mplayer-skins/Makefile
index f68da4c729c3..d8f7195314c5 100644
--- a/multimedia/mplayer-skins/Makefile
+++ b/multimedia/mplayer-skins/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mplayer
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.mplayerhq.hu/MPlayer/Skin/ \
 		http://ftp.mplayerhq.hu/MPlayer/Skin/ \
@@ -70,8 +70,10 @@ WITH_SKIN_ALIENMIND=yes
 WITH_SKIN_AVIFILE=yes
 WITH_SKIN_BLUEHEART=yes
 WITH_SKIN_CORNERMP=yes
+WITH_SKIN_CORNERMP_AGUA=yes
 WITH_SKIN_CUBICPLAYER=yes
 WITH_SKIN_CYRUS=yes
+WITH_SKIN_HWSW_SKIN=yes
 WITH_SKIN_MENTALIC=yes
 WITH_SKIN_MIDNIGHTLOVE=yes
 WITH_SKIN_NETSCAPE4=yes
@@ -133,6 +135,15 @@ PLIST_SUB+=	CORNERMP=""
 PLIST_SUB+=	CORNERMP="@comment "
 .endif
 
+DISTFILES+=	CornerMP-aqua.tar.bz2
+.ifdef(WITH_SKIN_CORNERMP_AGUA)
+EXTRACT_ONLY+=	CornerMP-aqua.tar.bz2
+
+PLIST_SUB+=	CORNERMP_AGUA=""
+.else
+PLIST_SUB+=	CORNERMP_AGUA="@comment "
+.endif
+
 DISTFILES+=	CubicPlayer.tar.bz2
 .ifdef(WITH_SKIN_CUBICPLAYER)
 EXTRACT_ONLY+=	CubicPlayer.tar.bz2
@@ -151,6 +162,15 @@ PLIST_SUB+=	CYRUS=""
 PLIST_SUB+=	CYRUS="@comment "
 .endif
 
+DISTFILES+=	hwswskin.tar.bz2
+.ifdef(WITH_SKIN_HWSW_SKIN)
+EXTRACT_ONLY+=	hwswskin.tar.bz2
+
+PLIST_SUB+=	HWSW_SKIN=""
+.else
+PLIST_SUB+=	HWSW_SKIN="@comment "
+.endif
+
 DISTFILES+=	mentalic.tar.bz2
 .ifdef(WITH_SKIN_MENTALIC)
 EXTRACT_ONLY+=	mentalic.tar.bz2
diff --git a/multimedia/mplayer-skins/distinfo b/multimedia/mplayer-skins/distinfo
index 8c3a46099cb0..2de8315fb31d 100644
--- a/multimedia/mplayer-skins/distinfo
+++ b/multimedia/mplayer-skins/distinfo
@@ -1,18 +1,20 @@
-MD5 (mplayer/default.tar.bz2) = 3b3640a1cd4d3a55ac8f9c0cf8948985
-MD5 (mplayer/AlienMind.tar.bz2) = f574b04769ece458c0bd818f55025cfd
-MD5 (mplayer/avifile.tar.bz2) = 40d0f30ac3d681b32bfb38f1d37b351e
-MD5 (mplayer/BlueHeart.tar.bz2) = acb7d4d73bd82d73cf3187f219f59ef8
-MD5 (mplayer/CornerMP.tar.bz2) = 66501a39c3635b3c3d61ee6dfe05398d
-MD5 (mplayer/CubicPlayer.tar.bz2) = b5267a04aae9358d15c9d24ac5867ee0
-MD5 (mplayer/Cyrus.tar.bz2) = 1e4eccdec1a7cd361ba5c4e099e6fd12
-MD5 (mplayer/mentalic.tar.bz2) = 484e8b238ad3db586f3d7de6ea44fc02
-MD5 (mplayer/MidnightLove.tar.bz2) = 354663272b22a61819adf05ad3af69cb
-MD5 (mplayer/netscape4.tar.bz2) = 3d7cfd1c484c759056466369b6a5c631
-MD5 (mplayer/neutron.tar.bz2) = 802b59f4eb21b50f90c969bbe71db38e
-MD5 (mplayer/phony.tar.bz2) = 3ea4d8d830029b8c401708da8f279ffe
-MD5 (mplayer/plastic.tar.bz2) = abfb9abd894c7dcfda8236419341e4b3
-MD5 (mplayer/proton.tar.bz2) = 5da11799d3e3fbf88343f6946954b80b
-MD5 (mplayer/slim.tar.bz2) = 5a1c33fbbffe6dd6953a83c8ff8b3e8a
-MD5 (mplayer/WindowsMediaPlayer6.tar.bz2) = 91f964b3b59a91c6b0507588ff6e6077
-MD5 (mplayer/xanim.tar.bz2) = 74fd858b0b4512245f5c85275224ecfc
-MD5 (mplayer/xine-lcd.tar.bz2) = 1cdf65944f468c918449bf19fde1fe9d
+MD5 (mplayer/default.tar.bz2) = 8134215252ada2429f6d9456725c713f
+MD5 (mplayer/AlienMind.tar.bz2) = e9ffe9c50f140d635d4b7dc8efa02218
+MD5 (mplayer/avifile.tar.bz2) = 84dcf3543048203bbd12fa5e5274cd78
+MD5 (mplayer/BlueHeart.tar.bz2) = 4aae1e93c59ac4ad258acd02878705c8
+MD5 (mplayer/CornerMP.tar.bz2) = d1d6294de26888f16a9294f7b71387df
+MD5 (mplayer/CornerMP-aqua.tar.bz2) = 398255acfbdd59133eb52f942a15b426
+MD5 (mplayer/CubicPlayer.tar.bz2) = 125666e70e6a1fdc9fa1d3a5c39e0bab
+MD5 (mplayer/Cyrus.tar.bz2) = 7abbc337c115c94d034e4e1fa517b2ef
+MD5 (mplayer/hwswskin.tar.bz2) = 31aad1e6e052b6d49eda825ec6f0838a
+MD5 (mplayer/mentalic.tar.bz2) = 058a2586e6f1f380822e14a0ec0b0e7d
+MD5 (mplayer/MidnightLove.tar.bz2) = b5d8ce5933fdd1affce33cc715cd0a88
+MD5 (mplayer/netscape4.tar.bz2) = 9fc71389ed133b5a97716ce8433ae7a4
+MD5 (mplayer/neutron.tar.bz2) = 9014d9d3999cbad41fc32d2c07feebfe
+MD5 (mplayer/phony.tar.bz2) = e42a5af9fd14e5443722382fce4f1e33
+MD5 (mplayer/plastic.tar.bz2) = 2ba4eed14871e745531a209b5ea3b58b
+MD5 (mplayer/proton.tar.bz2) = df0f4eb8ad2c9164552ff76c2e6d6171
+MD5 (mplayer/slim.tar.bz2) = f4c99d54ad8436cd0d44b84ea983d26a
+MD5 (mplayer/WindowsMediaPlayer6.tar.bz2) = 7133892228f84ddc0f79c51878c26467
+MD5 (mplayer/xanim.tar.bz2) = c9646ba406161d2f571c57a8bb6ee829
+MD5 (mplayer/xine-lcd.tar.bz2) = def3fac8bea451110cb5e01a7300665d
diff --git a/multimedia/mplayer-skins/pkg-plist b/multimedia/mplayer-skins/pkg-plist
index cfc99cc8498f..87bee03f7130 100644
--- a/multimedia/mplayer-skins/pkg-plist
+++ b/multimedia/mplayer-skins/pkg-plist
@@ -78,6 +78,35 @@
 %%CORNERMP%%%%myDATADIR%%CornerMP/symbols.fnt
 %%CORNERMP%%%%myDATADIR%%CornerMP/symbols.png
 %%CORNERMP%%%%myDATADIR%%CornerMP/vol.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/README
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/about.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/back.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/eqls.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/exit.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/font.fnt
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/font.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/forwd.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/full.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/icnf.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/load.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/main.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/menu.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/menu_ko.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/menus.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/menus_ko.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/next.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/pause.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/play.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/plst.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/pos.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/prev.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/skin
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/stop.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/sub.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/subt.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/symbols.fnt
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/symbols.png
+%%CORNERMP_AGUA%%%%myDATADIR%%CornerMP-aqua/vol.png
 %%CUBICPLAYER%%%%myDATADIR%%CubicPlayer/README
 %%CUBICPLAYER%%%%myDATADIR%%CubicPlayer/VERSION
 %%CUBICPLAYER%%%%myDATADIR%%CubicPlayer/balance.png
@@ -206,6 +235,26 @@
 %%DEFAULT%%%%myDATADIR%%default/symbols.fnt
 %%DEFAULT%%%%myDATADIR%%default/symbols.png
 %%DEFAULT%%%%myDATADIR%%default/volume.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-about.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-exit.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-forward.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-fullscr.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-next.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-open.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-pause.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-play.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-playlst.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-prev.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-rewind.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-skinbr.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/button-stop.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/font.fnt
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/font.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/main.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/pos.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/skin
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/sub.png
+%%HWSW_SKIN%%%%myDATADIR%%hwswskin/vol.png
 %%MENTALIC%%%%myDATADIR%%mentalic/about.png
 %%MENTALIC%%%%myDATADIR%%mentalic/back.png
 %%MENTALIC%%%%myDATADIR%%mentalic/exit.png
@@ -452,12 +501,14 @@
 %%NEUTRON%%@dirrm %%myDATADIR%%neutron
 %%NETSCAPE4%%@dirrm %%myDATADIR%%netscape4
 %%MENTALIC%%@dirrm %%myDATADIR%%mentalic
+%%HWSW_SKIN%%@dirrm %%myDATADIR%%hwswskin
 %%DEFAULT%%@dirrm %%myDATADIR%%default
 %%AVIFILE%%@dirrm %%myDATADIR%%avifile
 %%WINDOWSMEDIAPLAYER6%%@dirrm %%myDATADIR%%WindowsMediaPlayer6
 %%MIDNIGHTLOVE%%@dirrm %%myDATADIR%%MidnightLove
 %%CYRUS%%@dirrm %%myDATADIR%%Cyrus
 %%CUBICPLAYER%%@dirrm %%myDATADIR%%CubicPlayer
+%%CORNERMP_AGUA%%@dirrm %%myDATADIR%%CornerMP-aqua
 %%CORNERMP%%@dirrm %%myDATADIR%%CornerMP
 %%BLUEHEART%%@dirrm %%myDATADIR%%BlueHeart
 %%ALIENMIND%%@dirrm %%myDATADIR%%AlienMind
diff --git a/multimedia/mplayer-skins/scripts/choice b/multimedia/mplayer-skins/scripts/choice
index adb92c8191e9..e38026b78396 100644
--- a/multimedia/mplayer-skins/scripts/choice
+++ b/multimedia/mplayer-skins/scripts/choice
@@ -20,8 +20,10 @@ only the skins you really want. \n\n\
   "avifile"	"MPlayer skin, with the look of aviplay"	OFF \
   "BlueHeart"	"MPlayer conversion of a BlueHeart XMMS skin"	OFF \
   "CornerMP"	"CornerMP"					OFF \
+  "CornerMP-agua"	"CornerMP agua"				OFF \
   "CubicPlayer"	"CubicPlayer skin"				OFF \
   "Cyrus"	"Cyrus skin from XMMS"				OFF \
+  "hwsw-skin"	"no comment"					OFF \
   "Mentalic"	"Sharp and shiny"				OFF \
   "MidnightLove"	"MPlayer version of WinAMP/XMMS Rei Ayanami's skin"		OFF \
   "Netscape4"	"Netscape \"unatkozok\" skin"			OFF \