pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wolf4SDL: update to git snapshot



Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Thu Jan 30 22:30:36 2020 +0200
Changeset:	41de5ad5e855cfaea0eb0155bd930657e32d8616

Modified Files:
	wolf4SDL/Makefile
	wolf4SDL/PLIST
	wolf4SDL/distinfo
Added Files:
	wolf4SDL/patches/patch-man6_wolf4sdl.6
	wolf4SDL/patches/patch-version.h

Log Message:
wolf4SDL: update to git snapshot

The master site and homepage are gone, but a git repository
provides the release with a few updates (snapshots only).

pkgsrc changes:

 * Install executables for all versions of the game.
 * Install the man page.
 * Search for data files in share/games/wolf3d.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=41de5ad5e855cfaea0eb0155bd930657e32d8616

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wolf4SDL/Makefile                      | 65 +++++++++++++++++++++++++++++-----
 wolf4SDL/PLIST                         | 13 ++++++-
 wolf4SDL/distinfo                      |  9 +++--
 wolf4SDL/patches/patch-man6_wolf4sdl.6 | 36 +++++++++++++++++++
 wolf4SDL/patches/patch-version.h       | 20 +++++++++++
 5 files changed, 131 insertions(+), 12 deletions(-)

diffs:
diff --git a/wolf4SDL/Makefile b/wolf4SDL/Makefile
index c183eabbaa..53f7f72897 100644
--- a/wolf4SDL/Makefile
+++ b/wolf4SDL/Makefile
@@ -1,25 +1,74 @@
 # $NetBSD: Makefile,v 1.1 2015/08/17 20:10:44 yhardy Exp $
 #
 
-DISTNAME=		Wolf4SDL-1.7-src
-PKGNAME=		Wolf4SDL-1.7
-CATEGORIES=		games
-MASTER_SITES=		http://homepage.o2mail.de/mkroll/bins/
-EXTRACT_SUFX=		.zip
-EXTRACT_OPTS_ZIP=	-aqo
+GITHUB_PROJECT=	wolf4sdl
+GITHUB_TAG=	5387b99d32fc5bac39c87defcb0abbf1018d8083
+DISTNAME=	${GITHUB_TAG}
+PKGNAME=	Wolf4SDL-1.7
+PKGREVISION=	1
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_GITHUB:=mozzwald/}
+DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://homepage.o2mail.de/mkroll/
+HOMEPAGE=	https://github.com/mozzwald/wolf4sdl
 COMMENT=	Wolfenstein 3D ported to SDL
 LICENSE=	xdoom-license AND mame-license
 
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake
 
-CFLAGS+=	-DCARMACIZED -DUPLOAD
+WOLF4SDLBIN+=	wolf4sdl-11
+WOLF4SDLBIN+=	wolf4sdl-14
+WOLF4SDLBIN+=	wolf4sdl-14gt
+WOLF4SDLBIN+=	wolf4sdl-10sw
+WOLF4SDLBIN+=	wolf4sdl-11sw
+WOLF4SDLBIN+=	wolf4sdl-12sw
+WOLF4SDLBIN+=	wolf4sdl-14sw
+WOLF4SDLBIN+=	wolf4sdl-sod
+WOLF4SDLBIN+=	wolf4sdl-soddemo
+WOLF4SDLBIN+=	wolf4sdl
+
+CFLAGS.wolf4sdl=	-DCARMACIZED
+CFLAGS.wolf4sdl-11=	-DCARMACIZED -DAPOGEE_1_1
+CFLAGS.wolf4sdl-14=	-DCARMACIZED
+CFLAGS.wolf4sdl-14gt=	-DCARMACIZED -DGOODTIMES
+CFLAGS.wolf4sdl-10sw=	-DUPLOAD -DAPOGEE_1_0
+CFLAGS.wolf4sdl-11sw=	-DCARMACIZED -DUPLOAD -DAPOGEE_1_1
+CFLAGS.wolf4sdl-12sw=	-DCARMACIZED -DUPLOAD -DAPOGEE_1_2
+CFLAGS.wolf4sdl-14sw=	-DCARMACIZED -DUPLOAD
+CFLAGS.wolf4sdl-sod=	-DCARMACIZED -DSPEAR
+CFLAGS.wolf4sdl-soddemo=-DCARMACIZED -DSPEAR -DSPEARDEMO
+
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	${PKGMANDIR}/man6
+INSTALLATION_DIRS+=	share/games/wolf3d
 
 BUILD_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
+BUILD_MAKE_FLAGS+=	MANPREFIX=${DESTDIR}${PREFIX}/${PKGMANDIR}
+INSTALL_MAKE_FLAGS+=	BINARY=wolf4sdl
 INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=	MANPREFIX=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
+SUBST_CLASSES+=		man
+SUBST_STAGE.man=	pre-configure
+SUBST_MESSAGE.man=	Fixing absolute paths.
+SUBST_FILES.man=	man6/wolf4sdl.6
+SUBST_SED.man=		-e 's,@PREFIX@,${PREFIX},g'
+
+do-build:
+.for bin in ${WOLF4SDLBIN}
+	cd ${WRKSRC} \
+	&& env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} \
+		BINARY=${bin} \
+		CFLAGS='-DDATADIR=\"${PREFIX}/share/games/wolf3d/\" ${CFLAGS.${bin}}' \
+		-f ${MAKE_FILE} clean ${BUILD_TARGET}
+.endfor
+
+post-install:
+.for bin in ${WOLF4SDLBIN}
+	${INSTALL_PROGRAM} ${WRKSRC}/${bin} ${DESTDIR}${PREFIX}/bin
+.endfor
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/wolf4SDL/PLIST b/wolf4SDL/PLIST
index 53a0a95e08..e05e8ba73b 100644
--- a/wolf4SDL/PLIST
+++ b/wolf4SDL/PLIST
@@ -1,2 +1,13 @@
 @comment $NetBSD: PLIST,v 1.1 2015/08/17 20:10:44 yhardy Exp $
