Update to 1.0rc5nb3:

Remove one skin that disappeared, and update one skin name.
Also, all skin distfiles have changed, so set DIST_SUBDIR to a new
value and update the checksums.

Addresses PR 27071.

3 files changed, 86 insertions, 118 deletions

diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index bc62d1c485b..06b00886e0f 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/08/18 13:35:06 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2004/09/30 09:01:57 wiz Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,7 @@
 #
 
 PKGNAME=	gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 
 SKIN_SITES=	http://www.mplayerhq.hu/MPlayer/Skin/		\
 		ftp://ftp.mplayerhq.hu/MPlayer/Skin/		\
@@ -21,14 +21,13 @@ SKIN_SITES=	http://www.mplayerhq.hu/MPlayer/Skin/		\
 
 COMMENT=	Software only MPEG-1/2/4 video decoder with a GTK+ interface
 
-SKINS +=	default-1.8${EXTRACT_SUFX}			\
-		AlienMind-1.2${EXTRACT_SUFX}			\
+SKINS +=	AlienMind-1.2${EXTRACT_SUFX}			\
 		BlueHeart-1.5${EXTRACT_SUFX}			\
 		CornerMP-1.2${EXTRACT_SUFX}			\
 		CornerMP-aqua-1.4${EXTRACT_SUFX}		\
 		Cyrus-1.2${EXTRACT_SUFX}			\
 		MidnightLove-1.6${EXTRACT_SUFX}			\
-		WindowsMediaPlayer6-2.0${EXTRACT_SUFX}		\
+		WMP6-2.2${EXTRACT_SUFX}				\
 		avifile-1.6${EXTRACT_SUFX}			\
 		gnome-1.1${EXTRACT_SUFX}			\
 		hayraphon-1.0${EXTRACT_SUFX}			\
@@ -42,7 +41,7 @@ SKINS +=	default-1.8${EXTRACT_SUFX}			\
 		xanim-1.6${EXTRACT_SUFX}			\
 		xine-lcd-1.2${EXTRACT_SUFX}
 
-.if !defined(SITES_default-1.8.tar.bz2)
+.if !defined(SITES_AlienMind-1.2.tar.bz2)
 .  for skin in ${SKINS}
 SITES_${skin}= ${SKIN_SITES}
 .  endfor
@@ -51,6 +50,7 @@ SITES_${skin}= ${SKIN_SITES}
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=	${SKINS}
 DISTINFO_FILE=	${.CURDIR}/distinfo
+DIST_SUBDIR=	${PKGNAME_NOREV}
 
 USE_BUILDLINK3=		YES
 CONFIGURE_ARGS+=	--enable-gui --disable-mencoder \
diff --git a/multimedia/gmplayer/PLIST b/multimedia/gmplayer/PLIST
index 0878e1be6a5..a803bf5559d 100644
--- a/multimedia/gmplayer/PLIST
+++ b/multimedia/gmplayer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/06/18 18:43:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/09/30 09:01:57 wiz Exp $
 bin/gmplayer
 share/mplayer/Skin/AlienMind/README
 share/mplayer/Skin/AlienMind/VERSION
@@ -159,42 +159,43 @@ share/mplayer/Skin/MidnightLove/stop.png
 share/mplayer/Skin/MidnightLove/sub.png
 share/mplayer/Skin/MidnightLove/symbols.fnt
 share/mplayer/Skin/MidnightLove/symbols.png
