CVS commit: pkgsrc/games

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sun, 30 Jun 2019 23:33:41 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun 30 23:33:41 UTC 2019

Modified Files:
        pkgsrc/games: Makefile
        pkgsrc/games/etlegacy: Makefile PLIST options.mk
Added Files:
        pkgsrc/games/etlegacy: Makefile.common
        pkgsrc/games/etlegacy-server: DESCR Makefile options.mk

Log Message:
Split out an etlegacy-server package for etlegacy.

Allows most of the dependencies to be disabled because they won't be used
on a headless server.


To generate a diff of this commit:
cvs rdiff -u -r1.434 -r1.435 pkgsrc/games/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/etlegacy/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/games/etlegacy/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/etlegacy/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/etlegacy/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/games/etlegacy-server/DESCR \
    pkgsrc/games/etlegacy-server/Makefile \
    pkgsrc/games/etlegacy-server/options.mk

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

Modified files:

Index: pkgsrc/games/Makefile
diff -u pkgsrc/games/Makefile:1.434 pkgsrc/games/Makefile:1.435
--- pkgsrc/games/Makefile:1.434 Sun Jun 30 22:27:22 2019
+++ pkgsrc/games/Makefile       Sun Jun 30 23:33:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.434 2019/06/30 22:27:22 nia Exp $
+# $NetBSD: Makefile,v 1.435 2019/06/30 23:33:40 nia Exp $
 #
 
 COMMENT=       Games
@@ -95,6 +95,7 @@ SUBDIR+=      einstein-puzzle
 SUBDIR+=       enigma
 SUBDIR+=       et
 SUBDIR+=       etlegacy
+SUBDIR+=       etlegacy-server
 SUBDIR+=       eus-demo
 SUBDIR+=       exchess
 SUBDIR+=       exchess-book-medium

Index: pkgsrc/games/etlegacy/Makefile
diff -u pkgsrc/games/etlegacy/Makefile:1.6 pkgsrc/games/etlegacy/Makefile:1.7
--- pkgsrc/games/etlegacy/Makefile:1.6  Thu Jun 27 16:05:11 2019
+++ pkgsrc/games/etlegacy/Makefile      Sun Jun 30 23:33:40 2019
@@ -1,99 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2019/06/27 16:05:11 nia Exp $
+# $NetBSD: Makefile,v 1.7 2019/06/30 23:33:40 nia Exp $
 
-PKGNAME=       etlegacy-2.76
-PKGREVISION=   4
-CATEGORIES=    games
+.include "Makefile.common"
 
-DIST_SUBDIR=   etlegacy-${PKGVERSION_NOREV}
+PKGNAME=       etlegacy-${ETL_VERSION}
+PKGREVISION=   5
 
-DISTFILES+=    etlegacy.tar.gz
-DISTFILES+=    etlegacy-libs.tar.gz
-
-LIBS_TAG=      f04f846898a92d36fd9cfe7425b1ab4d31bca794
-
-SITES.etlegacy.tar.gz= \
-    -https://github.com/etlegacy/etlegacy/archive/v${PKGVERSION_NOREV}.tar.gz
-
-SITES.etlegacy-libs.tar.gz= \
-    -https://github.com/etlegacy/etlegacy-libs/archive/${LIBS_TAG}.tar.gz
-
-MAINTAINER=    nia%NetBSD.org@localhost
-HOMEPAGE=      https://www.etlegacy.com/
 COMMENT=       Open source Wolfenstein: Enemy Territory client and server
-LICENSE=       gnu-gpl-v3
-
-USE_CMAKE=     yes
-USE_LANGUAGES= c c++
 
 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