-bin/wolf3d
+bin/wolf4sdl
+bin/wolf4sdl-11
+bin/wolf4sdl-14
+bin/wolf4sdl-14gt
+bin/wolf4sdl-10sw
+bin/wolf4sdl-11sw
+bin/wolf4sdl-12sw
+bin/wolf4sdl-14sw
+bin/wolf4sdl-sod
+bin/wolf4sdl-soddemo
+man/man6/wolf4sdl.6
+@pkgdir share/games/wolf3d
diff --git a/wolf4SDL/distinfo b/wolf4SDL/distinfo
index 91eba8fe78..6d52170b49 100644
--- a/wolf4SDL/distinfo
+++ b/wolf4SDL/distinfo
@@ -1,5 +1,8 @@
 $NetBSD: distinfo,v 1.1 2015/08/17 20:10:44 yhardy Exp $
 
-SHA1 (Wolf4SDL-1.7-src.zip) = 09c51a8ccdc6918daa7a1471a75e8c520795b173
-RMD160 (Wolf4SDL-1.7-src.zip) = df45a4468224fb7d93a4753a76584a381445410d
-Size (Wolf4SDL-1.7-src.zip) = 681316 bytes
+SHA1 (wolf4sdl/5387b99d32fc5bac39c87defcb0abbf1018d8083-5387b99d32fc5bac39c87defcb0abbf1018d8083.tar.gz) = 4ce55c3998f682febd065170aec576a4d9a54adf
+RMD160 (wolf4sdl/5387b99d32fc5bac39c87defcb0abbf1018d8083-5387b99d32fc5bac39c87defcb0abbf1018d8083.tar.gz) = d5a9ab623026f0fb616ba063de4b3885fcd46f42
+SHA512 (wolf4sdl/5387b99d32fc5bac39c87defcb0abbf1018d8083-5387b99d32fc5bac39c87defcb0abbf1018d8083.tar.gz) = 14e30272ba753b1f94934bcbff2d3e8ce58411ea79bbb7030718970d9187d0c3e9a464e577ae7bc1841a857403202393d40ddb6284912d44f644c86370bdefac
+Size (wolf4sdl/5387b99d32fc5bac39c87defcb0abbf1018d8083-5387b99d32fc5bac39c87defcb0abbf1018d8083.tar.gz) = 664674 bytes
+SHA1 (patch-man6_wolf4sdl.6) = 80182ef0e3607504ac4d9266886da39f4c50b9a8
+SHA1 (patch-version.h) = 15e7b7b4c8ce793ea0509ce1103ff0fac5de5ed8
diff --git a/wolf4SDL/patches/patch-man6_wolf4sdl.6 b/wolf4SDL/patches/patch-man6_wolf4sdl.6
new file mode 100644
index 0000000000..c9fc005391
--- /dev/null
+++ b/wolf4SDL/patches/patch-man6_wolf4sdl.6
@@ -0,0 +1,36 @@
+$NetBSD$
+
+Elaborate on the (pkgsrc) executable names.
+
+--- man6/wolf4sdl.6.orig	2015-04-17 01:23:41.000000000 +0000
++++ man6/wolf4sdl.6
+@@ -24,15 +24,28 @@ can work and run in any machine from 199
+ The
+ .B wolf4sdl
+ produced binaries start one of the 
++.TP
++wolf4sdl-14gt
+ .B Wolf3d Full v1.4 GT/ID/Activision,
++.TP
++wolf4sdl-14, wolf4sdl
+ .B Wolf3d Full v1.4 Apogee (with ReadThis),
++.TP
++wolf4sdl-14sw
+ .B Wolf3d Shareware v1.4,
++.TP
++wolf4sdl-sod
+ .B Spear of Destiny Full and Mission Disks
+ and
++.TP
++wolf4sdl-soddemo
+ .B Spear of Destiny Demo
++.P
+ games, respectively as compilation flags that compiler may provide.
+ Run the binary and there's a notification around what its compiled and what game for.
+-
++Wolf4SDL searches for game data in
++.TP
++	@PREFIX@/share/games/wolf3d
+ 
+ .SH OPTIONS
+ .TP
diff --git a/wolf4SDL/patches/patch-version.h b/wolf4SDL/patches/patch-version.h
new file mode 100644
index 0000000000..cd4fb02282
--- /dev/null
+++ b/wolf4SDL/patches/patch-version.h
@@ -0,0 +1,20 @@
+$NetBSD$
+
+These defines are set in the Makefile to create the different
+versions of wolf4sdl, instead of building only one version.
+
+--- version.h.orig	2015-04-17 01:23:41.000000000 +0000
++++ version.h
+@@ -11,9 +11,9 @@
+ 
+ //#define SPEAR
+ //#define SPEARDEMO
+-#define UPLOAD
+-#define GOODTIMES
+-#define CARMACIZED
++//#define UPLOAD
++//#define GOODTIMES
++//#define CARMACIZED
+ //#define APOGEE_1_0
+ //#define APOGEE_1_1
+ //#define APOGEE_1_2


Home | Main Index | Thread Index | Old Index