From cef7980b7d0ffc1138149ef3fa92a62eabd430be Mon Sep 17 00:00:00 2001 From: bcallah Date: Fri, 15 May 2020 19:57:34 +0000 Subject: [PATCH] Update to gnukem-1.0.1 --- games/gnukem/Makefile | 4 ++-- games/gnukem/distinfo | 4 ++-- games/gnukem/patches/patch-src_datadir_h | 16 ---------------- games/gnukem/patches/patch-src_djimage_cpp | 4 ++-- games/gnukem/patches/patch-src_game_cpp | 16 ---------------- games/gnukem/patches/patch-src_sdl_djgraph_cpp | 2 +- games/gnukem/patches/patch-src_sdl_djsound_cpp | 14 -------------- games/gnukem/patches/patch-src_sys_defs_h | 14 -------------- games/gnukem/pkg/PLIST | 3 ++- 9 files changed, 9 insertions(+), 68 deletions(-) delete mode 100644 games/gnukem/patches/patch-src_datadir_h delete mode 100644 games/gnukem/patches/patch-src_game_cpp delete mode 100644 games/gnukem/patches/patch-src_sdl_djsound_cpp delete mode 100644 games/gnukem/patches/patch-src_sys_defs_h diff --git a/games/gnukem/Makefile b/games/gnukem/Makefile index f59cc3ca824..1e98babe6b1 100644 --- a/games/gnukem/Makefile +++ b/games/gnukem/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.2 2019/07/12 20:46:19 sthen Exp $ +# $OpenBSD: Makefile,v 1.3 2020/05/15 19:57:34 bcallah Exp $ COMMENT = open source retro-style 2D scrolling platform shooter game -DISTNAME = gnukem-1.0 +DISTNAME = gnukem-1.0.1 CATEGORIES = games x11 HOMEPAGE = https://djoffe.com/gnukem/ diff --git a/games/gnukem/distinfo b/games/gnukem/distinfo index eb2a116a4e2..602e5fe2777 100644 --- a/games/gnukem/distinfo +++ b/games/gnukem/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnukem-1.0.tar.gz) = KOX8oFvgtUKGmrP9x8J2dNr9VvfPFmzFp+2dFDxMDKs= -SIZE (gnukem-1.0.tar.gz) = 20553539 +SHA256 (gnukem-1.0.1.tar.gz) = BwmDKeY852NKhV3Cb74u9lcQQyfzYNpwrR9pZuM7BO4= +SIZE (gnukem-1.0.1.tar.gz) = 20566679 diff --git a/games/gnukem/patches/patch-src_datadir_h b/games/gnukem/patches/patch-src_datadir_h deleted file mode 100644 index 07e4f828c48..00000000000 --- a/games/gnukem/patches/patch-src_datadir_h +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_datadir_h,v 1.1.1.1 2019/05/04 02:00:17 bcallah Exp $ - -Only define DATA_DIR if you haven't already. - -Index: src/datadir.h ---- src/datadir.h.orig -+++ src/datadir.h -@@ -10,6 +10,8 @@ Copyright (C) 1999-2018 David Joffe - #define _DATADIR_H_ - - //! Data directory [dj2017-08 should this move to config.h?] -+#ifndef DATA_DIR - #define DATA_DIR "data/" -+#endif - - #endif diff --git a/games/gnukem/patches/patch-src_djimage_cpp b/games/gnukem/patches/patch-src_djimage_cpp index eebe4a4a25c..5734744a1f7 100644 --- a/games/gnukem/patches/patch-src_djimage_cpp +++ b/games/gnukem/patches/patch-src_djimage_cpp @@ -1,4 +1,4 @@ -$OpenBSD: patch-src_djimage_cpp,v 1.1.1.1 2019/05/04 02:00:17 bcallah Exp $ +$OpenBSD: patch-src_djimage_cpp,v 1.2 2020/05/15 19:57:34 bcallah Exp $ Fix big endian issue @@ -6,7 +6,7 @@ Index: src/djimage.cpp --- src/djimage.cpp.orig +++ src/djimage.cpp @@ -264,8 +264,13 @@ int djImage::LoadTGA( const char * szFilename ) - for ( unsigned int j=0; j127. - -Index: src/game.cpp ---- src/game.cpp.orig -+++ src/game.cpp -@@ -2014,7 +2014,7 @@ bool HeroIsHurting() - void DrawHealth() - { - // Build a string representing health bars (which are in the 8x8 font) -- char szHealth[MAX_HEALTH+1]={0}; -+ unsigned char szHealth[MAX_HEALTH+1]={0}; - for ( unsigned int i=0; iHeight(), 32, pImage->Pitch(), diff --git a/games/gnukem/patches/patch-src_sdl_djsound_cpp b/games/gnukem/patches/patch-src_sdl_djsound_cpp deleted file mode 100644 index e137367d7f0..00000000000 --- a/games/gnukem/patches/patch-src_sdl_djsound_cpp +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_sdl_djsound_cpp,v 1.1.1.1 2019/05/04 02:00:17 bcallah Exp $ - -Index: src/sdl/djsound.cpp ---- src/sdl/djsound.cpp.orig -+++ src/sdl/djsound.cpp -@@ -13,7 +13,7 @@ Copyright (C) 1999-2018 David Joffe and Kent Mein - #include - #endif - --#ifdef __APPLE__ -+#ifdef __OpenBSD__ - #include //Fixing malloc.h 'not found' error compiling on Mac [dj2016-10] - #else - #include diff --git a/games/gnukem/patches/patch-src_sys_defs_h b/games/gnukem/patches/patch-src_sys_defs_h deleted file mode 100644 index 2ebccf8458e..00000000000 --- a/games/gnukem/patches/patch-src_sys_defs_h +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_sys_defs_h,v 1.1.1.1 2019/05/04 02:00:17 bcallah Exp $ - -Index: src/sys_defs.h ---- src/sys_defs.h.orig -+++ src/sys_defs.h -@@ -21,7 +21,7 @@ extern "C" - #include - #include - #include --#ifdef __APPLE__ -+#ifdef __OpenBSD__ - #include //Fixing malloc.h 'not found' error compiling on Mac [dj2016-10] - #else - #include diff --git a/games/gnukem/pkg/PLIST b/games/gnukem/pkg/PLIST index a79f282a375..cc261b1388f 100644 --- a/games/gnukem/pkg/PLIST +++ b/games/gnukem/pkg/PLIST @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2019/05/04 02:00:17 bcallah Exp $ +@comment $OpenBSD: PLIST,v 1.2 2020/05/15 19:57:34 bcallah Exp $ bin/davegnukem share/gnukem/ share/gnukem/data/ +share/gnukem/data/README.md share/gnukem/data/credits.tga share/gnukem/data/default.gam share/gnukem/data/editor/