Sun Nov 22 19:30:33 2015 UTC ()
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@


(leot)
diff -r1.128 -r1.129 pkgsrc/multimedia/gmplayer/Makefile
diff -r1.11 -r1.12 pkgsrc/multimedia/gmplayer/PLIST
cvs diff -r1.128 -r1.129 pkgsrc/multimedia/gmplayer/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/gmplayer/Makefile 2015/11/22 15:38:56 1.128
+++ pkgsrc/multimedia/gmplayer/Makefile 2015/11/22 19:30:33 1.129
@@ -1,45 +1,41 @@ @@ -1,45 +1,41 @@
1# $NetBSD: Makefile,v 1.128 2015/11/22 15:38:56 martin Exp $ 1# $NetBSD: Makefile,v 1.129 2015/11/22 19:30:33 leot Exp $
2# 2#
3# NOTE: if you are updating both mplayer and gmplayer, you must ensure 3# NOTE: if you are updating both mplayer and gmplayer, you must ensure
4# that *both* distinfo files contain the correct, up-to-date files and 4# that *both* distinfo files contain the correct, up-to-date files and
5# checksums. 5# checksums.
6# 6#
7# NOTE: patches are shared between mplayer and gmplayer! 7# NOTE: patches are shared between mplayer and gmplayer!
8# 8#
9 9
10PKGNAME= gmplayer-${MPLAYER_VERSION} 10PKGNAME= gmplayer-${MPLAYER_VERSION}
11PKGREVISION= 1 11PKGREVISION= 2
12 12
13SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \ 13SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \
14 http://www2.mplayerhq.hu/MPlayer/skins/ \ 14 http://www2.mplayerhq.hu/MPlayer/skins/ \
15 ftp://ftp1.mplayerhq.hu/MPlayer/skins/ \ 15 ftp://ftp1.mplayerhq.hu/MPlayer/skins/ \
16 ftp://ftp2.mplayerhq.hu/MPlayer/skins/ \ 16 ftp://ftp2.mplayerhq.hu/MPlayer/skins/ \
17 http://ftp5.mplayerhq.hu/MPlayer/skins/ \ 17 http://ftp5.mplayerhq.hu/MPlayer/skins/ \
18 ftp://ftp5.mplayerhq.hu/MPlayer/skins/ 18 ftp://ftp5.mplayerhq.hu/MPlayer/skins/
19 19
20.include "../../multimedia/mplayer-share/Makefile.common" 20.include "../../multimedia/mplayer-share/Makefile.common"
21SKIN_EXTRACT_SUFX= .tar.bz2 21SKIN_EXTRACT_SUFX= .tar.bz2
22 22
23.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 23.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
24BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm 24BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
25.endif 25.endif
26 26
27COMMENT= Fast, cross-platform movie player with GTK2+ interface 27COMMENT= Fast, cross-platform movie player with GTK2+ interface
28 28
29# This one does not work with the current version, re-add once it 
30# gets fixed... 
31# brushedGnome-1.0${SKIN_EXTRACT_SUFX} 
32 
33SKINS+= Abyss-1.7${SKIN_EXTRACT_SUFX} \ 29SKINS+= Abyss-1.7${SKIN_EXTRACT_SUFX} \
34 AlienMind-1.2${SKIN_EXTRACT_SUFX} \ 30 AlienMind-1.2${SKIN_EXTRACT_SUFX} \
35 Blue-1.11${SKIN_EXTRACT_SUFX} \ 31 Blue-1.11${SKIN_EXTRACT_SUFX} \
36 BlueHeart-1.5${SKIN_EXTRACT_SUFX} \ 32 BlueHeart-1.5${SKIN_EXTRACT_SUFX} \
37 Blue-small-1.8${SKIN_EXTRACT_SUFX} \ 33 Blue-small-1.8${SKIN_EXTRACT_SUFX} \
38 Canary-1.2${SKIN_EXTRACT_SUFX} \ 34 Canary-1.2${SKIN_EXTRACT_SUFX} \
39 Clearlooks-1.7${SKIN_EXTRACT_SUFX} \ 35 Clearlooks-1.7${SKIN_EXTRACT_SUFX} \
40 CornerMP-1.2${SKIN_EXTRACT_SUFX} \ 36 CornerMP-1.2${SKIN_EXTRACT_SUFX} \
41 CornerMP-aqua-1.4${SKIN_EXTRACT_SUFX} \ 37 CornerMP-aqua-1.4${SKIN_EXTRACT_SUFX} \
42 Corelian-1.2${SKIN_EXTRACT_SUFX} \ 38 Corelian-1.2${SKIN_EXTRACT_SUFX} \
43 CubicPlayer-1.1${SKIN_EXTRACT_SUFX} \ 39 CubicPlayer-1.1${SKIN_EXTRACT_SUFX} \
44 Cyrus-1.2${SKIN_EXTRACT_SUFX} \ 40 Cyrus-1.2${SKIN_EXTRACT_SUFX} \
45 DVDPlayer-1.1${SKIN_EXTRACT_SUFX} \ 41 DVDPlayer-1.1${SKIN_EXTRACT_SUFX} \
@@ -52,26 +48,27 @@ SKINS+= Abyss-1.7${SKIN_EXTRACT_SUFX}  @@ -52,26 +48,27 @@ SKINS+= Abyss-1.7${SKIN_EXTRACT_SUFX}
52 MidnightLove-1.6${SKIN_EXTRACT_SUFX} \ 48 MidnightLove-1.6${SKIN_EXTRACT_SUFX} \
53 OSX-Brushed-2.3${SKIN_EXTRACT_SUFX} \ 49 OSX-Brushed-2.3${SKIN_EXTRACT_SUFX} \
54 OSX-Mod-1.1${SKIN_EXTRACT_SUFX} \ 50 OSX-Mod-1.1${SKIN_EXTRACT_SUFX} \
55 OpenDoh-1.1${SKIN_EXTRACT_SUFX} \ 51 OpenDoh-1.1${SKIN_EXTRACT_SUFX} \
56 Orange-1.3${SKIN_EXTRACT_SUFX} \ 52 Orange-1.3${SKIN_EXTRACT_SUFX} \
57 PowerPlayer-1.1${SKIN_EXTRACT_SUFX} \ 53 PowerPlayer-1.1${SKIN_EXTRACT_SUFX} \
58 QPlayer-1.2${SKIN_EXTRACT_SUFX} \ 54 QPlayer-1.2${SKIN_EXTRACT_SUFX} \
59 QuickSilver-1.0${SKIN_EXTRACT_SUFX} \ 55 QuickSilver-1.0${SKIN_EXTRACT_SUFX} \
60 Terminator3-1.1${SKIN_EXTRACT_SUFX} \ 56 Terminator3-1.1${SKIN_EXTRACT_SUFX} \
61 WMP6-2.2${SKIN_EXTRACT_SUFX} \ 57 WMP6-2.2${SKIN_EXTRACT_SUFX} \
62 XFce4-1.0${SKIN_EXTRACT_SUFX} \ 58 XFce4-1.0${SKIN_EXTRACT_SUFX} \
63 avifile-1.7${SKIN_EXTRACT_SUFX} \ 59 avifile-1.7${SKIN_EXTRACT_SUFX} \
64 bluecurve-1.3${SKIN_EXTRACT_SUFX} \ 60 bluecurve-1.3${SKIN_EXTRACT_SUFX} \
 61 brushedGnome-1.0${SKIN_EXTRACT_SUFX} \
