Update to gnukem-1.0.3

Changelog: https://github.com/davidjoffe/dave_gnukem/releases/tag/1.0.3

games/gnukem/Makefile

@@ -1,38 +1,38 @@
+V =		1.0.3
 COMMENT =	open source retro-style 2D scrolling platform shooter game
-DISTNAME =	gnukem-1.0.1
+DISTFILES =	davegnukem_${V}.orig.tar.xz \
+		davegnukem_${V}.orig-data.tar.xz
+PKGNAME =	gnukem-${V}
 CATEGORIES =	games x11
 
 HOMEPAGE =	https://djoffe.com/gnukem/
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
 
 # Dual licensed: MIT or GPLv2 only
+# Data assets: CC-BY-3.0, CC0
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += ${COMPILER_LIBCXX} SDL SDL_mixer c m
+WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_mixer c m
 
-# Upstream data fetching is ugh...
-MASTER_SITES =	https://mirrors.nycbug.org/pub/distfiles/
+MASTER_SITES =	https://github.com/davidjoffe/dave_gnukem/releases/download/${V}/
 
+# C++14
 COMPILER =	base-clang ports-gcc
 
-LIB_DEPENDS =	devel/sdl-mixer
+LIB_DEPENDS =	devel/sdl2-mixer
+
+RUN_DEPENDS =	devel/desktop-file-utils \
+		x11/gtk+4,-guic
 
 USE_GMAKE =	Yes
-ALL_TARGET =	default
-MAKE_FLAGS =	CC="${CC}" CPP="${CXX}" \
-		CXXFLAGS="${CXXFLAGS}"
+MAKE_FLAGS =	CC="${CC}" CXX="${CXX}" \
+		FLAGS="${CXXFLAGS}"
 
 NO_TEST =	Yes
 
-# No install routine
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/gnukem/data
-	cd ${WRKSRC}/data && find * -type d -exec ${INSTALL_DATA_DIR} \
-		"${PREFIX}/share/gnukem/data/{}" \;
-	cd ${WRKSRC}/data && find * -type f -exec ${INSTALL_DATA} \
-		"{}" "${PREFIX}/share/gnukem/data/{}" \;
-	echo "#!/bin/sh\ncd ${TRUEPREFIX}/share/gnukem && ./davegnukem \"\$$@\"" >> ${WRKSRC}/gnukem.sh
-	${INSTALL_PROGRAM} ${WRKSRC}/davegnukem ${PREFIX}/share/gnukem
-	${INSTALL_SCRIPT} ${WRKSRC}/gnukem.sh ${PREFIX}/bin/davegnukem
+WRKDIST =	${WRKDIR}/dave_gnukem-${V}
+
+post-extract:
+	mv ${WRKDIR}/gnukem_data-${V} ${WRKDIST}/data
 
 .include <bsd.port.mk>

games/gnukem/distinfo

@@ -1,2 +1,4 @@
-SHA256 (gnukem-1.0.1.tar.gz) = BwmDKeY852NKhV3Cb74u9lcQQyfzYNpwrR9pZuM7BO4=
-SIZE (gnukem-1.0.1.tar.gz) = 20566679
+SHA256 (davegnukem_1.0.3.orig-data.tar.xz) = 7C5xo6ljVNxmBFDXWQz1o9YEiG/jhlq2kEj1/CppXxY=
+SHA256 (davegnukem_1.0.3.orig.tar.xz) = d6ZOJ6uMAGyMq1zewAWgIN/jg+mv81dI/55CbCcI1pw=
+SIZE (davegnukem_1.0.3.orig-data.tar.xz) = 19957856
+SIZE (davegnukem_1.0.3.orig.tar.xz) = 277296

games/gnukem/patches/patch-Makefile

@@ -3,28 +3,40 @@ Fix up Makefile.
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -8,8 +8,8 @@
- # 2017-07-29: Remove obsolete standalone-editor-related stuff, and add new thing_monsters.o
- #
+@@ -22,20 +22,20 @@ VERSION  = v$(V_NUM) - $(V_DATE)
  
