svn commit: r543630 - in head/games/freeorion: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Tue Jul 28 19:25:17 UTC 2020
Author: amdmi3
Date: Tue Jul 28 19:25:15 2020
New Revision: 543630
URL: https://svnweb.freebsd.org/changeset/ports/543630
Log:
- Update to 0.4.10
Modified:
head/games/freeorion/Makefile
head/games/freeorion/distinfo
head/games/freeorion/files/patch-cmake_make__versioncpp.py
head/games/freeorion/pkg-plist
Modified: head/games/freeorion/Makefile
==============================================================================
--- head/games/freeorion/Makefile Tue Jul 28 18:52:11 2020 (r543629)
+++ head/games/freeorion/Makefile Tue Jul 28 19:25:15 2020 (r543630)
@@ -3,7 +3,7 @@
PORTNAME= freeorion
DISTVERSIONPREFIX= v
-DISTVERSION= 0.4.9
+DISTVERSION= 0.4.10
CATEGORIES= games
MAINTAINER= amdmi3 at FreeBSD.org
@@ -12,15 +12,13 @@ COMMENT= Turn-based space empire and galactic conquest
LICENSE= GPLv2 CC-BY-SA-3.0
LICENSE_COMB= multi
-DEPRECATED= Uses deprecated version of python
-EXPIRATION_DATE= 2020-08-15
-
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
${PY_BOOST}
USE_GITHUB= yes
-USES= cmake compiler:c++14-lang python:2.7
+USES= cmake compiler:c++14-lang python:3.5+
+CMAKE_ARGS= -Wno-dev
LDFLAGS_i386= -Wl,-znotext
@@ -39,10 +37,11 @@ HEADLESS_CMAKE_BOOL= BUILD_HEADLESS
HEADLESS_USES_OFF= gl openal sdl
HEADLESS_USE_OFF= SDL=sdl2 GL=gl,glu,glew
HEADLESS_LIB_DEPENDS_OFF= \
- libfreetype.so:print/freetype2 \
- libogg.so:audio/libogg \
- libvorbis.so:audio/libvorbis \
- libpng.so:graphics/png
+ libfreetype.so:print/freetype2 \
+ libogg.so:audio/libogg \
+ libvorbis.so:audio/libvorbis \
+ libpng.so:graphics/png
+HEADLESS_BROKEN= does not build
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
Modified: head/games/freeorion/distinfo
==============================================================================
--- head/games/freeorion/distinfo Tue Jul 28 18:52:11 2020 (r543629)
+++ head/games/freeorion/distinfo Tue Jul 28 19:25:15 2020 (r543630)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581356540
-SHA256 (freeorion-freeorion-v0.4.9_GH0.tar.gz) = bf16ecfe73e5f14f2fba0e4d30f10111051ec88806f97361ab3f4e1fdac1f512
-SIZE (freeorion-freeorion-v0.4.9_GH0.tar.gz) = 124612120
+TIMESTAMP = 1595854352
+SHA256 (freeorion-freeorion-v0.4.10_GH0.tar.gz) = 638b684db2a031709cee8a7702a8caa43ae6801ce561edd03c15c16b43307ae2
+SIZE (freeorion-freeorion-v0.4.10_GH0.tar.gz) = 124690604
Modified: head/games/freeorion/files/patch-cmake_make__versioncpp.py
==============================================================================
--- head/games/freeorion/files/patch-cmake_make__versioncpp.py Tue Jul 28 18:52:11 2020 (r543629)
+++ head/games/freeorion/files/patch-cmake_make__versioncpp.py Tue Jul 28 19:25:15 2020 (r543630)
@@ -1,23 +1,21 @@
---- cmake/make_versioncpp.py.orig 2017-09-03 13:21:52 UTC
+--- cmake/make_versioncpp.py.orig 2020-07-10 08:49:11 UTC
+++ cmake/make_versioncpp.py
-@@ -115,19 +115,7 @@ if system() == 'Darwin':
-
- version = "0.4.7.1"
+@@ -127,18 +127,6 @@ version = "0.4.10"
branch = ""
--build_no = INVALID_BUILD_NO
--
+ build_no = INVALID_BUILD_NO
+
-try:
-- branch = check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip()
+- branch = check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], universal_newlines=True).strip()
- if (branch == "master") or (branch[:7] == "release"):
- branch = ""
- else:
- branch += " "
-- commit = check_output(["git", "show", "-s", "--format=%h", "--abbrev=7", "HEAD"]).strip()
-- timestamp = float(check_output(["git", "show", "-s", "--format=%ct", "HEAD"]).strip())
+- commit = check_output(["git", "show", "--no-show-signature", "-s", "--format=%h", "--abbrev=7", "HEAD"], universal_newlines=True).strip()
+- timestamp = float(check_output(["git", "show", "--no-show-signature", "-s", "--format=%ct", "HEAD"], universal_newlines=True).strip())
- build_no = ".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"), commit])
--except:
-- print "WARNING: git not installed or not setup correctly"
-+build_no = "portbld"
-
+-except IOError:
+- print("WARNING: git not installed or not setup correctly")
+-
for generator in generators:
generator.execute(version, branch, build_no, build_sys)
+
Modified: head/games/freeorion/pkg-plist
==============================================================================
--- head/games/freeorion/pkg-plist Tue Jul 28 18:52:11 2020 (r543629)
+++ head/games/freeorion/pkg-plist Tue Jul 28 19:25:15 2020 (r543630)
@@ -2,13 +2,13 @@
bin/freeorionca
bin/freeoriond
%%NO_HEADLESS%%lib/freeorion/libGiGi.so
-%%NO_HEADLESS%%lib/freeorion/libGiGiSDL.so
lib/freeorion/libfreeorioncommon.so
lib/freeorion/libfreeorionparse.so
-%%NO_HEADLESS%%share/applications/freeorion.desktop
+%%NO_HEADLESS%%share/applications/org.freeorion.FreeOrion.desktop
share/icons/hicolor/128x128/apps/freeorion.png
share/icons/hicolor/16x16/apps/freeorion.png
share/icons/hicolor/24x24/apps/freeorion.png
share/icons/hicolor/256x256/apps/freeorion.png
share/icons/hicolor/32x32/apps/freeorion.png
share/icons/hicolor/64x64/apps/freeorion.png
+%%NO_HEADLESS%%share/metainfo/org.freeorion.FreeOrion.metainfo.xml
More information about the svn-ports-all
mailing list