-share/mplayer/Skin/WindowsMediaPlayer6/README
-share/mplayer/Skin/WindowsMediaPlayer6/VERSION
-share/mplayer/Skin/WindowsMediaPlayer6/bw10sec.png
-share/mplayer/Skin/WindowsMediaPlayer6/bw1min.png
-share/mplayer/Skin/WindowsMediaPlayer6/close.png
-share/mplayer/Skin/WindowsMediaPlayer6/equalizer.png
-share/mplayer/Skin/WindowsMediaPlayer6/favorites.png
-share/mplayer/Skin/WindowsMediaPlayer6/file.png
-share/mplayer/Skin/WindowsMediaPlayer6/font.fnt
-share/mplayer/Skin/WindowsMediaPlayer6/font.png
-share/mplayer/Skin/WindowsMediaPlayer6/fw10sec.png
-share/mplayer/Skin/WindowsMediaPlayer6/fw1min.png
-share/mplayer/Skin/WindowsMediaPlayer6/go.png
-share/mplayer/Skin/WindowsMediaPlayer6/help.png
-share/mplayer/Skin/WindowsMediaPlayer6/main.png
-share/mplayer/Skin/WindowsMediaPlayer6/maximize.png
-share/mplayer/Skin/WindowsMediaPlayer6/media.png
-share/mplayer/Skin/WindowsMediaPlayer6/menu.png
-share/mplayer/Skin/WindowsMediaPlayer6/menus.png
-share/mplayer/Skin/WindowsMediaPlayer6/minimize.png
-share/mplayer/Skin/WindowsMediaPlayer6/music.png
-share/mplayer/Skin/WindowsMediaPlayer6/mute.png
-share/mplayer/Skin/WindowsMediaPlayer6/next.png
-share/mplayer/Skin/WindowsMediaPlayer6/pause.png
-share/mplayer/Skin/WindowsMediaPlayer6/play.png
-share/mplayer/Skin/WindowsMediaPlayer6/pos.png
-share/mplayer/Skin/WindowsMediaPlayer6/prev.png
-share/mplayer/Skin/WindowsMediaPlayer6/radio.png
-share/mplayer/Skin/WindowsMediaPlayer6/skin
-share/mplayer/Skin/WindowsMediaPlayer6/stop.png
-share/mplayer/Skin/WindowsMediaPlayer6/sub.png
-share/mplayer/Skin/WindowsMediaPlayer6/sub.png.win
-share/mplayer/Skin/WindowsMediaPlayer6/symbols.fnt
-share/mplayer/Skin/WindowsMediaPlayer6/symbols.png
-share/mplayer/Skin/WindowsMediaPlayer6/view.png
-share/mplayer/Skin/WindowsMediaPlayer6/vol.png
+share/mplayer/Skin/WMP6/README
+share/mplayer/Skin/WMP6/VERSION
+share/mplayer/Skin/WMP6/bw10sec.png
+share/mplayer/Skin/WMP6/bw1min.png
+share/mplayer/Skin/WMP6/close.png
+share/mplayer/Skin/WMP6/equalizer.png
+share/mplayer/Skin/WMP6/favorites.png
+share/mplayer/Skin/WMP6/file.png
+share/mplayer/Skin/WMP6/font.fnt
+share/mplayer/Skin/WMP6/font.png
+share/mplayer/Skin/WMP6/fw10sec.png
+share/mplayer/Skin/WMP6/fw1min.png
+share/mplayer/Skin/WMP6/go.png
+share/mplayer/Skin/WMP6/help.png
+share/mplayer/Skin/WMP6/main.png
+share/mplayer/Skin/WMP6/maximize.png
+share/mplayer/Skin/WMP6/media.png
+share/mplayer/Skin/WMP6/menu.png
+share/mplayer/Skin/WMP6/menus.png
+share/mplayer/Skin/WMP6/minimize.png
+share/mplayer/Skin/WMP6/music.png
+share/mplayer/Skin/WMP6/mute.png
+share/mplayer/Skin/WMP6/next.png
+share/mplayer/Skin/WMP6/pause.png
+share/mplayer/Skin/WMP6/play.png
+share/mplayer/Skin/WMP6/playlist.png
+share/mplayer/Skin/WMP6/pos.png
+share/mplayer/Skin/WMP6/prev.png
+share/mplayer/Skin/WMP6/radio.png
+share/mplayer/Skin/WMP6/skin
+share/mplayer/Skin/WMP6/stop.png
+share/mplayer/Skin/WMP6/sub.png
+share/mplayer/Skin/WMP6/sub.png.win
+share/mplayer/Skin/WMP6/symbols.fnt
+share/mplayer/Skin/WMP6/symbols.png
+share/mplayer/Skin/WMP6/view.png
+share/mplayer/Skin/WMP6/vol.png
 share/mplayer/Skin/avifile/README
 share/mplayer/Skin/avifile/VERSION
 share/mplayer/Skin/avifile/alap.png
@@ -214,36 +215,6 @@ share/mplayer/Skin/avifile/sub.png
 share/mplayer/Skin/avifile/symbols.fnt
 share/mplayer/Skin/avifile/symbols.png
 share/mplayer/Skin/avifile/volume.png