--CPP = g++
--CC = gcc
-+CPP ?= g++
-+CC ?= gcc
+ # paths
+ PREFIX   = /usr/local
+-DATA_DIR = $(PREFIX)/share/games/$(BIN)/# the trailing slash is required for paths in the source
++DATA_DIR = $(PREFIX)/share/$(BIN)/# the trailing slash is required for paths in the source
  
+ LIBS    = `sdl2-config --libs` -lSDL2_mixer
+ LDFLAGS = $(LIBS)
  
- # dj2016-10 Add L -I/usr/local/include/SDL in process of getting this working on Mac OS X - not sure if this is 'bad' to just have both /usr/include and /usr/local/include??
-@@ -21,11 +21,11 @@ INCLUDEDIRS= -I/usr/include/SDL -I/usr/local/include/S
- # If you don't -DDATA_DIR to a valid dir, then data files will be assumed
- # to be in current directory
- #CCFLAGS = -Wall -I/usr/local/include -DHAVE_SOUND -DDEBUG -O -m486
--CCFLAGS = -Wall -Wno-switch -DDEBUG $(INCLUDEDIRS)
-+CCFLAGS = ${CXXFLAGS} -Wall -Wno-switch -I${LOCALBASE}/include/SDL
- #Release version:
- #CCFLAGS = -O -Wall -I/usr/local/include -DHAVE_SOUND $(INCLUDEDIRS)
+ CPPFLAGS = -DDATA_DIR=\"$(DATA_DIR)\" -DVERSION=\"'$(VERSION)'\"
  
--LIBS = -lSDL -lSDLmain -lSDL_mixer -lpthread 
-+LIBS = -L${LOCALBASE}/lib -lSDL -lSDLmain -lSDL_mixer -lpthread 
- BIN = davegnukem
+-CXX = g++
++CXX ?= g++
  
+ OBJ = $(shell find src -iname '*.cpp' -type f | sed 's/\.cpp$$/.o/')
  
