Mon May 21 14:55:10 2012 UTC ()
games/xblast: Fix unicode translation error during installation

Likely a mistake, one of the "levels" source files used unicode in the
filename.  The manifest even indicated the name should have been
"reconstruction2.xal".

The post-extract hook is used to correct the filename to be as intended.
As a bonus, platforms like Linux and DragonFly can install the package
without a libarchive translation error disrupting the process.


(marino)
diff -r1.29 -r1.30 pkgsrc/games/xblast/Makefile
diff -r1.5 -r1.6 pkgsrc/games/xblast/PLIST
cvs diff -r1.29 -r1.30 pkgsrc/games/xblast/Makefile (expand / switch to unified diff)

--- pkgsrc/games/xblast/Makefile 2011/05/24 12:38:43 1.29
+++ pkgsrc/games/xblast/Makefile 2012/05/21 14:55:10 1.30
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.29 2011/05/24 12:38:43 obache Exp $ 1# $NetBSD: Makefile,v 1.30 2012/05/21 14:55:10 marino Exp $
2# 2#
3 3
4DISTNAME= xblast-2.10.4 4DISTNAME= xblast-2.10.4
 5PKGREVISION= 1
5CATEGORIES= games x11 6CATEGORIES= games x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xblast/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xblast/}
7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
8 images-2005-01-06${EXTRACT_SUFX} \ 9 images-2005-01-06${EXTRACT_SUFX} \
9 levels-2005-01-06${EXTRACT_SUFX} \ 10 levels-2005-01-06${EXTRACT_SUFX} \
10 models-2005-01-06${EXTRACT_SUFX} \ 11 models-2005-01-06${EXTRACT_SUFX} \
11 musics-2005-01-06${EXTRACT_SUFX} \ 12 musics-2005-01-06${EXTRACT_SUFX} \
12 sounds${EXTRACT_SUFX} 13 sounds${EXTRACT_SUFX}
13 14
14MAINTAINER= dsainty@NetBSD.org 15MAINTAINER= dsainty@NetBSD.org
15HOMEPAGE= http://xblast.sourceforge.net/ 16HOMEPAGE= http://xblast.sourceforge.net/
16COMMENT= 2-6 player kill the other guy with bombs game. A real blast! 17COMMENT= 2-6 player kill the other guy with bombs game. A real blast!
17LICENSE= gnu-gpl-v2 # or later 18LICENSE= gnu-gpl-v2 # or later
@@ -37,26 +38,30 @@ SUBST_CLASSES+= ossaudio @@ -37,26 +38,30 @@ SUBST_CLASSES+= ossaudio
37SUBST_STAGE.ossaudio= pre-configure 38SUBST_STAGE.ossaudio= pre-configure
38SUBST_MESSAGE.ossaudio= Linking ossaudio library 39SUBST_MESSAGE.ossaudio= Linking ossaudio library
39SUBST_FILES.ossaudio= Makefile.in 40SUBST_FILES.ossaudio= Makefile.in
40SUBST_SED.ossaudio= -e 's|xbsndsrv_LDADD =|& ${LIBOSSAUDIO}|' 41SUBST_SED.ossaudio= -e 's|xbsndsrv_LDADD =|& ${LIBOSSAUDIO}|'
41 42
42SUBST_CLASSES+= xbsndsrv 43SUBST_CLASSES+= xbsndsrv
43SUBST_STAGE.xbsndsrv= pre-configure 44SUBST_STAGE.xbsndsrv= pre-configure
44SUBST_MESSAGE.xbsndsrv= Qualify path to xbsndsrv 45SUBST_MESSAGE.xbsndsrv= Qualify path to xbsndsrv
45SUBST_FILES.xbsndsrv= x11_sound.c 46SUBST_FILES.xbsndsrv= x11_sound.c
46SUBST_SED.xbsndsrv= -e 's|"xbsndsrv"|"${PREFIX}/bin/xbsndsrv"|' 47SUBST_SED.xbsndsrv= -e 's|"xbsndsrv"|"${PREFIX}/bin/xbsndsrv"|'
47 48
48INSTALLATION_DIRS= ${PKGMANDIR}/man6 49INSTALLATION_DIRS= ${PKGMANDIR}/man6
49 50
 51post-extract:
 52 ${MV} ${WRKDIR}/levels-2005-01-06/reconstruct?on2.xal \
 53 ${WRKDIR}/levels-2005-01-06/reconstruction2.xal
 54
