doomlegacy-devel: Update to SVN revision 1538

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Tue Jun 16 11:55:49 2020 +0200
Changeset:	022069647fc61c5e1d28f78c7ff58a7a35fb2388

Modified Files:
	doomlegacy-devel/Makefile
	doomlegacy-devel/distinfo
Added Files:
	doomlegacy-devel/patches/patch-src_mserv.c
	doomlegacy-devel/patches/patch-src_t__prepro.h

Log Message:
doomlegacy-devel: Update to SVN revision 1538

Add build fixes for SunOS.

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

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

diffstat:
 doomlegacy-devel/Makefile                      |  2 +-
 doomlegacy-devel/distinfo                      |  2 ++
 doomlegacy-devel/patches/patch-src_mserv.c     | 17 +++++++++++++++++
 doomlegacy-devel/patches/patch-src_t__prepro.h | 16 ++++++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)

diffs:
diff --git a/doomlegacy-devel/Makefile b/doomlegacy-devel/Makefile
index 7721e0ad5c..90aaa8f7b0 100644
--- a/doomlegacy-devel/Makefile
+++ b/doomlegacy-devel/Makefile
@@ -2,7 +2,7 @@
 
 VERS=		1.48.4
 #PKGNAME=	doomlegacy-${VERS}
-SVNVERS=	1535
+SVNVERS=	1538
 DISTNAME=	doomlegacy-devel-0r${SVNVERS}
 CATEGORIES=	games
 
diff --git a/doomlegacy-devel/distinfo b/doomlegacy-devel/distinfo
index 761e3fb5e5..6ffc1b7884 100644
--- a/doomlegacy-devel/distinfo
+++ b/doomlegacy-devel/distinfo
@@ -8,6 +8,8 @@ SHA1 (patch-src_Makefile) = 40184838a23e00975a5380f18c8c53b3cc2eee47
 SHA1 (patch-src_am__map.c) = 14b3c8b70c63778ad043827ab2f0b6f4fe07bcde
 SHA1 (patch-src_doomdata.h) = 8c3186dafbf11a8a75262a06755dd9807cb58612
 SHA1 (patch-src_dstrings.c) = a654c47792800dc6547f5819ef4f5850803b2ca3
+SHA1 (patch-src_mserv.c) = cf90e57287523cc1d27c44a575008b078b195522
 SHA1 (patch-src_p__local.h) = 0340c38a80ba4323e4fe7a8c314575a70a246708
 SHA1 (patch-src_p__setup.c) = 3690d253d07a772eeab87f658ebc5cb61ecc000c
 SHA1 (patch-src_r__defs.h) = 91e6543674e3474c9afdb0ba19d6869b658d0543
+SHA1 (patch-src_t__prepro.h) = 768fc3a87665a75a85ff4ff88b53091b13eab55e
diff --git a/doomlegacy-devel/patches/patch-src_mserv.c b/doomlegacy-devel/patches/patch-src_mserv.c
new file mode 100644
index 0000000000..0b931474a9
--- /dev/null
+++ b/doomlegacy-devel/patches/patch-src_mserv.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_mserv.c,v 1.1 2020/06/15 10:32:52 micha Exp $
+
+Use native inet_aton() on Solaris.
+
+--- src/mserv.c.orig	2020-05-10 22:05:17.000000000 +0000
++++ src/mserv.c
+@@ -210,7 +210,9 @@ struct Copy_CVarMS_t
+ #define close closesocket
+ #endif
+ 
+-#if defined( WIN32) || defined( __OS2__) || defined( SOLARIS)
++// For pkgsrc: Use native inet_aton() on Solaris
++// Solaris has inet_aton() in libresolv since version 2.6 from 1997
++#if defined( WIN32) || defined( __OS2__) // || defined( SOLARIS)
+ // it seems windows doesn't define that... maybe some other OS? OS/2
+ static inline
+ int inet_aton(const char *hostname,
diff --git a/doomlegacy-devel/patches/patch-src_t__prepro.h b/doomlegacy-devel/patches/patch-src_t__prepro.h
new file mode 100644
index 0000000000..8ed5b3bb71
--- /dev/null
+++ b/doomlegacy-devel/patches/patch-src_t__prepro.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_t__prepro.h,v 1.1 2020/06/10 15:35:02 micha Exp $
+
+The type label_t is not available on all OS, e.g. on SmartOS.
+labelforname() is an unused function and the only place where label_t is used.
+
+--- src/t_prepro.h.orig	2018-07-16 09:17:06.000000000 +0000
++++ src/t_prepro.h
+@@ -97,6 +97,8 @@ typedef enum    // section types
+ 
+ /****** goto labels ***********/
+ 
++#if 0
+ label_t * labelforname(char *labelname);
++#endif
+ 
+ #endif