Date: Mon, 12 Apr 2021 16:50:12 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9945661f238e - main - lang/tolua++: remove dependency on python2, undeprecate consumer ports Message-ID: <202104121650.13CGoC4a086607@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=9945661f238e9a5e2186b0c671c91c10a30cf53e commit 9945661f238e9a5e2186b0c671c91c10a30cf53e Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2021-04-12 10:55:13 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2021-04-12 16:49:07 +0000 lang/tolua++: remove dependency on python2, undeprecate consumer ports --- games/stratagus/Makefile | 3 --- games/wargus/Makefile | 3 --- games/wyrmgus/Makefile | 3 --- games/wyrmsun/Makefile | 3 --- graphics/cegui/Makefile | 5 ----- lang/tolua++/Makefile | 2 +- lang/tolua++/files/patch-SConstruct | 11 ++++++++++- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile index 75fa6be440ae..599781c9db67 100644 --- a/games/stratagus/Makefile +++ b/games/stratagus/Makefile @@ -11,9 +11,6 @@ COMMENT= Free cross-platform real-time strategy gaming engine LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Uses EOL Python 2.7 via lang/tolua++ -EXPIRATION_DATE=2021-06-23 - LIB_DEPENDS= libpng.so:graphics/png \ libtolua++-${LUA_VER}.so:lang/tolua++ diff --git a/games/wargus/Makefile b/games/wargus/Makefile index b672d567b34d..d676bc6e82d3 100644 --- a/games/wargus/Makefile +++ b/games/wargus/Makefile @@ -11,9 +11,6 @@ COMMENT= Warcraft 2 mod that allows you to play Warcraft 2 with Stratagus LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Uses EOL Python 2.7 via games/stratagus -EXPIRATION_DATE=2021-06-23 - RUN_DEPENDS= stratagus:games/stratagus \ ffmpeg2theora:multimedia/ffmpeg2theora \ cdparanoia:audio/cdparanoia diff --git a/games/wyrmgus/Makefile b/games/wyrmgus/Makefile index 738a8243ff00..49845c530b50 100644 --- a/games/wyrmgus/Makefile +++ b/games/wyrmgus/Makefile @@ -11,9 +11,6 @@ COMMENT= Modified Stratagus engine for Wyrmsun LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Uses EOL Python 2.7 via lang/tolua++ -EXPIRATION_DATE=2021-06-23 - LIB_DEPENDS= libtolua++-${LUA_VER}.so:lang/tolua++ BUILD_DEPENDS= ${LOCALBASE}/include/boost/tokenizer.hpp:devel/boost-libs diff --git a/games/wyrmsun/Makefile b/games/wyrmsun/Makefile index 3c532a11be61..29c66f481ed2 100644 --- a/games/wyrmsun/Makefile +++ b/games/wyrmsun/Makefile @@ -9,9 +9,6 @@ COMMENT= Strategy game based on history, mythology and fiction LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/license.txt -DEPRECATED= Uses EOL Python 2.7 via games/wyrmgus -EXPIRATION_DATE=2021-06-23 - RUN_DEPENDS= wyrmgus:games/wyrmgus USE_GITHUB= yes diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile index 4da0828f6c29..30bdffd04582 100644 --- a/graphics/cegui/Makefile +++ b/graphics/cegui/Makefile @@ -110,11 +110,6 @@ CMAKE_ARGS+= -DCEGUI_BUILD_PYTHON_MODULES=OFF # python support doesn't build .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MLUA} -DEPRECATED= Uses EOL Python 2.7 via lang/tolua++ -EXPIRATION_DATE=2021-06-23 -.endif - .if ${PORT_OPTIONS:MEXPAT} || ${PORT_OPTIONS:MXERCES} || ${PORT_OPTIONS:MLIBXML2} || ${PORT_OPTIONS:MRAPIDXML} || ${PORT_OPTIONS:MTINYXML} PLIST_SUB+= XMLPARSERS="" .else diff --git a/lang/tolua++/Makefile b/lang/tolua++/Makefile index 91614dbcba67..345db7496506 100644 --- a/lang/tolua++/Makefile +++ b/lang/tolua++/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://www.codenix.com/~tolua/ \ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Extended version of tolua, a tool to integrate C/C++ code with Lua -USES= scons:python2 lua:51 tar:bzip2 +USES= scons lua:51 tar:bzip2 MAKE_ARGS= prefix=${PREFIX} SONAME="libtolua++-${LUA_VER}.so" CCFLAGS+= -I${LUA_INCDIR} diff --git a/lang/tolua++/files/patch-SConstruct b/lang/tolua++/files/patch-SConstruct index f0856026d593..7725f9021c2c 100644 --- a/lang/tolua++/files/patch-SConstruct +++ b/lang/tolua++/files/patch-SConstruct @@ -28,7 +28,16 @@ opts.Add('no_cygwin', 'Use -mno-cygwin to build using the mingw compiler on cygwin', 0) opts.Add('LIBS', 'libraries', []) opts.Add('LIBPATH', 'library path', []) -@@ -145,7 +146,9 @@ Files will be installed on <prefix>/bin, +@@ -65,7 +66,7 @@ def pkg_scan_dep(self, target, source): + ## TODO: detectar si el archivo existe antes de abrirlo asi nomas + pkg = open(source, "rt") + +- for linea in pkg.xreadlines(): ++ for linea in pkg: + dep = re.search("^[\t\w]*\$[cphl]file\s*\"([^\"]+)\"", linea) + if dep: + self.Depends(target, '#' + dep.groups()[0]); +@@ -145,7 +146,9 @@ Files will be installed on <prefix>/bin, <prefix>/lib ########### end of helper builders env['CPPPATH'] = '#/include'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104121650.13CGoC4a086607>