CVS commit: pkgsrc/games/etlegacy

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Jun 23 11:20:24 UTC 2019

Modified Files:
        pkgsrc/games/etlegacy: Makefile PLIST distinfo
Added Files:
        pkgsrc/games/etlegacy: PLIST.Darwin PLIST.FreeBSD PLIST.Linux
            PLIST.NetBSD PLIST.OpenBSD
        pkgsrc/games/etlegacy/patches: patch-cmake_ETLPlatform.cmake

Log Message:
etlegacy: have cmake figure out whether -ldl should be used.

Make per-OS PLISTs because for some reason it makes one file include
per-OS names. It would be easier to just not do that... but that's what
it already does.

the linux case is actually "else". I think the linux logic can be used
for all OSes after this.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/etlegacy/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/etlegacy/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/games/etlegacy/PLIST.Darwin \
    pkgsrc/games/etlegacy/PLIST.FreeBSD pkgsrc/games/etlegacy/PLIST.Linux \
    pkgsrc/games/etlegacy/PLIST.NetBSD pkgsrc/games/etlegacy/PLIST.OpenBSD
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/etlegacy/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/etlegacy/patches/patch-cmake_ETLPlatform.cmake

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

Modified files:

Index: pkgsrc/games/etlegacy/Makefile
diff -u pkgsrc/games/etlegacy/Makefile:1.3 pkgsrc/games/etlegacy/Makefile:1.4
--- pkgsrc/games/etlegacy/Makefile:1.3  Wed May 29 19:52:49 2019
+++ pkgsrc/games/etlegacy/Makefile      Sun Jun 23 11:20:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/05/29 19:52:49 adam Exp $
+# $NetBSD: Makefile,v 1.4 2019/06/23 11:20:23 maya Exp $
 
 PKGNAME=       etlegacy-2.76
 PKGREVISION=   2
@@ -73,7 +73,6 @@ post-extract:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
-BUILDLINK_TRANSFORM+=  rm:-ldl
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/games/etlegacy/PLIST
diff -u pkgsrc/games/etlegacy/PLIST:1.2 pkgsrc/games/etlegacy/PLIST:1.3
--- pkgsrc/games/etlegacy/PLIST:1.2     Sat May 18 17:29:47 2019
+++ pkgsrc/games/etlegacy/PLIST Sun Jun 23 11:20:23 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/05/18 17:29:47 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/06/23 11:20:23 maya Exp $
 bin/etl
 bin/etlded
 man/man6/etl.6
@@ -118,7 +118,6 @@ share/etlegacy/legacy/luascripts/wolfadm
 share/etlegacy/legacy/luascripts/wolfadmin/util/timers.lua
 share/etlegacy/legacy/luascripts/wolfadmin/util/util.lua
 share/etlegacy/legacy/pak3_${PKGVERSION}-dirty.pk3
-share/etlegacy/legacy/qagame.mp.nbsd.x86_64.so
 share/etlegacy/legacy/rules.toml
 share/etlegacy/legacy/sprees.toml
 share/etlegacy/legacy/wolfadmin.toml

Index: pkgsrc/games/etlegacy/distinfo
diff -u pkgsrc/games/etlegacy/distinfo:1.1 pkgsrc/games/etlegacy/distinfo:1.2
--- pkgsrc/games/etlegacy/distinfo:1.1  Thu Apr 11 20:56:34 2019
+++ pkgsrc/games/etlegacy/distinfo      Sun Jun 23 11:20:23 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2019/04/11 20:56:34 nia Exp $
+$NetBSD: distinfo,v 1.2 2019/06/23 11:20:23 maya Exp $
 
 SHA1 (etlegacy-2.76/etlegacy-libs.tar.gz) = 27da78b9c118be2bb931543ee217f95246e26658
 RMD160 (etlegacy-2.76/etlegacy-libs.tar.gz) = 3052bd1c8f3164016d5402452e76f4ed66e3571f
@@ -9,5 +9,6 @@ RMD160 (etlegacy-2.76/etlegacy.tar.gz) =
 SHA512 (etlegacy-2.76/etlegacy.tar.gz) = 911c91dac71741067b9ac4e4651fae64c7def77c4061d31aafa2d473b14fb0db20c2c2fd03edf16efaabab4a026c89c647883864e031e17c551584f0ee06a5e2
 Size (etlegacy-2.76/etlegacy.tar.gz) = 10381173 bytes
 SHA1 (patch-cmake_ETLInstall.cmake) = f89a99b5c280227f520fbd6f2eec06139cec503f
