Source-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/games/doomlegacy games/doomlegacy: Build fix for Solaris



details:   https://anonhg.NetBSD.org/pkgsrc/rev/27b5f1b44af6
branches:  trunk
changeset: 434369:27b5f1b44af6
user:      micha <micha%pkgsrc.org@localhost>
date:      Mon Jun 15 10:32:52 2020 +0000

description:
games/doomlegacy: Build fix for Solaris

Use native inet_aton() on Solaris.
Solaris has inet_aton() in libresolv since version 2.6 from 1997.

No revision bump because this only affects the Solaris build that was
broken before.

diffstat:

 games/doomlegacy/Makefile                  |   3 ++-
 games/doomlegacy/distinfo                  |   3 ++-
 games/doomlegacy/patches/patch-src_mserv.c |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (55 lines):

diff -r 364e2d8b852d -r 27b5f1b44af6 games/doomlegacy/Makefile
--- a/games/doomlegacy/Makefile Mon Jun 15 10:04:03 2020 +0000
+++ b/games/doomlegacy/Makefile Mon Jun 15 10:32:52 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/06/10 15:35:02 micha Exp $
+# $NetBSD: Makefile,v 1.6 2020/06/15 10:32:52 micha Exp $
 
 VERS=                  1.48.4
 PKGNAME=               doomlegacy-${VERS}
@@ -37,6 +37,7 @@
 # Other Unix (should work for GNU/Linux, OpenBSD and SunOS)
 MAKE_FLAGS+=           OS=LINUX
 CFLAGS.SunOS+=         -DSOLARIS
+LDFLAGS.SunOS+=                -lresolv
 .endif
 
 .if ${MACHINE_ENDIAN} == "big"
diff -r 364e2d8b852d -r 27b5f1b44af6 games/doomlegacy/distinfo
--- a/games/doomlegacy/distinfo Mon Jun 15 10:04:03 2020 +0000
+++ b/games/doomlegacy/distinfo Mon Jun 15 10:32:52 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2020/06/10 15:35:02 micha Exp $
+$NetBSD: distinfo,v 1.5 2020/06/15 10:32:52 micha Exp $
 
 SHA1 (doomlegacy_1.48.4_common.zip) = 14aed4c0091e8c61f46a2303f9316659ab6c0483
 RMD160 (doomlegacy_1.48.4_common.zip) = cca61af6bdda1003032ee117129e07596c8bbfcf
@@ -12,6 +12,7 @@
 SHA1 (patch-src_am__map.c) = 647bcba2374cfa7038646e0c053636b43caaf33a
 SHA1 (patch-src_doomdata.h) = 2fd95b5db154b05ba88597b20c45146339db4622
 SHA1 (patch-src_dstrings.c) = e1fc8bdcb83efa18690d95c56e3ea7c94a388a50
+SHA1 (patch-src_mserv.c) = cf90e57287523cc1d27c44a575008b078b195522
 SHA1 (patch-src_p__local.h) = e429f2ce5d60dd538bc5e796847b53ae72604b33
 SHA1 (patch-src_p__setup.c) = c3766f924b05655b8d9d17d4686dde9a83239e0a
 SHA1 (patch-src_r__defs.h) = 9211ae6db72f0288f38449b18c8c252f42686405
diff -r 364e2d8b852d -r 27b5f1b44af6 games/doomlegacy/patches/patch-src_mserv.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/doomlegacy/patches/patch-src_mserv.c        Mon Jun 15 10:32:52 2020 +0000
@@ -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,



Home | Main Index | Thread Index | Old Index