65 changuito-0.2${SKIN_EXTRACT_SUFX} \ 62 changuito-0.2${SKIN_EXTRACT_SUFX} \
66 clearplayer-0.9${SKIN_EXTRACT_SUFX} \ 63 clearplayer-0.9${SKIN_EXTRACT_SUFX} \
67 disappearer-1.2${SKIN_EXTRACT_SUFX} \ 64 disappearer-1.2${SKIN_EXTRACT_SUFX} \
68 divxplayer-1.3${SKIN_EXTRACT_SUFX} \ 65 divxplayer-1.3${SKIN_EXTRACT_SUFX} \
69 gnome-1.1${SKIN_EXTRACT_SUFX} \ 66 gnome-1.1${SKIN_EXTRACT_SUFX} \
70 handheld-1.0${SKIN_EXTRACT_SUFX} \ 67 handheld-1.0${SKIN_EXTRACT_SUFX} \
71 hayraphon-1.0${SKIN_EXTRACT_SUFX} \ 68 hayraphon-1.0${SKIN_EXTRACT_SUFX} \
72 hwswskin-1.3${SKIN_EXTRACT_SUFX} \ 69 hwswskin-1.3${SKIN_EXTRACT_SUFX} \
73 iTunes-1.1${SKIN_EXTRACT_SUFX} \ 70 iTunes-1.1${SKIN_EXTRACT_SUFX} \
74 iTunes-mini-1.1${SKIN_EXTRACT_SUFX} \ 71 iTunes-mini-1.1${SKIN_EXTRACT_SUFX} \
75 krystal-1.1${SKIN_EXTRACT_SUFX} \ 72 krystal-1.1${SKIN_EXTRACT_SUFX} \
76 mentalic-1.3${SKIN_EXTRACT_SUFX} \ 73 mentalic-1.3${SKIN_EXTRACT_SUFX} \
77 mini-0.1${SKIN_EXTRACT_SUFX} \ 74 mini-0.1${SKIN_EXTRACT_SUFX} \
@@ -99,39 +96,48 @@ SKINS+= Abyss-1.7${SKIN_EXTRACT_SUFX}  @@ -99,39 +96,48 @@ SKINS+= Abyss-1.7${SKIN_EXTRACT_SUFX}
99 xanim-1.7${SKIN_EXTRACT_SUFX} \ 96 xanim-1.7${SKIN_EXTRACT_SUFX} \
100 xine-lcd-1.2${SKIN_EXTRACT_SUFX} \ 97 xine-lcd-1.2${SKIN_EXTRACT_SUFX} \
101 xmmplayer-1.5${SKIN_EXTRACT_SUFX} 98 xmmplayer-1.5${SKIN_EXTRACT_SUFX}
102 99
103.for skin in ${SKINS} 100.for skin in ${SKINS}
104SITES.${skin}= ${SKIN_SITES} 101SITES.${skin}= ${SKIN_SITES}
105.endfor 102.endfor
106 103
107DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} 104DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
108DISTFILES+= ${SKINS} 105DISTFILES+= ${SKINS}
109DISTINFO_FILE= ${.CURDIR}/distinfo 106DISTINFO_FILE= ${.CURDIR}/distinfo
110DIST_SUBDIR= mplayer 107DIST_SUBDIR= mplayer
111 108
112USE_TOOLS+= bzcat gtar pkg-config 109USE_TOOLS+= pax pkg-config
113CONFIGURE_ARGS+= --enable-gui --disable-mencoder \ 110CONFIGURE_ARGS+= --enable-gui --disable-mencoder \
114 --confdir=${PREFIX}/share/mplayer 111 --confdir=${PREFIX}/share/mplayer
115CONFIGURE_ARGS+= --enable-xvmc 112CONFIGURE_ARGS+= --enable-xvmc
116 113
 114# XXX: fix a typo in brushedGnome-1.0 skin otherwise it fails to load with:
 115# XXX: Error in skin config file at line 61: Unknown message 'evEqualeaser'
 116SUBST_CLASSES+= skins
 117SUBST_STAGE.skins= pre-patch
 118SUBST_MESSAGE.skins= Fixing typo in brushedGnome-1.0 skin
 119SUBST_FILES.skins= ${WRKDIR}/brushedGnome/skin
 120SUBST_SED.skins= -e 's/evEqualeaser/evEqualizer/'
 121
