head 1.12; access; symbols pkgsrc-2017Q2:1.11.0.68 pkgsrc-2017Q2-base:1.11 pkgsrc-2017Q1:1.11.0.66 pkgsrc-2017Q1-base:1.11 pkgsrc-2016Q4:1.11.0.64 pkgsrc-2016Q4-base:1.11 pkgsrc-2016Q3:1.11.0.62 pkgsrc-2016Q3-base:1.11 pkgsrc-2016Q2:1.11.0.60 pkgsrc-2016Q2-base:1.11 pkgsrc-2016Q1:1.11.0.58 pkgsrc-2016Q1-base:1.11 pkgsrc-2015Q4:1.11.0.56 pkgsrc-2015Q4-base:1.11 pkgsrc-2015Q3:1.11.0.54 pkgsrc-2015Q3-base:1.11 pkgsrc-2015Q2:1.11.0.52 pkgsrc-2015Q2-base:1.11 pkgsrc-2015Q1:1.11.0.50 pkgsrc-2015Q1-base:1.11 pkgsrc-2014Q4:1.11.0.48 pkgsrc-2014Q4-base:1.11 pkgsrc-2014Q3:1.11.0.46 pkgsrc-2014Q3-base:1.11 pkgsrc-2014Q2:1.11.0.44 pkgsrc-2014Q2-base:1.11 pkgsrc-2014Q1:1.11.0.42 pkgsrc-2014Q1-base:1.11 pkgsrc-2013Q4:1.11.0.40 pkgsrc-2013Q4-base:1.11 pkgsrc-2013Q3:1.11.0.38 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.11.0.36 pkgsrc-2013Q2-base:1.11 pkgsrc-2013Q1:1.11.0.34 pkgsrc-2013Q1-base:1.11 pkgsrc-2012Q4:1.11.0.32 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q3:1.11.0.30 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.28 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.26 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.24 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.22 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.11.0.20 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.18 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.16 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.11.0.14 pkgsrc-2010Q3-base:1.11 pkgsrc-2010Q2:1.11.0.12 pkgsrc-2010Q2-base:1.11 pkgsrc-2010Q1:1.11.0.10 pkgsrc-2010Q1-base:1.11 pkgsrc-2009Q4:1.11.0.8 pkgsrc-2009Q4-base:1.11 pkgsrc-2009Q3:1.11.0.6 pkgsrc-2009Q3-base:1.11 pkgsrc-2009Q2:1.11.0.4 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.11.0.2 pkgsrc-2009Q1-base:1.11 pkgsrc-2008Q4:1.10.0.14 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.10.0.12 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.10 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.8 pkgsrc-2008Q2-base:1.10 cwrapper:1.10.0.6 pkgsrc-2008Q1:1.10.0.4 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.2 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.9.0.10 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.8 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.6 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.4 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.2 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.8.0.8 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.6 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.4 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.2 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.7.0.6 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.4 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.2 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.6.0.8 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.6 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.4 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.12 date 2017.09.09.07.10.34; author adam; state dead; branches; next 1.11; commitid CJ7p87HF1Gf8vu6A; 1.11 date 2009.01.12.19.22.18; author adam; state Exp; branches; next 1.10; 1.10 date 2007.10.13.12.58.48; author adam; state Exp; branches; next 1.9; 1.9 date 2006.07.22.23.16.42; author heinz; state Exp; branches; next 1.8; 1.8 date 2005.08.16.15.35.51; author adam; state Exp; branches; next 1.7; 1.7 date 2004.11.03.15.14.17; author adam; state Exp; branches; next 1.6; 1.6 date 2003.11.19.12.48.47; author adam; state Exp; branches; next 1.5; 1.5 date 2003.08.05.15.12.47; author adam; state Exp; branches; next 1.4; 1.4 date 2002.10.19.20.06.46; author heinz; state Exp; branches; next 1.3; 1.3 date 2001.07.05.22.07.59; author kristerw; state Exp; branches; next 1.2; 1.2 date 2000.12.20.01.23.05; author wiz; state Exp; branches; next 1.1; 1.1 date 2000.01.03.17.23.27; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.01.03.17.23.27; author wiz; state Exp; branches; next ; desc @@ 1.12 log @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 @ text @$NetBSD: patch-ab,v 1.11 2009/01/12 19:22:18 adam Exp $ --- src/Makefile.orig 2008-11-03 21:22:19.000000000 +0100 +++ src/Makefile @@@@ -160,8 +160,10 @@@@ ifdef BUILD_DIST # distribution build 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 \ @ 1.11 log @Changes 3.2.6.0: * fixed crash bug when scrolling with cursor keys in editor * fixed X11 crash bug when scaling images with width/height less than 32 * fixed X11 crash bug when blitting masked title screens over background * fixed growing steel wall to also leave behind steel wall * fixed custom element change conditions where a player element is used * fixed bug with player relocation while the player switches an element * fixed problems with re-mapping players on playfield to input devices * fixed wrong behaviour of player option "no centering when relocating" * added condition "deadly when " for custom elements * added possibility to reanimate player immediately after his death * added "element used as action parameter" to element change actions * added optional initial inventory for players (pre-collected elements) * added change page actions "set player inventory" and "set CE artwork" * added switch for EM style dynamite "[ ] explodes with chain reaction" * moved "level settings" and "editor settings" to two tabbed screens * added level setting to start a level with always the same random seed * added CE action "set random seed" to re-initialize random seed in game @ text @d1 1 a1 1 $NetBSD$ @ 1.10 log @Changes 3.2.4: * fixed crash bug in toon drawing functions for large step offset values * fixed some problems with displaying game panel when quick-loading tape * fixed (experimental only) redrawing of every tile per frame (even if unneeded) for the extended (R'n'D based) EMC graphics engine * added optimization to only calculate element count for panel display if really needed (that is, if element count values defined on panel) * fixed problem with special editor door redraw when entering main menu * fixed bug with displaying background for title messages on info screen * some code cleanup for the extended (R'n'D based) EMC graphics engine * fixed bug with CE action "move player" always resulting in player 4 if there was a CE action with no trigger player (because the player element was calculated by using log_2() from trigger player bits with the value PLAYER_BITS_ANY) -- this is now fixed by also storing the triggering player bit mask and handling all players in "move player" * fixed bug when defined artwork cannot be found for artwork that has default artwork cloned from other artwork (without default filename) * added several fixes to the extended (R'n'D based) EMC graphics engine * fixed broken editor copy and paste for custom elements between levels @ text @d3 1 a3 1 --- src/Makefile.orig 2007-09-13 23:32:36.000000000 +0200 d5 1 a5 1 @@@@ -142,8 +142,10 @@@@ ifdef BUILD_DIST # distribution build @ 1.9 log @Updated to version 3.2.0. Pkgsrc changes: - Cleaned up COMMENT: There are no more separate packages for x11 and sdl. - INSTALLATION_DIRS should be extended, not set absolutely. - Simplified PLIST handling: no more @@exec in PLIST, replaced by OWN_DIRS_PERMS. - Simplified installation of sounds/graphics/levels etc. All the files are now dynamically added to the PLIST, so the static PLIST is really short now. - Use GAMEOWN and GAMEGRP as user and group now. - No more substitutions in the pre-configure target and no more patch-aa: Replaced by overriding GNU make variables with MAKE_FLAGS. - Simplified patch-ab, also with MAKE_FLAGS. - Changed mode of top-level score directory so that users cannot see the score files. This prevents tampering with high scores :). - The do-install target uses now INSTALL_GAME to honor SETGIDGAME (from mk.conf). Relevant changes since version 3.1.2: ===================================== - finished new native game engine for Emerald Mine (Club) levels - added all new elements from EMC engine also to R'n'D engine - added selection between ECS and AGA graphics for EMC levels to setup - added multi-player support for EMC game engine (with up to four players) - added player switching (visual and quick) to R'n'D and EM game engine - added key shortcut settings for switching player focus to setup menu - added custom element actions for CE change page in level editor - added "CE value" and "CE score" counters for custom elements - added cascaded element lists to element list in level editor - added dynamic element list with all elements used in current level - added special Supaplex animations for Murphy being bored and sleeping - added setup option to display element token name in level editor - added up to five title screens for each level set to show after loading - added credits pages to the "credits" section that were really missing - lots of bugfixes and internal engine changes (see ChangeLog file) @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.8 2005/08/16 15:35:51 adam Exp $ d3 1 a3 1 --- src/Makefile.orig 2006-07-16 02:29:15.000000000 +0200 d5 1 a5 1 @@@@ -141,8 +141,10 @@@@ ifdef BUILD_DIST # distribution build @ 1.8 log @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) @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- src/Makefile.orig 2005-08-15 22:09:24.000000000 +0000 d5 1 a5 13 @@@@ -21,8 +21,9 @@@@ endif ifdef X11_PATH # path to X11 specified by top level Makefile XINC_PATH = $(X11_PATH)/include XLIB_PATH = $(X11_PATH)/lib -X11_INCL = -I$(XINC_PATH) -X11_LIBS = -L$(XLIB_PATH) -lX11 +# flags for X11 paths will be supplied by pkgsrc +X11_INCL = # empty +X11_LIBS = -lX11 endif AR = ar @@@@ -141,8 +142,10 @@@@ ifdef BUILD_DIST # distribution build @ 1.7 log @Changes 3.1.0: - fixed obvious bug with wrong "Murphy" graphics (when digging etc.) - fixed a lot of Emerald Mine and Supaplex game engine emulation bugs - re-converted Emerald Mine and Supaplex levels to apply engine fixes - changed default snap/drop keys from left/right Shift to Control keys - added level loader for loading native Emerald Mine levels - added level loader for loading native Supaplex packed levels - added group elements for multiple matches and random element creation - added elements that can be digged or left behind by custom elements - added element "Sokoban field with player" missing for Sokoban levels - added custom element features to allow building of teleporters - added option to use step limit instead of time limit for level - added pressing "space" key as valid action to select menu options - added clipboard (cut and paste buttons) for custom and group elements - added shortcut to dump brush (type ":DB" in editor) for use in forum - added network multiplayer code for Windows (still only command line) - replaced old tutorial level set with far better one by Niko Böhm - "contributions" levels now separate package to make base set smaller - too many bugfixes and changes to list them all here (see ChangeLog) @ text @d3 1 a3 1 --- src/Makefile.orig 2004-06-06 23:57:02.000000000 +0000 d17 1 a17 1 @@@@ -134,8 +135,10 @@@@ ifdef BUILD_DIST # distribution build @ 1.6 log @Most important changes since last release version 3.0.6: - fixed incorrectly displayed animation for attacking dragon - fixed bug with not setting initial gravity for each new game - fixed bug with teleportation of player by custom element change - fixed bug with player not getting smashed by rock sometimes - fixed serious bug in code for delayed element pushing - fixed little bug in animation frame selection for pushed elements - fixed bug when pushing element that can move away to the side - fixed tape recording when player is created from CE element change - fixed player animation frame reset for identical animations - unavailable setup options now marked as "n/a" instead of "off" - prevent "extended" changed elements from delay change in same frame - speed-up of reading config file for verbose output - added configuration option for opening and closing Supaplex exit - added configuration option for moving up/down animation for Murphy - added animation for "turning" action (for elements with move delay) - added turning animations for bug, spaceship and sniksnak @ text @d3 1 a3 1 --- src/Makefile.orig 2003-11-09 23:35:32.000000000 +0100 d10 1 a10 1 -X11_LIBS = -L$(XLIB_PATH) d13 1 a13 1 +X11_LIBS = # empty d17 1 a17 1 @@@@ -128,8 +129,10 @@@@ ifdef BUILD_DIST # distribution build d21 2 a22 2 -CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG) -LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm d25 1 a25 1 +CFLAGS += $(SYS_CFLAGS) $(CONFIG) @ 1.5 log @Changes 3.0.0 (since 2.1.1): - final version bumped to 3.0.0 due to the massive changes - graphics and sounds now completely and dynamically customizable - element animation length, speed and mode now freely configurable - 128 custom elements with lots of configurable element properties - advanced custom element settings for powerful, self-created elements - automatic tape playing function for game engine and level testing - added support for stereo WAV sound files - added support for background images for all menu screens - added some example levels showing how to create custom artwork - fixed Supaplex gravity tubes - fixed very nasty bug in SDL_image (and X11) PCX loading routine - fixed some very nasty bugs in bitmap zoom routine - fixed very nasty bug in level/artwork loading routine @ text @d3 1 a3 1 --- src/Makefile.orig 2003-08-05 01:58:16.000000000 +0200 d5 1 a5 1 @@@@ -16,8 +16,9 @@@@ endif d17 1 a17 1 @@@@ -119,8 +120,10 @@@@ ifdef BUILD_DIST # distribution build @ 1.4 log @Update to rocksndiamonds 2.1.1. Maybe someone can check how well this works with pkgsrc on MacOS X (see below). Summary of changes since rocksndiamonds-2.0.0 ============================================= - lots of new contributed levels Release Version 2.1.1 [13 AUG 2002] ----------------------------------- - sound bug (causing crashes) fixed (reported by Keith Peterston) - small NetBSD compilation bug fixed (thanks to Adam Ciarcinski) - default keys for "snap field" and "place bomb" fixed for Mac OS X Release Version 2.1.0 [05 AUG 2002] ----------------------------------- - native Mac OS X port (finally!) - graphics, sounds and music now fully configurable - added support for TrueColor PCX graphics files - added support for 16 bit WAV sound files - enhanced sound system (especially regarding stereo and loop sounds) - new structured setup menu (with sub-menues for graphics and sounds) - added "quick save" and "quick load" functions with shortcut key - added single-step playing mode (automatic pause after each step) - behaviour of "Escape" key in level editor now more intuitive - changed default slipping behaviour of gems back to 2.0.0 style; this is now an element property for gems in the level editor, although existing converted levels use the new EM gems behaviour - bug fixed that prevented walking through tubes when gravity on - added Boulder Dash style "snap-pushing" (thanks to Achim Härtel) - fixed memory leak in image loading code - fixed some "solid" elements that were accidentally destructible - fixed some tape stuff - added custom graphics set "Animal Kingdom" by Flyboy Release Version 2.0.1 [19 MAR 2002] ----------------------------------- - bug in explosion code fixed that broke level 24 of "Baby Ghost Mine" - several Supaplex emulation bugs fixed (thanks to Mihail Milushev): + orange disk does not fall off from slippery elements + infotrons kill electrons and snik snaks and trigger orange disks + explosion chain reactions are now a bit slower than murphy - behaviour of robots adjusted to make them less aggressive (needed for quite some Emerald Mine Club levels) - emeralds and diamonds now fall off normal, steel and growing walls, as this is the correct behaviour in Emerald Mine; existing private and contributed levels will still behave as before, unless saved again (with or without modifications) from the level editor of the current version of the game - icon for Windows executable added - bug when selecting default level series fixed - new IFF style file format for level and tape files - bug in storing amoeba content fixed - nasty tape bugs fixed (completely reworked tape stuff) - fullscreen mode now works with Windows (workaround for bug in SDL) - /dev/dsp support for NetBSD added (thanks to Krister Walfridsson) - file permissions when saving files and creating directories changed - some small sound bugs fixed @ text @d3 1 a3 1 --- src/Makefile.orig Tue Aug 13 01:52:36 2002 d5 1 a5 1 @@@@ -16,8 +16,9 @@@@ d17 1 a17 1 @@@@ -117,8 +118,10 @@@@ @ 1.3 log @Update rocksndiamonds to version 2.0.0 Changes since version 1.4.0: - major code redesign to maintain generic game functions in a separate library and make it easier to port the game to new targets like SDL - can be compiled with SDL library to build native Windows version - DOS and Windows versions can be compiled with gcc cross-compiler - trying to open already busy audio device does not block the game - fixed network playing bug (patch from web site) - SDL version can load and play music modules - fixed element description in level editor for EM doors and keys @ text @d2 5 a6 3 --- src/Makefile.orig Wed May 2 23:13:44 2001 +++ src/Makefile Wed May 2 23:24:24 2001 @@@@ -17,7 +17,7 @@@@ d9 1 a9 1 X11_INCL = -I$(XINC_PATH) d11 3 a13 1 +X11_LIBS = -L$(XLIB_PATH) -Wl,-R$(XLIB_PATH) d17 3 a19 3 @@@@ -100,7 +100,7 @@@@ # OPTIONS = -O3 # OPTIONS = -DSYSV -Ae # may be needed for HP-UX d22 5 a26 2 +CFLAGS = $(SYS_CFLAGS) $(CONFIG) LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm d29 1 @ 1.2 log @Apply network patch from distribution site (to small to fetch, just added it), and allow usage of CFLAGS from environment. Patches supplied by Adam Ciarcinski in private mail. @ text @d1 4 a4 5 $NetBSD: patch-ab,v 1.1.1.1 2000/01/03 17:23:27 wiz Exp $ --- src/Makefile.orig Sun Oct 24 18:51:53 1999 +++ src/Makefile Mon Jan 3 13:52:45 2000 @@@@ -15,7 +15,7 @@@@ d12 8 a20 15 @@@@ -35,7 +35,7 @@@@ endif INCL = $(X11_INCL) -LIBS = $(X11_LIBS) -lX11 -lm $(EXTRA_LIBS) +LIBS = $(X11_LIBS) ${LDFLAGS} -lX11 -lm $(EXTRA_LIBS) endif @@@@ -65,7 +65,7 @@@@ # SYSTEM = -DSYSV -Ae # may be needed for HP-UX -CFLAGS = $(OPTIONS) $(SYSTEM) $(INCL) $(CONFIG) +CFLAGS += $(SYSTEM) $(INCL) $(CONFIG) a21 2 SRCS = main.c \ init.c \ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d28 1 a28 1 +CFLAGS += $(OPTIONS) $(SYSTEM) $(INCL) $(CONFIG) @ 1.1.1.1 log @Initial import of Rocks'n'Diamonds 1.4.0, an arcade game like Boulder Dash or Emerald Mines, also includes Sokoban levels @ text @@