Re-add brushedGnome skin that did not worked due to a typo and bump PKGREVISION.

While here restructure do-install target in order to avoid bzcat and gtar and
directly use pax to copy the skins.
This made the skins patchable and avoid to re-extract skin distfiles during the
install phase (at the price of a regular expression that should not be too
incomprensible).

ok martin@

2 files changed, 43 insertions, 11 deletions

diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index 0e697e5c4f1..5887488e646 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2015/11/22 15:38:56 martin Exp $
+# $NetBSD: Makefile,v 1.129 2015/11/22 19:30:33 leot Exp $
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
 # that *both* distinfo files contain the correct, up-to-date files and
@@ -8,7 +8,7 @@
 #
 
 PKGNAME=	gmplayer-${MPLAYER_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 
 SKIN_SITES=	http://www1.mplayerhq.hu/MPlayer/skins/		\
 		http://www2.mplayerhq.hu/MPlayer/skins/		\
@@ -26,10 +26,6 @@ BUILD_DEPENDS+=		yasm-[0-9]*:../../devel/yasm
 
 COMMENT=	Fast, cross-platform movie player with GTK2+ interface
 
-# This one does not work with the current version, re-add once it
-# gets fixed...
-# brushedGnome-1.0${SKIN_EXTRACT_SUFX}
-
 SKINS+=		Abyss-1.7${SKIN_EXTRACT_SUFX}			\
 		AlienMind-1.2${SKIN_EXTRACT_SUFX}		\
 		Blue-1.11${SKIN_EXTRACT_SUFX}			\
@@ -62,6 +58,7 @@ SKINS+=		Abyss-1.7${SKIN_EXTRACT_SUFX}			\
 		XFce4-1.0${SKIN_EXTRACT_SUFX}			\
 		avifile-1.7${SKIN_EXTRACT_SUFX}			\
 		bluecurve-1.3${SKIN_EXTRACT_SUFX}		\
+		brushedGnome-1.0${SKIN_EXTRACT_SUFX}		\
 		changuito-0.2${SKIN_EXTRACT_SUFX}		\
 		clearplayer-0.9${SKIN_EXTRACT_SUFX}		\
 		disappearer-1.2${SKIN_EXTRACT_SUFX}		\
@@ -109,19 +106,28 @@ DISTFILES+=	${SKINS}
 DISTINFO_FILE=	${.CURDIR}/distinfo
 DIST_SUBDIR=	mplayer
 
-USE_TOOLS+=		bzcat gtar pkg-config
+USE_TOOLS+=		pax pkg-config
 CONFIGURE_ARGS+=	--enable-gui --disable-mencoder \
 			--confdir=${PREFIX}/share/mplayer
 CONFIGURE_ARGS+=	--enable-xvmc
 
+# XXX: fix a typo in brushedGnome-1.0 skin otherwise it fails to load with:
+# XXX:  Error in skin config file at line 61: Unknown message 'evEqualeaser'
+SUBST_CLASSES+=		skins
+SUBST_STAGE.skins=	pre-patch
+SUBST_MESSAGE.skins=	Fixing typo in brushedGnome-1.0 skin
+SUBST_FILES.skins=	${WRKDIR}/brushedGnome/skin
+SUBST_SED.skins=	-e 's/evEqualeaser/evEqualizer/'
+
 INSTALLATION_DIRS=	bin share/mplayer/skins
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${DESTDIR}${PREFIX}/bin/gmplayer
 .for skin in ${SKINS}
-	@${ECHO_MSG} "Installing skin ${skin}..."
-	${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${skin} |	\
-	  ${GTAR} xCmf ${DESTDIR}${PREFIX}/share/mplayer/skins -
+	( cd ${WRKDIR} && \
+		${PAX} -rw ${skin:C/-[0-9]+.[0-9]+${SKIN_EXTRACT_SUFX}//} \
+		    ${DESTDIR}${PREFIX}/share/mplayer/skins \
+	)
 .endfor
 	${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/mplayer/skins
 	${RM} -f ${DESTDIR}${PREFIX}/share/mplayer/skins/default
diff --git a/multimedia/gmplayer/PLIST b/multimedia/gmplayer/PLIST
index 937d2feaf2e..4a24379757c 100644
--- a/multimedia/gmplayer/PLIST
+++ b/multimedia/gmplayer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2015/11/22 16:00:26 martin Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/11/22 19:30:33 leot Exp $
 bin/gmplayer
 share/mplayer/skins/Abyss/README
 share/mplayer/skins/Abyss/VERSION
@@ -979,6 +979,32 @@ share/mplayer/skins/bluecurve/stop.png
 share/mplayer/skins/bluecurve/sub.png
 share/mplayer/skins/bluecurve/symbols.fnt
 share/mplayer/skins/bluecurve/symbols.png
+share/mplayer/skins/brushedGnome/README
+share/mplayer/skins/brushedGnome/VERSION
+share/mplayer/skins/brushedGnome/about.png
+share/mplayer/skins/brushedGnome/double.png
+share/mplayer/skins/brushedGnome/dvd.png
+share/mplayer/skins/brushedGnome/exit.png
+share/mplayer/skins/brushedGnome/font.fnt
+share/mplayer/skins/brushedGnome/font.png
+share/mplayer/skins/brushedGnome/fullscr.png
+share/mplayer/skins/brushedGnome/icon.png
+share/mplayer/skins/brushedGnome/knob.png
+share/mplayer/skins/brushedGnome/main.png
+share/mplayer/skins/brushedGnome/menu.png
+share/mplayer/skins/brushedGnome/menus.png
+share/mplayer/skins/brushedGnome/mute.png
+share/mplayer/skins/brushedGnome/next.png
+share/mplayer/skins/brushedGnome/open.png
+share/mplayer/skins/brushedGnome/pause.png
+share/mplayer/skins/brushedGnome/play.png
+share/mplayer/skins/brushedGnome/playbar3.png
+share/mplayer/skins/brushedGnome/prev.png
+share/mplayer/skins/brushedGnome/skin
+share/mplayer/skins/brushedGnome/stop.png
+share/mplayer/skins/brushedGnome/sub.png
+share/mplayer/skins/brushedGnome/symbols.fnt
+share/mplayer/skins/brushedGnome/symbols.png
 share/mplayer/skins/changuito/README
 share/mplayer/skins/changuito/VERSION
 share/mplayer/skins/changuito/button_forward.png