diff options
author | adam <adam@pkgsrc.org> | 2017-09-09 07:10:34 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2017-09-09 07:10:34 +0000 |
commit | 4a140dbcbeb7febcb9e64f84670abc1804b7b033 (patch) | |
tree | 806505e7926509ab419e0e6a84dc441672ea594d /games | |
parent | 6ff84e781d7c3c07df80a79812f0c46866077a50 (diff) | |
download | pkgsrc-4a140dbcbeb7febcb9e64f84670abc1804b7b033.tar.gz |
Rocks'n'Diamonds 4.0.0.2:
This release is mainly a bugfix release, but also contains the following changes and additions:
* fixed several bugs and problems with level template handling in the level editor
* fixed several problems with the undo/redo buttons under certain conditions
* fixed various other small and medium bugs (see commit history for details)
* improved menu screens navigation and level selection using the keyboard
* added option to use pre-defined level template for newly created levels
* added level template settings to editor/level configuration screen in editor
* added setup option to show/hide classic elements in the editor palette
* added setup option to enable/disable auto-incrementing solved levels
* added headless mode (no window) for automated tape tests using ‘autotest’
* improved progress and summary output for automatic tape replay / testing
Diffstat (limited to 'games')
-rw-r--r-- | games/rocksndiamonds/Makefile | 53 | ||||
-rw-r--r-- | games/rocksndiamonds/PLIST | 3 | ||||
-rw-r--r-- | games/rocksndiamonds/distinfo | 19 | ||||
-rw-r--r-- | games/rocksndiamonds/options.mk | 21 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-ac | 13 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-ag | 38 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-ak | 22 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-src_Makefile (renamed from games/rocksndiamonds/patches/patch-ab) | 8 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-src_libgame_joystick.c | 22 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-src_libgame_joystick.h (renamed from games/rocksndiamonds/patches/patch-ah) | 8 | ||||
-rw-r--r-- | games/rocksndiamonds/patches/patch-src_libgame_system.c | 19 |
11 files changed, 81 insertions, 145 deletions
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index 183b7be3d30..757dc27a415 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.51 2015/04/25 14:23:03 tnn Exp $ +# $NetBSD: Makefile,v 1.52 2017/09/09 07:10:34 adam Exp $ -DISTNAME= rocksndiamonds-3.3.1.2 -PKGREVISION= 1 -CATEGORIES= games x11 +DISTNAME= rocksndiamonds-4.0.0.2 +CATEGORIES= games MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ MAINTAINER= pkgsrc-users@NetBSD.org @@ -10,21 +9,19 @@ HOMEPAGE= http://www.artsoft.org/rocksndiamonds/ COMMENT= Game like Boulder Dash, Emerald Mine, or Sokoban LICENSE= gnu-gpl-v2 +USE_GAMESGROUP= yes USE_TOOLS+= gmake -INSTALLATION_DIRS+= bin ${PKGMANDIR}/man6 +INSTALLATION_DIRS+= bin -BUILD_DEFS+= VARBASE SCORE_PATH +BUILD_DEFS+= VARBASE SCORE_PATH +BUILD_DIRS= src SHARESUBDIR= share/rocksndiamonds SHAREDIR= ${PREFIX}/${SHARESUBDIR} - -SCORE_PATH= ${VARBASE}/games/rocksndiamonds - +SCORE_PATH= ${VARBASE}/games/rocksndiamonds REQD_DIRS+= ${SHARESUBDIR} -USE_GAMESGROUP= yes - OWN_DIRS_PERMS+= ${SCORE_PATH:Q} OWN_DIRS_PERMS+= ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE} OWN_DIRS_PERMS+= ${SCORE_PATH:Q}/scores @@ -55,35 +52,25 @@ PLIST_SRC= PLIST ${WRKDIR}/PLIST.F MAKE_FLAGS+= JOYSTICK=-DHAVE_JOYSTICK .endif -MAKE_FLAGS+= CC=${CC:Q} -MAKE_FLAGS+= MAKE=${MAKE_PROGRAM:Q} -MAKE_FLAGS+= X11_PATH=${X11BASE} MAKE_FLAGS+= RO_GAME_DIR=${PREFIX}/share/rocksndiamonds MAKE_FLAGS+= RW_GAME_DIR=${SCORE_PATH:Q} -MAKE_FLAGS+= X11_INCL= -MAKE_FLAGS+= X11_LIBS=-lX11 - -.include "options.mk" +MAKE_FLAGS+= TARGET=sdl2 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${DESTDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/rocksndiamonds.6 - ${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR} # auto-generated PLIST rm -f ${WRKDIR}/PLIST.F - set -e; \ - cd ${WRKSRC} && \ - for d in sounds graphics levels music; do \ - find "$${d}" -type d -print | while read subdir; do \ - ${INSTALL_DATA_DIR} \ - ${DESTDIR}${SHAREDIR}/"$${subdir}"; \ - done ; \ - find "$${d}" -type f -print | while read f; do \ - ${INSTALL_DATA} "$${f}" \ - ${DESTDIR}${SHAREDIR}/"$${f}"; \ - ${ECHO} ${SHARESUBDIR}/"$${f}" >> ${WRKDIR}/PLIST.F;\ - done ; \ + ${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 --git a/games/rocksndiamonds/PLIST b/games/rocksndiamonds/PLIST index a9efc517c14..d18fd02a28b 100644 --- a/games/rocksndiamonds/PLIST +++ b/games/rocksndiamonds/PLIST @@ -1,3 +1,2 @@ -@comment $NetBSD: PLIST,v 1.9 2006/07/22 23:16:42 heinz Exp $ +@comment $NetBSD: PLIST,v 1.10 2017/09/09 07:10:34 adam Exp $ bin/rocksndiamonds -man/man6/rocksndiamonds.6 diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo index 2d5ae5f8cf9..64230b21d68 100644 --- a/games/rocksndiamonds/distinfo +++ b/games/rocksndiamonds/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.27 2015/11/03 20:57:03 agc Exp $ +$NetBSD: distinfo,v 1.28 2017/09/09 07:10:34 adam Exp $ -SHA1 (rocksndiamonds-3.3.1.2.tar.gz) = 14afa84205f4fbba6e774a232d39961160030744 -RMD160 (rocksndiamonds-3.3.1.2.tar.gz) = e901cf7ba00a4f8de7b747b1ffbbd54eb4a56617 -SHA512 (rocksndiamonds-3.3.1.2.tar.gz) = b627e4a8e2f03dc380b5a111cc42f296b283e63b20e019f522a8a1431fe9c138eb0dc7aa0fa03dd843c3a93bcd0a90704e651f5a590cb7d4c3e3b46976125755 -Size (rocksndiamonds-3.3.1.2.tar.gz) = 2614904 bytes -SHA1 (patch-ab) = 0b364394ae03f31c9ed966039f2f2cd2e054bca1 -SHA1 (patch-ac) = 9cbf5ff897cae129455081c941d7ae355b525d1b -SHA1 (patch-ag) = c9c500490948a03b6f5e2fa409f52112edbf7e92 -SHA1 (patch-ah) = 584b406eef29b2849f7fc42181a7b9f29e6c9c69 -SHA1 (patch-ak) = ec80d7e32285a827afacfda4f17e686f2876fd14 +SHA1 (rocksndiamonds-4.0.0.2.tar.gz) = 9f19c740bf6fdc13a8559647ebd49131fdb469f8 +RMD160 (rocksndiamonds-4.0.0.2.tar.gz) = f865b343b07494644c16b21853b1c93b68ff9e58 +SHA512 (rocksndiamonds-4.0.0.2.tar.gz) = caab7693b37e1fa535c42e7b54eac618adeaffa31c93e70d0eeb1be438efe8a576cca8ddf37b0dec9dab8dceb85785b587eebffc26feae02de4cfd66a5386d3a +Size (rocksndiamonds-4.0.0.2.tar.gz) = 3522458 bytes +SHA1 (patch-src_Makefile) = 702af16aeb41f10d3ea995ad8c5c2a43f3ce9a0e +SHA1 (patch-src_libgame_joystick.c) = 152bfcca101d5b66838d68532fbd76599297a6ef +SHA1 (patch-src_libgame_joystick.h) = 05122ba22e0e46ba9cf12cecef710c1d591c096e +SHA1 (patch-src_libgame_system.c) = 02fd27e60d02a61d0ad4e7f3e19825088374d696 diff --git a/games/rocksndiamonds/options.mk b/games/rocksndiamonds/options.mk deleted file mode 100644 index 18528a334fa..00000000000 --- a/games/rocksndiamonds/options.mk +++ /dev/null @@ -1,21 +0,0 @@ -# $NetBSD: options.mk,v 1.6 2016/02/25 13:15:15 jperkin 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) -BUILD_TARGET= sdl -. include "../../audio/SDL_mixer/buildlink3.mk" -. include "../../graphics/SDL_image/buildlink3.mk" -. include "../../multimedia/smpeg/buildlink3.mk" -. include "../../net/SDL_net/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mx11) -BUILD_TARGET= x11 -. include "../../mk/oss.buildlink3.mk" -. include "../../x11/libXt/buildlink3.mk" -.endif diff --git a/games/rocksndiamonds/patches/patch-ac b/games/rocksndiamonds/patches/patch-ac deleted file mode 100644 index d453a0b5685..00000000000 --- a/games/rocksndiamonds/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$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 <ioctl.h> -+#include <sys/ioctl.h> - #include <soundcard.h> - #endif - diff --git a/games/rocksndiamonds/patches/patch-ag b/games/rocksndiamonds/patches/patch-ag deleted file mode 100644 index 758bf0df842..00000000000 --- a/games/rocksndiamonds/patches/patch-ag +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2005/08/16 15:35:51 adam Exp $ - ---- src/libgame/joystick.c.orig 2005-07-23 19:10:58.000000000 +0000 -+++ src/libgame/joystick.c -@@ -11,12 +11,13 @@ - * joystick.c * - ***********************************************************/ - --#if defined(PLATFORM_FREEBSD) -+#include "misc.h" -+ -+#if defined(PLATFORM_FREEBSD) || (defined(PLATFORM_NETBSD) && defined(HAVE_JOYSTICK)) - #include <machine/joystick.h> - #endif - - #include "joystick.h" --#include "misc.h" - - - /* ========================================================================= */ -@@ -68,7 +69,7 @@ void UnixInitJoysticks() - - boolean UnixReadJoystick(int fd, int *x, int *y, boolean *b1, boolean *b2) - { --#if defined(PLATFORM_FREEBSD) -+#if defined(PLATFORM_FREEBSD) || (defined(PLATFORM_NETBSD) && defined(HAVE_JOYSTICK)) - struct joystick joy_ctrl; - #else - struct joystick_control -@@ -87,7 +88,7 @@ boolean UnixReadJoystick(int fd, int *x, - if (y != NULL) - *y = joy_ctrl.y; - --#if defined(PLATFORM_FREEBSD) -+#if defined(PLATFORM_FREEBSD) || (defined(PLATFORM_NETBSD) && defined(HAVE_JOYSTICK)) - if (b1 != NULL) - *b1 = joy_ctrl.b1; - if (b2 != NULL) diff --git a/games/rocksndiamonds/patches/patch-ak b/games/rocksndiamonds/patches/patch-ak deleted file mode 100644 index af7bfbb0c61..00000000000 --- a/games/rocksndiamonds/patches/patch-ak +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ak,v 1.8 2009/01/12 19:22:18 adam Exp $ - ---- src/libgame/system.c.orig 2008-01-25 22:25:33.000000000 +0100 -+++ src/libgame/system.c -@@ -1494,10 +1494,14 @@ void InitJoysticks() - return; /* joysticks generally deactivated by compile-time directive */ - #endif - -+ /* pkgsrc: InitJoystick will be called more than once, so reset -+ * the state variable 'joystick' only if there's no joystick available (yet) -+ */ - /* always start with reliable default values */ -- joystick.status = JOYSTICK_NOT_AVAILABLE; -- for (i = 0; i < MAX_PLAYERS; i++) -- joystick.fd[i] = -1; /* joystick device closed */ -+ if (joystick.status == JOYSTICK_NOT_AVAILABLE) { -+ for (i=0; i<MAX_PLAYERS; i++) -+ joystick.fd[i] = -1; /* joystick device closed */ -+ } - - #if defined(TARGET_SDL) - SDLInitJoysticks(); diff --git a/games/rocksndiamonds/patches/patch-ab b/games/rocksndiamonds/patches/patch-src_Makefile index 2c6e751deac..2cb8c9b9659 100644 --- a/games/rocksndiamonds/patches/patch-ab +++ b/games/rocksndiamonds/patches/patch-src_Makefile @@ -1,8 +1,10 @@ -$NetBSD: patch-ab,v 1.11 2009/01/12 19:22:18 adam Exp $ +$NetBSD: patch-src_Makefile,v 1.1 2017/09/09 07:10:34 adam Exp $ ---- src/Makefile.orig 2008-11-03 21:22:19.000000000 +0100 +Append to CFLAGS and LDFLAGS. + +--- src/Makefile.orig 2017-03-15 20:15:06.000000000 +0000 +++ src/Makefile -@@ -160,8 +160,10 @@ ifdef BUILD_DIST # distribution build +@@ -117,8 +117,10 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG OPTIONS = -O3 -Wall endif diff --git a/games/rocksndiamonds/patches/patch-src_libgame_joystick.c b/games/rocksndiamonds/patches/patch-src_libgame_joystick.c new file mode 100644 index 00000000000..1a5149f10f2 --- /dev/null +++ b/games/rocksndiamonds/patches/patch-src_libgame_joystick.c @@ -0,0 +1,22 @@ +$NetBSD: patch-src_libgame_joystick.c,v 1.1 2017/09/09 07:10:34 adam Exp $ + +Allow joystick on NetBSD. + +--- src/libgame/joystick.c.orig 2015-10-20 21:58:08.000000000 +0000 ++++ src/libgame/joystick.c +@@ -9,12 +9,13 @@ + // joystick.c + // ============================================================================ + +-#if defined(PLATFORM_FREEBSD) ++#include "misc.h" ++ ++#if defined(PLATFORM_FREEBSD) || (defined(PLATFORM_NETBSD) && defined(HAVE_JOYSTICK)) + #include <machine/joystick.h> + #endif + + #include "joystick.h" +-#include "misc.h" + + + /* ========================================================================= */ diff --git a/games/rocksndiamonds/patches/patch-ah b/games/rocksndiamonds/patches/patch-src_libgame_joystick.h index 49ada6765d9..f06490c7235 100644 --- a/games/rocksndiamonds/patches/patch-ah +++ b/games/rocksndiamonds/patches/patch-src_libgame_joystick.h @@ -1,8 +1,10 @@ -$NetBSD: patch-ah,v 1.3 2002/10/19 20:06:46 heinz Exp $ +$NetBSD: patch-src_libgame_joystick.h,v 1.1 2017/09/09 07:10:34 adam Exp $ ---- src/libgame/joystick.h.orig Fri Apr 19 23:16:40 2002 +Allow joystick on NetBSD. + +--- src/libgame/joystick.h.orig 2015-10-20 21:58:08.000000000 +0000 +++ src/libgame/joystick.h -@@ -21,7 +21,7 @@ +@@ -19,7 +19,7 @@ #define JOYSTICK_ACTIVE (1 << 1) #define JOYSTICK_ACTIVATED (JOYSTICK_AVAILABLE | JOYSTICK_ACTIVE) diff --git a/games/rocksndiamonds/patches/patch-src_libgame_system.c b/games/rocksndiamonds/patches/patch-src_libgame_system.c new file mode 100644 index 00000000000..44285d4fe3e --- /dev/null +++ b/games/rocksndiamonds/patches/patch-src_libgame_system.c @@ -0,0 +1,19 @@ +$NetBSD: patch-src_libgame_system.c,v 1.1 2017/09/09 07:10:34 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-03-15 20:15:06.000000000 +0000 ++++ src/libgame/system.c +@@ -1603,9 +1603,10 @@ void InitJoysticks() + #endif + + /* always start with reliable default values */ +- joystick.status = JOYSTICK_NOT_AVAILABLE; ++ if (joystick.status == JOYSTICK_NOT_AVAILABLE) { + for (i = 0; i < MAX_PLAYERS; i++) + joystick.fd[i] = -1; /* joystick device closed */ ++ } + + SDLInitJoysticks(); + } |