From 89607e20020b685e79d724ebad3f38a250aed32f Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 16 Aug 2005 15:35:51 +0000 Subject: Changes 3.1.1: - added tutorial level set created by Aaron Davidson - added editor element descriptions written by Aaron Davidson - added native game engine for Emerald Mine (Club) levels - added level skipping functionality to main menu - added support for dumping small-sized level sketches from editor - added use of "editorsetup.conf" for different level sets - lots of bugfixes and internal engine changes (see ChangeLog) --- games/rocksndiamonds/Makefile | 83 +++++++++++++++++++++++++++++++---- games/rocksndiamonds/Makefile.common | 71 ------------------------------ games/rocksndiamonds/PLIST | 6 +-- games/rocksndiamonds/distinfo | 17 ++++--- games/rocksndiamonds/options.mk | 28 ++++++++++++ games/rocksndiamonds/patches/patch-ab | 6 +-- games/rocksndiamonds/patches/patch-ac | 13 ++++++ games/rocksndiamonds/patches/patch-ag | 8 ++-- games/rocksndiamonds/patches/patch-ak | 6 +-- 9 files changed, 136 insertions(+), 102 deletions(-) delete mode 100644 games/rocksndiamonds/Makefile.common create mode 100644 games/rocksndiamonds/options.mk create mode 100644 games/rocksndiamonds/patches/patch-ac (limited to 'games/rocksndiamonds') diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index 1c87e882de8..32636b5f673 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -1,14 +1,79 @@ -# $NetBSD: Makefile,v 1.22 2005/01/16 19:33:27 kristerw Exp $ -# +# $NetBSD: Makefile,v 1.23 2005/08/16 15:35:51 adam Exp $ +DISTNAME= rocksndiamonds-3.1.1 +CATEGORIES= games x11 +MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ + +MAINTAINER= heinz@NetBSD.org +HOMEPAGE= http://www.artsoft.org/rocksndiamonds/ COMMENT= Game like Boulder Dash, Emerald Mine, or Sokoban (X11 build) -PKGREVISION= 1 -.include "Makefile.common" +USE_PKGINSTALL= yes +USE_TOOLS+= gmake + +INSTALLATION_DIRS= man/man6 + +PLIST_SRC= ${WRKDIR}/PLIST ../rocksndiamonds/PLIST +PLIST_SUBST+= SCORE_PATH=${SCORE_PATH} +PLIST_SUBST+= ROCK_INSTALL_DIR="${INSTALL} -d -o ${RND_USER} -g ${RND_GROUP} -m 775" -.if ${OPSYS} == "SunOS" -BUILD_TARGET= solaris -.else -BUILD_TARGET= x11 +PKG_GROUPS= ${RND_GROUP} +PKG_USERS= ${RND_USER}:${RND_GROUP} + +RND_USER= games +RND_GROUP= games + +.if ( ${MACHINE} == "i386" || ${MACHINE} == "prep" || ${MACHINE} == "cats" || \ + ${MACHINE} == "shark" ) +MAKE_ENV+= HAVE_JOYSTICK=1 .endif -CONFLICTS= rocksndiamonds-sdl-[1-9]* + +#.if ${OPSYS} == "SunOS" +#BUILD_TARGET= solaris +#.else +#BUILD_TARGET= x11 +#.endif + +.include "options.mk" + +SCORE_PATH= ${VARBASE}/games/rocksndiamonds + +pre-configure: + @${SED} -e "s,@SCORE_PATH@,${SCORE_PATH},g" \ + ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.fixed && \ + ${MV} ${WRKSRC}/Makefile.fixed ${WRKSRC}/Makefile + +do-install: + ${INSTALL_PROGRAM} -o ${RND_USER} -g ${RND_GROUP} -m 2755 \ + ${WRKSRC}/rocksndiamonds ${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 \ + ${PREFIX}/man/man6/rocksndiamonds.6 + ${INSTALL_DATA_DIR} ${PREFIX}/share/rocksndiamonds + cd ${WRKSRC} && ${PAX} -rw sounds graphics levels music \ + ${PREFIX}/share/rocksndiamonds/ + ${CHOWN} -R ${RND_USER}:${RND_GROUP} ${PREFIX}/share/rocksndiamonds + ${CHMOD} -R a-w ${PREFIX}/share/rocksndiamonds + ${INSTALL_DATA_DIR} ${SCORE_PATH}/scores + ${CHMOD} 755 ${SCORE_PATH} + ${CHMOD} 775 ${SCORE_PATH}/scores + # extract basenames of level subdirectories, levelinfo.conf is a file + LEVELDIRS=`${LS} -d ${WRKSRC}/levels/*/* | \ + ${SED} -e 's@^.*/\([^/]*\)$$@\1@' -e '/levelinfo\.conf/d'` && \ + for directory in $${LEVELDIRS}; do \ + ${INSTALL_DATA_DIR} ${SCORE_PATH}/scores/$${directory}; \ + ${CHMOD} 775 ${SCORE_PATH}/scores/$${directory}; \ + done + ${CHOWN} -R ${RND_USER}:${RND_GROUP} ${SCORE_PATH} + # auto-generated PLIST + ${RM} -f ${WRKDIR}/PLIST +.for levdir in Classic_Games Tutorials + cd ${PREFIX} && \ + ${FIND} share/rocksndiamonds/levels/${levdir} -type f -print >>${WRKDIR}/PLIST +.endfor +.for directory in graphics music sounds + cd ${PREFIX} && \ + ${FIND} share/rocksndiamonds/${directory} -type f -print >>${WRKDIR}/PLIST +.endfor + +.include "../../mk/x11.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/games/rocksndiamonds/Makefile.common b/games/rocksndiamonds/Makefile.common deleted file mode 100644 index 2b957606ae3..00000000000 --- a/games/rocksndiamonds/Makefile.common +++ /dev/null @@ -1,71 +0,0 @@ -# $NetBSD: Makefile.common,v 1.14 2005/06/01 18:02:52 jlam Exp $ - -DISTNAME= rocksndiamonds-3.1.0 -CATEGORIES= games x11 -MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ - -MAINTAINER= heinz@NetBSD.org -HOMEPAGE= http://www.artsoft.org/rocksndiamonds/ - -USE_TOOLS+= gmake -USE_PKGINSTALL= YES - -INSTALLATION_DIRS= man/man6 - -PLIST_SRC= ${WRKDIR}/PLIST ../rocksndiamonds/PLIST -PLIST_SUBST+= SCORE_PATH=${SCORE_PATH} -PLIST_SUBST+= ROCK_INSTALL_DIR="${INSTALL} -d -o ${RND_USER} -g ${RND_GROUP} -m 775" - -PKG_GROUPS= ${RND_GROUP} -PKG_USERS= ${RND_USER}:${RND_GROUP} - -RND_USER= games -RND_GROUP= games - -.if ( ${MACHINE} == "i386" || ${MACHINE} == "prep" || ${MACHINE} == "cats" || \ - ${MACHINE} == "shark" ) -MAKE_ENV+= HAVE_JOYSTICK=1 -.endif - -SCORE_PATH= ${VARBASE}/games/rocksndiamonds - -.include "../../mk/x11.buildlink3.mk" - -pre-configure: - @${SED} -e "s,@SCORE_PATH@,${SCORE_PATH},g" \ - ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.fixed && \ - ${MV} ${WRKSRC}/Makefile.fixed ${WRKSRC}/Makefile - -do-install: - ${INSTALL_PROGRAM} -o ${RND_USER} -g ${RND_GROUP} -m 2755 \ - ${WRKSRC}/rocksndiamonds ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 \ - ${PREFIX}/man/man6/rocksndiamonds.6 - ${INSTALL_DATA_DIR} ${PREFIX}/share/rocksndiamonds - cd ${WRKSRC} && ${PAX} -rw sounds graphics levels music \ - ${PREFIX}/share/rocksndiamonds/ - ${CHOWN} -R ${RND_USER}:${RND_GROUP} ${PREFIX}/share/rocksndiamonds - ${CHMOD} -R a-w ${PREFIX}/share/rocksndiamonds - ${INSTALL_DATA_DIR} ${SCORE_PATH}/scores - ${CHMOD} 755 ${SCORE_PATH} - ${CHMOD} 775 ${SCORE_PATH}/scores - # extract basenames of level subdirectories, levelinfo.conf is a file - LEVELDIRS=`${LS} -d ${WRKSRC}/levels/*/* | \ - ${SED} -e 's@^.*/\([^/]*\)$$@\1@' -e '/levelinfo\.conf/d'` && \ - for directory in $${LEVELDIRS}; do \ - ${INSTALL_DATA_DIR} ${SCORE_PATH}/scores/$${directory}; \ - ${CHMOD} 775 ${SCORE_PATH}/scores/$${directory}; \ - done - ${CHOWN} -R ${RND_USER}:${RND_GROUP} ${SCORE_PATH} - # auto-generated PLIST - ${RM} -f ${WRKDIR}/PLIST -.for levdir in Classic_Games Tutorials - cd ${PREFIX} && \ - ${FIND} share/rocksndiamonds/levels/${levdir} -type f -print >>${WRKDIR}/PLIST -.endfor -.for directory in graphics music sounds - cd ${PREFIX} && \ - ${FIND} share/rocksndiamonds/${directory} -type f -print >>${WRKDIR}/PLIST -.endfor - -.include "../../mk/bsd.pkg.mk" diff --git a/games/rocksndiamonds/PLIST b/games/rocksndiamonds/PLIST index ddc6674c870..69a06474527 100644 --- a/games/rocksndiamonds/PLIST +++ b/games/rocksndiamonds/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/12/22 16:46:19 reed Exp $ +@comment $NetBSD: PLIST,v 1.8 2005/08/16 15:35:51 adam Exp $ bin/rocksndiamonds man/man6/rocksndiamonds.6 @dirrm share/rocksndiamonds/sounds/snd_classic @@ -7,7 +7,8 @@ man/man6/rocksndiamonds.6 @dirrm share/rocksndiamonds/music @dirrm share/rocksndiamonds/levels/Tutorials/rnd_tutorial_niko_boehm/tapes @dirrm share/rocksndiamonds/levels/Tutorials/rnd_tutorial_niko_boehm -@dirrm share/rocksndiamonds/levels/Tutorials/rnd_tutorial +@dirrm share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/tapes +@dirrm share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson @dirrm share/rocksndiamonds/levels/Tutorials @dirrm share/rocksndiamonds/levels/Classic_Games/classic_supaplex/music @dirrm share/rocksndiamonds/levels/Classic_Games/classic_supaplex @@ -18,7 +19,6 @@ man/man6/rocksndiamonds.6 @dirrm share/rocksndiamonds/levels/Classic_Games @dirrm share/rocksndiamonds/levels @dirrm share/rocksndiamonds/graphics/gfx_classic -@dirrm share/rocksndiamonds/graphics/gfx_animal_kingdom @dirrm share/rocksndiamonds/graphics @dirrm share/rocksndiamonds @exec ${ROCK_INSTALL_DIR} ${SCORE_PATH} diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo index 84c83197192..edc65fb9ffe 100644 --- a/games/rocksndiamonds/distinfo +++ b/games/rocksndiamonds/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.17 2005/02/23 23:12:02 agc Exp $ +$NetBSD: distinfo,v 1.18 2005/08/16 15:35:51 adam Exp $ -SHA1 (rocksndiamonds-3.1.0.tar.gz) = a6e015cb0a513041da113f84fc1c3cba5fd59580 -RMD160 (rocksndiamonds-3.1.0.tar.gz) = 79ad4cf3efb4108627b60b1e3072e5be864a9099 -Size (rocksndiamonds-3.1.0.tar.gz) = 3004476 bytes -SHA1 (rnd-contrib-1.0.0.tar.gz) = 9b55ae5865575ba76a90353b1b3883ef3950d792 -Size (rnd-contrib-1.0.0.tar.gz) = 3389242 bytes +SHA1 (rocksndiamonds-3.1.1.tar.gz) = c350316f74f036404352bd3925c73c1c10260a2c +RMD160 (rocksndiamonds-3.1.1.tar.gz) = cd589eb8ec8819a562f08b8aed7d5201a531df77 +Size (rocksndiamonds-3.1.1.tar.gz) = 3122766 bytes SHA1 (patch-aa) = 824bf9ef3ee1335a8a412d4cfd3bbf7ea13d3f46 -SHA1 (patch-ab) = 44f8c17ac22fa755e5363f2dfb3bd143c401112a -SHA1 (patch-ag) = 8a80c7d96e508b66ec2ff998f65cbf1b4db45815 +SHA1 (patch-ab) = 7bcd534d22c2ffef4ca0f32e772cd108ed18ecf3 +SHA1 (patch-ac) = 9cbf5ff897cae129455081c941d7ae355b525d1b +SHA1 (patch-ag) = c9c500490948a03b6f5e2fa409f52112edbf7e92 SHA1 (patch-ah) = 584b406eef29b2849f7fc42181a7b9f29e6c9c69 -SHA1 (patch-ak) = 9b7f80aade2ae4d542640c94fde4803f9c5441c8 +SHA1 (patch-ak) = c3218874428731601c90d142b9f327002d6a5fdd diff --git a/games/rocksndiamonds/options.mk b/games/rocksndiamonds/options.mk new file mode 100644 index 00000000000..2f1640ff695 --- /dev/null +++ b/games/rocksndiamonds/options.mk @@ -0,0 +1,28 @@ +# $NetBSD: options.mk,v 1.1 2005/08/16 15:35:51 adam Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.rocksndiamonds +PKG_SUPPORTED_OPTIONS= sdl x11 +PKG_SUGGESTED_OPTIONS= sdl + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Msdl) +.if ${OPSYS} == "Solaris" +BUILD_TARGET= solaris-sdl +.else +BUILD_TARGET= sdl +.endif +.include "../../audio/SDL_mixer/buildlink3.mk" +.include "../../graphics/SDL_image/buildlink3.mk" +.include "../../net/SDL_net/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Mx11) +.if ${OPSYS} == "Solaris" +BUILD_TARGET= solaris +.else +BUILD_TARGET= x11 +.endif +.include "../../mk/ossaudio.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" +.endif diff --git a/games/rocksndiamonds/patches/patch-ab b/games/rocksndiamonds/patches/patch-ab index 81598ced889..c4c6671544c 100644 --- a/games/rocksndiamonds/patches/patch-ab +++ b/games/rocksndiamonds/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.7 2004/11/03 15:14:17 adam Exp $ +$NetBSD: patch-ab,v 1.8 2005/08/16 15:35:51 adam Exp $ ---- src/Makefile.orig 2004-06-06 23:57:02.000000000 +0000 +--- src/Makefile.orig 2005-08-15 22:09:24.000000000 +0000 +++ src/Makefile @@ -21,8 +21,9 @@ endif ifdef X11_PATH # path to X11 specified by top level Makefile @@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.7 2004/11/03 15:14:17 adam Exp $ endif AR = ar -@@ -134,8 +135,10 @@ ifdef BUILD_DIST # distribution build +@@ -141,8 +142,10 @@ ifdef BUILD_DIST # distribution build OPTIONS = -O3 -Wall endif diff --git a/games/rocksndiamonds/patches/patch-ac b/games/rocksndiamonds/patches/patch-ac new file mode 100644 index 00000000000..d453a0b5685 --- /dev/null +++ b/games/rocksndiamonds/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.4 2005/08/16 15:35:51 adam Exp $ + +--- src/game_em/sound.c.orig 2005-08-16 17:27:37.000000000 +0000 ++++ src/game_em/sound.c +@@ -16,7 +16,7 @@ + #endif + + #ifdef PLATFORM_BSD +-#include ++#include + #include + #endif + diff --git a/games/rocksndiamonds/patches/patch-ag b/games/rocksndiamonds/patches/patch-ag index a0a5593d8f0..758bf0df842 100644 --- a/games/rocksndiamonds/patches/patch-ag +++ b/games/rocksndiamonds/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.3 2002/10/19 20:06:46 heinz Exp $ +$NetBSD: patch-ag,v 1.4 2005/08/16 15:35:51 adam Exp $ ---- src/libgame/joystick.c.orig Mon Jul 22 01:13:43 2002 +--- src/libgame/joystick.c.orig 2005-07-23 19:10:58.000000000 +0000 +++ src/libgame/joystick.c @@ -11,12 +11,13 @@ * joystick.c * @@ -18,7 +18,7 @@ $NetBSD: patch-ag,v 1.3 2002/10/19 20:06:46 heinz Exp $ /* ========================================================================= */ -@@ -60,7 +61,7 @@ +@@ -68,7 +69,7 @@ void UnixInitJoysticks() boolean UnixReadJoystick(int fd, int *x, int *y, boolean *b1, boolean *b2) { @@ -27,7 +27,7 @@ $NetBSD: patch-ag,v 1.3 2002/10/19 20:06:46 heinz Exp $ struct joystick joy_ctrl; #else struct joystick_control -@@ -79,7 +80,7 @@ +@@ -87,7 +88,7 @@ boolean UnixReadJoystick(int fd, int *x, if (y != NULL) *y = joy_ctrl.y; diff --git a/games/rocksndiamonds/patches/patch-ak b/games/rocksndiamonds/patches/patch-ak index 3f15d7491aa..1216357701c 100644 --- a/games/rocksndiamonds/patches/patch-ak +++ b/games/rocksndiamonds/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.4 2004/11/03 15:14:18 adam Exp $ +$NetBSD: patch-ak,v 1.5 2005/08/16 15:35:51 adam Exp $ ---- src/libgame/system.c.orig 2004-04-27 23:14:34.000000000 +0000 +--- src/libgame/system.c.orig 2005-06-27 20:26:12.000000000 +0000 +++ src/libgame/system.c -@@ -1190,10 +1190,14 @@ inline void InitJoysticks() +@@ -1279,10 +1279,14 @@ inline void InitJoysticks() return; /* joysticks generally deactivated by compile-time directive */ #endif -- cgit v1.2.3