Hi,
Just pinging the list about this diff. I posted it last month.
Re-attaching the diff.
OK?
Thanks!
Tom
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 15 Aug 2020 20:30:53 -0000 1.8
+++ Makefile 8 Oct 2020 19:15:06 -0000
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2020/08/15 20:30:53 rsadowski Exp $
-V = 0.4.10
+V = 0.4.10.1
COMMENT = turn-based space empire and galactic conquest computer game
-DISTNAME = FreeOrion_v${V}_2020-07-10.f3d403e_Source
+DISTNAME = FreeOrion_v${V}_2020-09-25.39cfe10_Source
PKGNAME = freeorion-${V}
CATEGORIES = games
-REVISION = 0
HOMEPAGE = https://www.freeorion.org/
MAINTAINER = Tom Murphy <open...@pertho.net>
@@ -14,7 +13,7 @@ MAINTAINER = Tom Murphy <openbsd@pertho.
#Assets: CC-BY-SA 3.0
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU SDL2 boost_atomic-mt
+WANTLIB += ${COMPILER_LIBCXX} GL GLEW SDL2 boost_atomic-mt
WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
WANTLIB += boost_python${MODPY_VERSION:C/\.//g}-mt boost_regex-mt
boost_serialization-mt
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/freeorion/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 9 Aug 2020 09:37:07 -0000 1.3
+++ distinfo 8 Oct 2020 19:15:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (FreeOrion_v0.4.10_2020-07-10.f3d403e_Source.tar.gz) =
5yq0LLoe6IQlBzQJMe84nmQBHgQKStx0rdX0mXu8uos=
-SIZE (FreeOrion_v0.4.10_2020-07-10.f3d403e_Source.tar.gz) = 124810803
+SHA256 (FreeOrion_v0.4.10.1_2020-09-25.39cfe10_Source.tar.gz) =
AAYZGttQRtURFvblpld3PyAVr3wjaE8p4qff99r15Oc=
+SIZE (FreeOrion_v0.4.10.1_2020-09-25.39cfe10_Source.tar.gz) = 124809524
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/games/freeorion/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 9 Aug 2020 09:37:07 -0000 1.3
+++ patches/patch-CMakeLists_txt 8 Oct 2020 19:15:06 -0000
@@ -4,7 +4,7 @@ Remove hardcoded optimisation option.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -436,7 +436,6 @@ target_compile_options(freeorionparseobj
+@@ -423,7 +423,6 @@ target_compile_options(freeorionparseobj
PRIVATE
$<$<CXX_COMPILER_ID:Clang>:-ftemplate-depth=512>
$<$<CXX_COMPILER_ID:AppleClang>:-ftemplate-depth=512>
Index: patches/patch-cmake_make_versioncpp_py
===================================================================
RCS file: patches/patch-cmake_make_versioncpp_py
diff -N patches/patch-cmake_make_versioncpp_py
--- patches/patch-cmake_make_versioncpp_py 9 Aug 2020 09:37:07 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-cmake_make_versioncpp_py,v 1.1 2020/08/09 09:37:07 kirby Exp $
-
-Patch script to provide same information as if you had run git on the
-checked out tree. This script should not be executing git since this
-is the official source tarball and it does not provide any git info.
-Index: cmake/make_versioncpp.py
---- cmake/make_versioncpp.py.orig
-+++ cmake/make_versioncpp.py
-@@ -124,20 +124,12 @@ if system() == 'Darwin':
- generators.append(Generator('packaging/Info.plist.in',
'packaging/Info.plist'))
-
- version = "0.4.10"
--branch = ""
-+branch = "release-v0.4.10"
- build_no = INVALID_BUILD_NO
-+commit = 'a3e7a51'
-+timestamp = 1595927480
-
--try:
-- 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", "--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 IOError:
-- print("WARNING: git not installed or not setup correctly")
-+build_no =
".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"), commit])
-
- for generator in generators:
- generator.execute(version, branch, build_no, build_sys)