117INSTALLATION_DIRS= bin share/mplayer/skins 122INSTALLATION_DIRS= bin share/mplayer/skins
118 123
119do-install: 124do-install:
120 ${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${DESTDIR}${PREFIX}/bin/gmplayer 125 ${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${DESTDIR}${PREFIX}/bin/gmplayer
121.for skin in ${SKINS} 126.for skin in ${SKINS}
122 @${ECHO_MSG} "Installing skin ${skin}..." 127 ( cd ${WRKDIR} && \
123 ${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${skin} | \ 128 ${PAX} -rw ${skin:C/-[0-9]+.[0-9]+${SKIN_EXTRACT_SUFX}//} \
124 ${GTAR} xCmf ${DESTDIR}${PREFIX}/share/mplayer/skins - 129 ${DESTDIR}${PREFIX}/share/mplayer/skins \
 130 )
125.endfor 131.endfor
126 ${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/mplayer/skins 132 ${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/mplayer/skins
127 ${RM} -f ${DESTDIR}${PREFIX}/share/mplayer/skins/default 133 ${RM} -f ${DESTDIR}${PREFIX}/share/mplayer/skins/default
128 ${LN} -s Blue ${DESTDIR}${PREFIX}/share/mplayer/skins/default 134 ${LN} -s Blue ${DESTDIR}${PREFIX}/share/mplayer/skins/default
129 ${RM} -rf ${DESTDIR}${PREFIX}/share/mplayer/skins/Blue/.svn 135 ${RM} -rf ${DESTDIR}${PREFIX}/share/mplayer/skins/Blue/.svn
130 ${RM} -rf ${DESTDIR}${PREFIX}/share/mplayer/skins/Blue/icons/.svn 136 ${RM} -rf ${DESTDIR}${PREFIX}/share/mplayer/skins/Blue/icons/.svn
131 ${RM} -f ${DESTDIR}${PREFIX}/share/mplayer/skins/disappearer/volume/generate_pot.c 137 ${RM} -f ${DESTDIR}${PREFIX}/share/mplayer/skins/disappearer/volume/generate_pot.c
132 ${RM} -f ${DESTDIR}${PREFIX}/share/mplayer/skins/disappearer/volume/make.sh 138 ${RM} -f ${DESTDIR}${PREFIX}/share/mplayer/skins/disappearer/volume/make.sh
133 ${RM} -f ${DESTDIR}${PREFIX}/share/mplayer/skins/disappearer/volume/spec 139 ${RM} -f ${DESTDIR}${PREFIX}/share/mplayer/skins/disappearer/volume/spec
134 140
135.include "../../devel/glib2/buildlink3.mk" 141.include "../../devel/glib2/buildlink3.mk"
136.include "../../x11/libXScrnSaver/buildlink3.mk" 142.include "../../x11/libXScrnSaver/buildlink3.mk"
137.include "../../multimedia/libdvdnav/buildlink3.mk" 143.include "../../multimedia/libdvdnav/buildlink3.mk"
cvs diff -r1.11 -r1.12 pkgsrc/multimedia/gmplayer/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/gmplayer/PLIST 2015/11/22 16:00:26 1.11
+++ pkgsrc/multimedia/gmplayer/PLIST 2015/11/22 19:30:33 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.11 2015/11/22 16:00:26 martin Exp $ 1@comment $NetBSD: PLIST,v 1.12 2015/11/22 19:30:33 leot Exp $
2bin/gmplayer 2bin/gmplayer
3share/mplayer/skins/Abyss/README 3share/mplayer/skins/Abyss/README
4share/mplayer/skins/Abyss/VERSION 4share/mplayer/skins/Abyss/VERSION
5share/mplayer/skins/Abyss/bal-button.png 5share/mplayer/skins/Abyss/bal-button.png
6share/mplayer/skins/Abyss/balance.png 6share/mplayer/skins/Abyss/balance.png
7share/mplayer/skins/Abyss/barequ.png 7share/mplayer/skins/Abyss/barequ.png
8share/mplayer/skins/Abyss/barexit.png 8share/mplayer/skins/Abyss/barexit.png
9share/mplayer/skins/Abyss/barffwd.png 9share/mplayer/skins/Abyss/barffwd.png
10share/mplayer/skins/Abyss/barfs.png 10share/mplayer/skins/Abyss/barfs.png
11share/mplayer/skins/Abyss/barfwd.png 11share/mplayer/skins/Abyss/barfwd.png
12share/mplayer/skins/Abyss/barmute.png 12share/mplayer/skins/Abyss/barmute.png
13share/mplayer/skins/Abyss/barpl.png 13share/mplayer/skins/Abyss/barpl.png
14share/mplayer/skins/Abyss/barplay.png 14share/mplayer/skins/Abyss/barplay.png
@@ -969,26 +969,52 @@ share/mplayer/skins/bluecurve/menu.png @@ -969,26 +969,52 @@ share/mplayer/skins/bluecurve/menu.png
969share/mplayer/skins/bluecurve/menubutt.png 969share/mplayer/skins/bluecurve/menubutt.png
970share/mplayer/skins/bluecurve/menus.png 970share/mplayer/skins/bluecurve/menus.png
971share/mplayer/skins/bluecurve/next.png 971share/mplayer/skins/bluecurve/next.png
972share/mplayer/skins/bluecurve/pause.png 972share/mplayer/skins/bluecurve/pause.png
973share/mplayer/skins/bluecurve/play.png 973share/mplayer/skins/bluecurve/play.png
974share/mplayer/skins/bluecurve/plb.png 974share/mplayer/skins/bluecurve/plb.png
975share/mplayer/skins/bluecurve/pos.png 975share/mplayer/skins/bluecurve/pos.png
976share/mplayer/skins/bluecurve/prev.png 976share/mplayer/skins/bluecurve/prev.png
977share/mplayer/skins/bluecurve/skin 977share/mplayer/skins/bluecurve/skin
978share/mplayer/skins/bluecurve/stop.png 978share/mplayer/skins/bluecurve/stop.png
979share/mplayer/skins/bluecurve/sub.png 979share/mplayer/skins/bluecurve/sub.png
980share/mplayer/skins/bluecurve/symbols.fnt 980share/mplayer/skins/bluecurve/symbols.fnt
981share/mplayer/skins/bluecurve/symbols.png 981share/mplayer/skins/bluecurve/symbols.png
 982share/mplayer/skins/brushedGnome/README
 983share/mplayer/skins/brushedGnome/VERSION
 984share/mplayer/skins/brushedGnome/about.png
 985share/mplayer/skins/brushedGnome/double.png
 986share/mplayer/skins/brushedGnome/dvd.png
 987share/mplayer/skins/brushedGnome/exit.png
 988share/mplayer/skins/brushedGnome/font.fnt
 989share/mplayer/skins/brushedGnome/font.png
 990share/mplayer/skins/brushedGnome/fullscr.png
 991share/mplayer/skins/brushedGnome/icon.png
 992share/mplayer/skins/brushedGnome/knob.png
 993share/mplayer/skins/brushedGnome/main.png
 994share/mplayer/skins/brushedGnome/menu.png
 995share/mplayer/skins/brushedGnome/menus.png
 996share/mplayer/skins/brushedGnome/mute.png
 997share/mplayer/skins/brushedGnome/next.png
 998share/mplayer/skins/brushedGnome/open.png
 999share/mplayer/skins/brushedGnome/pause.png
 1000share/mplayer/skins/brushedGnome/play.png
 1001share/mplayer/skins/brushedGnome/playbar3.png
 1002share/mplayer/skins/brushedGnome/prev.png
 1003share/mplayer/skins/brushedGnome/skin
 1004share/mplayer/skins/brushedGnome/stop.png
 1005share/mplayer/skins/brushedGnome/sub.png
 1006share/mplayer/skins/brushedGnome/symbols.fnt
 1007share/mplayer/skins/brushedGnome/symbols.png
982share/mplayer/skins/changuito/README 1008share/mplayer/skins/changuito/README
983share/mplayer/skins/changuito/VERSION 1009share/mplayer/skins/changuito/VERSION
984share/mplayer/skins/changuito/button_forward.png 1010share/mplayer/skins/changuito/button_forward.png
985share/mplayer/skins/changuito/button_play.png 1011share/mplayer/skins/changuito/button_play.png
986share/mplayer/skins/changuito/button_rewind.png 1012share/mplayer/skins/changuito/button_rewind.png
987share/mplayer/skins/changuito/exit.png 1013share/mplayer/skins/changuito/exit.png
988share/mplayer/skins/changuito/font.fnt 1014share/mplayer/skins/changuito/font.fnt
989share/mplayer/skins/changuito/font.png 1015share/mplayer/skins/changuito/font.png
990share/mplayer/skins/changuito/full.png 1016share/mplayer/skins/changuito/full.png
991share/mplayer/skins/changuito/main.png 1017share/mplayer/skins/changuito/main.png
992share/mplayer/skins/changuito/pos.png 1018share/mplayer/skins/changuito/pos.png
993share/mplayer/skins/changuito/skin 1019share/mplayer/skins/changuito/skin
994share/mplayer/skins/changuito/sub.png 1020share/mplayer/skins/changuito/sub.png