-share/mplayer/Skin/default/README
-share/mplayer/Skin/default/VERSION
-share/mplayer/Skin/default/about.png
-share/mplayer/Skin/default/back.png
-share/mplayer/Skin/default/eq.png
-share/mplayer/Skin/default/eqb.png
-share/mplayer/Skin/default/exit.png
-share/mplayer/Skin/default/font.fnt
-share/mplayer/Skin/default/font.png
-share/mplayer/Skin/default/forward.png
-share/mplayer/Skin/default/fsb.png
-share/mplayer/Skin/default/iconify.png
-share/mplayer/Skin/default/load.png
-share/mplayer/Skin/default/main.png
-share/mplayer/Skin/default/menu.png
-share/mplayer/Skin/default/menus.png
-share/mplayer/Skin/default/next.png
-share/mplayer/Skin/default/pause.png
-share/mplayer/Skin/default/play.png
-share/mplayer/Skin/default/playbar.png
-share/mplayer/Skin/default/plb.png
-share/mplayer/Skin/default/pos.png
-share/mplayer/Skin/default/prev.png
-share/mplayer/Skin/default/skin
-share/mplayer/Skin/default/stop.png
-share/mplayer/Skin/default/sub.png
-share/mplayer/Skin/default/subload.png
-share/mplayer/Skin/default/symbols.fnt
-share/mplayer/Skin/default/symbols.png
-share/mplayer/Skin/default/volume.png
 share/mplayer/Skin/gnome/README
 share/mplayer/Skin/gnome/VERSION
 share/mplayer/Skin/gnome/back.png
@@ -552,9 +523,8 @@ share/mplayer/Skin/xine-lcd/volume.png
 @dirrm share/mplayer/Skin/hwswskin
 @dirrm share/mplayer/Skin/hayraphon
 @dirrm share/mplayer/Skin/gnome
-@dirrm share/mplayer/Skin/default
 @dirrm share/mplayer/Skin/avifile
-@dirrm share/mplayer/Skin/WindowsMediaPlayer6
+@dirrm share/mplayer/Skin/WMP6
 @dirrm share/mplayer/Skin/MidnightLove
 @dirrm share/mplayer/Skin/Cyrus
 @dirrm share/mplayer/Skin/CornerMP-aqua
diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index 7d86a81e295..a29561bdae8 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,47 +1,45 @@
-$NetBSD: distinfo,v 1.13 2004/07/24 01:19:34 wiz Exp $
+$NetBSD: distinfo,v 1.14 2004/09/30 09:01:57 wiz Exp $
 
