From d5e714bad13e61ba9eb513214d3be756470320d0 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 7 Sep 2008 07:54:04 +0000 Subject: [PATCH] - update to rocksndiamonds-3.2.4 ok landry@ --- games/rocksndiamonds/Makefile | 24 ++++++++++++++----- games/rocksndiamonds/distinfo | 10 ++++---- .../rocksndiamonds/patches/patch-src_Makefile | 14 ++++++----- games/rocksndiamonds/pkg/PLIST | 12 ++++++---- 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index 185966e505b..2cec6ed9487 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -1,33 +1,45 @@ -# $OpenBSD: Makefile,v 1.11 2008/06/15 01:51:11 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.12 2008/09/07 07:54:04 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 + +# XXX segfaults with gcc3 +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 diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo index f1d7979770b..c8c3b4b1b1d 100644 --- a/games/rocksndiamonds/distinfo +++ b/games/rocksndiamonds/distinfo @@ -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 diff --git a/games/rocksndiamonds/patches/patch-src_Makefile b/games/rocksndiamonds/patches/patch-src_Makefile index 2a9f13f4db2..4444ed86198 100644 --- a/games/rocksndiamonds/patches/patch-src_Makefile +++ b/games/rocksndiamonds/patches/patch-src_Makefile @@ -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 +$OpenBSD: patch-src_Makefile,v 1.5 2008/09/07 07:54:04 ajacoutot Exp $ +--- 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 \ diff --git a/games/rocksndiamonds/pkg/PLIST b/games/rocksndiamonds/pkg/PLIST index 217b4ca6c02..475272dff97 100644 --- a/games/rocksndiamonds/pkg/PLIST +++ b/games/rocksndiamonds/pkg/PLIST @@ -1,17 +1,22 @@ -@comment $OpenBSD: PLIST,v 1.9 2006/01/27 01:11:08 jolan Exp $ +@comment $OpenBSD: PLIST,v 1.10 2008/09/07 07:54:04 ajacoutot Exp $ @mode 2555 @group games -bin/rocksndiamonds +@bin 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/RocksToons.pcx 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/013.level 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/013.tape 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