pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/rocksndiamonds rocksndiamonds: updated to 4.1.0.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/096ab1a1e9c4
branches: trunk
changeset: 310366:096ab1a1e9c4
user: adam <adam%pkgsrc.org@localhost>
date: Fri Jul 13 17:27:32 2018 +0000
description:
rocksndiamonds: updated to 4.1.0.0
4.1.0.0:
added various additional customization options to create your own games
added showing/hiding game element sections in the level editor depending on the selected game engine
added doing ?redo? by pressing ?undo? button with Ctrl or Shift key in the level editor
added new automatically saved config file for the selected zoom tile size in the level editor
moved level property ?initial wind direction? to balloon elements in editor
fixed various bugs (and probably added some new ones)
diffstat:
games/rocksndiamonds/Makefile | 76 +---------------
games/rocksndiamonds/Makefile.common | 66 ++++++++++++++
games/rocksndiamonds/distinfo | 12 +-
games/rocksndiamonds/patches/patch-src_libgame_system.c | 6 +-
4 files changed, 81 insertions(+), 79 deletions(-)
diffs (194 lines):
diff -r b2f69823a513 -r 096ab1a1e9c4 games/rocksndiamonds/Makefile
--- a/games/rocksndiamonds/Makefile Fri Jul 13 17:14:43 2018 +0000
+++ b/games/rocksndiamonds/Makefile Fri Jul 13 17:27:32 2018 +0000
@@ -1,76 +1,12 @@
-# $NetBSD: Makefile,v 1.54 2018/03/08 19:05:10 adam Exp $
-
-DISTNAME= rocksndiamonds-4.0.1.3
-CATEGORIES= games
-MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.artsoft.org/rocksndiamonds/
-COMMENT= Game like Boulder Dash, Emerald Mine, or Sokoban
-LICENSE= gnu-gpl-v2
+# $NetBSD: Makefile,v 1.55 2018/07/13 17:27:32 adam Exp $
-USE_GAMESGROUP= yes
-USE_TOOLS+= gmake
-
-INSTALLATION_DIRS+= bin
+DISTNAME= rocksndiamonds-4.1.0.0
-BUILD_DEFS+= VARBASE SCORE_PATH
-BUILD_DIRS= src
-
-SHARESUBDIR= share/rocksndiamonds
-SHAREDIR= ${PREFIX}/${SHARESUBDIR}
-SCORE_PATH= ${VARBASE}/games/rocksndiamonds
-REQD_DIRS+= ${SHARESUBDIR}
+COMMENT= Game like Boulder Dash, Emerald Mine, or Sokoban
-OWN_DIRS_PERMS+= ${SCORE_PATH:Q}
-OWN_DIRS_PERMS+= ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
-OWN_DIRS_PERMS+= ${SCORE_PATH:Q}/scores
-OWN_DIRS_PERMS+= ${GAMES_USER} ${GAMES_GROUP} 750
-OWN_DIRS_PERMS+= ${SCORE_PATH:Q}/scores/classic_boulderdash
-OWN_DIRS_PERMS+= ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
-OWN_DIRS_PERMS+= ${SCORE_PATH:Q}/scores/classic_emerald_mine
-OWN_DIRS_PERMS+= ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
-OWN_DIRS_PERMS+= ${SCORE_PATH:Q}/scores/classic_sokoban
-OWN_DIRS_PERMS+= ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
-OWN_DIRS_PERMS+= ${SCORE_PATH:Q}/scores/classic_supaplex
-OWN_DIRS_PERMS+= ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
-OWN_DIRS_PERMS+= ${SCORE_PATH:Q}/scores/rnd_tutorial_aaron_davidson
-OWN_DIRS_PERMS+= ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
-OWN_DIRS_PERMS+= ${SCORE_PATH:Q}/scores/rnd_tutorial_niko_boehm
-OWN_DIRS_PERMS+= ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "Darwin"
-SPECIAL_PERMS= bin/rocksndiamonds ${SETGID_GAMES_PERMS}
-.endif
-
-PLIST_SRC= PLIST ${WRKDIR}/PLIST.F
+LEVEL_NAMES= classic_boulderdash classic_emerald_mine classic_sokoban \
+ classic_supaplex rnd_tutorial_aaron_davidson rnd_tutorial_niko_boehm
-.if (${MACHINE} == "i386" || ${MACHINE} == "prep" || ${MACHINE} == "cats" || \
- ${MACHINE} == "shark")
-MAKE_FLAGS+= JOYSTICK=-DHAVE_JOYSTICK
-.endif
-
-MAKE_FLAGS+= RO_GAME_DIR=${PREFIX}/share/rocksndiamonds
-MAKE_FLAGS+= RW_GAME_DIR=${SCORE_PATH:Q}
-MAKE_FLAGS+= TARGET=sdl2
+.include "Makefile.common"
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${DESTDIR}${PREFIX}/bin/
- # auto-generated PLIST
- rm -f ${WRKDIR}/PLIST.F
- ${RUN} cd ${WRKSRC} && for d in sounds graphics levels music; do \
- find "$${d}" -type d -print | while read s; do \
- ${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}/"$${s}"; \
- done; \
- find "$${d}" -type f -print | while read f; do \
- ${INSTALL_DATA} "$${f}" ${DESTDIR}${SHAREDIR}/"$${f}"; \
- ${ECHO} ${SHARESUBDIR}/"$${f}" >> ${WRKDIR}/PLIST.F; \
- done; \
- done
-
-.include "../../audio/SDL2_mixer/buildlink3.mk"
-.include "../../graphics/SDL2_image/buildlink3.mk"
-.include "../../net/SDL2_net/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b2f69823a513 -r 096ab1a1e9c4 games/rocksndiamonds/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/rocksndiamonds/Makefile.common Fri Jul 13 17:27:32 2018 +0000
@@ -0,0 +1,66 @@
+# $NetBSD: Makefile.common,v 1.16 2018/07/13 17:27:32 adam Exp $
+# used by games/mirrormagic/Makefile
+# used by games/rocksndiamonds/Makefile
+
+CATEGORIES= games
+MASTER_SITES= http://www.artsoft.org/RELEASES/unix/${PKGBASE}/
+
+MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://www.artsoft.org/${PKGBASE}/
+LICENSE= gnu-gpl-v2
+
+PATCHDIR= ${.CURDIR}/../../games/rocksndiamonds/patches
+
+USE_GAMESGROUP= yes
+USE_TOOLS+= gmake
+
+INSTALLATION_DIRS+= bin
+
+BUILD_DEFS+= VARBASE SCORE_PATH
+BUILD_DIRS= src
+
+SHARESUBDIR= share/${PKGBASE}
+SHAREDIR= ${PREFIX}/${SHARESUBDIR}
+SCORE_PATH= ${VARBASE}/games/${PKGBASE}
+REQD_DIRS+= ${SHARESUBDIR}
+
+OWN_DIRS_PERMS+= ${SCORE_PATH:Q} ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+= ${SCORE_PATH:Q}/scores ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+.for dir in ${LEVEL_NAMES}
+OWN_DIRS_PERMS+= ${SCORE_PATH:Q}/scores/${dir} ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+.endfor
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+SPECIAL_PERMS= bin/${PKGBASE} ${SETGID_GAMES_PERMS}
+.endif
+
+PLIST_SRC= PLIST ${WRKDIR}/PLIST.F
+
+.if (${MACHINE} == "i386" || ${MACHINE} == "prep" || ${MACHINE} == "cats" || \
+ ${MACHINE} == "shark")
+MAKE_FLAGS+= JOYSTICK=-DHAVE_JOYSTICK
+.endif
+
+MAKE_FLAGS+= RO_GAME_DIR=${PREFIX}/share/${PKGBASE}
+MAKE_FLAGS+= RW_GAME_DIR=${SCORE_PATH:Q}
+MAKE_FLAGS+= TARGET=sdl2
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PKGBASE} ${DESTDIR}${PREFIX}/bin/
+ # auto-generated PLIST
+ rm -f ${WRKDIR}/PLIST.F
+ ${RUN} cd ${WRKSRC} && for d in graphics levels music sounds; do \
+ ${FIND} "$${d}" -type d -print | while read s; do \
+ ${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}/"$${s}"; \
+ done; \
+ ${FIND} "$${d}" -type f -print | while read f; do \
+ ${INSTALL_DATA} "$${f}" ${DESTDIR}${SHAREDIR}/"$${f}"; \
+ ${ECHO} ${SHARESUBDIR}/"$${f}" >> ${WRKDIR}/PLIST.F; \
+ done; \
+ done
+
+.include "../../audio/SDL2_mixer/buildlink3.mk"
+.include "../../graphics/SDL2_image/buildlink3.mk"
+.include "../../net/SDL2_net/buildlink3.mk"
diff -r b2f69823a513 -r 096ab1a1e9c4 games/rocksndiamonds/distinfo
--- a/games/rocksndiamonds/distinfo Fri Jul 13 17:14:43 2018 +0000
+++ b/games/rocksndiamonds/distinfo Fri Jul 13 17:27:32 2018 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.30 2018/03/08 19:05:10 adam Exp $
+$NetBSD: distinfo,v 1.31 2018/07/13 17:27:32 adam Exp $
-SHA1 (rocksndiamonds-4.0.1.3.tar.gz) = 0e5d4e941c736ae588c4241d4fdf65451716a696
-RMD160 (rocksndiamonds-4.0.1.3.tar.gz) = 599c37ee415b1b93712eb07f095e4c36f1f4a088
-SHA512 (rocksndiamonds-4.0.1.3.tar.gz) = 1e05b70fc286b48ce034c7068b020b7cf53a2f7427b95bc711a3cbd5aa388958419f233d84f6194bbc0de1c6f1a5ed7cf04c2fd60babf1864ee3d78a4c19b814
-Size (rocksndiamonds-4.0.1.3.tar.gz) = 3609220 bytes
+SHA1 (rocksndiamonds-4.1.0.0.tar.gz) = 9262857f4862bc52b47e53ef247efe3963cbc5b2
+RMD160 (rocksndiamonds-4.1.0.0.tar.gz) = 6e9f572dbd78d0dbb88b5cbf3d1aa94f54c16ddd
+SHA512 (rocksndiamonds-4.1.0.0.tar.gz) = 4949c2e9a601c8e005b006b13b82e36f7f001321051d392bc34aa4c234c6cddfa9fae16e58d83070072cac1429e13f1fb96d2c4b2ecd35a309065ca3c1c869c2
+Size (rocksndiamonds-4.1.0.0.tar.gz) = 3850621 bytes
SHA1 (patch-src_Makefile) = 702af16aeb41f10d3ea995ad8c5c2a43f3ce9a0e
SHA1 (patch-src_libgame_joystick.c) = 152bfcca101d5b66838d68532fbd76599297a6ef
SHA1 (patch-src_libgame_joystick.h) = a6bae0443a6285b9e4179119f1101ba7bf8d6727
-SHA1 (patch-src_libgame_system.c) = 5ce2d385c5aac315be1c5624a297ae46d4085fdf
+SHA1 (patch-src_libgame_system.c) = 5e45cba46865f43c7f7d9de3a1f5b44aebb185d0
diff -r b2f69823a513 -r 096ab1a1e9c4 games/rocksndiamonds/patches/patch-src_libgame_system.c
--- a/games/rocksndiamonds/patches/patch-src_libgame_system.c Fri Jul 13 17:14:43 2018 +0000
+++ b/games/rocksndiamonds/patches/patch-src_libgame_system.c Fri Jul 13 17:27:32 2018 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_libgame_system.c,v 1.2 2017/10/13 16:08:35 adam Exp $
+$NetBSD: patch-src_libgame_system.c,v 1.3 2018/07/13 17:27:32 adam Exp $
InitJoystick will be called more than once, so reset the state
variable 'joystick' only if there's no joystick available (yet).
---- src/libgame/system.c.orig 2017-09-12 20:17:10.000000000 +0000
+--- src/libgame/system.c.orig 2018-04-10 19:44:08.000000000 +0000
+++ src/libgame/system.c
-@@ -1630,8 +1630,10 @@ void InitJoysticks()
+@@ -1744,8 +1744,10 @@ void InitJoysticks()
/* always start with reliable default values */
joystick.status = JOYSTICK_NOT_AVAILABLE;
Home |
Main Index |
Thread Index |
Old Index