svn commit: r545621 - in head: . games games/colobot games/colobot/files
Max Brazhnikov
makc at FreeBSD.org
Fri Aug 21 19:56:37 UTC 2020
Author: makc
Date: Fri Aug 21 19:56:36 2020
New Revision: 545621
URL: https://svnweb.freebsd.org/changeset/ports/545621
Log:
games/colobot: fix build with Python 3 and restore port
Added:
head/games/colobot/
- copied from r544926, head/games/colobot/
head/games/colobot/files/patch-data_CMakeLists.txt (contents, props changed)
Modified:
head/MOVED
head/games/Makefile
head/games/colobot/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Fri Aug 21 19:02:02 2020 (r545620)
+++ head/MOVED Fri Aug 21 19:56:36 2020 (r545621)
@@ -15266,7 +15266,6 @@ devel/py-yum-metadata-parser||2020-08-15|Has expired:
devel/rubygem-warden127||2020-08-15|Has expired: No longer needed
dns/py-dnschain||2020-08-15|Has expired: Uses deprecated version of python
dns/py-idnkit2||2020-08-15|Has expired: Uses deprecated version of python
-games/colobot||2020-08-15|Has expired: Uses deprecated version of python
games/endgame-singularity||2020-08-15|Has expired: Uses deprecated version of python
games/katawa-shoujo||2020-08-15|Has expired: Uses deprecated version of RenPy
games/pyfa||2020-08-15|Has expired: Uses deprecated version of python
Modified: head/games/Makefile
==============================================================================
--- head/games/Makefile Fri Aug 21 19:02:02 2020 (r545620)
+++ head/games/Makefile Fri Aug 21 19:56:36 2020 (r545621)
@@ -145,6 +145,7 @@
SUBDIR += circuslinux
SUBDIR += cockatrice
SUBDIR += coffeebreak
+ SUBDIR += colobot
SUBDIR += colorcode
SUBDIR += columns
SUBDIR += concentration
Modified: head/games/colobot/Makefile
==============================================================================
--- head/games/colobot/Makefile Sat Aug 15 10:05:27 2020 (r544926)
+++ head/games/colobot/Makefile Fri Aug 21 19:56:36 2020 (r545621)
@@ -4,20 +4,17 @@ PORTNAME= colobot
DISTVERSIONPREFIX= ${PORTNAME}-gold-
DISTVERSION= 0.1.12
DISTVERSIONSUFFIX= -alpha
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= https://colobot.info/files/music/:music
DISTFILES= colobot-music_ogg_0.1.12-alpha.tar.gz:music
-MAINTAINER= fernape at FreeBSD.org
+MAINTAINER= makc at FreeBSD.org
COMMENT= Educational game aiming to teach programming to kids
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-DEPRECATED= Uses deprecated version of python
-EXPIRATION_DATE= 2020-08-15
-
LIB_DEPENDS= libpng.so:graphics/png \
libsndfile.so:audio/libsndfile \
libvorbis.so:audio/libvorbis \
@@ -27,7 +24,8 @@ LIB_DEPENDS= libpng.so:graphics/png \
libboost_system.so:devel/boost-libs
USES= cmake compiler:c++11-lang gl gettext-runtime \
- gettext-tools:build localbase:ldflags openal python:2.7 sdl
+ gettext-tools:build localbase:ldflags openal python:build \
+ sdl shebangfix
USE_SDL= image2 ttf2
USE_GL= gl glew glu
USE_LDCONFIG= yes
@@ -36,6 +34,7 @@ USE_GITHUB= yes
GH_TUPLE= colobot:colobot-data:c467bd9:data
LDFLAGS_i386= -Wl,-znotext
+SHEBANG_FILES= data/i18n-tools/scripts/process_translations.py
post-extract:
@${MV} ${WRKDIR}/colobot-data-c467bd9/* ${WRKSRC}/data
@@ -50,5 +49,6 @@ post-patch:
@${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/cmake/FindSDL2_image.cmake
@${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/cmake/FindSDL2_ttf.cmake
@${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/tools/check-levels.sh
+ ${REINPLACE_CMD} 's|python|${PYTHON_CMD}|' ${WRKSRC}/data/tools/*.sh
.include <bsd.port.mk>
Added: head/games/colobot/files/patch-data_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/colobot/files/patch-data_CMakeLists.txt Fri Aug 21 19:56:36 2020 (r545621)
@@ -0,0 +1,11 @@
+--- data/CMakeLists.txt.orig 2019-02-23 19:01:32 UTC
++++ data/CMakeLists.txt
+@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
+ option(TRANSLATIONS "Enable translations of help and level files" ON)
+
+ if(TRANSLATIONS)
+- find_package(PythonInterp 2.7 REQUIRED)
++ find_package(PythonInterp REQUIRED)
+ else()
+ message(STATUS "Translations disabled; only English files will be installed")
+ endif()
More information about the svn-ports-head
mailing list