+SHA1 (patch-cmake_ETLPlatform.cmake) = d73dd745cf2d70f0f0fe6385364d54ac2cdbe0e8
 SHA1 (patch-src_client_snd__main.c) = 82d4fef339044d6677eadad526b8f2b57099514f
 SHA1 (patch-src_qcommon_q__platform.h) = b377ad5033c4f47a2c6659837e2a0b72082dd570

Added files:

Index: pkgsrc/games/etlegacy/PLIST.Darwin
diff -u /dev/null pkgsrc/games/etlegacy/PLIST.Darwin:1.1
--- /dev/null   Sun Jun 23 11:20:24 2019
+++ pkgsrc/games/etlegacy/PLIST.Darwin  Sun Jun 23 11:20:23 2019
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2019/06/23 11:20:23 maya Exp $
+share/etlegacy/legacy/qagame_mac.x86_64.so
Index: pkgsrc/games/etlegacy/PLIST.FreeBSD
diff -u /dev/null pkgsrc/games/etlegacy/PLIST.FreeBSD:1.1
--- /dev/null   Sun Jun 23 11:20:24 2019
+++ pkgsrc/games/etlegacy/PLIST.FreeBSD Sun Jun 23 11:20:23 2019
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.FreeBSD,v 1.1 2019/06/23 11:20:23 maya Exp $
+share/etlegacy/legacy/qagame.mp.fbsd.x86_64.so
Index: pkgsrc/games/etlegacy/PLIST.Linux
diff -u /dev/null pkgsrc/games/etlegacy/PLIST.Linux:1.1
--- /dev/null   Sun Jun 23 11:20:24 2019
+++ pkgsrc/games/etlegacy/PLIST.Linux   Sun Jun 23 11:20:23 2019
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2019/06/23 11:20:23 maya Exp $
+share/etlegacy/legacy/qagame.mp.x86_64.so
Index: pkgsrc/games/etlegacy/PLIST.NetBSD
diff -u /dev/null pkgsrc/games/etlegacy/PLIST.NetBSD:1.1
--- /dev/null   Sun Jun 23 11:20:24 2019
+++ pkgsrc/games/etlegacy/PLIST.NetBSD  Sun Jun 23 11:20:23 2019
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.1 2019/06/23 11:20:23 maya Exp $
+share/etlegacy/legacy/qagame.mp.nbsd.x86_64.so
Index: pkgsrc/games/etlegacy/PLIST.OpenBSD
diff -u /dev/null pkgsrc/games/etlegacy/PLIST.OpenBSD:1.1
--- /dev/null   Sun Jun 23 11:20:24 2019
+++ pkgsrc/games/etlegacy/PLIST.OpenBSD Sun Jun 23 11:20:23 2019
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.OpenBSD,v 1.1 2019/06/23 11:20:23 maya Exp $
+share/etlegacy/legacy/qagame.mp.obsd.x86_64.so

Index: pkgsrc/games/etlegacy/patches/patch-cmake_ETLPlatform.cmake
diff -u /dev/null pkgsrc/games/etlegacy/patches/patch-cmake_ETLPlatform.cmake:1.1
--- /dev/null   Sun Jun 23 11:20:24 2019
+++ pkgsrc/games/etlegacy/patches/patch-cmake_ETLPlatform.cmake Sun Jun 23 11:20:24 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-cmake_ETLPlatform.cmake,v 1.1 2019/06/23 11:20:24 maya Exp $
+
+Have cmake figure out if -ldl should be used.
+(netbsd doesn't have libdl)
+
+--- cmake/ETLPlatform.cmake.orig       2019-01-05 19:54:35.000000000 +0000
++++ cmake/ETLPlatform.cmake
+@@ -86,7 +86,7 @@ if(UNIX)
+               set(LIB_SUFFIX "_mac")
+               set(CMAKE_SHARED_MODULE_SUFFIX "")
+       else()
+-              set(OS_LIBRARIES dl m rt pthread)
++              set(OS_LIBRARIES ${CMAKE_DL_LIBS} m rt pthread)
+               set(LIB_SUFFIX ".mp.")
+       endif()
+