CVS commit: pkgsrc/games/etlegacy

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun 23 13:28:04 UTC 2019

Modified Files:
        pkgsrc/games/etlegacy: MESSAGE Makefile distinfo
Removed Files:
        pkgsrc/games/etlegacy/patches: patch-src_client_snd__main.c

Log Message:
etlegacy: rm workaround for SDL_netbsdaudio, since it ain't broken now.

Also, improve comments.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/etlegacy/MESSAGE
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/etlegacy/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/etlegacy/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/games/etlegacy/patches/patch-src_client_snd__main.c

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/MESSAGE
diff -u pkgsrc/games/etlegacy/MESSAGE:1.1 pkgsrc/games/etlegacy/MESSAGE:1.2
--- pkgsrc/games/etlegacy/MESSAGE:1.1   Thu Apr 11 20:56:34 2019
+++ pkgsrc/games/etlegacy/MESSAGE       Sun Jun 23 13:28:04 2019
@@ -1,5 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2019/04/11 20:56:34 nia Exp $
+$NetBSD: MESSAGE,v 1.2 2019/06/23 13:28:04 nia Exp $
+
+Enemy Territory is available as a free download, but the data files are not
+redistributable.
 
 pak0.pk3, pak1.pk3 and pak2.pk3 must be copied from the official game
 files to ${PREFIX}/share/etlegacy/etmain to play Enemy Territory.

Index: pkgsrc/games/etlegacy/Makefile
diff -u pkgsrc/games/etlegacy/Makefile:1.4 pkgsrc/games/etlegacy/Makefile:1.5
--- pkgsrc/games/etlegacy/Makefile:1.4  Sun Jun 23 11:20:23 2019
+++ pkgsrc/games/etlegacy/Makefile      Sun Jun 23 13:28:04 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2019/06/23 11:20:23 maya Exp $
+# $NetBSD: Makefile,v 1.5 2019/06/23 13:28:04 nia Exp $
 
 PKGNAME=       etlegacy-2.76
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    games
 
 DIST_SUBDIR=   etlegacy-${PKGVERSION_NOREV}
@@ -25,12 +25,14 @@ LICENSE=    gnu-gpl-v3
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-CMAKE_ARGS+=   -DRENDERER_DYNAMIC=OFF # doesn't work with builtin MesaLib
+CMAKE_ARGS+=   -DRENDERER_DYNAMIC=OFF
 CMAKE_ARGS+=   -DFEATURE_RENDERER2=OFF # experimental, buggy
 
+# use libraries from pkgsrc
 CMAKE_ARGS+=   -DBUNDLED_CURL=OFF
 CMAKE_ARGS+=   -DBUNDLED_FREETYPE=OFF
 CMAKE_ARGS+=   -DBUNDLED_GLEW=OFF
+CMAKE_ARGS+=   -DBUNDLED_JANSSON=OFF
 CMAKE_ARGS+=   -DBUNDLED_JPEG=OFF
 CMAKE_ARGS+=   -DBUNDLED_LUA=OFF
 CMAKE_ARGS+=   -DBUNDLED_OGG_VORBIS=OFF
@@ -41,20 +43,22 @@ CMAKE_ARGS+=        -DBUNDLED_SQLITE3=OFF
 CMAKE_ARGS+=   -DBUNDLED_THEORA=OFF
 CMAKE_ARGS+=   -DBUNDLED_ZLIB=OFF
 
+# don't try to build i386 binaries on amd64
 CMAKE_ARGS+=   -DCROSS_COMPILE32=OFF
 
 CMAKE_ARGS+=   -DFEATURE_AUTOUPDATE=OFF
 
+# tries to install binaries
+# but maybe this can be built from source separately
 CMAKE_ARGS+=   -DFEATURE_OMNIBOT=OFF
 CMAKE_ARGS+=   -DINSTALL_OMNIBOT=OFF
 
-CMAKE_ARGS+=   -DFEATURE_OPENAL=ON
-
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
 CMAKE_ARGS+=   -DINSTALL_DEFAULT_BASEDIR="${PREFIX}/share/etlegacy"
 CMAKE_ARGS+=   -DINSTALL_DEFAULT_BINDIR="bin"
 CMAKE_ARGS+=   -DINSTALL_DEFAULT_MODDIR="share/etlegacy"
 
+# don't use fopen64 etc
 CFLAGS+=       -DIOAPI_NO_64
 
 CHECK_PORTABILITY_SKIP+=       libs/sdl2/build-scripts/*

Index: pkgsrc/games/etlegacy/distinfo
diff -u pkgsrc/games/etlegacy/distinfo:1.2 pkgsrc/games/etlegacy/distinfo:1.3
--- pkgsrc/games/etlegacy/distinfo:1.2  Sun Jun 23 11:20:23 2019
+++ pkgsrc/games/etlegacy/distinfo      Sun Jun 23 13:28:04 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2019/06/23 11:20:23 maya Exp $
+$NetBSD: distinfo,v 1.3 2019/06/23 13:28:04 nia Exp $
 
 SHA1 (etlegacy-2.76/etlegacy-libs.tar.gz) = 27da78b9c118be2bb931543ee217f95246e26658
 RMD160 (etlegacy-2.76/etlegacy-libs.tar.gz) = 3052bd1c8f3164016d5402452e76f4ed66e3571f
@@ -10,5 +10,4 @@ SHA512 (etlegacy-2.76/etlegacy.tar.gz) =
 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