Skip to content

Commit

Permalink
games/freeorion: update 0.4.10.2 → 0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
AMDmi3 committed Apr 5, 2023
1 parent 45b8b03 commit dfec969
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 32 deletions.
19 changes: 9 additions & 10 deletions games/freeorion/Makefile
@@ -1,7 +1,6 @@
PORTNAME= freeorion
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.10.2
PORTREVISION= 3
DISTVERSION= 0.5
CATEGORIES= games

MAINTAINER= amdmi3@FreeBSD.org
Expand All @@ -16,27 +15,27 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \

USE_GITHUB= yes

USES= cmake compiler:c++14-lang python:3.8+
USES= cmake compiler:c++17-lang python:3.8+
CMAKE_ARGS= -Wno-dev

LDFLAGS_i386= -Wl,-znotext

PORTDOCS= ChangeLog.md README.md
PORTDATA= *

OPTIONS_DEFINE= DOCS TEST HEADLESS
OPTIONS_DEFINE= DOCS TEST CLIENT_GG
OPTIONS_DEFAULT=DOCS TEST CLIENT_GG
OPTIONS_SUB= yes

TEST_CMAKE_BOOL= BUILD_TESTING
TEST_TEST_TARGET= unittest
TEST_USES= localbase

HEADLESS_DESC= Build only headless components: server and AI
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 \
CLIENT_GG_DESC= Build GiGi client
CLIENT_GG_CMAKE_BOOL= BUILD_CLIENT_GG
CLIENT_GG_USES= gl openal sdl
CLIENT_GG_USE= SDL=sdl2 GL=gl,glu,glew
CLIENT_GG_LIB_DEPENDS= libfreetype.so:print/freetype2 \
libogg.so:audio/libogg \
libvorbis.so:audio/libvorbis \
libpng.so:graphics/png
Expand Down
6 changes: 3 additions & 3 deletions games/freeorion/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1629828016
SHA256 (freeorion-freeorion-v0.4.10.2_GH0.tar.gz) = 8c3bd4dcae7e2b160361b88f9a97cdb62b5c7413675acc15774054878228e709
SIZE (freeorion-freeorion-v0.4.10.2_GH0.tar.gz) = 124720711
TIMESTAMP = 1680518770
SHA256 (freeorion-freeorion-v0.5_GH0.tar.gz) = b95667957047e02cf4bf4b230bf3ad02edbeffff6be600cc38a62cb115adb10c
SIZE (freeorion-freeorion-v0.5_GH0.tar.gz) = 154593192
26 changes: 17 additions & 9 deletions games/freeorion/files/patch-cmake_make__versioncpp.py
@@ -1,21 +1,29 @@
--- cmake/make_versioncpp.py.orig 2020-09-25 11:06:39 UTC
--- cmake/make_versioncpp.py.orig 2023-03-21 15:16:58 UTC
+++ cmake/make_versioncpp.py
@@ -127,18 +127,6 @@ version = "0.4.10.1"
branch = ""
@@ -136,26 +136,6 @@ branch = ""
build_no = INVALID_BUILD_NO
version_file_name = version

-try:
- branch = check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], universal_newlines=True).strip()
- if (branch == "master") or (branch[:7] == "release"):
- branch = check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"], text=True).strip()
- if (branch == "master") or (branch == "weekly-test-builds") or (branch[:7] == "release"):
- branch = ""
- else:
- branch += " "
- 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())
- commit = check_output(
- ["git", "show", "--no-show-signature", "-s", "--format=%h", "--abbrev=7", "HEAD"], text=True
- ).strip()
- timestamp = float(
- check_output(["git", "show", "--no-show-signature", "-s", "--format=%ct", "HEAD"], text=True).strip()
- )
- build_no = ".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"), commit])
-except (IOError, CalledProcessError):
- if branch[:7] == "release":
- version_file_name = "v" + version
- else:
- version_file_name = build_no + "_Test"
-except (OSError, CalledProcessError):
- print("WARNING: git not installed or not setup correctly")
-
for generator in generators:
generator.execute(version, branch, build_no, build_sys)
generator.execute(version, branch, build_no, build_sys, version_file_name)

21 changes: 11 additions & 10 deletions games/freeorion/pkg-plist
@@ -1,17 +1,17 @@
%%NO_HEADLESS%%bin/freeorion
%%CLIENT_GG%%bin/freeorion
bin/freeorionca
bin/freeoriond
%%NO_HEADLESS%%lib/freeorion/libGiGi.so
%%CLIENT_GG%%lib/freeorion/libGiGi.so
lib/freeorion/libfreeorioncommon.so
lib/freeorion/libfreeorionparse.so
%%NO_HEADLESS%%share/applications/org.freeorion.FreeOrion.desktop
%%NO_HEADLESS%%share/icons/hicolor/128x128/apps/freeorion.png
%%NO_HEADLESS%%share/icons/hicolor/16x16/apps/freeorion.png
%%NO_HEADLESS%%share/icons/hicolor/24x24/apps/freeorion.png
%%NO_HEADLESS%%share/icons/hicolor/256x256/apps/freeorion.png
%%NO_HEADLESS%%share/icons/hicolor/32x32/apps/freeorion.png
%%NO_HEADLESS%%share/icons/hicolor/64x64/apps/freeorion.png
%%NO_HEADLESS%%share/metainfo/org.freeorion.FreeOrion.metainfo.xml
%%CLIENT_GG%%share/applications/org.freeorion.FreeOrion.desktop
%%CLIENT_GG%%share/icons/hicolor/128x128/apps/freeorion.png
%%CLIENT_GG%%share/icons/hicolor/16x16/apps/freeorion.png
%%CLIENT_GG%%share/icons/hicolor/24x24/apps/freeorion.png
%%CLIENT_GG%%share/icons/hicolor/256x256/apps/freeorion.png
%%CLIENT_GG%%share/icons/hicolor/32x32/apps/freeorion.png
%%CLIENT_GG%%share/icons/hicolor/64x64/apps/freeorion.png
%%CLIENT_GG%%share/metainfo/org.freeorion.FreeOrion.metainfo.xml
@dir %%DATADIR%%/default/data/sound/combat
@dir %%DATADIR%%/default/data/art/stars_sidepanel
@dir %%DATADIR%%/default/data/art/stars/old_stars
Expand All @@ -36,6 +36,7 @@ lib/freeorion/libfreeorionparse.so
@dir %%DATADIR%%/default/data/art/icons/sitrep
@dir %%DATADIR%%/default/data/art/icons/ship_parts
@dir %%DATADIR%%/default/data/art/icons/ship_hulls
@dir %%DATADIR%%/default/data/art/icons/policies
@dir %%DATADIR%%/default/data/art/icons/planet
@dir %%DATADIR%%/default/data/art/icons/monsters
@dir %%DATADIR%%/default/data/art/icons/meter
Expand Down

0 comments on commit dfec969

Please sign in to comment.