From 246224933bf5b1239af0bf692a070119716e37db Mon Sep 17 00:00:00 2001 From: benoit Date: Tue, 26 Feb 2019 20:14:23 +0000 Subject: [PATCH] Update to rocksndiamonds-4.1.2.0. --- games/rocksndiamonds/Makefile | 14 +++++++------- games/rocksndiamonds/distinfo | 4 ++-- games/rocksndiamonds/patches/patch-src_Makefile | 13 ++++++------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index 7c44ce05481..3db22777014 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.36 2018/10/17 08:48:34 benoit Exp $ +# $OpenBSD: Makefile,v 1.37 2019/02/26 20:14:23 benoit Exp $ ONLY_FOR_ARCHS = ${GCC4_ARCHS} ${CLANG_ARCHS} COMMENT = maze game resembling boulderdash -DISTNAME = rocksndiamonds-4.1.1.0 +DISTNAME = rocksndiamonds-4.1.2.0 CATEGORIES = games x11 HOMEPAGE = http://www.artsoft.org/rocksndiamonds/ @@ -14,13 +14,13 @@ MAINTAINER = Benoit Lecocq # GPLv2 PERMIT_PACKAGE_CDROM = Yes -WANTLIB = SDL c m pthread SDL_mixer SDL_image SDL_net +WANTLIB = SDL2 c m SDL2_mixer SDL2_image SDL2_net z MASTER_SITES = http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ -LIB_DEPENDS = devel/sdl-mixer \ - devel/sdl-image \ - devel/sdl-net>=1.2.7 +LIB_DEPENDS = devel/sdl2-mixer \ + devel/sdl2-image \ + devel/sdl2-net RUN_DEPENDS = devel/desktop-file-utils USE_GMAKE = Yes @@ -28,7 +28,7 @@ MAKE_FLAGS = CC="${CC}" MAKE="${MAKE_PROGRAM}" X11_PATH="${X11BASE}" \ RO_GAME_DIR="${PREFIX}/share/rocksndiamonds" \ RW_GAME_DIR="/var/games/rocksndiamonds" -ALL_TARGET = sdl +ALL_TARGET = sdl2 NO_TEST = Yes diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo index 251fc219e9f..a62cda90dd8 100644 --- a/games/rocksndiamonds/distinfo +++ b/games/rocksndiamonds/distinfo @@ -1,2 +1,2 @@ -SHA256 (rocksndiamonds-4.1.1.0.tar.gz) = 4kxtTblXHQIgfRlE5G4taGlcDn8AG8h5Tc0g9Ao1Fcw= -SIZE (rocksndiamonds-4.1.1.0.tar.gz) = 3876555 +SHA256 (rocksndiamonds-4.1.2.0.tar.gz) = o7sQR01JjfLbkx2vaijeDBAUxIt7Z0onYUH5po23zKo= +SIZE (rocksndiamonds-4.1.2.0.tar.gz) = 3923401 diff --git a/games/rocksndiamonds/patches/patch-src_Makefile b/games/rocksndiamonds/patches/patch-src_Makefile index 0d984cdb275..da2862f9276 100644 --- a/games/rocksndiamonds/patches/patch-src_Makefile +++ b/games/rocksndiamonds/patches/patch-src_Makefile @@ -1,15 +1,14 @@ -$OpenBSD: patch-src_Makefile,v 1.10 2018/05/04 21:04:43 benoit Exp $ -Index: src/Makefile ---- src/Makefile.orig -+++ src/Makefile -@@ -119,8 +119,8 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAGS) | \ +$OpenBSD: patch-src_Makefile,v 1.11 2019/02/26 20:14:23 benoit Exp $ +--- src/Makefile.orig Sun Feb 17 20:09:38 2019 ++++ src/Makefile Tue Feb 26 15:16:38 2019 +@@ -113,8 +113,8 @@ OPTIONS = -O3 -Wall endif -CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(EXTRA_CFLAGS) $(CONFIG) --LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm +-LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm -lz +CFLAGS += $(SYS_CFLAGS) $(EXTRA_CFLAGS) $(CONFIG) -+LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm ++LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm -lz SRCS = main.c \