Attachment #12911 for bug #24731

View | Details | Raw Unified | Return to bug 24731
Collapse All | Expand All




#

PORTNAME=	rocksndiamonds
PORTVERSION=	2.0.0
PORTREVISION= 	1
CATEGORIES=	games
MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \
		http://homepages.compuserve.de/rocksndiamonds/
MASTER_SITE_SUBDIR=	games

PATCH_SITES=	http://www.artsoft.org/RELEASES/
PATCHFILES=	rocksndiamonds-1.4.0pl1.diff

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 \


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

Lines 1-2 Link Here

(-)rocksndiamonds/distinfo (-2 / +1 lines)
1	MD5 (rocksndiamonds-1.4.0.tar.gz) = 48f94ba1421ff1865199d560aca70abb	1	MD5 (rocksndiamonds-2.0.0.tar.gz) = 58e70641241e5b036ea052b7bcba384f
2	MD5 (rocksndiamonds-1.4.0pl1.diff) = 9ba906a29b5deaff19080b00cca3f18c




--- 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 -Wall
 # OPTIONS = -O3
 # OPTIONS = -DSYSV -Ae				# may be needed for HP-UX
 # SYSTEM = -DSYSV -Ae		# may be needed for HP-UX
 




--- 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 @@
 extern void ioctl(long, long, void *);
 #endif
 
 #if defined(PLATFORM_LINUX)
 #include <linux/soundcard.h>
-#elif defined(PLATFORM_FREEBSD)
+#elif defined(PLATFORM_FREEBSD) && !defined(NO_SOUNDS)
 #include <machine/soundcard.h>
 #elif defined(PLATFORM_HPUX)
 #include <sys/audio.h>

Lines 1-13 Link Here

(-)rocksndiamonds/files/patch-ae (-5 / +5 lines)
1	--- src/tools.c.orig Sun Jun 20 18:09:07 1999	1	--- src/tools.c.orig Tue Dec 5 02:14:16 2000
2	+++ src/tools.c Sun Jun 20 18:09:42 1999	2	+++ src/tools.c Tue Jan 30 09:50:28 2001
3	@@ -13,10 +13,6 @@	3	@@ -13,10 +13,6 @@
4		4
5	#include <stdarg.h>	5	#include <stdarg.h>
6		6
7	-#ifdef __FreeBSD__	7	-#if defined(PLATFORM_FREEBSD)
8	-#include <machine/joystick.h>	8	-#include <machine/joystick.h>
9	-#endif	9	-#endif
10	-	10	-
		11	#include "libgame/libgame.h"
		12
11	#include "tools.h"	13	#include "tools.h"
12	#include "game.h"
13	#include "events.h"




--- 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                                               *
 ***********************************************************/
 
-#if defined(PLATFORM_FREEBSD)
-#include <machine/joystick.h>
-#endif
-
 #include "libgame/libgame.h"
 #include "misc.h"
 
 #include "joystick.h"
