CVS commit: pkgsrc/games/rocksndiamonds

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Oct 20 09:53:02 UTC 2023

Modified Files:
        pkgsrc/games/rocksndiamonds: Makefile Makefile.common distinfo
        pkgsrc/games/rocksndiamonds/patches: patch-src_Makefile

Log Message:
rocksndiamonds: updated to 4.3.6.0

Rocks'n'Diamonds 4.3.6.0

added new Deflektor style steel slope game elements for MM game engine
added new Deflektor style fixed mirror game elements for MM game engine
added flipping and rotating brushes in level editor using keys “x”, “y” and “z”
added supporting reference elements for custom element explosion content
improved showing game music on music info screen
fixed bug with playing game music for first level of level set
fixed centering credits text when using fonts with different width
fixed drawing mouse pointer global animation above MM engine tile cursor
fixed bug with triggering “entered by player” event when pushing element


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/games/rocksndiamonds/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/games/rocksndiamonds/Makefile.common
cvs rdiff -u -r1.39 -r1.40 pkgsrc/games/rocksndiamonds/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/games/rocksndiamonds/patches/patch-src_Makefile

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.69 pkgsrc/games/rocksndiamonds/Makefile:1.70
--- pkgsrc/games/rocksndiamonds/Makefile:1.69   Sat May  6 19:09:28 2023
+++ pkgsrc/games/rocksndiamonds/Makefile        Fri Oct 20 09:53:02 2023
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.69 2023/05/06 19:09:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2023/10/20 09:53:02 adam Exp $
 
-DISTNAME=      rocksndiamonds-4.3.1.1
+DISTNAME=      rocksndiamonds-4.3.6.0-linux
 
 COMMENT=       Game like Boulder Dash, Emerald Mine, or Sokoban
-PKGREVISION=   3
 
 LEVEL_NAMES=   classic_boulderdash classic_emerald_mine classic_sokoban \
                classic_supaplex rnd_tutorial_aaron_davidson rnd_tutorial_niko_boehm
 
 .include "Makefile.common"
 
-MAKE_FLAGS+=   BASE_PATH=${PREFIX}/share/${PKGBASE}
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/rocksndiamonds/Makefile.common
diff -u pkgsrc/games/rocksndiamonds/Makefile.common:1.20 pkgsrc/games/rocksndiamonds/Makefile.common:1.21
--- pkgsrc/games/rocksndiamonds/Makefile.common:1.20    Sun Apr 10 12:18:19 2022
+++ pkgsrc/games/rocksndiamonds/Makefile.common Fri Oct 20 09:53:02 2023
@@ -1,14 +1,18 @@
-# $NetBSD: Makefile.common,v 1.20 2022/04/10 12:18:19 adam Exp $
+# $NetBSD: Makefile.common,v 1.21 2023/10/20 09:53:02 adam Exp $
 # used by games/mirrormagic/Makefile
 # used by games/rocksndiamonds/Makefile
 
