CVS commit: pkgsrc/games/0ad

["Nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Thu May  4 17:29:33 UTC 2023

Modified Files:
        pkgsrc/games/0ad: Makefile Makefile.common options.mk

Log Message:
0ad: allow 0ad-data dependency with revisions.
python dependency seems limited to tests, restrict it to the test option.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/0ad/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/0ad/Makefile.common \
    pkgsrc/games/0ad/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/0ad/Makefile
diff -u pkgsrc/games/0ad/Makefile:1.2 pkgsrc/games/0ad/Makefile:1.3
--- pkgsrc/games/0ad/Makefile:1.2       Thu May  4 15:26:02 2023
+++ pkgsrc/games/0ad/Makefile   Thu May  4 17:29:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/05/04 15:26:02 nikita Exp $
+# $NetBSD: Makefile,v 1.3 2023/05/04 17:29:33 nikita Exp $
 
 .include "Makefile.common"
 
@@ -16,11 +16,8 @@ USE_LANGUAGES=       c c++
 
 USE_TOOLS+=    cmake bash gmake pax perl pkg-config
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
-DEPENDS+=              0ad-data-${PKGVERSION}:../../games/0ad-data
+DEPENDS+=              0ad-data-${PKGVERSION_NOREV}{,nb*}:../../games/0ad-data
 BUILD_DEPENDS+=                premake5-[0-9]*:../../devel/premake5
-TOOL_DEPENDS+=         python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
 TOOL_DEPENDS+=         patchelf-[0-9]*:../../devel/patchelf
 
 SUBST_CLASSES+=                        sysincludedir
@@ -136,7 +133,9 @@ do-install:
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/mozjs78/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mtests)
 .include "../../lang/python/tool.mk"
+.endif
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../net/enet/buildlink3.mk"
 .include "../../net/miniupnpc/buildlink3.mk"

Index: pkgsrc/games/0ad/Makefile.common
diff -u pkgsrc/games/0ad/Makefile.common:1.1 pkgsrc/games/0ad/Makefile.common:1.2
--- pkgsrc/games/0ad/Makefile.common:1.1        Thu May  4 15:20:52 2023
+++ pkgsrc/games/0ad/Makefile.common    Thu May  4 17:29:33 2023
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.common,v 1.1 2023/05/04 15:20:52 nikita Exp $
+# $NetBSD: Makefile.common,v 1.2 2023/05/04 17:29:33 nikita Exp $
 # used by wip/0ad-data/Makefile
+# used by games/0ad-data/Makefile
 
 DISTVERSION=   0ad-0.0.26-alpha-unix
 CATEGORIES=    games
Index: pkgsrc/games/0ad/options.mk
diff -u pkgsrc/games/0ad/options.mk:1.1 pkgsrc/games/0ad/options.mk:1.2
--- pkgsrc/games/0ad/options.mk:1.1     Thu May  4 15:20:52 2023
+++ pkgsrc/games/0ad/options.mk Thu May  4 17:29:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/05/04 15:20:52 nikita Exp $
+# $NetBSD: options.mk,v 1.2 2023/05/04 17:29:33 nikita Exp $
 PKG_OPTIONS_VAR=       PKG_OPTIONS.0ad
 PKG_SUPPORTED_OPTIONS+=        tests editor
 
@@ -8,6 +8,8 @@ PLIST_VARS+=            editor tests
 
 .if ${PKG_OPTIONS:Mtests}
 CONFIGURE_TESTS?=
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+TOOL_DEPENDS+=                 python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
 PLIST.tests=                   yes
 .else
 CONFIGURE_TESTS?=              --without-tests