+ # debug
+ #CXXFLAGS = -ggdb -DDEBUG -std=c++14 -Wall `sdl2-config --cflags` $(CPPFLAGS)
+-CXXFLAGS = -O2 -std=c++14 -Wall `sdl2-config --cflags` $(CPPFLAGS)
++CXXFLAGS += $(FLAGS) -std=c++14 -Wall `sdl2-config --cflags` $(CPPFLAGS)
+ 
+ all: options davegnukem
+ 
+@@ -64,9 +64,9 @@ dist: clean
+ 
+ install: 
+ 	# binary
+-	mkdir -p $(DESTDIR)$(PREFIX)/games
+-	cp -f $(BIN) $(DESTDIR)$(PREFIX)/games
+-	chmod 755 $(DESTDIR)$(PREFIX)/games/$(BIN)
++	mkdir -p $(DESTDIR)$(PREFIX)/bin
++	cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin
++	chmod 755 $(DESTDIR)$(PREFIX)/bin/$(BIN)
+ 	# data
+ 	mkdir -p $(DESTDIR)$(DATA_DIR)
+ 	cp -fR data/* $(DESTDIR)$(DATA_DIR)

games/gnukem/patches/patch-src_djimage_cpp

@@ -3,7 +3,7 @@ Fix big endian issue
 Index: src/djimage.cpp
 --- src/djimage.cpp.orig
 +++ src/djimage.cpp
-@@ -264,8 +264,13 @@ int djImage::LoadTGA( const char * szFilename )
+@@ -257,8 +257,13 @@ int djImage::LoadTGA( const char * szFilename )
  					for ( unsigned int j=0; j<nWidth; ++j )
  					{
  						// reverse endianness from file
@@ -17,7 +17,7 @@ Index: src/djimage.cpp
  					}
  				}
  				djDELV(pBuf);
-@@ -285,10 +290,17 @@ int djImage::LoadTGA( const char * szFilename )
+@@ -278,10 +283,17 @@ int djImage::LoadTGA( const char * szFilename )
  					for ( unsigned int j=0; j<nWidth; j++ )
  					{
  						// A,B,G,R
@@ -35,7 +35,7 @@ Index: src/djimage.cpp
  					}
  				}
  				djDELV(pBuf);
-@@ -314,10 +326,17 @@ int djImage::LoadTGA( const char * szFilename )
+@@ -307,10 +319,17 @@ int djImage::LoadTGA( const char * szFilename )
  						// FIXME: Interesting "problem" .. it seems the VNC server
  						// inverts the ordering of some of this stuff! So while doing
  						// the remote thing I had everything confused!

games/gnukem/patches/patch-src_sdl_djgraph_cpp

@@ -5,7 +5,7 @@ Revert commit/a94bae1f70b9110431f8a21f0118141c25a343d8
 Index: src/sdl/djgraph.cpp
 --- src/sdl/djgraph.cpp.orig
 +++ src/sdl/djgraph.cpp
-@@ -747,15 +747,10 @@ bool djCreateImageHWSurface( djImage* pImage/*, djVisu
+@@ -756,15 +756,10 @@ void* djCreateImageHWSurface( djImage* pImage/*, djVis
  		pImage->Height(),
  		32,
  		pImage->Pitch(),
@@ -19,5 +19,5 @@ Index: src/sdl/djgraph.cpp
  		0xFF000000
 -		#endif
  	);
- 	g_SurfaceMap[ pImage ] = pSurfaceFoo;
- 
+ 	//fixme should be sped up:
+ 	// 1. A map is not really the most efficient way to do this as it must do a lookup for every blit

games/gnukem/pkg/PLIST

@@ -1,102 +1,111 @@
-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/
-share/gnukem/data/editor/macros.txt
-share/gnukem/data/emh/
-share/gnukem/data/emh/nextm1.lev
-share/gnukem/data/emh/nextm2.lev
-share/gnukem/data/font.tga
-share/gnukem/data/fonts/
-share/gnukem/data/fonts/simple_6x8.tga
-share/gnukem/data/fonts/simple_6x8_shadow.tga
-share/gnukem/data/gameskin.tga
-share/gnukem/data/hiscores.tga
-share/gnukem/data/icon/
-share/gnukem/data/icon.bmp
-share/gnukem/data/icon/application_icon.ico
-share/gnukem/data/levels/
-share/gnukem/data/levels/bg1.tga
-share/gnukem/data/levels/bg2.tga
-share/gnukem/data/levels/citybackdrop.tga
-share/gnukem/data/levels/d_lev1.lev
-share/gnukem/data/levels/dj0.lev
-share/gnukem/data/levels/example.lev
-share/gnukem/data/levels/foo.lev
-share/gnukem/data/levels/kevin.lev
-share/gnukem/data/levels/level1.lev
-share/gnukem/data/levels/level2.lev
-share/gnukem/data/levels/level3.lev
-share/gnukem/data/levels/sjm001.lev
-share/gnukem/data/levels/sjm2.lev
-share/gnukem/data/levels/template.lev
-share/gnukem/data/main.tga
-share/gnukem/data/menucharbackground.tga
-share/gnukem/data/missions.txt
-share/gnukem/data/music/
-share/gnukem/data/music/eric_matyas/
-share/gnukem/data/music/eric_matyas/8-Bit-Mayhem.ogg
-share/gnukem/data/music/eric_matyas/Dystopic-Mayhem.ogg
-share/gnukem/data/music/eric_matyas/Escape_Looping.ogg
-share/gnukem/data/music/eric_matyas/Funky-Gameplay_Looping.ogg
-share/gnukem/data/music/eric_matyas/Insane-Gameplay_Looping.ogg
-share/gnukem/data/music/eric_matyas/Mad-Scientist_Looping.ogg
-share/gnukem/data/music/eric_matyas/Monkey-Drama.ogg
-share/gnukem/data/music/eric_matyas/Monster-Street-Fighters.ogg
-share/gnukem/data/music/eric_matyas/Monsters-in-Bell-Bottoms_Looping.ogg
-share/gnukem/data/music/eric_matyas/Retro-Frantic_V001_Looping.ogg
-share/gnukem/data/music/eric_matyas/Techno-Caper.ogg
-share/gnukem/data/music/eric_matyas/Techno-Gameplay_Looping.ogg
-share/gnukem/data/music/eric_matyas/The-Darkness-Below_Looping.ogg
-share/gnukem/data/sample.gam
-share/gnukem/data/shadows.tga
-share/gnukem/data/simplefont.tga
-share/gnukem/data/sounds/
-share/gnukem/data/sounds/cardflip.wav
-share/gnukem/data/sounds/exit.ogg
-share/gnukem/data/sounds/explode.wav
-share/gnukem/data/sounds/jump.wav
-share/gnukem/data/sounds/jump_landing.wav
-share/gnukem/data/sounds/key_pickup.wav
-share/gnukem/data/sounds/laser.wav
-share/gnukem/data/sounds/laser2.wav
-share/gnukem/data/sounds/lightmag.wav
-share/gnukem/data/sounds/pickup.wav
-share/gnukem/data/sounds/sfx_weapon_singleshot7.wav
-share/gnukem/data/sounds/shoot_cg1_modified.wav
-share/gnukem/data/sounds/soft_explode.wav
-share/gnukem/data/sounds/wooeep.wav
-share/gnukem/data/sprites/
-share/gnukem/data/sprites/def0spr.dat
-share/gnukem/data/sprites/def1spr.dat
-share/gnukem/data/sprites/def2spr.dat
-share/gnukem/data/sprites/def3spr.dat
-share/gnukem/data/sprites/def4spr.dat
-share/gnukem/data/sprites/def5spr.dat
-share/gnukem/data/sprites/def6spr.dat
-share/gnukem/data/sprites/def7spr.dat
-share/gnukem/data/sprites/sprites00.tga
-share/gnukem/data/sprites/sprites01.tga
-share/gnukem/data/sprites/sprites02.tga
-share/gnukem/data/sprites/sprites03.tga
-share/gnukem/data/sprites/sprites04.tga
-share/gnukem/data/sprites/sprites05.tga
-share/gnukem/data/sprites/sprites06.tga
-share/gnukem/data/sprites/sprites07.tga
-share/gnukem/data/sprites/sprites16.tga
-share/gnukem/data/sprites/sprites16_metadata.dat
-share/gnukem/data/tog/
-share/gnukem/data/tog/tog-bg-black.tga
-share/gnukem/data/tog/tog-lev_0.lev
-share/gnukem/data/tog/tog-lev_1.lev
-share/gnukem/data/tog/tog-lev_2.lev
-share/gnukem/data/tog/tog-lev_3.lev
-share/gnukem/data/tog/tog-spr_16.bmp
-share/gnukem/data/tog/tog-spr_16.dat
-share/gnukem/data/tog/tog-spr_16.tga
-share/gnukem/data/tog/tog.gam
-share/gnukem/data/tog/zz-empty.lev
-@bin share/gnukem/davegnukem
+@bin bin/davegnukem
+share/applications/davegnukem.desktop
+share/davegnukem/
+share/davegnukem/credits.tga
+share/davegnukem/default.gam
+share/davegnukem/editor/
+share/davegnukem/editor/macros.txt
+share/davegnukem/emh/
+share/davegnukem/emh/nextm1.lev
+share/davegnukem/emh/nextm2.lev
+share/davegnukem/font.tga
+share/davegnukem/fonts/
+share/davegnukem/fonts/simple_6x8.tga
+share/davegnukem/fonts/simple_6x8_shadow.tga
+share/davegnukem/gameskin.tga
+share/davegnukem/hiscores.tga
+share/davegnukem/icon/
+share/davegnukem/icon.bmp
+share/davegnukem/icon/application_icon.ico
+share/davegnukem/levels/
+share/davegnukem/levels/bg1.tga
+share/davegnukem/levels/bg2.tga
+share/davegnukem/levels/citybackdrop.tga
+share/davegnukem/levels/d_lev1.lev
+share/davegnukem/levels/dj0.lev
+share/davegnukem/levels/example.lev
+share/davegnukem/levels/foo.lev
+share/davegnukem/levels/kevin.lev
+share/davegnukem/levels/level1.lev
+share/davegnukem/levels/level2.lev
+share/davegnukem/levels/level3.lev
+share/davegnukem/levels/sjm001.lev
+share/davegnukem/levels/sjm2.lev
+share/davegnukem/levels/template.lev
+share/davegnukem/main.tga
+share/davegnukem/menucharbackground.tga
+share/davegnukem/missions.txt
+share/davegnukem/music/
+share/davegnukem/music/eric_matyas/
+share/davegnukem/music/eric_matyas/8-Bit-Mayhem.ogg
+share/davegnukem/music/eric_matyas/Dystopic-Mayhem.ogg
+share/davegnukem/music/eric_matyas/Escape_Looping.ogg
+share/davegnukem/music/eric_matyas/Funky-Gameplay_Looping.ogg
+share/davegnukem/music/eric_matyas/Insane-Gameplay_Looping.ogg
+share/davegnukem/music/eric_matyas/Mad-Scientist_Looping.ogg
+share/davegnukem/music/eric_matyas/Monkey-Drama.ogg
+share/davegnukem/music/eric_matyas/Monster-Street-Fighters.ogg
+share/davegnukem/music/eric_matyas/Monsters-in-Bell-Bottoms_Looping.ogg
+share/davegnukem/music/eric_matyas/Retro-Frantic_V001_Looping.ogg
+share/davegnukem/music/eric_matyas/Techno-Caper.ogg
+share/davegnukem/music/eric_matyas/Techno-Gameplay_Looping.ogg
+share/davegnukem/music/eric_matyas/The-Darkness-Below_Looping.ogg
+share/davegnukem/sample.gam
+share/davegnukem/shadows.tga
+share/davegnukem/simplefont.tga
+share/davegnukem/sounds/
+share/davegnukem/sounds/cardflip.wav
+share/davegnukem/sounds/exit.ogg
+share/davegnukem/sounds/explode.wav
+share/davegnukem/sounds/jump.wav
+share/davegnukem/sounds/jump_landing.wav
+share/davegnukem/sounds/key_pickup.wav
+share/davegnukem/sounds/laser.wav
+share/davegnukem/sounds/laser2.wav
+share/davegnukem/sounds/lightmag.wav
+share/davegnukem/sounds/pickup.wav
+share/davegnukem/sounds/sfx_weapon_singleshot7.wav
+share/davegnukem/sounds/shoot_cg1_modified.wav
+share/davegnukem/sounds/soft_explode.wav
+share/davegnukem/sounds/wooeep.wav
+share/davegnukem/sprites/
+share/davegnukem/sprites/def0spr.dat
+share/davegnukem/sprites/def1spr.dat
+share/davegnukem/sprites/def2spr.dat
+share/davegnukem/sprites/def3spr.dat
+share/davegnukem/sprites/def4spr.dat
+share/davegnukem/sprites/def5spr.dat
+share/davegnukem/sprites/def6spr.dat
+share/davegnukem/sprites/def7spr.dat
+share/davegnukem/sprites/sprites00.tga
+share/davegnukem/sprites/sprites01.tga
+share/davegnukem/sprites/sprites02.tga
+share/davegnukem/sprites/sprites03.tga
+share/davegnukem/sprites/sprites04.tga
+share/davegnukem/sprites/sprites05.tga
+share/davegnukem/sprites/sprites06.tga
+share/davegnukem/sprites/sprites07.tga
+share/davegnukem/sprites/sprites16.tga
+share/davegnukem/sprites/sprites16_metadata.dat
+share/davegnukem/tog/
+share/davegnukem/tog/tog-bg-black.tga
+share/davegnukem/tog/tog-lev_0.lev
+share/davegnukem/tog/tog-lev_1.lev
+share/davegnukem/tog/tog-lev_2.lev
+share/davegnukem/tog/tog-lev_3.lev
+share/davegnukem/tog/tog-spr_16.bmp
+share/davegnukem/tog/tog-spr_16.dat
+share/davegnukem/tog/tog-spr_16.tga
+share/davegnukem/tog/tog.gam
+share/davegnukem/tog/zz-empty.lev
+share/doc/davegnukem/
+share/doc/davegnukem-data/
+share/doc/davegnukem-data/README.md
+share/doc/davegnukem/HISTORY.txt
+share/doc/davegnukem/README.md
+share/icons/hicolor/32x32/apps/davegnukem.png
+@mandir share/man/
+share/man/man6/
+@man share/man/man6/davegnukem.6
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor