Hi, This diff updates neverball to the latest release 1.5.4. Tested on amd64.
Comments ? OK ? Cheers, benoit
Index: Makefile =================================================================== RCS file: /cvs/ports/games/neverball/Makefile,v retrieving revision 1.4 diff -N -u Makefile --- Makefile 10 Aug 2009 06:31:42 -0000 1.4 +++ Makefile 21 Dec 2009 13:31:57 -0000 @@ -3,33 +3,35 @@ COMMENT-main= tilt the floor to roll a ball through an obstacle course COMMENT-data= data for Neverball/Neverputt -V= 20081103 +V= 1.5.4 DISTNAME= neverball-$V -PKGNAME= neverball-$V -PKGNAME-main= neverball-$Vp1 -PKGNAME-data= neverball-data-$Vp0 -EXTRACT_SUFX= .tar.bz2 +PKGNAME= neverball-$Vv0 +PKGNAME-main= neverball-$Vv0 +PKGNAME-data= neverball-data-$Vv0 CATEGORIES= games x11 -HOMEPAGE= http://icculus.org/neverball/ -MASTER_SITES= http://openbsd.fi/distfiles/ +HOMEPAGE= http://neverball.org/ +MASTER_SITES= ${HOMEPAGE} MULTI_PACKAGES= -main -data -# GPL +MAINTAINER= Benoit Lecocq <[email protected]> + +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB-main= GL SDL X11 c iconv intl m pthread pthread-stubs xcb z +WANTLIB-main= GL SDL X11 c iconv intl m pthread z LIB_DEPENDS-main= ogg::audio/libogg \ vorbis,vorbisfile::audio/libvorbis \ jpeg::graphics/jpeg \ png::graphics/png \ - SDL_ttf::devel/sdl-ttf + SDL_ttf::devel/sdl-ttf \ + physfs::devel/physfs LIB_DEPENDS-data= RUN_DEPENDS-main= :neverball-data-$V:${BUILD_PKGPATH},-data @@ -39,25 +41,22 @@ NO_REGRESS= Yes MAKE_FLAGS= CPPFLAGS="-I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -logg -lvorbis" \ + LDFLAGS="-L${LOCALBASE}/lib -pthread -logg -lvorbis" \ INTL_LIBS="-lintl -liconv" +SUBST_VARS= V + pre-configure: - perl -pi -e 's,\./data,${PREFIX}/share/neverball/data,' \ - ${WRKSRC}/share/base_config.h - perl -pi -e 's,\./locale,${PREFIX}/share/locale,' \ - ${WRKSRC}/share/base_config.h - perl -pi -e 's,^version=".*",version=$V,' \ + ${SUBST_CMD} ${WRKSRC}/share/base_config.h ${WRKSRC}/Makefile \ ${WRKSRC}/scripts/version.sh do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} neverball neverputt ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/neverball \ ${PREFIX}/share/doc/neverball - cd ${WRKSRC} && find data ! \( -name .svn -type d -prune \) -type f \ - | pax -rw ${PREFIX}/share/neverball - cd ${WRKSRC} && find locale ! \( -name .svn -type d -prune \) -type f \ - | pax -rw ${PREFIX}/share + cd ${WRKSRC}/data && find . -type f ! -perm 644 -exec chmod 644 {} \; + cd ${WRKSRC} && find data -type f | pax -rw ${PREFIX}/share/neverball + cd ${WRKSRC} && find locale -type f | pax -rw ${PREFIX}/share cd ${WRKSRC} && ${INSTALL_DATA} COPYING README doc/AUTHORS doc/MANUAL \ ${PREFIX}/share/doc/neverball Index: distinfo =================================================================== RCS file: /cvs/ports/games/neverball/distinfo,v retrieving revision 1.2 diff -N -u distinfo --- distinfo 14 Nov 2008 22:09:46 -0000 1.2 +++ distinfo 21 Dec 2009 13:31:57 -0000 @@ -1,5 +1,5 @@ -MD5 (neverball-20081103.tar.bz2) = QaEVortdzYSNyNT20ybDBA== -RMD160 (neverball-20081103.tar.bz2) = dsIAhZTYQpnxOQvPMHHCvEHkFdI= -SHA1 (neverball-20081103.tar.bz2) = W0fZOxPOfdb4WK3poLn/wjG6ULQ= -SHA256 (neverball-20081103.tar.bz2) = CVEecgmVQUFt3249jPPTZJWSsB3zWCFad74dz6daYmc= -SIZE (neverball-20081103.tar.bz2) = 41818625 +MD5 (neverball-1.5.4.tar.gz) = xSOw9ywgNYMTEOghFi971w== +RMD160 (neverball-1.5.4.tar.gz) = 9Ua15sEt8aEll2p+I/pVFGSAJB0= +SHA1 (neverball-1.5.4.tar.gz) = YZwifhlYvWBzjxLbvemzDJHdeac= +SHA256 (neverball-1.5.4.tar.gz) = 6jHKn27scMjmbqog186eSClf2wdzE7l2N8UDsWt7DaY= +SIZE (neverball-1.5.4.tar.gz) = 26767623 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/games/neverball/patches/patch-Makefile,v retrieving revision 1.2 diff -N -u patches/patch-Makefile --- patches/patch-Makefile 14 Nov 2008 22:09:46 -0000 1.2 +++ patches/patch-Makefile 21 Dec 2009 13:31:57 -0000 @@ -1,7 +1,18 @@ -$OpenBSD: patch-Makefile,v 1.2 2008/11/14 22:09:46 sthen Exp $ ---- Makefile.orig Mon Nov 3 22:06:36 2008 -+++ Makefile Mon Nov 3 22:47:18 2008 -@@ -16,11 +16,11 @@ endif +$OpenBSD$ +--- Makefile.orig Sun Sep 20 12:06:00 2009 ++++ Makefile Mon Dec 21 14:06:11 2009 +@@ -27,8 +27,8 @@ + # Paths (packagers might want to set DATADIR and LOCALEDIR) + + USERDIR := .neverball +-DATADIR := ./data +-LOCALEDIR := ./locale ++DATADIR := ${PREFIX}/share/neverball/data ++LOCALEDIR := ${PREFIX}/share/locale + + ifdef MINGW + USERDIR := Neverball +@@ -42,11 +42,11 @@ # Optional flags (CFLAGS, CPPFLAGS, ...) ifeq ($(DEBUG),1) Index: patches/patch-scripts_version_sh =================================================================== RCS file: patches/patch-scripts_version_sh diff -N -u patches/patch-scripts_version_sh --- /dev/null 21 Dec 2009 13:31:58 -0000 +++ patches/patch-scripts_version_sh 21 Dec 2009 13:31:57 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- scripts/version.sh.orig Sun Sep 20 12:06:00 2009 ++++ scripts/version.sh Mon Dec 21 13:59:18 2009 +@@ -9,6 +9,6 @@ + test "$svn_rev" != "exported" && echo "r$svn_rev" + } + +-version="$(svn_version || date -u +"%Y-%m-%d")" ++version=${V} + test -n "$version" && echo "$version" || echo "unknown" + Index: patches/patch-share_base_config_h =================================================================== RCS file: patches/patch-share_base_config_h diff -N -u patches/patch-share_base_config_h --- /dev/null 21 Dec 2009 13:31:58 -0000 +++ patches/patch-share_base_config_h 21 Dec 2009 13:31:57 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ +--- share/base_config.h.orig Mon Dec 21 12:03:19 2009 ++++ share/base_config.h Mon Dec 21 12:04:13 2009 +@@ -30,11 +30,11 @@ + #endif + + #ifndef CONFIG_DATA +-#define CONFIG_DATA "./data" /* Game data directory */ ++#define CONFIG_DATA "${PREFIX}/share/neverball/data" /* Game data directory */ + #endif + + #ifndef CONFIG_LOCALE +-#define CONFIG_LOCALE "./locale" /* Game localisation */ ++#define CONFIG_LOCALE "${PREFIX}/share/locale" /* Game localisation */ + #endif + + /* User config directory */ Index: pkg/PLIST-data =================================================================== RCS file: /cvs/ports/games/neverball/pkg/PLIST-data,v retrieving revision 1.1 diff -N -u pkg/PLIST-data --- pkg/PLIST-data 14 Nov 2008 22:09:46 -0000 1.1 +++ pkg/PLIST-data 21 Dec 2009 13:31:58 -0000 @@ -30,6 +30,7 @@ share/neverball/data/back/red_wht.png share/neverball/data/back/sea_land.png share/neverball/data/back/space.png +share/neverball/data/back/volcano.png share/neverball/data/ball/ share/neverball/data/ball/atom/ share/neverball/data/ball/atom/atom-glow @@ -58,21 +59,6 @@ share/neverball/data/ball/blinky/blinky-outer.sol share/neverball/data/ball/blinky/blinky.obj share/neverball/data/ball/blinky/blinky.png -share/neverball/data/ball/bonus-ball/ -share/neverball/data/ball/bonus-ball/bonus-ball -share/neverball/data/ball/bonus-ball/bonus-ball-solid.map -share/neverball/data/ball/bonus-ball/bonus-ball-solid.sol -share/neverball/data/ball/bonus-ball/bonus-ball.png -share/neverball/data/ball/bowling-ball/ -share/neverball/data/ball/bowling-ball/bowling-ball -share/neverball/data/ball/bowling-ball/bowling-ball-solid.map -share/neverball/data/ball/bowling-ball/bowling-ball-solid.sol -share/neverball/data/ball/bowling-ball/bowling-ball.png -share/neverball/data/ball/crystal-ball/ -share/neverball/data/ball/crystal-ball/crystal-ball -share/neverball/data/ball/crystal-ball/crystal-ball-solid.map -share/neverball/data/ball/crystal-ball/crystal-ball-solid.sol -share/neverball/data/ball/crystal-ball/crystal-ball.png share/neverball/data/ball/earth/ share/neverball/data/ball/earth/earth-atmos share/neverball/data/ball/earth/earth-atmos.png @@ -88,13 +74,7 @@ share/neverball/data/ball/earth/earth-outer.sol share/neverball/data/ball/earth/earth-solid.map share/neverball/data/ball/earth/earth-solid.sol -share/neverball/data/ball/eightball/ -share/neverball/data/ball/eightball/eightball -share/neverball/data/ball/eightball/eightball-solid.map -share/neverball/data/ball/eightball/eightball-solid.sol -share/neverball/data/ball/eightball/eightball.png share/neverball/data/ball/eyeball/ -share/neverball/data/ball/eyeball.png share/neverball/data/ball/eyeball/eyeball share/neverball/data/ball/eyeball/eyeball-solid.map share/neverball/data/ball/eyeball/eyeball-solid.sol @@ -140,11 +120,6 @@ share/neverball/data/ball/saturn/saturn-solid.sol share/neverball/data/ball/saturn/saturn-surface share/neverball/data/ball/saturn/saturn-surface.jpg -share/neverball/data/ball/smiley/ -share/neverball/data/ball/smiley/smiley -share/neverball/data/ball/smiley/smiley-solid.map -share/neverball/data/ball/smiley/smiley-solid.sol -share/neverball/data/ball/smiley/smiley.png share/neverball/data/ball/snowglobe/ share/neverball/data/ball/snowglobe/snowglobe-atlas share/neverball/data/ball/snowglobe/snowglobe-atlas.jpg @@ -177,8 +152,10 @@ share/neverball/data/bgm/track3.ogg share/neverball/data/bgm/track4.ogg share/neverball/data/bgm/track5.ogg +share/neverball/data/bgm/track6.ogg share/neverball/data/courses.txt share/neverball/data/gui/ +share/neverball/data/gui/ball.nbr share/neverball/data/gui/demo1.nbr share/neverball/data/gui/demo2.nbr share/neverball/data/gui/help1.jpg @@ -230,6 +207,8 @@ share/neverball/data/map-back/jupiter.sol share/neverball/data/map-back/ocean.map share/neverball/data/map-back/ocean.sol +share/neverball/data/map-back/volcano.map +share/neverball/data/map-back/volcano.sol share/neverball/data/map-ckk/ share/neverball/data/map-ckk/01.map share/neverball/data/map-ckk/01.sol @@ -464,8 +443,6 @@ share/neverball/data/map-misc/bounce.sol share/neverball/data/map-misc/bounce2.map share/neverball/data/map-misc/bounce2.sol -share/neverball/data/map-misc/canals.map -share/neverball/data/map-misc/canals.sol share/neverball/data/map-misc/checkers.map share/neverball/data/map-misc/checkers.sol share/neverball/data/map-misc/elevator.map @@ -476,8 +453,6 @@ share/neverball/data/map-misc/grow_demo.sol share/neverball/data/map-misc/groweasy.map share/neverball/data/map-misc/groweasy.sol -share/neverball/data/map-misc/hurdles.map -share/neverball/data/map-misc/hurdles.sol share/neverball/data/map-misc/ocean.map share/neverball/data/map-misc/ocean.sol share/neverball/data/map-misc/stairs.map @@ -486,6 +461,8 @@ share/neverball/data/map-misc/texture-debug.sol share/neverball/data/map-misc/thwomp1.map share/neverball/data/map-misc/thwomp1.sol +share/neverball/data/map-misc/timer-test.map +share/neverball/data/map-misc/timer-test.sol share/neverball/data/map-mym/ share/neverball/data/map-mym/assault.map share/neverball/data/map-mym/assault.sol @@ -847,12 +824,18 @@ share/neverball/data/mtrl/blue-gradient-bright share/neverball/data/mtrl/blue-gradient-bright.png share/neverball/data/mtrl/blue-gradient.png +share/neverball/data/mtrl/blue-natural +share/neverball/data/mtrl/blue-natural.png share/neverball/data/mtrl/blue-sea share/neverball/data/mtrl/blue-sea.png +share/neverball/data/mtrl/blue-wave +share/neverball/data/mtrl/blue-wave.png share/neverball/data/mtrl/blue.png share/neverball/data/mtrl/border-carpet share/neverball/data/mtrl/border-carpet.jpg share/neverball/data/mtrl/brass +share/neverball/data/mtrl/brass-faceted +share/neverball/data/mtrl/brass-faceted.jpg share/neverball/data/mtrl/brass.jpg share/neverball/data/mtrl/brick share/neverball/data/mtrl/brick-small @@ -872,6 +855,8 @@ share/neverball/data/mtrl/chrome.jpg share/neverball/data/mtrl/coin-blue share/neverball/data/mtrl/coin-blue.jpg +share/neverball/data/mtrl/coin-brown-small +share/neverball/data/mtrl/coin-brown-small.jpg share/neverball/data/mtrl/coin-green-check share/neverball/data/mtrl/coin-green-check.jpg share/neverball/data/mtrl/coin-green-check2 @@ -896,12 +881,6 @@ share/neverball/data/mtrl/coin-pad-dot-yellow.png share/neverball/data/mtrl/coin-pad-green-dark share/neverball/data/mtrl/coin-pad-green-dark.png -share/neverball/data/mtrl/coin-pad-ring-blue -share/neverball/data/mtrl/coin-pad-ring-blue.png -share/neverball/data/mtrl/coin-pad-ring-brown -share/neverball/data/mtrl/coin-pad-ring-brown.png -share/neverball/data/mtrl/coin-pad-ring-grey -share/neverball/data/mtrl/coin-pad-ring-grey.png share/neverball/data/mtrl/coin-purple share/neverball/data/mtrl/coin-purple-check share/neverball/data/mtrl/coin-purple-check.jpg @@ -992,10 +971,10 @@ share/neverball/data/mtrl/goal-special share/neverball/data/mtrl/goal-special.png share/neverball/data/mtrl/goal.png +share/neverball/data/mtrl/green share/neverball/data/mtrl/green-gas share/neverball/data/mtrl/green-gas.png -share/neverball/data/mtrl/green-glass -share/neverball/data/mtrl/green-glass.png +share/neverball/data/mtrl/green.png share/neverball/data/mtrl/hole share/neverball/data/mtrl/hole.png share/neverball/data/mtrl/invisible @@ -1102,6 +1081,8 @@ share/neverball/data/mtrl/turf-blue share/neverball/data/mtrl/turf-blue.jpg share/neverball/data/mtrl/turf-brown +share/neverball/data/mtrl/turf-brown-small +share/neverball/data/mtrl/turf-brown-small.jpg share/neverball/data/mtrl/turf-brown.jpg share/neverball/data/mtrl/turf-disco share/neverball/data/mtrl/turf-disco.jpg @@ -1165,6 +1146,8 @@ share/neverball/data/mtrl/yellow-gradient-bright share/neverball/data/mtrl/yellow-gradient-bright.png share/neverball/data/mtrl/yellow-gradient.png +share/neverball/data/mtrl/yellow-natural +share/neverball/data/mtrl/yellow-natural.png share/neverball/data/mtrl/yellow.png share/neverball/data/mtrl/zip share/neverball/data/mtrl/zip.png @@ -1199,20 +1182,45 @@ share/neverball/data/png/hills3.png share/neverball/data/png/io.png share/neverball/data/png/jupiter.png +share/neverball/data/png/lava.png +share/neverball/data/png/lava_mask3.png +share/neverball/data/png/lava_wave.png share/neverball/data/png/loops1.png share/neverball/data/png/loops2.png share/neverball/data/png/loops3.png +share/neverball/data/png/meteorite.png share/neverball/data/png/moon.png share/neverball/data/png/mount1.png share/neverball/data/png/mount2.png share/neverball/data/png/part.png share/neverball/data/png/shadow.png +share/neverball/data/png/smoke1.png +share/neverball/data/png/smoke2.png +share/neverball/data/png/smoke3.png share/neverball/data/png/space.png +share/neverball/data/png/squiggle.png share/neverball/data/png/stars1.png share/neverball/data/png/stars2.png share/neverball/data/png/stars3.png share/neverball/data/png/stars4.png share/neverball/data/png/sun.png +share/neverball/data/png/v-cloud1.png +share/neverball/data/png/v-cloud2.png +share/neverball/data/png/v-cloud3.png +share/neverball/data/png/v-cloud4.png +share/neverball/data/png/v-cloud5.png +share/neverball/data/png/v-hill1.png +share/neverball/data/png/v-hill2.png +share/neverball/data/png/v-hill3.png +share/neverball/data/png/v-hill4.png +share/neverball/data/png/v-mountains1.png +share/neverball/data/png/v-mountains2.png +share/neverball/data/png/v-mountains3.png +share/neverball/data/png/v-sun.png +share/neverball/data/png/volcano1.png +share/neverball/data/png/volcano2.png +share/neverball/data/png/volcano3.png +share/neverball/data/png/volcano4.png share/neverball/data/png/wave.png share/neverball/data/set-easy.txt share/neverball/data/set-fwp.txt @@ -1319,17 +1327,15 @@ share/neverball/data/shot-medium/zigzag.jpg share/neverball/data/shot-misc/ share/neverball/data/shot-misc/bigball-old.jpg -share/neverball/data/shot-misc/billiard.jpg +share/neverball/data/shot-misc/billiard.png share/neverball/data/shot-misc/blockers.jpg share/neverball/data/shot-misc/bounce.jpg share/neverball/data/shot-misc/bounce2.jpg -share/neverball/data/shot-misc/canals.jpg share/neverball/data/shot-misc/checkers.jpg share/neverball/data/shot-misc/elevator.jpg share/neverball/data/shot-misc/freefall-old.jpg share/neverball/data/shot-misc/grow_demo.jpg share/neverball/data/shot-misc/groweasy.png -share/neverball/data/shot-misc/hurdles.jpg share/neverball/data/shot-misc/ocean.jpg share/neverball/data/shot-misc/stairs.jpg share/neverball/data/shot-misc/thwomp1.jpg @@ -1430,4 +1436,3 @@ share/neverball/data/snd/tock.ogg share/neverball/data/ttf/ share/neverball/data/ttf/DejaVuSans-Bold.ttf -share/neverball/data/ttf/VeraBd.ttf Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/games/neverball/pkg/PLIST-main,v retrieving revision 1.1 diff -N -u pkg/PLIST-main --- pkg/PLIST-main 14 Nov 2008 22:09:46 -0000 1.1 +++ pkg/PLIST-main 21 Dec 2009 13:31:58 -0000 @@ -13,3 +13,5 @@ share/locale/fr/LC_MESSAGES/neverball.mo share/locale/lv/LC_MESSAGES/neverball.mo share/locale/nn/LC_MESSAGES/neverball.mo +share/locale/pt_BR/LC_MESSAGES/neverball.mo +share/locale/zh_CN/LC_MESSAGES/neverball.mo
