Hi.
This diff updates rocksndiamonds to the latest available version.
Successfully tested on i386.
Comments? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/rocksndiamonds/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 15 Jun 2008 01:51:11 -0000 1.11
+++ Makefile 6 Sep 2008 15:25:34 -0000
@@ -1,33 +1,44 @@
# $OpenBSD: Makefile,v 1.11 2008/06/15 01:51:11 ajacoutot Exp $
COMMENT= maze game resembling boulderdash
-DISTNAME= rocksndiamonds-3.1.2
-PKGNAME= ${DISTNAME}p1
+DISTNAME= rocksndiamonds-3.2.4
CATEGORIES= games x11
MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
HOMEPAGE= http://www.artsoft.org/rocksndiamonds/
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= SDL X11 Xext c m pthread smpeg usbhid
+
+WANTLIB= SDL c m pthread smpeg
LIB_DEPENDS= SDL_mixer::devel/sdl-mixer \
SDL_image::devel/sdl-image \
- SDL_net::devel/sdl-net
+ SDL_net:sdl-net->=1.2.7:devel/sdl-net
NO_REGRESS= Yes
USE_GMAKE= Yes
USE_X11= Yes
+ALL_TARGET= sdl
+
+MODULES+= gcc4
+MODGCC4_ARCHES= *
+
N=rocksndiamonds
+
+post-extract:
+ @find ${WRKSRC} -name \*.orig -exec rm {} \;
+
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/${N} ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/${N}
@cp -R ${WRKSRC}/{graphics,levels,music,sounds} ${PREFIX}/share/${N}
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${N}
+ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${N}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/rocksndiamonds/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 5 Apr 2007 15:38:11 -0000 1.7
+++ distinfo 6 Sep 2008 15:25:34 -0000
@@ -1,5 +1,5 @@
-MD5 (rocksndiamonds-3.1.2.tar.gz) = SJ0cFAHvH+G9IYukZbBVlA==
-RMD160 (rocksndiamonds-3.1.2.tar.gz) = C0ZY7DyNNFt0XE6zUMTUJTFyzOc=
-SHA1 (rocksndiamonds-3.1.2.tar.gz) = hCy3Q7/t6WbesF4OxfObh3soQ48=
-SHA256 (rocksndiamonds-3.1.2.tar.gz) =
qwJsw0rPiLxgC9xubGi+cBa9oXCDVLp+sHNbfjMY1FY=
-SIZE (rocksndiamonds-3.1.2.tar.gz) = 3120830
+MD5 (rocksndiamonds-3.2.4.tar.gz) = Vhu+vH9Zs/phuunXNArknQ==
+RMD160 (rocksndiamonds-3.2.4.tar.gz) = pkEWpqF8SWm6seecVFe2fOCJCms=
+SHA1 (rocksndiamonds-3.2.4.tar.gz) = k6vUiaPgJ9JVOIYyLNk97otUHzU=
+SHA256 (rocksndiamonds-3.2.4.tar.gz) =
iXPpyM6kOVwLoF6YMppXP79pHADoZsjVP1c/otN0EKw=
+SIZE (rocksndiamonds-3.2.4.tar.gz) = 3427302
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/games/rocksndiamonds/patches/patch-src_Makefile,v
retrieving revision 1.4
diff -u -r1.4 patch-src_Makefile
--- patches/patch-src_Makefile 27 Jan 2006 01:11:08 -0000 1.4
+++ patches/patch-src_Makefile 6 Sep 2008 15:25:34 -0000
@@ -1,12 +1,14 @@
$OpenBSD: patch-src_Makefile,v 1.4 2006/01/27 01:11:08 jolan Exp $
---- src/Makefile.orig Wed Jan 11 22:27:20 2006
-+++ src/Makefile Sat Jan 14 23:47:13 2006
-@@ -141,7 +141,7 @@ ifdef BUILD_DIST # distribution
build
+--- src/Makefile.orig Thu Sep 13 23:32:36 2007
++++ src/Makefile Fri Jun 20 09:44:06 2008
+@@ -142,8 +142,8 @@ ifdef BUILD_DIST # distribution
build
OPTIONS = -O3 -Wall
endif
-CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(EXTRA_CFLAGS) $(CONFIG)
-+CFLAGS = $(SYS_CFLAGS) $(EXTRA_CFLAGS) $(CONFIG)
- LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+-LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
++CFLAGS += $(SYS_CFLAGS) $(EXTRA_CFLAGS) $(CONFIG)
++LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+ SRCS = main.c \
Index: patches/patch-src_game_em_sound_c
===================================================================
RCS file: patches/patch-src_game_em_sound_c
diff -N patches/patch-src_game_em_sound_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_game_em_sound_c 6 Sep 2008 15:25:34 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/game_em/sound.c.orig Sat Sep 6 17:02:58 2008
++++ src/game_em/sound.c Sat Sep 6 17:03:51 2008
+@@ -16,7 +16,7 @@
+ #endif
+
+ #ifdef PLATFORM_BSD
+-#include <ioctl.h>
++#include <sys/ioctl.h>
+ #include <soundcard.h>
+ #endif
+
Index: patches/patch-src_libgame_sound_c
===================================================================
RCS file: patches/patch-src_libgame_sound_c
diff -N patches/patch-src_libgame_sound_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_libgame_sound_c 6 Sep 2008 15:25:34 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/libgame/sound.c.orig Wed Sep 12 21:52:33 2007
++++ src/libgame/sound.c Sat Sep 6 17:05:11 2008
+@@ -27,6 +27,8 @@
+ #include <linux/soundcard.h>
+ #elif defined(PLATFORM_FREEBSD)
+ #include <machine/soundcard.h>
++#elif defined(PLATFORM_OPENBSD)
++#include <soundcard.h>
+ #elif defined(PLATFORM_NETBSD)
+ #include <sys/ioctl.h>
+ #include <sys/audioio.h>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/rocksndiamonds/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- pkg/PLIST 27 Jan 2006 01:11:08 -0000 1.9
+++ pkg/PLIST 6 Sep 2008 15:25:35 -0000
@@ -1,17 +1,22 @@
@comment $OpenBSD: PLIST,v 1.9 2006/01/27 01:11:08 jolan Exp $
@mode 2555
@group games
-bin/rocksndiamonds
[EMAIL PROTECTED] bin/rocksndiamonds
@mode
@group
+share/doc/rocksndiamonds/
+share/doc/rocksndiamonds/README
share/rocksndiamonds/
share/rocksndiamonds/graphics/
share/rocksndiamonds/graphics/gfx_classic/
+share/rocksndiamonds/graphics/gfx_classic/RocksBusy.pcx
share/rocksndiamonds/graphics/gfx_classic/RocksDC.pcx
+share/rocksndiamonds/graphics/gfx_classic/RocksDC2.pcx
share/rocksndiamonds/graphics/gfx_classic/RocksDoor.pcx
share/rocksndiamonds/graphics/gfx_classic/RocksEMC.pcx
share/rocksndiamonds/graphics/gfx_classic/RocksElements.pcx
share/rocksndiamonds/graphics/gfx_classic/RocksFontBig.pcx
+share/rocksndiamonds/graphics/gfx_classic/RocksFontDC.pcx
share/rocksndiamonds/graphics/gfx_classic/RocksFontEM.pcx
share/rocksndiamonds/graphics/gfx_classic/RocksFontMedium.pcx
share/rocksndiamonds/graphics/gfx_classic/RocksFontSmall.pcx
@@ -23,6 +28,7 @@
share/rocksndiamonds/graphics/gfx_classic/graphicsinfo.conf
share/rocksndiamonds/graphics/gfx_classic/mouse.pcx
share/rocksndiamonds/graphics/gfx_classic/rocks_icon.xbm
+share/rocksndiamonds/graphics/gfx_classic/rocks_icon_32x32.pcx
share/rocksndiamonds/graphics/gfx_classic/rocks_iconmask.xbm
share/rocksndiamonds/levels/
share/rocksndiamonds/levels/Classic_Games/
@@ -471,7 +477,6 @@
share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/014.level
share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/015.level
share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/016.level
-share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/016.level.orig
share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/017.level
share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/018.level
share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/019.level
@@ -500,7 +505,6 @@
share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/tapes/014.tape
share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/tapes/015.tape
share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/tapes/016.tape
-share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/tapes/016.tape.orig
share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/tapes/017.tape
share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/tapes/018.tape
share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/tapes/019.tape
--
Antoine
