Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Sep 2022 06:58:45 GMT
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1a23c5b1df19 - main - games/0ad: Update to 0.0.26
Message-ID:  <202209260658.28Q6wjPH098379@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1a23c5b1df197a78249c1580cb8eeac7183c8218

commit 1a23c5b1df197a78249c1580cb8eeac7183c8218
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2022-09-26 06:58:02 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2022-09-26 06:58:02 +0000

    games/0ad: Update to 0.0.26
---
 games/0ad/Makefile              |  5 +----
 games/0ad/distinfo              | 10 +++++-----
 games/0ad/files/setuptools.diff | 19 -------------------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/games/0ad/Makefile b/games/0ad/Makefile
index b92074df4535..b49831ec9587 100644
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	0ad
-PORTVERSION=	0.0.25b
-PORTREVISION=	17
+PORTVERSION=	0.0.26
 CATEGORIES=	games
 MASTER_SITES=	http://releases.wildfiregames.com/ \
 		SF/zero-ad/releases
@@ -68,8 +67,6 @@ post-patch:
 			-e '1441s/"execinfo",/& "ssp_nonshared",/' \
 		${WRKSRC}/build/premake/premake5.lua
 .endif
-	@${ECHO_CMD} "patch < ../setuptools.diff" >> ${WRKSRC}/libraries/source/spidermonkey/patch.sh
-	@${CP} ${FILESDIR}/setuptools.diff ${WRKSRC}/libraries/source/spidermonkey/
 
 pre-build:
 	(cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME})
diff --git a/games/0ad/distinfo b/games/0ad/distinfo
index 9e1b81f591e1..c780a130cc5b 100644
--- a/games/0ad/distinfo
+++ b/games/0ad/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1630008378
-SHA256 (0ad-0.0.25b-alpha-unix-build.tar.xz) = d70dcd75f473a7d5c81432c3d9260926bf8d9dff5cd541796169497d1c522edd
-SIZE (0ad-0.0.25b-alpha-unix-build.tar.xz) = 75579956
-SHA256 (0ad-0.0.25b-alpha-unix-data.tar.xz) = 9e535e5e37b770748920a39967f06a7927bef872a6d1aa23537b77595bcb3fb1
-SIZE (0ad-0.0.25b-alpha-unix-data.tar.xz) = 1249684600
+TIMESTAMP = 1664037479
+SHA256 (0ad-0.0.26-alpha-unix-build.tar.xz) = 2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b
+SIZE (0ad-0.0.26-alpha-unix-build.tar.xz) = 75599800
+SHA256 (0ad-0.0.26-alpha-unix-data.tar.xz) = b200e48558f882807910e3c686567b6a396248d9d418044ecfde090b05772d7d
+SIZE (0ad-0.0.26-alpha-unix-data.tar.xz) = 1351511480
diff --git a/games/0ad/files/setuptools.diff b/games/0ad/files/setuptools.diff
deleted file mode 100644
index 9cc0efb613c5..000000000000
--- a/games/0ad/files/setuptools.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- build/moz.configure/init.configure.orig	2020-11-28 16:33:01.000000000 +0000
-+++ build/moz.configure/init.configure	2022-03-22 20:13:07.253730000 +0000
-@@ -245,6 +245,7 @@
- @imports('sys')
- @imports('subprocess')
- @imports('distutils.sysconfig')
-+@imports(_from='distutils', _import='sysconfig')
- @imports(_from='mozbuild.configure.util', _import='LineIO')
- @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager')
- @imports(_from='mozbuild.virtualenv', _import='verify_python_version')
-@@ -375,7 +376,7 @@
-         sys.exit(subprocess.call([python] + sys.argv))
- 
-     # We are now in the virtualenv
--    if not distutils.sysconfig.get_python_lib():
-+    if not sysconfig.get_python_lib():
-         die('Could not determine python site packages directory')
- 
-     str_version = '.'.join(str(v) for v in version)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209260658.28Q6wjPH098379>