50pre-build: 55pre-build:
51 ${MV} ${WRKDIR}/images-2005-01-06 ${WRKSRC}/image 56 ${MV} ${WRKDIR}/images-2005-01-06 ${WRKSRC}/image
52 ${MV} ${WRKDIR}/levels-2005-01-06 ${WRKSRC}/level 57 ${MV} ${WRKDIR}/levels-2005-01-06 ${WRKSRC}/level
53 ${MV} ${WRKDIR}/models-2005-01-06 ${WRKSRC}/image/sprite 58 ${MV} ${WRKDIR}/models-2005-01-06 ${WRKSRC}/image/sprite
54 ${MV} ${WRKDIR}/sounds ${WRKSRC}/sounds 59 ${MV} ${WRKDIR}/sounds ${WRKSRC}/sounds
55 ${MV} ${WRKDIR}/musics-2005-01-06/* ${WRKSRC}/sounds 60 ${MV} ${WRKDIR}/musics-2005-01-06/* ${WRKSRC}/sounds
56 61
57post-install: 62post-install:
58 ${INSTALL_MAN} ${WRKSRC}/xblast.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/xblast.6 63 ${INSTALL_MAN} ${WRKSRC}/xblast.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/xblast.6
59 64
60BUILDLINK_DEPMETHOD.libXt?= build 65BUILDLINK_DEPMETHOD.libXt?= build
61 66
62.include "../../x11/libICE/buildlink3.mk" 67.include "../../x11/libICE/buildlink3.mk"
cvs diff -r1.5 -r1.6 pkgsrc/games/xblast/PLIST (expand / switch to unified diff)

--- pkgsrc/games/xblast/PLIST 2009/06/14 17:56:58 1.5
+++ pkgsrc/games/xblast/PLIST 2012/05/21 14:55:10 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:56:58 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.6 2012/05/21 14:55:10 marino Exp $
2bin/xblast 2bin/xblast
3bin/xbsndsrv 3bin/xbsndsrv
4man/man6/xblast.6 4man/man6/xblast.6
5share/xblast/image/Imakefile 5share/xblast/image/Imakefile
6share/xblast/image/block/EPFL_stop.ppm 6share/xblast/image/block/EPFL_stop.ppm
7share/xblast/image/block/Imakefile 7share/xblast/image/block/Imakefile
8share/xblast/image/block/air_pump.ppm 8share/xblast/image/block/air_pump.ppm
9share/xblast/image/block/bomb.ppm 9share/xblast/image/block/bomb.ppm
10share/xblast/image/block/bomb_floor.ppm 10share/xblast/image/block/bomb_floor.ppm
11share/xblast/image/block/bomb_floor_X.ppm 11share/xblast/image/block/bomb_floor_X.ppm
12share/xblast/image/block/bomb_floor_black.ppm 12share/xblast/image/block/bomb_floor_black.ppm
13share/xblast/image/block/bomb_floor_black_X.ppm 13share/xblast/image/block/bomb_floor_black_X.ppm
14share/xblast/image/block/book_shelf.ppm 14share/xblast/image/block/book_shelf.ppm
@@ -2617,27 +2617,27 @@ share/xblast/level/psykogroupycocainecra @@ -2617,27 +2617,27 @@ share/xblast/level/psykogroupycocainecra
2617share/xblast/level/pyramid.xal 2617share/xblast/level/pyramid.xal
2618share/xblast/level/pyromania.xal 2618share/xblast/level/pyromania.xal
2619share/xblast/level/pythagorus_theorem.xal 2619share/xblast/level/pythagorus_theorem.xal
2620share/xblast/level/quadrilateral_excitation.xal 2620share/xblast/level/quadrilateral_excitation.xal
2621share/xblast/level/quarter.xal 2621share/xblast/level/quarter.xal
2622share/xblast/level/quefaitlapolice.xal 2622share/xblast/level/quefaitlapolice.xal
2623share/xblast/level/quelecielestbas.xal 2623share/xblast/level/quelecielestbas.xal
2624share/xblast/level/quickdraw.xal 2624share/xblast/level/quickdraw.xal
2625share/xblast/level/random.xal 2625share/xblast/level/random.xal
2626share/xblast/level/random_field.xal 2626share/xblast/level/random_field.xal
2627share/xblast/level/rapiddeath.xal 2627share/xblast/level/rapiddeath.xal
2628share/xblast/level/raymasters.xal 2628share/xblast/level/raymasters.xal
2629share/xblast/level/reconstruction.xal 2629share/xblast/level/reconstruction.xal
2630share/xblast/level/reconstructîon2.xal 2630share/xblast/level/reconstruction2.xal
2631share/xblast/level/reincocloned.xal 2631share/xblast/level/reincocloned.xal
2632share/xblast/level/remembernokicking.xal 2632share/xblast/level/remembernokicking.xal
2633share/xblast/level/remote_quest.xal 2633share/xblast/level/remote_quest.xal
2634share/xblast/level/remotesnow.xal 2634share/xblast/level/remotesnow.xal
2635share/xblast/level/renew.xal 2635share/xblast/level/renew.xal
2636share/xblast/level/renovation_man.xal 2636share/xblast/level/renovation_man.xal
2637share/xblast/level/renovation_master.xal 2637share/xblast/level/renovation_master.xal
2638share/xblast/level/renovation_master2.xal 2638share/xblast/level/renovation_master2.xal
2639share/xblast/level/revive.xal 2639share/xblast/level/revive.xal
2640share/xblast/level/rhombus.xal 2640share/xblast/level/rhombus.xal
2641share/xblast/level/rightcurve.xal 2641share/xblast/level/rightcurve.xal
2642share/xblast/level/robbslevel.xal 2642share/xblast/level/robbslevel.xal
2643share/xblast/level/round.xal 2643share/xblast/level/round.xal