CVS commit: pkgsrc/games

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Nov 22 21:38:31 UTC 2019

Modified Files:
        pkgsrc/games/etlegacy: Makefile Makefile.common PLIST
        pkgsrc/games/etlegacy-server: Makefile

Log Message:
etlegacy: Don't download unversioned tarballs.

Should prevent PLIST issues in future.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/etlegacy/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/etlegacy/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/etlegacy/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/etlegacy-server/Makefile

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.10 pkgsrc/games/etlegacy/Makefile:1.11
--- pkgsrc/games/etlegacy/Makefile:1.10 Thu Aug 22 12:23:08 2019
+++ pkgsrc/games/etlegacy/Makefile      Fri Nov 22 21:38:31 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2019/08/22 12:23:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/22 21:38:31 nia Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       etlegacy-${ETL_VERSION}
-PKGREVISION=   8
+PKGREVISION=   9
 
 COMMENT=       Open source Wolfenstein: Enemy Territory client and server
 

Index: pkgsrc/games/etlegacy/Makefile.common
diff -u pkgsrc/games/etlegacy/Makefile.common:1.2 pkgsrc/games/etlegacy/Makefile.common:1.3
--- pkgsrc/games/etlegacy/Makefile.common:1.2   Sun Nov  3 19:28:47 2019
+++ pkgsrc/games/etlegacy/Makefile.common       Fri Nov 22 21:38:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2019/11/03 19:28:47 rillig Exp $
+# $NetBSD: Makefile.common,v 1.3 2019/11/22 21:38:31 nia Exp $
 # used by games/etlegacy/Makefile
 # used by games/etlegacy-server/Makefile
 
@@ -51,6 +51,9 @@ CMAKE_ARGS+=  -DBUNDLED_ZLIB=OFF
 # don't try to build i386 binaries on amd64
 CMAKE_ARGS+=   -DCROSS_COMPILE32=OFF
 
+# Don't download unversioned tarballs
+CMAKE_ARGS+=   -DINSTALL_EXTRA=OFF
+
 CMAKE_ARGS+=   -DFEATURE_AUTOUPDATE=OFF
 
 # tries to install binaries

Index: pkgsrc/games/etlegacy/PLIST
diff -u pkgsrc/games/etlegacy/PLIST:1.5 pkgsrc/games/etlegacy/PLIST:1.6
--- pkgsrc/games/etlegacy/PLIST:1.5     Fri Nov 22 18:42:03 2019
+++ pkgsrc/games/etlegacy/PLIST Fri Nov 22 21:38:31 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/11/22 18:42:03 nia Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/11/22 21:38:31 nia Exp $
 ${PLIST.client}bin/etl
 bin/etlded
 man/man6/etl.6
@@ -12,116 +12,8 @@ share/etlegacy/etmain/legacy.cfg
 share/etlegacy/etmain/lmscycle.cfg
 share/etlegacy/etmain/mapvotecycle.cfg
 share/etlegacy/etmain/objectivecycle.cfg
-share/etlegacy/legacy/GeoIP.dat
-share/etlegacy/legacy/banners.toml
 share/etlegacy/legacy/description.txt
 share/etlegacy/legacy/etl_bin_${PKGVERSION}-dirty.pk3
