Date: Fri, 13 Mar 2020 20:15:42 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528376 - in head/games/gtkradiant: . files Message-ID: <202003132015.02DKFgW6047037@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Mar 13 20:15:41 2020 New Revision: 528376 URL: https://svnweb.freebsd.org/changeset/ports/528376 Log: Unbreak against Clang 10 and Python 3. Reported by: pkg-fallout Modified: head/games/gtkradiant/Makefile head/games/gtkradiant/files/patch-SConstruct head/games/gtkradiant/files/patch-install.py Modified: head/games/gtkradiant/Makefile ============================================================================== --- head/games/gtkradiant/Makefile Fri Mar 13 19:58:39 2020 (r528375) +++ head/games/gtkradiant/Makefile Fri Mar 13 20:15:41 2020 (r528376) @@ -16,14 +16,11 @@ COMMENT= Map editor for FPS games, by id Software and LICENSE= GPLv2 -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-08-15 - LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \ libmhash.so:security/mhash \ libpng.so:graphics/png -USES= compiler:c++11-lang gnome pkgconfig python:2.7,build scons zip +USES= compiler:c++11-lang gnome pkgconfig python:build scons zip USE_GNOME= gtk20 libxml2 MAKE_ARGS= ${MAKE_ENV} BUILD=release SSP_UNSAFE= yes Modified: head/games/gtkradiant/files/patch-SConstruct ============================================================================== --- head/games/gtkradiant/files/patch-SConstruct Fri Mar 13 19:58:39 2020 (r528375) +++ head/games/gtkradiant/files/patch-SConstruct Fri Mar 13 20:15:41 2020 (r528376) @@ -33,6 +33,15 @@ # OS OS = commands.getoutput('uname') +@@ -140,7 +132,7 @@ + ver_cc = GetGCCVersion(CC) + ver_cxx = GetGCCVersion(CXX) + +-if ( ver_cc is None or ver_cxx is None or ver_cc[0] < '3' or ver_cxx[0] < '3' or ver_cc != ver_cxx ): ++if ( ver_cc is None or ver_cxx is None or ver_cc[0] < 3 or ver_cxx[0] < 3 or ver_cc != ver_cxx ): + print 'Compiler version check failed - need gcc 3.x or later:' + print 'CC: %s %s\nCXX: %s %s' % ( CC, repr(ver_cc), CXX, repr(ver_cxx) ) + Exit(1) @@ -172,8 +164,8 @@ # common flags warningFlags = '-W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter ' Modified: head/games/gtkradiant/files/patch-install.py ============================================================================== --- head/games/gtkradiant/files/patch-install.py Fri Mar 13 19:58:39 2020 (r528375) +++ head/games/gtkradiant/files/patch-install.py Fri Mar 13 20:15:41 2020 (r528376) @@ -1,5 +1,14 @@ --- ./install.py.orig Sun Feb 12 16:47:01 2006 +++ ./install.py Thu Mar 16 16:09:46 2006 +@@ -38,7 +38,7 @@ + targetFile = target + if os.path.isdir(targetFile): + targetFile = os.path.join(target, os.path.basename(source)) +- print source, "->", targetFile ++ print(source, "->", targetFile) + shutil.copyfile(source, targetFile) + + def copyFileIfExists(source, target): @@ -98,8 +98,6 @@ ]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003132015.02DKFgW6047037>