From fceb0f12f9f28233a64220fc519978ce552e9e3a Mon Sep 17 00:00:00 2001
From: martymac <martymac@FreeBSD.org>
Date: Tue, 16 Jan 2018 11:10:14 +0000
Subject: Update to 20171024 and switch to GH

---
 games/openjazz/Makefile             | 18 ++++++------------
 games/openjazz/distinfo             |  5 +++--
 games/openjazz/files/patch-Makefile | 15 ---------------
 3 files changed, 9 insertions(+), 29 deletions(-)
 delete mode 100644 games/openjazz/files/patch-Makefile

(limited to 'games')

diff --git a/games/openjazz/Makefile b/games/openjazz/Makefile
index e5cd13026665..4b8eb8df30b1 100644
--- a/games/openjazz/Makefile
+++ b/games/openjazz/Makefile
@@ -2,36 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	openjazz
-PORTVERSION=	20120819
-PORTREVISION=	4
+PORTVERSION=	20171024
 CATEGORIES=	games
-MASTER_SITES=	http://alister.eu/jazz/oj/ \
-		LOCAL/martymac
-DISTNAME=	OpenJazz-src-190812
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Free re-implementation of the Jazz Jackrabbit(tm) game engine
 
 LICENSE=	GPLv2
 
-WRKSRC=	${WRKDIR}/${PORTNAME}
-EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
+USES=	dos2unix gmake
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	AlisterT
 
-USES=	dos2unix gmake zip
 DOS2UNIX_REGEX=	.*\.(h|cpp)
 ALL_TARGET=	OpenJazz
 USE_XORG=	x11 xext xrandr xrender xau xdmcp
 USE_SDL=	sdl
 
-CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` \
+CXXFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` \
 		-DDATAPATH=\\\"${DATADIR}/\\\" -DHOMEDIR
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib `${SDL_CONFIG} --libs`
 
 SUB_FILES=	pkg-message
 
-pre-extract:
-	@${MKDIR} ${WRKSRC}
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/openjazz.000 ${STAGEDIR}${DATADIR}
diff --git a/games/openjazz/distinfo b/games/openjazz/distinfo
index 1c6b70cbcddc..b88bf40488d6 100644
--- a/games/openjazz/distinfo
+++ b/games/openjazz/distinfo
@@ -1,2 +1,3 @@
-SHA256 (OpenJazz-src-190812.zip) = b8e628c663085ea8eb4ea86b12606ada1f0c005a3bba03aedca41570ec9a9b2a
-SIZE (OpenJazz-src-190812.zip) = 224532
+TIMESTAMP = 1515619966
+SHA256 (AlisterT-openjazz-20171024_GH0.tar.gz) = 1722df8a528b0735e84f82bab1adb6beb7b8a99977b831060e483f6ee55311c0
+SIZE (AlisterT-openjazz-20171024_GH0.tar.gz) = 209725
diff --git a/games/openjazz/files/patch-Makefile b/games/openjazz/files/patch-Makefile
deleted file mode 100644
index f17f84929b07..000000000000
--- a/games/openjazz/files/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	2010-10-05 16:47:06.968648948 +0000
-+++ Makefile	2010-10-05 16:48:42.770653951 +0000
-@@ -27,10 +27,10 @@
- 
- 
- OpenJazz: $(objects)
--	cc -Wall -o OpenJazz -lSDL -lstdc++ -lz $(objects)
-+	${CXX} ${LDFLAGS} -Wall -o OpenJazz $(objects) -lz -lm
- 
- %.o: %.cpp
--	cc -Wall -DUSE_SOCKETS -DSCALE -Isrc -O2 -c $< -o $@
-+	${CXX} ${CPPFLAGS} ${CFLAGS} -Wall -DUSE_SOCKETS -DSCALE -Isrc -c $< -o $@
- 
- clean:
- 	rm -f OpenJazz $(objects)
-- 
cgit