xargon-git: import xargon (git snapshot) as wip/xargon-git

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Fri Sep 4 11:59:34 2020 +0200
Changeset:	b5749b2abf5696bfa93bad23ce46296e6afc80cd

Modified Files:
	Makefile
Added Files:
	xargon-git/DESCR
	xargon-git/Makefile
	xargon-git/PLIST
	xargon-git/distinfo
	xargon-git/patches/patch-src_music.cpp
	xargon-git/patches/patch-src_shapeman.cpp

Log Message:
xargon-git: import xargon (git snapshot) as wip/xargon-git

Description:

Game engine for the game Xargon using SDL. The game data is not included with
the package. If you don't have the data files handy, all three episodes have
been released as freeware and can be downloaded from

 http://www.classicdosgames.com/game/Xargon.html

The data files should be extracted all in lower case. This package provides the
executables xrfile01, xrfile02 and xrfile03 for each of the Xargon episodes.

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

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

diffstat:
 Makefile                                  |  1 +
 xargon-git/DESCR                          |  8 ++++++++
 xargon-git/Makefile                       | 27 +++++++++++++++++++++++++++
 xargon-git/PLIST                          |  4 ++++
 xargon-git/distinfo                       |  4 ++++
 xargon-git/patches/patch-src_music.cpp    | 16 ++++++++++++++++
 xargon-git/patches/patch-src_shapeman.cpp | 15 +++++++++++++++
 7 files changed, 75 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index f09247bad1..0e49840c4c 100644
--- a/Makefile
+++ b/Makefile
@@ -5011,6 +5011,7 @@ SUBDIR+=	xalan-c
 SUBDIR+=	xalan-c-1.10
 SUBDIR+=	xapps
 SUBDIR+=	xar
+SUBDIR+=	xargon-git
 SUBDIR+=	xaralx-bin
 SUBDIR+=	xbase
 SUBDIR+=	xbelmark
diff --git a/xargon-git/DESCR b/xargon-git/DESCR
new file mode 100644
index 0000000000..2311ba2326
--- /dev/null
+++ b/xargon-git/DESCR
@@ -0,0 +1,8 @@
+Game engine for the game Xargon using SDL. The game data is not included with
+the package. If you don't have the data files handy, all three episodes have
+been released as freeware and can be downloaded from
+
+ http://www.classicdosgames.com/game/Xargon.html
+
+The data files should be extracted all in lower case. This package provides the
+executables xrfile01, xrfile02 and xrfile03 for each of the Xargon episodes.
diff --git a/xargon-git/Makefile b/xargon-git/Makefile
new file mode 100644
index 0000000000..53143effe1
--- /dev/null
+++ b/xargon-git/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD$
+
+DISTNAME=	xargon-0.0
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_GITHUB:=Malvineous/}
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://github.com/Malvineous/xargon/
+COMMENT=	SDL port of the DOS game Xargon
+LICENSE=	gnu-gpl-v3
+
+GIT_REPOSITORIES=	xargon
+GIT_REPO.xargon=	git://github.com/Malvineous/xargon.git
+WRKSRC=			${WRKDIR}/xargon
+
+GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	aclocal autoconf autoheader automake pkg-config
+
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	libtoolize; aclocal; autoheader; automake -a --foreign -i; autoconf
+
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../wip/libgamemusic/buildlink3.mk"
+.include "../../wip/mk/git-package.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/xargon-git/PLIST b/xargon-git/PLIST
new file mode 100644
index 0000000000..344002ab17
--- /dev/null
+++ b/xargon-git/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD$
+bin/xrfile01
+bin/xrfile02
+bin/xrfile03
diff --git a/xargon-git/distinfo b/xargon-git/distinfo
new file mode 100644
index 0000000000..f79337eeab
--- /dev/null
+++ b/xargon-git/distinfo
@@ -0,0 +1,4 @@
+$NetBSD$
+
+SHA1 (patch-src_music.cpp) = 12701ac8a8b5564ebd819cffe85f8dfe01fc4044
+SHA1 (patch-src_shapeman.cpp) = 1649b29fd8f1c239bd091e3ba59ea814b1efff0f
diff --git a/xargon-git/patches/patch-src_music.cpp b/xargon-git/patches/patch-src_music.cpp
new file mode 100644
index 0000000000..4007ebac47
--- /dev/null
+++ b/xargon-git/patches/patch-src_music.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Use unsigned char to work around narrowing conversion to char.
+The vochdr array includes a value of 0xaa.
+
+--- src/music.cpp.orig	2020-08-19 22:41:06.000000000 +0000
++++ src/music.cpp
+@@ -65,7 +65,7 @@ void interrupt (*worxint8)(void)=NULL;
+ 
+ void interrupt spkr_intr (void);
+ 
+-const char vochdr[0x20]={
++const unsigned char vochdr[0x20]={
+ 	0x43,0x72,0x65,0x61,0x74,0x69,0x76,0x65,
+ 	0x20,0x56,0x6f,0x69,0x63,0x65,0x20,0x46,
+ 	0x69,0x6c,0x65,0x1a,0x1a,0x00,0x0a,0x01,
diff --git a/xargon-git/patches/patch-src_shapeman.cpp b/xargon-git/patches/patch-src_shapeman.cpp
new file mode 100644
index 0000000000..b26bc5625d
--- /dev/null
+++ b/xargon-git/patches/patch-src_shapeman.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+"c" is used as an array index, as a "byte" is causes a segmentation fault.
+
+--- src/shapeman.cpp.orig	2020-08-19 22:41:06.000000000 +0000
++++ src/shapeman.cpp
+@@ -58,7 +58,7 @@ void xlate_table (int n, char *addr, cha
+ 	uint16_t len_cga, len_ega, len_vga, len;
+ 	byte xs, xsb, ys;
+ 	byte storetype;
+-	byte c;
++	int c;
+ 	int16_t x,y,b,flags;
+ 	//uint16_t x,y,flags;
+ 	//int b;