-share/etlegacy/legacy/greetings.toml
-share/etlegacy/legacy/lualibs/legacydb.lua
-share/etlegacy/legacy/lualibs/toml.lua
-share/etlegacy/legacy/luascripts/wolfadmin/COPYING.txt
-share/etlegacy/legacy/luascripts/wolfadmin/admin/admin.lua
-share/etlegacy/legacy/luascripts/wolfadmin/admin/balancer.lua
-share/etlegacy/legacy/luascripts/wolfadmin/admin/banners.lua
-share/etlegacy/legacy/luascripts/wolfadmin/admin/bans.lua
-share/etlegacy/legacy/luascripts/wolfadmin/admin/history.lua
-share/etlegacy/legacy/luascripts/wolfadmin/admin/mutes.lua
-share/etlegacy/legacy/luascripts/wolfadmin/admin/rules.lua
-share/etlegacy/legacy/luascripts/wolfadmin/auth/acl.lua
-share/etlegacy/legacy/luascripts/wolfadmin/auth/auth.lua
-share/etlegacy/legacy/luascripts/wolfadmin/auth/shrubbot.lua
-share/etlegacy/legacy/luascripts/wolfadmin/auth/shrubbot/etpub.lua
-share/etlegacy/legacy/luascripts/wolfadmin/auth/shrubbot/nq.lua
-share/etlegacy/legacy/luascripts/wolfadmin/auth/shrubbot/silent.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/admintest.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/balance.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/ban.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/cointoss.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/enablevote.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/finger.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/gib.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/greeting.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/help.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/incognito.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/kick.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/kickbots.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/listaliases.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/listmaps.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/listplayers.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/lock.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/mute.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/needbots.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/news.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/nextmap.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/pause.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/plock.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/punlock.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/put.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/putbots.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/readconfig.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/rename.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/reset.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/resetsprees.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/restart.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/rules.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/setlevel.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/showbans.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/showhistory.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/shuffle.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/slap.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/spec999.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/sprees.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/stats.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/swap.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/time.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/unban.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/unlock.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/unmute.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/unpause.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/vmute.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/vunmute.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/admin/warn.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/client/ac.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/client/callvote.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/client/pm.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/client/r.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/client/say.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/client/team.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/client/wolfadmin.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/commands.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/server/acl.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/server/cannounce.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/server/cchat.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/server/ccp.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/server/ccpm.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/server/cmusic.lua
-share/etlegacy/legacy/luascripts/wolfadmin/commands/server/csay.lua
-share/etlegacy/legacy/luascripts/wolfadmin/db/db.lua
-share/etlegacy/legacy/luascripts/wolfadmin/db/mysql.lua
-share/etlegacy/legacy/luascripts/wolfadmin/db/sqlite3.lua
-share/etlegacy/legacy/luascripts/wolfadmin/game/bots.lua
-share/etlegacy/legacy/luascripts/wolfadmin/game/fireteams.lua
-share/etlegacy/legacy/luascripts/wolfadmin/game/game.lua
-share/etlegacy/legacy/luascripts/wolfadmin/game/sprees.lua
-share/etlegacy/legacy/luascripts/wolfadmin/game/teams.lua
-share/etlegacy/legacy/luascripts/wolfadmin/game/voting.lua
-share/etlegacy/legacy/luascripts/wolfadmin/main.lua
-share/etlegacy/legacy/luascripts/wolfadmin/players/greetings.lua
-share/etlegacy/legacy/luascripts/wolfadmin/players/players.lua
-share/etlegacy/legacy/luascripts/wolfadmin/players/stats.lua
-share/etlegacy/legacy/luascripts/wolfadmin/util/bits.lua
-share/etlegacy/legacy/luascripts/wolfadmin/util/constants.lua
-share/etlegacy/legacy/luascripts/wolfadmin/util/debug.lua
-share/etlegacy/legacy/luascripts/wolfadmin/util/events.lua
-share/etlegacy/legacy/luascripts/wolfadmin/util/files.lua
-share/etlegacy/legacy/luascripts/wolfadmin/util/logs.lua
-share/etlegacy/legacy/luascripts/wolfadmin/util/pagination.lua
-share/etlegacy/legacy/luascripts/wolfadmin/util/settings.lua
-share/etlegacy/legacy/luascripts/wolfadmin/util/tables.lua
-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/rules.toml
-share/etlegacy/legacy/wolfadmin.toml
 share/icons/hicolor/scalable/apps/etl.svg
 share/mime/packages/etlegacy.xml

Index: pkgsrc/games/etlegacy-server/Makefile
diff -u pkgsrc/games/etlegacy-server/Makefile:1.4 pkgsrc/games/etlegacy-server/Makefile:1.5
--- pkgsrc/games/etlegacy-server/Makefile:1.4   Thu Aug 22 12:23:08 2019
+++ pkgsrc/games/etlegacy-server/Makefile       Fri Nov 22 21:38:31 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2019/08/22 12:23:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/22 21:38:31 nia Exp $
 
-PKGREVISION= 3
+PKGREVISION= 4
 .include "../../games/etlegacy/Makefile.common"
 
 PKGNAME=       etlegacy-server-${ETL_VERSION}