pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/rocksndiamonds
Module Name: pkgsrc
Committed By: adam
Date: Sat Sep 9 07:10:34 UTC 2017
Modified Files:
pkgsrc/games/rocksndiamonds: Makefile PLIST distinfo
Added Files:
pkgsrc/games/rocksndiamonds/patches: patch-src_Makefile
patch-src_libgame_joystick.c patch-src_libgame_joystick.h
patch-src_libgame_system.c
Removed Files:
pkgsrc/games/rocksndiamonds: options.mk
pkgsrc/games/rocksndiamonds/patches: patch-ab patch-ac patch-ag
patch-ah patch-ak
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/games/rocksndiamonds/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/rocksndiamonds/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/games/rocksndiamonds/distinfo
cvs rdiff -u -r1.6 -r0 pkgsrc/games/rocksndiamonds/options.mk
cvs rdiff -u -r1.11 -r0 pkgsrc/games/rocksndiamonds/patches/patch-ab
cvs rdiff -u -r1.4 -r0 pkgsrc/games/rocksndiamonds/patches/patch-ac \
pkgsrc/games/rocksndiamonds/patches/patch-ag
cvs rdiff -u -r1.3 -r0 pkgsrc/games/rocksndiamonds/patches/patch-ah
cvs rdiff -u -r1.8 -r0 pkgsrc/games/rocksndiamonds/patches/patch-ak
cvs rdiff -u -r0 -r1.1 pkgsrc/games/rocksndiamonds/patches/patch-src_Makefile \
pkgsrc/games/rocksndiamonds/patches/patch-src_libgame_joystick.c \
pkgsrc/games/rocksndiamonds/patches/patch-src_libgame_joystick.h \
pkgsrc/games/rocksndiamonds/patches/patch-src_libgame_system.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/games/rocksndiamonds/Makefile
diff -u pkgsrc/games/rocksndiamonds/Makefile:1.51 pkgsrc/games/rocksndiamonds/Makefile:1.52
--- pkgsrc/games/rocksndiamonds/Makefile:1.51 Sat Apr 25 14:23:03 2015
+++ pkgsrc/games/rocksndiamonds/Makefile Sat Sep 9 07:10:34 2017
@@ -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@localhost
@@ -10,21 +9,19 @@ HOMEPAGE= http://www.artsoft.org/rocksnd
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"
Index: pkgsrc/games/rocksndiamonds/PLIST
diff -u pkgsrc/games/rocksndiamonds/PLIST:1.9 pkgsrc/games/rocksndiamonds/PLIST:1.10
--- pkgsrc/games/rocksndiamonds/PLIST:1.9 Sat Jul 22 23:16:42 2006
+++ pkgsrc/games/rocksndiamonds/PLIST Sat Sep 9 07:10:34 2017
@@ -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
Index: pkgsrc/games/rocksndiamonds/distinfo
diff -u pkgsrc/games/rocksndiamonds/distinfo:1.27 pkgsrc/games/rocksndiamonds/distinfo:1.28
--- pkgsrc/games/rocksndiamonds/distinfo:1.27 Tue Nov 3 20:57:03 2015
+++ pkgsrc/games/rocksndiamonds/distinfo Sat Sep 9 07:10:34 2017
@@ -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
Added files:
Index: pkgsrc/games/rocksndiamonds/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/games/rocksndiamonds/patches/patch-src_Makefile:1.1
--- /dev/null Sat Sep 9 07:10:34 2017
+++ pkgsrc/games/rocksndiamonds/patches/patch-src_Makefile Sat Sep 9 07:10:34 2017
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_Makefile,v 1.1 2017/09/09 07:10:34 adam Exp $
+
+Append to CFLAGS and LDFLAGS.
+
+--- src/Makefile.orig 2017-03-15 20:15:06.000000000 +0000
++++ src/Makefile
+@@ -117,8 +117,10 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG
+ OPTIONS = -O3 -Wall
+ endif
+
+-CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(EXTRA_CFLAGS) $(CONFIG)
+-LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
++# pkgsrc presets those variables, so use '+=' to append to them
++# flags for debugging or optimisation may be supplied from the pkgsrc Makefile
++CFLAGS += $(SYS_CFLAGS) $(EXTRA_CFLAGS) $(CONFIG)
++LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+
+
+ SRCS = main.c \
Index: pkgsrc/games/rocksndiamonds/patches/patch-src_libgame_joystick.c
diff -u /dev/null pkgsrc/games/rocksndiamonds/patches/patch-src_libgame_joystick.c:1.1
--- /dev/null Sat Sep 9 07:10:34 2017
+++ pkgsrc/games/rocksndiamonds/patches/patch-src_libgame_joystick.c Sat Sep 9 07:10:34 2017
@@ -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"
+
+
+ /* ========================================================================= */
Index: pkgsrc/games/rocksndiamonds/patches/patch-src_libgame_joystick.h
diff -u /dev/null pkgsrc/games/rocksndiamonds/patches/patch-src_libgame_joystick.h:1.1
--- /dev/null Sat Sep 9 07:10:34 2017
+++ pkgsrc/games/rocksndiamonds/patches/patch-src_libgame_joystick.h Sat Sep 9 07:10:34 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libgame_joystick.h,v 1.1 2017/09/09 07:10:34 adam Exp $
+
+Allow joystick on NetBSD.
+
+--- src/libgame/joystick.h.orig 2015-10-20 21:58:08.000000000 +0000
++++ src/libgame/joystick.h
+@@ -19,7 +19,7 @@
+ #define JOYSTICK_ACTIVE (1 << 1)
+ #define JOYSTICK_ACTIVATED (JOYSTICK_AVAILABLE | JOYSTICK_ACTIVE)
+
+-#if defined(PLATFORM_FREEBSD)
++#if defined(PLATFORM_FREEBSD) || (defined(PLATFORM_NETBSD) && defined(HAVE_JOYSTICK))
+ #define DEV_JOYSTICK_0 "/dev/joy0"
+ #define DEV_JOYSTICK_1 "/dev/joy1"
+ #define DEV_JOYSTICK_2 "/dev/joy2"
Index: pkgsrc/games/rocksndiamonds/patches/patch-src_libgame_system.c
diff -u /dev/null pkgsrc/games/rocksndiamonds/patches/patch-src_libgame_system.c:1.1
--- /dev/null Sat Sep 9 07:10:34 2017
+++ pkgsrc/games/rocksndiamonds/patches/patch-src_libgame_system.c Sat Sep 9 07:10:34 2017
@@ -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();
+ }
Home |
Main Index |
Thread Index |
Old Index