@@ -319,7 +315,7 @@
 #if defined(PLATFORM_UNIX)
 int Joystick(int player_nr)
 {
-#ifdef __FreeBSD__

   struct joystick joy_ctrl;
 #else
   struct joystick_control
@@ -355,7 +351,7 @@
   js_x  = joy_ctrl.x;
   js_y  = joy_ctrl.y;
 




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

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

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

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

Return to bug 24731

Lines 6-23 Link Here

(-)rocksndiamonds/Makefile (-8 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= rocksndiamonds	8	PORTNAME= rocksndiamonds
9	PORTVERSION= 1.4.0	9	PORTVERSION= 2.0.0
10	PORTREVISION= 1
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= http://www.artsoft.org/rocksndiamonds/RELEASES/ \	11	MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \
13	${MASTER_SITE_XCONTRIB}	12	http://homepages.compuserve.de/rocksndiamonds/
14	MASTER_SITE_SUBDIR= games
15
16	PATCH_SITES= http://www.artsoft.org/RELEASES/
17	PATCHFILES= rocksndiamonds-1.4.0pl1.diff
18		13
19	MAINTAINER= mwest@uct.ac.za	14	MAINTAINER= mwest@uct.ac.za
20		15
		16	.if defined(WITH_SDL)
		17	LIB_DEPENDS= SDL_image.10:${PORTSDIR}/graphics/sdl_image \
		18	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
		19	MAKE_ARGS+= sdl
		20	.endif
		21
21	USE_XLIB= yes	22	USE_XLIB= yes
22	USE_GMAKE= yes	23	USE_GMAKE= yes
23	MAKE_ENV+= RO_GAME_DIR=${GAME_DIR} RW_GAME_DIR=${GAME_DIR}/scores \	24	MAKE_ENV+= RO_GAME_DIR=${GAME_DIR} RW_GAME_DIR=${GAME_DIR}/scores \
Lines 28-33 Link Here
28		29
29	GAME_DIR=${PREFIX}/share/rocksndiamonds	30	GAME_DIR=${PREFIX}/share/rocksndiamonds
30	DOC_DIR=${PREFIX}/share/doc/rocksndiamonds	31	DOC_DIR=${PREFIX}/share/doc/rocksndiamonds
		32
		33	.if defined(WITH_SDL)
		34	pre-patch:
		35	@${PERL} -pi.orig -e 's:sdl-config:sdl11-config:g' ${WRKSRC}/src/Makefile
		36	.endif
31		37
32	do-install:	38	do-install:
33	${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${PREFIX}/bin	39	${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${PREFIX}/bin

Lines 1-11 Link Here

(-)rocksndiamonds/files/patch-ab (-9 / +9 lines)
1	--- src/Makefile.orig Sun Oct 24 18:51:53 1999	1	--- src/Makefile.orig Mon Jan 1 20:02:21 2001
2	+++ src/Makefile Wed Jan 5 22:11:35 2000	2	+++ src/Makefile Tue Jan 30 09:14:35 2001
3	@@ -61,7 +61,7 @@	3	@@ -96,7 +96,7 @@
4	# OPTIONS = -DDEBUG -g -Wall # only for debugging purposes	4	# OPTIONS = $(DEBUG) -O3 -Wall # only for debugging purposes
		5	# OPTIONS = $(DEBUG) -Wall -ansi -pedantic # only for debugging purposes
5	# OPTIONS = -O3 -Wall -ansi -pedantic	6	# OPTIONS = -O3 -Wall -ansi -pedantic
6	# OPTIONS = -O3 -Wall	7	-OPTIONS = -O3 -Wall
7	-OPTIONS = -O3	8	+OPTIONS ?= -O3 -Wall
8	+OPTIONS ?= -O3	9	# OPTIONS = -O3
9		10	# OPTIONS = -DSYSV -Ae # may be needed for HP-UX
10	# SYSTEM = -DSYSV -Ae # may be needed for HP-UX
11		11

Lines 1-11 Link Here

(-)rocksndiamonds/files/patch-ad (-9 / +9 lines)
1	--- src/sound.h.orig Sun Jun 20 18:05:54 1999	1	--- src/libgame/sound.h.orig Sat Dec 16 23:07:58 2000
2	+++ src/sound.h Sun Jun 20 18:06:06 1999	2	+++ src/libgame/sound.h Tue Jan 30 09:48:31 2001
3	@@ -26,7 +26,7 @@	3	@@ -24,7 +24,7 @@
4	extern void ioctl(long, long, void *);
5	#endif
6		4
7	-#ifdef __FreeBSD__	5	#if defined(PLATFORM_LINUX)
8	+#if defined(__FreeBSD__) && !defined(NO_SOUNDS)	6	#include <linux/soundcard.h>
		7	-#elif defined(PLATFORM_FREEBSD)
		8	+#elif defined(PLATFORM_FREEBSD) && !defined(NO_SOUNDS)
9	#include <machine/soundcard.h>	9	#include <machine/soundcard.h>
10	#endif	10	#elif defined(PLATFORM_HPUX)
11		11	#include <sys/audio.h>

Lines 1-18 Link Here

(-)rocksndiamonds/files/patch-ag (-9 / +9 lines)
1	--- src/joystick.c.orig Sun Jun 20 18:15:41 1999	1	--- src/joystick.c.orig Tue Dec 5 02:11:08 2000
2	+++ src/joystick.c Sun Jun 20 18:16:24 1999	2	+++ src/joystick.c Tue Jan 30 09:52:41 2001
3	@@ -11,10 +11,6 @@	3	@@ -11,10 +11,6 @@
4	* joystick.c *	4	* joystick.c *
5	***********************************************************/	5	***********************************************************/
6		6
7	-#ifdef __FreeBSD__	7	-#if defined(PLATFORM_FREEBSD)
8	-#include <machine/joystick.h>	8	-#include <machine/joystick.h>
9	-#endif	9	-#endif
10	-	10	-
11	#include "joystick.h"	11	#include "libgame/libgame.h"
12	#include "misc.h"
13		12
14	@@ -67,7 +63,7 @@	13	#include "joystick.h"
15	#ifndef MSDOS	14	@@ -319,7 +315,7 @@
		15	#if defined(PLATFORM_UNIX)
16	int Joystick(int player_nr)	16	int Joystick(int player_nr)
17	{	17	{
18	-#ifdef __FreeBSD__	18	-#ifdef __FreeBSD__
Lines 20-26 Link Here
20	struct joystick joy_ctrl;	20	struct joystick joy_ctrl;
21	#else	21	#else
22	struct joystick_control	22	struct joystick_control
23	@@ -103,7 +99,7 @@	23	@@ -355,7 +351,7 @@
24	js_x = joy_ctrl.x;	24	js_x = joy_ctrl.x;
25	js_y = joy_ctrl.y;	25	js_y = joy_ctrl.y;
26		26

Lines 1114-1120 Link Here

(-)rocksndiamonds/pkg-plist (-7 lines)
1114	share/rocksndiamonds/levels/Boulderdash/bd_xbd/037.level	1114	share/rocksndiamonds/levels/Boulderdash/bd_xbd/037.level
1115	share/rocksndiamonds/levels/Boulderdash/bd_xbd/030.level	1115	share/rocksndiamonds/levels/Boulderdash/bd_xbd/030.level
1116	share/rocksndiamonds/levels/Boulderdash/levelinfo.conf	1116	share/rocksndiamonds/levels/Boulderdash/levelinfo.conf
1117	share/rocksndiamonds/sounds/alchemy.wav
1118	share/rocksndiamonds/sounds/amoebe.wav	1117	share/rocksndiamonds/sounds/amoebe.wav
1119	share/rocksndiamonds/sounds/antigrav.wav	1118	share/rocksndiamonds/sounds/antigrav.wav
1120	share/rocksndiamonds/sounds/autsch.wav	1119	share/rocksndiamonds/sounds/autsch.wav
Lines 1125-1132 Link Here
1125	share/rocksndiamonds/sounds/booom.wav	1124	share/rocksndiamonds/sounds/booom.wav
1126	share/rocksndiamonds/sounds/bug.wav	1125	share/rocksndiamonds/sounds/bug.wav
1127	share/rocksndiamonds/sounds/buing.wav	1126	share/rocksndiamonds/sounds/buing.wav
1128	share/rocksndiamonds/sounds/chase.wav
1129	share/rocksndiamonds/sounds/czardasz.wav
1130	share/rocksndiamonds/sounds/deng.wav	1127	share/rocksndiamonds/sounds/deng.wav
1131	share/rocksndiamonds/sounds/empty.wav	1128	share/rocksndiamonds/sounds/empty.wav
1132	share/rocksndiamonds/sounds/exit.wav	1129	share/rocksndiamonds/sounds/exit.wav
Lines 1149-1155 Link Here
1149	share/rocksndiamonds/sounds/lachen.wav	1146	share/rocksndiamonds/sounds/lachen.wav
1150	share/rocksndiamonds/sounds/laser.wav	1147	share/rocksndiamonds/sounds/laser.wav
1151	share/rocksndiamonds/sounds/miep.wav	1148	share/rocksndiamonds/sounds/miep.wav
1152	share/rocksndiamonds/sounds/network.wav
1153	share/rocksndiamonds/sounds/njam.wav	1149	share/rocksndiamonds/sounds/njam.wav
1154	share/rocksndiamonds/sounds/oeffnen.wav	1150	share/rocksndiamonds/sounds/oeffnen.wav
1155	share/rocksndiamonds/sounds/pling.wav	1151	share/rocksndiamonds/sounds/pling.wav
Lines 1168-1176 Link Here
1168	share/rocksndiamonds/sounds/sirr.wav	1164	share/rocksndiamonds/sounds/sirr.wav
1169	share/rocksndiamonds/sounds/slurp.wav	1165	share/rocksndiamonds/sounds/slurp.wav
1170	share/rocksndiamonds/sounds/sproing.wav	1166	share/rocksndiamonds/sounds/sproing.wav
1171	share/rocksndiamonds/sounds/twilight.wav
1172	share/rocksndiamonds/sounds/tyger.wav
1173	share/rocksndiamonds/sounds/voyager.wav
1174	share/rocksndiamonds/sounds/warnton.wav	1167	share/rocksndiamonds/sounds/warnton.wav
1175	share/rocksndiamonds/sounds/whoosh.wav	1168	share/rocksndiamonds/sounds/whoosh.wav
1176	share/rocksndiamonds/sounds/zisch.wav	1169	share/rocksndiamonds/sounds/zisch.wav