Date: Tue, 30 Jan 2001 11:34:45 +0200 From: mwest@uct.ac.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/24731: Update port: games/rocksndiamonds 1.4.0 to 2.0.0 Message-ID: <E14NXBV-000ALA-00@casper2.cs.uct.ac.za>
next in thread | raw e-mail | index | archive | help
>Number: 24731 >Category: ports >Synopsis: Update port: games/rocksndiamonds 1.4.0 to 2.0.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jan 30 01:40:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: Matthew West >Release: FreeBSD 4.2-STABLE i386 >Organization: University of Cape Town >Environment: >Description: updates games/rocksndiamonds from 1.4.0 to 2.0.0 plist changes, patch changes, hooks for SDL support >How-To-Repeat: >Fix: diff -ruN rocksndiamonds.orig/Makefile rocksndiamonds/Makefile --- rocksndiamonds.orig/Makefile Sun Nov 19 17:21:39 2000 +++ rocksndiamonds/Makefile Tue Jan 30 11:16:36 2001 @@ -6,18 +6,19 @@ # PORTNAME= rocksndiamonds -PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTVERSION= 2.0.0 CATEGORIES= games -MASTER_SITES= http://www.artsoft.org/rocksndiamonds/RELEASES/ \ - ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= games - -PATCH_SITES= http://www.artsoft.org/RELEASES/ -PATCHFILES= rocksndiamonds-1.4.0pl1.diff +MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \ + http://homepages.compuserve.de/rocksndiamonds/ MAINTAINER= mwest@uct.ac.za +.if defined(WITH_SDL) +LIB_DEPENDS= SDL_image.10:${PORTSDIR}/graphics/sdl_image \ + SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer +MAKE_ARGS+= sdl +.endif + USE_XLIB= yes USE_GMAKE= yes MAKE_ENV+= RO_GAME_DIR=${GAME_DIR} RW_GAME_DIR=${GAME_DIR}/scores \ @@ -28,6 +29,11 @@ GAME_DIR=${PREFIX}/share/rocksndiamonds DOC_DIR=${PREFIX}/share/doc/rocksndiamonds + +.if defined(WITH_SDL) +pre-patch: + @${PERL} -pi.orig -e 's:sdl-config:sdl11-config:g' ${WRKSRC}/src/Makefile +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${PREFIX}/bin diff -ruN rocksndiamonds.orig/distinfo rocksndiamonds/distinfo --- rocksndiamonds.orig/distinfo Sun Nov 19 17:21:39 2000 +++ rocksndiamonds/distinfo Tue Jan 30 09:00:02 2001 @@ -1,2 +1 @@ -MD5 (rocksndiamonds-1.4.0.tar.gz) = 48f94ba1421ff1865199d560aca70abb -MD5 (rocksndiamonds-1.4.0pl1.diff) = 9ba906a29b5deaff19080b00cca3f18c +MD5 (rocksndiamonds-2.0.0.tar.gz) = 58e70641241e5b036ea052b7bcba384f diff -ruN rocksndiamonds.orig/files/patch-ab rocksndiamonds/files/patch-ab --- rocksndiamonds.orig/files/patch-ab Thu Jan 6 21:58:59 2000 +++ rocksndiamonds/files/patch-ab Tue Jan 30 09:14:54 2001 @@ -1,11 +1,11 @@ ---- src/Makefile.orig Sun Oct 24 18:51:53 1999 -+++ src/Makefile Wed Jan 5 22:11:35 2000 -@@ -61,7 +61,7 @@ - # OPTIONS = -DDEBUG -g -Wall # only for debugging purposes +--- src/Makefile.orig Mon Jan 1 20:02:21 2001 ++++ src/Makefile Tue Jan 30 09:14:35 2001 +@@ -96,7 +96,7 @@ + # OPTIONS = $(DEBUG) -O3 -Wall # only for debugging purposes + # OPTIONS = $(DEBUG) -Wall -ansi -pedantic # only for debugging purposes # OPTIONS = -O3 -Wall -ansi -pedantic - # OPTIONS = -O3 -Wall --OPTIONS = -O3 -+OPTIONS ?= -O3 - - # SYSTEM = -DSYSV -Ae # may be needed for HP-UX +-OPTIONS = -O3 -Wall ++OPTIONS ?= -O3 -Wall + # OPTIONS = -O3 + # OPTIONS = -DSYSV -Ae # may be needed for HP-UX diff -ruN rocksndiamonds.orig/files/patch-ad rocksndiamonds/files/patch-ad --- rocksndiamonds.orig/files/patch-ad Tue Jun 22 19:58:21 1999 +++ rocksndiamonds/files/patch-ad Tue Jan 30 09:49:10 2001 @@ -1,11 +1,11 @@ ---- src/sound.h.orig Sun Jun 20 18:05:54 1999 -+++ src/sound.h Sun Jun 20 18:06:06 1999 -@@ -26,7 +26,7 @@ - extern void ioctl(long, long, void *); - #endif +--- src/libgame/sound.h.orig Sat Dec 16 23:07:58 2000 ++++ src/libgame/sound.h Tue Jan 30 09:48:31 2001 +@@ -24,7 +24,7 @@ --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) && !defined(NO_SOUNDS) + #if defined(PLATFORM_LINUX) + #include <linux/soundcard.h> +-#elif defined(PLATFORM_FREEBSD) ++#elif defined(PLATFORM_FREEBSD) && !defined(NO_SOUNDS) #include <machine/soundcard.h> - #endif - + #elif defined(PLATFORM_HPUX) + #include <sys/audio.h> diff -ruN rocksndiamonds.orig/files/patch-ae rocksndiamonds/files/patch-ae --- rocksndiamonds.orig/files/patch-ae Tue Jun 22 19:58:22 1999 +++ rocksndiamonds/files/patch-ae Tue Jan 30 09:50:51 2001 @@ -1,13 +1,13 @@ ---- src/tools.c.orig Sun Jun 20 18:09:07 1999 -+++ src/tools.c Sun Jun 20 18:09:42 1999 +--- src/tools.c.orig Tue Dec 5 02:14:16 2000 ++++ src/tools.c Tue Jan 30 09:50:28 2001 @@ -13,10 +13,6 @@ #include <stdarg.h> --#ifdef __FreeBSD__ +-#if defined(PLATFORM_FREEBSD) -#include <machine/joystick.h> -#endif - + #include "libgame/libgame.h" + #include "tools.h" - #include "game.h" - #include "events.h" diff -ruN rocksndiamonds.orig/files/patch-ag rocksndiamonds/files/patch-ag --- rocksndiamonds.orig/files/patch-ag Tue Jun 22 19:58:23 1999 +++ rocksndiamonds/files/patch-ag Tue Jan 30 09:53:05 2001 @@ -1,18 +1,18 @@ ---- src/joystick.c.orig Sun Jun 20 18:15:41 1999 -+++ src/joystick.c Sun Jun 20 18:16:24 1999 +--- src/joystick.c.orig Tue Dec 5 02:11:08 2000 ++++ src/joystick.c Tue Jan 30 09:52:41 2001 @@ -11,10 +11,6 @@ - * joystick.c * + * joystick.c * ***********************************************************/ --#ifdef __FreeBSD__ +-#if defined(PLATFORM_FREEBSD) -#include <machine/joystick.h> -#endif - - #include "joystick.h" - #include "misc.h" + #include "libgame/libgame.h" -@@ -67,7 +63,7 @@ - #ifndef MSDOS + #include "joystick.h" +@@ -319,7 +315,7 @@ + #if defined(PLATFORM_UNIX) int Joystick(int player_nr) { -#ifdef __FreeBSD__ @@ -20,7 +20,7 @@ struct joystick joy_ctrl; #else struct joystick_control -@@ -103,7 +99,7 @@ +@@ -355,7 +351,7 @@ js_x = joy_ctrl.x; js_y = joy_ctrl.y; diff -ruN rocksndiamonds.orig/pkg-plist rocksndiamonds/pkg-plist --- rocksndiamonds.orig/pkg-plist Thu Jan 6 21:59:01 2000 +++ rocksndiamonds/pkg-plist Tue Jan 30 10:00:15 2001 @@ -1114,7 +1114,6 @@ share/rocksndiamonds/levels/Boulderdash/bd_xbd/037.level share/rocksndiamonds/levels/Boulderdash/bd_xbd/030.level share/rocksndiamonds/levels/Boulderdash/levelinfo.conf -share/rocksndiamonds/sounds/alchemy.wav share/rocksndiamonds/sounds/amoebe.wav share/rocksndiamonds/sounds/antigrav.wav share/rocksndiamonds/sounds/autsch.wav @@ -1125,8 +1124,6 @@ share/rocksndiamonds/sounds/booom.wav share/rocksndiamonds/sounds/bug.wav share/rocksndiamonds/sounds/buing.wav -share/rocksndiamonds/sounds/chase.wav -share/rocksndiamonds/sounds/czardasz.wav share/rocksndiamonds/sounds/deng.wav share/rocksndiamonds/sounds/empty.wav share/rocksndiamonds/sounds/exit.wav @@ -1149,7 +1146,6 @@ share/rocksndiamonds/sounds/lachen.wav share/rocksndiamonds/sounds/laser.wav share/rocksndiamonds/sounds/miep.wav -share/rocksndiamonds/sounds/network.wav share/rocksndiamonds/sounds/njam.wav share/rocksndiamonds/sounds/oeffnen.wav share/rocksndiamonds/sounds/pling.wav @@ -1168,9 +1164,6 @@ share/rocksndiamonds/sounds/sirr.wav share/rocksndiamonds/sounds/slurp.wav share/rocksndiamonds/sounds/sproing.wav -share/rocksndiamonds/sounds/twilight.wav -share/rocksndiamonds/sounds/tyger.wav -share/rocksndiamonds/sounds/voyager.wav share/rocksndiamonds/sounds/warnton.wav share/rocksndiamonds/sounds/whoosh.wav share/rocksndiamonds/sounds/zisch.wav >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E14NXBV-000ALA-00>