-SHA1 (mplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = cf64892871b8673e452b5d390be25144d85fe307
-Size (mplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = 5072836 bytes
-SHA1 (mplayer-1.0rc5/default-1.8.tar.bz2) = c9cc56111b2de6295c032a2804fe16d24bbeb7bf
-Size (mplayer-1.0rc5/default-1.8.tar.bz2) = 173481 bytes
-SHA1 (mplayer-1.0rc5/AlienMind-1.2.tar.bz2) = a7796cf0827ceda4579edb918b864d783a879979
-Size (mplayer-1.0rc5/AlienMind-1.2.tar.bz2) = 131315 bytes
-SHA1 (mplayer-1.0rc5/BlueHeart-1.5.tar.bz2) = 3a32cc553c8abab8ef4129e00fa61215c37288e5
-Size (mplayer-1.0rc5/BlueHeart-1.5.tar.bz2) = 281091 bytes
-SHA1 (mplayer-1.0rc5/CornerMP-1.2.tar.bz2) = 630be3fa9aadff36c129b86980ba213638647abb
-Size (mplayer-1.0rc5/CornerMP-1.2.tar.bz2) = 232734 bytes
-SHA1 (mplayer-1.0rc5/CornerMP-aqua-1.4.tar.bz2) = 02c88db7b9ffbafcc04eeebcbfdc6a2993e688d0
-Size (mplayer-1.0rc5/CornerMP-aqua-1.4.tar.bz2) = 243204 bytes
-SHA1 (mplayer-1.0rc5/Cyrus-1.2.tar.bz2) = 420b079f9480fcba1da6085754ff9ea1f60401f2
-Size (mplayer-1.0rc5/Cyrus-1.2.tar.bz2) = 228490 bytes
-SHA1 (mplayer-1.0rc5/MidnightLove-1.6.tar.bz2) = 79c70c79e3916cf6f8d40d7e46aebe669e84b27e
-Size (mplayer-1.0rc5/MidnightLove-1.6.tar.bz2) = 539649 bytes
-SHA1 (mplayer-1.0rc5/WindowsMediaPlayer6-2.0.tar.bz2) = d52e3e6559ed811e9b3d9e797762c9793e1c0b5b
-Size (mplayer-1.0rc5/WindowsMediaPlayer6-2.0.tar.bz2) = 39105 bytes
-SHA1 (mplayer-1.0rc5/avifile-1.6.tar.bz2) = d3b66f779abe2c70f9cb0db2d9ffe4b4591db215
-Size (mplayer-1.0rc5/avifile-1.6.tar.bz2) = 42446 bytes
-SHA1 (mplayer-1.0rc5/gnome-1.1.tar.bz2) = b27618f2ec2f8bf83929b6e30c4fe1fab59595fd
-Size (mplayer-1.0rc5/gnome-1.1.tar.bz2) = 368720 bytes
-SHA1 (mplayer-1.0rc5/hayraphon-1.0.tar.bz2) = 793febace6325776d9795ef81566f378edcb4541
-Size (mplayer-1.0rc5/hayraphon-1.0.tar.bz2) = 77628 bytes
-SHA1 (mplayer-1.0rc5/hwswskin-1.1.tar.bz2) = e877c3594234e53b1bc7bd45c8e64c7c0682313a
-Size (mplayer-1.0rc5/hwswskin-1.1.tar.bz2) = 20375 bytes
-SHA1 (mplayer-1.0rc5/mentalic-1.2.tar.bz2) = 560c6b5bc08a981a1a335b8106701fa07af51524
-Size (mplayer-1.0rc5/mentalic-1.2.tar.bz2) = 166617 bytes
-SHA1 (mplayer-1.0rc5/neutron-1.5.tar.bz2) = 78f332ea926e476c90f690b2d3c925aadfc8baff
-Size (mplayer-1.0rc5/neutron-1.5.tar.bz2) = 369313 bytes
-SHA1 (mplayer-1.0rc5/phony-1.1.tar.bz2) = efb5cb181c1a8a9062a269f435f38a04fd0cc8d7
-Size (mplayer-1.0rc5/phony-1.1.tar.bz2) = 386409 bytes
-SHA1 (mplayer-1.0rc5/plastic-1.2.tar.bz2) = 3c448bed53b2bdedfdf6bbfabd91c3bd95c63119
-Size (mplayer-1.0rc5/plastic-1.2.tar.bz2) = 454151 bytes
-SHA1 (mplayer-1.0rc5/proton-1.2.tar.bz2) = 2f59c1458de1c3379b03c1618b54b18778db1997
-Size (mplayer-1.0rc5/proton-1.2.tar.bz2) = 322654 bytes
-SHA1 (mplayer-1.0rc5/slim-1.2.tar.bz2) = 91af8682bf5ffea4d184a839bd762ad377b5f0c3
-Size (mplayer-1.0rc5/slim-1.2.tar.bz2) = 399000 bytes
-SHA1 (mplayer-1.0rc5/xanim-1.6.tar.bz2) = ea147768cba50e62646216217028a9dac8b8e653
-Size (mplayer-1.0rc5/xanim-1.6.tar.bz2) = 94567 bytes
-SHA1 (mplayer-1.0rc5/xine-lcd-1.2.tar.bz2) = b882ec3e0aceeffb22c425cfd7322bf0f7aaf269
-Size (mplayer-1.0rc5/xine-lcd-1.2.tar.bz2) = 172340 bytes
+SHA1 (gmplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = cf64892871b8673e452b5d390be25144d85fe307
+Size (gmplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = 5072836 bytes
+SHA1 (gmplayer-1.0rc5/AlienMind-1.2.tar.bz2) = be18e5a94f59b820376cbd54ba860c16a66e5bc5
+Size (gmplayer-1.0rc5/AlienMind-1.2.tar.bz2) = 131329 bytes
+SHA1 (gmplayer-1.0rc5/BlueHeart-1.5.tar.bz2) = 00cad2079803ac14452a7930a5b92c9958440b67
+Size (gmplayer-1.0rc5/BlueHeart-1.5.tar.bz2) = 281150 bytes
+SHA1 (gmplayer-1.0rc5/CornerMP-1.2.tar.bz2) = 7566264faaf3b6a54fde09556e5a68bb4836357e
+Size (gmplayer-1.0rc5/CornerMP-1.2.tar.bz2) = 232779 bytes
+SHA1 (gmplayer-1.0rc5/CornerMP-aqua-1.4.tar.bz2) = b7a0bb02b9789d65e007ae01df67793bb4f93626
+Size (gmplayer-1.0rc5/CornerMP-aqua-1.4.tar.bz2) = 243135 bytes
+SHA1 (gmplayer-1.0rc5/Cyrus-1.2.tar.bz2) = 1ae6695ddaf3b4e12e1c8ed880cd0f8f814edb06
+Size (gmplayer-1.0rc5/Cyrus-1.2.tar.bz2) = 228472 bytes
+SHA1 (gmplayer-1.0rc5/MidnightLove-1.6.tar.bz2) = dda5886d771527ee3a86c5a2c03d875c580941dd
+Size (gmplayer-1.0rc5/MidnightLove-1.6.tar.bz2) = 539674 bytes
+SHA1 (gmplayer-1.0rc5/WMP6-2.2.tar.bz2) = 1a708c80e45da462c829b2a93f938a42b19b116d
+Size (gmplayer-1.0rc5/WMP6-2.2.tar.bz2) = 39354 bytes
+SHA1 (gmplayer-1.0rc5/avifile-1.6.tar.bz2) = 5d9d6c39810feb4b4a3cd7daf621860beaf0636d
+Size (gmplayer-1.0rc5/avifile-1.6.tar.bz2) = 42434 bytes
+SHA1 (gmplayer-1.0rc5/gnome-1.1.tar.bz2) = 8a39b3a59c6466fbb559e2081d9e2574eef679d5
+Size (gmplayer-1.0rc5/gnome-1.1.tar.bz2) = 368654 bytes
+SHA1 (gmplayer-1.0rc5/hayraphon-1.0.tar.bz2) = 14d3af2164dd8ec818d146266f687f6cc1715c72
+Size (gmplayer-1.0rc5/hayraphon-1.0.tar.bz2) = 77644 bytes
+SHA1 (gmplayer-1.0rc5/hwswskin-1.1.tar.bz2) = 0f70af0de9536665e4d74f3e66f37bfe1e98262b
+Size (gmplayer-1.0rc5/hwswskin-1.1.tar.bz2) = 20398 bytes
+SHA1 (gmplayer-1.0rc5/mentalic-1.2.tar.bz2) = 03371eeed214b4694cf3d1bb9fff7392205e3ea7
+Size (gmplayer-1.0rc5/mentalic-1.2.tar.bz2) = 166645 bytes
+SHA1 (gmplayer-1.0rc5/neutron-1.5.tar.bz2) = 740d189fc2f1dc9d2941291f10c87b4faf307863
+Size (gmplayer-1.0rc5/neutron-1.5.tar.bz2) = 369357 bytes
+SHA1 (gmplayer-1.0rc5/phony-1.1.tar.bz2) = d015a2e918d17fcccec9493c4d2f109a0ca08b2c
+Size (gmplayer-1.0rc5/phony-1.1.tar.bz2) = 386455 bytes
+SHA1 (gmplayer-1.0rc5/plastic-1.2.tar.bz2) = 10229eebccb9fbf64d61d516aa82087ab3c64b25
+Size (gmplayer-1.0rc5/plastic-1.2.tar.bz2) = 454150 bytes
+SHA1 (gmplayer-1.0rc5/proton-1.2.tar.bz2) = a5a4f717c5accad14f7b25459a85beb0d7d8aaec
+Size (gmplayer-1.0rc5/proton-1.2.tar.bz2) = 322606 bytes
+SHA1 (gmplayer-1.0rc5/slim-1.2.tar.bz2) = d106202a66ef9372f0a730cb5148a15e14bbc07f
+Size (gmplayer-1.0rc5/slim-1.2.tar.bz2) = 398958 bytes
+SHA1 (gmplayer-1.0rc5/xanim-1.6.tar.bz2) = 715fa7e4131055c32825a3d72a50093d91ee7e7c
+Size (gmplayer-1.0rc5/xanim-1.6.tar.bz2) = 94560 bytes
+SHA1 (gmplayer-1.0rc5/xine-lcd-1.2.tar.bz2) = c5b3ab9ff44707998bbbfe1aea0d4f5e017387f4
+Size (gmplayer-1.0rc5/xine-lcd-1.2.tar.bz2) = 172335 bytes
 SHA1 (patch-aa) = 9a90cadba608c518e998024f8dbde39cbfab70da
 SHA1 (patch-ab) = 68e81c67cd3902499f912d3ca8c6d6bc208a2433
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b