So update-workspaces.sh passes through arguments for premake5, which can
disable tests properly.

To ensure we only used bundled versions where needed, zap the rest;
this also eliminates grep noise.

Feedback? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/0ad/base/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile    12 Apr 2023 08:41:59 -0000      1.41
+++ Makefile    12 Apr 2023 10:24:50 -0000
@@ -2,7 +2,7 @@ COMMENT =               historical real-time strategy
 
 DISTNAME =             0ad-${V}-alpha-unix-build
 PKGNAME =              0ad-${V}
-REVISION =             0
+REVISION =             1
 
 USE_WXNEEDED =         Yes
 
@@ -98,13 +98,10 @@ do-install:
                ${PREFIX}/share/pixmaps/
 
 # most tests fail without nvtt
-NO_TEST =              Yes
-# avoid building unused tests in ${WRKSRC}/Makefile
-MAKE_FLAGS +=          cxxtestroot_config='' \
-                       mocks_test_config='' \
-                       test_config=''
+CONFIGURE_ARGS +=      --without-tests
 
-#do-test:
-#      cd ${WRKDIST}/binaries/system && ./test
+post-extract:
+       # remove unused bundled sources
+       rm -rf 
${WRKSRC}/libraries/source/{cxxtest-4.4,enet,miniupnpc,nvtt,valgrind}
 
 .include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/0ad/base/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST   9 Oct 2022 07:43:08 -0000       1.13
+++ pkg/PLIST   12 Apr 2023 10:24:50 -0000
@@ -10,7 +10,6 @@ bin/0ad
 @static-lib lib/liblobby.a
 @static-lib lib/liblowlevel.a
 @static-lib lib/libmocks_real.a
-@static-lib lib/libmocks_test.a
 @static-lib lib/libmongoose.a
 @lib lib/libmozjs78-ps-release.so.${LIBmozjs78-ps-release_VERSION}
 @static-lib lib/libnetwork.a

Reply via email to