-CMAKE_ARGS+=   -DBUNDLED_OPENAL=OFF
-CMAKE_ARGS+=   -DBUNDLED_OPENSSL=OFF
-CMAKE_ARGS+=   -DBUNDLED_SDL=OFF
-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+=   -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/*
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "x86_64"
-PLIST_SUBST+=  ARCH_STRING="x86_64"
-.elif ${MACHINE_ARCH} == "i386"
-PLIST_SUBST+=  ARCH_STRING="i386"
-.elif ${MACHINE_ARCH} == "alpha"
-PLIST_SUBST+=  ARCH_STRING="alpha"
-.elif ${MACHINE_ARCH} == "hppa"
-PLIST_SUBST+=  ARCH_STRING="hppa"
-.elif !empty(MACHINE_ARCH:Mpowerpc64*)
-PLIST_SUBST+=  ARCH_STRING="ppc64"
-.elif !empty(MACHINE_ARCH:Mpowerpc*)
-PLIST_SUBST+=  ARCH_STRING="ppc"
-.elif !empty(MACHINE_ARCH:Msh3*)
-PLIST_SUBST+=  ARCH_STRING="sh"
-.elif !empty(MACHINE_ARCH:Mmips*)
-PLIST_SUBST+=  ARCH_STRING="mips"
-.elif !empty(MACHINE_ARCH:Msparc*)
-PLIST_SUBST+=  ARCH_STRING="sparc"
-.elif !empty(MACHINE_ARCH:M*arm*)
-PLIST_SUBST+=  ARCH_STRING="arm"
-.else
-# maybe architecture-neutral shared objects could be generated
-PKG_SKIP_REASON+=\
-       "unsupported MACHINE_ARCH, maybe needs to be added to q_platform.h"
-.endif
-
-post-extract:
-       ${MV} ${WRKDIR}/etlegacy-libs-${LIBS_TAG}/* \
-           ${WRKDIR}/etlegacy-${PKGVERSION_NOREV}/libs
+PLIST_VARS+=   client
+PLIST.client=  yes
 
 .include "options.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
@@ -102,10 +20,7 @@ post-extract:
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/etlegacy/PLIST
diff -u pkgsrc/games/etlegacy/PLIST:1.3 pkgsrc/games/etlegacy/PLIST:1.4
--- pkgsrc/games/etlegacy/PLIST:1.3     Sun Jun 23 11:20:23 2019
+++ pkgsrc/games/etlegacy/PLIST Sun Jun 30 23:33:40 2019
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2019/06/23 11:20:23 maya Exp $
-bin/etl
+@comment $NetBSD: PLIST,v 1.4 2019/06/30 23:33:40 nia Exp $
+${PLIST.client}bin/etl
 bin/etlded
 man/man6/etl.6
 man/man6/etlded.6

Index: pkgsrc/games/etlegacy/options.mk
diff -u pkgsrc/games/etlegacy/options.mk:1.1 pkgsrc/games/etlegacy/options.mk:1.2
--- pkgsrc/games/etlegacy/options.mk:1.1        Thu Apr 11 20:56:34 2019
+++ pkgsrc/games/etlegacy/options.mk    Sun Jun 30 23:33:40 2019
@@ -1,18 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2019/04/11 20:56:34 nia Exp $
+# $NetBSD: options.mk,v 1.2 2019/06/30 23:33:40 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.etlegacy
-PKG_SUPPORTED_OPTIONS=         curl lua ogg theora freetype sqlite3 openssl
-PKG_SUGGESTED_OPTIONS=         curl lua ogg theora freetype sqlite3 openssl
+PKG_SUPPORTED_OPTIONS=         lua ogg theora freetype sqlite3
+PKG_SUGGESTED_OPTIONS=         lua ogg theora freetype sqlite3
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mcurl)
-CMAKE_ARGS+=   -DFEATURE_CURL=ON
-.include "../../www/curl/buildlink3.mk"
-.else
-CMAKE_ARGS+=   -DFEATURE_CURL=OFF
-.endif
-
 .if !empty(PKG_OPTIONS:Mlua)
 CMAKE_ARGS+=   -DFEATURE_LUA=ON
 .include "../../lang/lua53/buildlink3.mk"
@@ -47,10 +40,3 @@ CMAKE_ARGS+= -DFEATURE_DBMS=ON
 .else
 CMAKE_ARGS+=   -DFEATURE_DBMS=OFF
 .endif
-
-.if !empty(PKG_OPTIONS:Mopenssl)
-CMAKE_ARGS+=   -DFEATURE_OPENSSL=ON
-.include "../../security/openssl/buildlink3.mk"
-.else
-CMAKE_ARGS+=   -DFEATURE_OPENSSL=OFF
-.endif

Added files:

Index: pkgsrc/games/etlegacy/Makefile.common
diff -u /dev/null pkgsrc/games/etlegacy/Makefile.common:1.1
--- /dev/null   Sun Jun 30 23:33:41 2019
+++ pkgsrc/games/etlegacy/Makefile.common       Sun Jun 30 23:33:40 2019
@@ -0,0 +1,92 @@
+# $NetBSD: Makefile.common,v 1.1 2019/06/30 23:33:40 nia Exp $
+# used by games/etlegacy/Makefile
+# used by games/etlegacy-server/Makefile
+
+ETL_VERSION=   2.76
+CATEGORIES=    games
+
+DIST_SUBDIR=   etlegacy-${PKGVERSION_NOREV}
+
+DISTFILES+=    etlegacy.tar.gz
+DISTFILES+=    etlegacy-libs.tar.gz
+
+LIBS_TAG=      f04f846898a92d36fd9cfe7425b1ab4d31bca794
+
+SITES.etlegacy.tar.gz= \
+    -https://github.com/etlegacy/etlegacy/archive/v${PKGVERSION_NOREV}.tar.gz
+
+SITES.etlegacy-libs.tar.gz= \
+    -https://github.com/etlegacy/etlegacy-libs/archive/${LIBS_TAG}.tar.gz
+
+MAINTAINER=    nia%NetBSD.org@localhost
+HOMEPAGE=      https://www.etlegacy.com/
+LICENSE=       gnu-gpl-v3
+
+DISTINFO_FILE= ${.CURDIR}/../../games/etlegacy/distinfo
+PATCHDIR=      ${.CURDIR}/../../games/etlegacy/patches
+MESSAGE_SRC=   ${.CURDIR}/../../games/etlegacy/MESSAGE
+PLIST_SRC=     ${.CURDIR}/../../games/etlegacy/PLIST
+PLIST_SRC+=    ${.CURDIR}/../../games/etlegacy/PLIST.${OPSYS}
+
+WRKSRC=                ${WRKDIR}/etlegacy-${ETL_VERSION}
+
+USE_CMAKE=     yes
+USE_LANGUAGES= c c++
+
+# 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
+CMAKE_ARGS+=   -DBUNDLED_OPENAL=OFF
+CMAKE_ARGS+=   -DBUNDLED_OPENSSL=OFF
+CMAKE_ARGS+=   -DBUNDLED_SDL=OFF
+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+=   -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/*
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${MACHINE_ARCH} == "x86_64"
+PLIST_SUBST+=  ARCH_STRING="x86_64"
+.elif ${MACHINE_ARCH} == "i386"
+PLIST_SUBST+=  ARCH_STRING="i386"
+.elif !empty(MACHINE_ARCH:M*arm*)
+PLIST_SUBST+=  ARCH_STRING="arm"
+.else
+# maybe architecture-neutral shared objects could be generated
+PKG_SKIP_REASON+=\
+       "unsupported MACHINE_ARCH, add it to ETLPlatform.cmake"
+.endif
+
+post-extract:
+       ${MV} ${WRKDIR}/etlegacy-libs-${LIBS_TAG}/* \
+           ${WRKDIR}/etlegacy-${PKGVERSION_NOREV}/libs
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"

Index: pkgsrc/games/etlegacy-server/DESCR
diff -u /dev/null pkgsrc/games/etlegacy-server/DESCR:1.1
--- /dev/null   Sun Jun 30 23:33:41 2019
+++ pkgsrc/games/etlegacy-server/DESCR  Sun Jun 30 23:33:41 2019
@@ -0,0 +1,6 @@
+Enemy Territory: Legacy is an open source project that aims to
+create a fully compatible client and server for the popular online
+FPS game Wolfenstein: Enemy Territory.
+
+This package contains only the server and is intended for headless
+systems.
Index: pkgsrc/games/etlegacy-server/Makefile
diff -u /dev/null pkgsrc/games/etlegacy-server/Makefile:1.1
--- /dev/null   Sun Jun 30 23:33:41 2019
+++ pkgsrc/games/etlegacy-server/Makefile       Sun Jun 30 23:33:41 2019
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2019/06/30 23:33:41 nia Exp $
+
+.include "../../games/etlegacy/Makefile.common"
+
+PKGNAME=       etlegacy-server-${ETL_VERSION}
+
+COMMENT=       Open source Wolfenstein: Enemy Territory server
+
+CMAKE_ARGS+=   -DBUILD_CLIENT=OFF
+
+# Disable client-only features.
+CMAKE_ARGS+=   -DFEATURE_OGG_VORBIS=OFF
+CMAKE_ARGS+=   -DFEATURE_THEORA=OFF
+CMAKE_ARGS+=   -DFEATURE_OPENAL=OFF
+CMAKE_ARGS+=   -DFEATURE_FREETYPE=OFF
+CMAKE_ARGS+=   -DFEATURE_RENDERER2=OFF
+
+# Not set.
+PLIST_VARS+=   client
+
+.include "options.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/etlegacy-server/options.mk
diff -u /dev/null pkgsrc/games/etlegacy-server/options.mk:1.1
--- /dev/null   Sun Jun 30 23:33:41 2019
+++ pkgsrc/games/etlegacy-server/options.mk     Sun Jun 30 23:33:41 2019
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2019/06/30 23:33:41 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.etlegacy-server
+PKG_SUPPORTED_OPTIONS=         lua sqlite3
+PKG_SUGGESTED_OPTIONS=         lua sqlite3
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mlua)
+CMAKE_ARGS+=   -DFEATURE_LUA=ON
+.include "../../lang/lua53/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DFEATURE_LUA=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Msqlite3)
+CMAKE_ARGS+=   -DFEATURE_DBMS=ON
+.include "../../databases/sqlite3/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DFEATURE_DBMS=OFF
+.endif

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index