+PKGNAME=       ${DISTNAME:S/-linux//}
+
 CATEGORIES=    games
-MASTER_SITES=  https://www.artsoft.org/RELEASES/unix/${PKGBASE}/
+MASTER_SITES=  https://www.artsoft.org/RELEASES/linux/${PKGBASE}/
 
 MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.artsoft.org/${PKGBASE}/
 LICENSE=       gnu-gpl-v2
 
+WRKSRC=                ${WRKDIR}/${DISTNAME:S/-linux//}
+
 USE_GAMESGROUP=                yes
 USE_TOOLS+=            gmake
 
@@ -41,6 +45,7 @@ PLIST_SRC=    PLIST ${WRKDIR}/PLIST.F
 MAKE_FLAGS+=   JOYSTICK=-DHAVE_JOYSTICK
 .endif
 
+MAKE_FLAGS+=   BASE_PATH=${PREFIX}/share/${PKGBASE}
 MAKE_FLAGS+=   TARGET=sdl2
 
 do-install:

Index: pkgsrc/games/rocksndiamonds/distinfo
diff -u pkgsrc/games/rocksndiamonds/distinfo:1.39 pkgsrc/games/rocksndiamonds/distinfo:1.40
--- pkgsrc/games/rocksndiamonds/distinfo:1.39   Sun Apr 10 12:18:19 2022
+++ pkgsrc/games/rocksndiamonds/distinfo        Fri Oct 20 09:53:02 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.39 2022/04/10 12:18:19 adam Exp $
+$NetBSD: distinfo,v 1.40 2023/10/20 09:53:02 adam Exp $
 
-BLAKE2s (rocksndiamonds-4.3.1.1.tar.gz) = ef3faf39ed02fb06eacb96268f3e5ed077863243efaec26ff78a99de65e35cd1
-SHA512 (rocksndiamonds-4.3.1.1.tar.gz) = a6e884ef89d44cb054a88c1b1136f1359e1ae9a37e36841c19d6ab8366fdc0be3367bb0d9a315f6118d17922aeb5e55b13caad21504f2be536d180d932de852a
-Size (rocksndiamonds-4.3.1.1.tar.gz) = 4248343 bytes
-SHA1 (patch-src_Makefile) = 527aa318c55072ee2f32dbc08c8d668b4f910bba
+BLAKE2s (rocksndiamonds-4.3.6.0-linux.tar.gz) = 6911627b50d67b9f52af049475ba28dbb7f40eabacbf3e6cd8ec88278aa38f1c
+SHA512 (rocksndiamonds-4.3.6.0-linux.tar.gz) = db74d74b89b9ab307d2979eb11e8192a74bd3ef4edb0987c59ce839410a01322a0c0384c009603a370443ce6ce96e3d5e0a82b14002bad62a4a965bd40aefeac
+Size (rocksndiamonds-4.3.6.0-linux.tar.gz) = 4655278 bytes
+SHA1 (patch-src_Makefile) = d7f78c0f5a24d53661f678da76233b55d039f6d3
 SHA1 (patch-src_libgame_joystick.c) = 000805d76fee695cbedc42f1aa25423f04c08dbb
 SHA1 (patch-src_libgame_joystick.h) = a6bae0443a6285b9e4179119f1101ba7bf8d6727
 SHA1 (patch-src_libgame_system.c) = a43d320a760c59dbc57f77c1d3726c5c4b138a95

Index: pkgsrc/games/rocksndiamonds/patches/patch-src_Makefile
diff -u pkgsrc/games/rocksndiamonds/patches/patch-src_Makefile:1.3 pkgsrc/games/rocksndiamonds/patches/patch-src_Makefile:1.4
--- pkgsrc/games/rocksndiamonds/patches/patch-src_Makefile:1.3  Thu Dec 10 16:33:02 2020
+++ pkgsrc/games/rocksndiamonds/patches/patch-src_Makefile      Fri Oct 20 09:53:02 2023
@@ -1,17 +1,17 @@
-$NetBSD: patch-src_Makefile,v 1.3 2020/12/10 16:33:02 adam Exp $
+$NetBSD: patch-src_Makefile,v 1.4 2023/10/20 09:53:02 adam Exp $
 
 Append to CFLAGS and LDFLAGS.
 
---- src/Makefile.orig  2020-11-26 23:40:22.000000000 +0000
+--- src/Makefile.orig  2023-10-19 17:28:21.525315606 +0000
 +++ src/Makefile
-@@ -140,8 +140,8 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG
+@@ -153,8 +153,8 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG
  OPTIONS = -O2 -Wall
  endif
  
--CFLAGS = $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
--LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
-+CFLAGS += $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
-+LDFLAGS +=           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
+-CFLAGS = $(OPTIONS) $(ANALYZE) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
+-LDFLAGS =           $(ANALYZE) $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
++CFLAGS += $(OPTIONS) $(ANALYZE) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
++LDFLAGS +=           $(ANALYZE) $(SYS_LDFLAGS) $(EXTRA_LDFLAGS)
  
  
  SRCS =        main.c          \