fallout{1,2}-ce: download third party libraries on "fetch" instead of "build"

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sat Jul 22 23:15:13 2023 +0200
Changeset:	3b765e89925d39adf136431989e442e10008638e

Modified Files:
	fallout1-ce/Makefile
	fallout1-ce/distinfo
	fallout2-ce/Makefile
	fallout2-ce/distinfo
Added Files:
	fallout1-ce/patches/patch-third__party_fpattern_CMakeLists.txt
	fallout2-ce/patches/patch-third__party_fpattern_CMakeLists.txt

Log Message:
fallout{1,2}-ce: download third party libraries on "fetch" instead of "build"

The CMakeLists download fpattern at build time. Instead, add fpattern to DISTFILES
and patch the CMakeLists to use the fetched copy.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3b765e89925d39adf136431989e442e10008638e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fallout1-ce/Makefile                               |  5 ++++
 fallout1-ce/distinfo                               |  4 +++
 .../patch-third__party_fpattern_CMakeLists.txt     | 30 ++++++++++++++++++++++
 fallout2-ce/Makefile                               |  5 ++++
 fallout2-ce/distinfo                               |  4 +++
 .../patch-third__party_fpattern_CMakeLists.txt     | 30 ++++++++++++++++++++++
 6 files changed, 78 insertions(+)

diffs:
diff --git a/fallout1-ce/Makefile b/fallout1-ce/Makefile
index 79efac74da..0f50c95f57 100644
--- a/fallout1-ce/Makefile
+++ b/fallout1-ce/Makefile
@@ -2,8 +2,11 @@
 
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	fallout1-ce-1.0.0
+DISTFILES=	${DEFAULT_DISTFILES} fpattern-1.9.tar.gz 
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=alexbatalov/}
+SITES.fpattern-1.9.tar.gz= \
+		-https://github.com/Loadmaster/fpattern/archive/refs/tags/v1.9.tar.gz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/alexbatalov/fallout1-ce/
@@ -15,6 +18,8 @@ USE_LANGUAGES=	c c++
 INSTALLATION_DIRS+=	bin
 INSTALL_TARGET=		${BUILD_TARGET}
 
+CMAKE_ARGS+=	-Dfpattern_SOURCE_DIR=${WRKDIR}/fpattern-1.9
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${CMAKE_BUILD_DIR}/fallout-ce ${DESTDIR}${PREFIX}/bin/
 
diff --git a/fallout1-ce/distinfo b/fallout1-ce/distinfo
index cea160560c..1131dbde3e 100644
--- a/fallout1-ce/distinfo
+++ b/fallout1-ce/distinfo
@@ -3,4 +3,8 @@ $NetBSD$
 BLAKE2s (fallout1-ce-1.0.0.tar.gz) = b88c7c1e78dc43760c1a3e9e25f8596f3892af62d35649cc4064d00ed1657e6f
 SHA512 (fallout1-ce-1.0.0.tar.gz) = cc68a2e8760851aa8f12bccfb7086eac60c27f77899ef1d08e05f2909eea90645892296b6b2aa8c5e0fd77deced434281bbca32afcd94e0c4c98c3192dc25969
 Size (fallout1-ce-1.0.0.tar.gz) = 3812123 bytes
+BLAKE2s (fpattern-1.9.tar.gz) = 1cd0c39597a3c3584c8233081cc240a0da28a73ca6cffdc8d5255f7caecddfc5
+SHA512 (fpattern-1.9.tar.gz) = f8d847a56b652bc53d52f04eba46c39b87b3746d694eb1070463fce2f4f7410894aa6f9acd6c13a0ab1fb28fa0912a0a27c1f4fa27755d74499519b77597f71e
+Size (fpattern-1.9.tar.gz) = 9822 bytes
 SHA1 (patch-CMakeLists.txt) = 9cb2cb26448929fa0d20358253d861a00cbb2da8
+SHA1 (patch-third__party_fpattern_CMakeLists.txt) = 41f91ba14eab70d35b457e805cb89d357becd941
diff --git a/fallout1-ce/patches/patch-third__party_fpattern_CMakeLists.txt b/fallout1-ce/patches/patch-third__party_fpattern_CMakeLists.txt
new file mode 100644
index 0000000000..1f52f49bda
--- /dev/null
+++ b/fallout1-ce/patches/patch-third__party_fpattern_CMakeLists.txt
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Don't download fpattern at build time.
+
+--- third_party/fpattern/CMakeLists.txt.orig	2023-02-09 19:13:05.000000000 +0000
++++ third_party/fpattern/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ include(FetchContent)
+ 
+-FetchContent_Declare(fpattern
+-    GIT_REPOSITORY "https://github.com/Loadmaster/fpattern";
+-    GIT_TAG "v1.9"
+-)
+-
+-FetchContent_GetProperties(fpattern)
+-if (NOT fpattern_POPULATED)
+-    FetchContent_Populate(fpattern)
+-endif()
++#FetchContent_Declare(fpattern
++#    GIT_REPOSITORY "https://github.com/Loadmaster/fpattern";
++#    GIT_TAG "v1.9"
++#)
++#
++#FetchContent_GetProperties(fpattern)
++#if (NOT fpattern_POPULATED)
++#    FetchContent_Populate(fpattern)
++#endif()
+ 
+ if(MSVC)
+     set(CMAKE_DEBUG_POSTFIX "d")
diff --git a/fallout2-ce/Makefile b/fallout2-ce/Makefile
index 4367506fd2..40e1e79995 100644
--- a/fallout2-ce/Makefile
+++ b/fallout2-ce/Makefile
@@ -2,8 +2,11 @@
 
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	fallout2-ce-1.2.0
+DISTFILES=	${DEFAULT_DISTFILES} fpattern-1.9.tar.gz 
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=alexbatalov/}
+SITES.fpattern-1.9.tar.gz= \
+		-https://github.com/Loadmaster/fpattern/archive/refs/tags/v1.9.tar.gz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/alexbatalov/fallout2-ce/
@@ -15,6 +18,8 @@ USE_LANGUAGES=	c c++
 INSTALLATION_DIRS+=	bin
 INSTALL_TARGET=		${BUILD_TARGET}
 
+CMAKE_ARGS+=	-Dfpattern_SOURCE_DIR=${WRKDIR}/fpattern-1.9
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${CMAKE_BUILD_DIR}/fallout2-ce ${DESTDIR}${PREFIX}/bin/
 
diff --git a/fallout2-ce/distinfo b/fallout2-ce/distinfo
index 2ef1a597fa..68e3555378 100644
--- a/fallout2-ce/distinfo
+++ b/fallout2-ce/distinfo
@@ -3,4 +3,8 @@ $NetBSD$
 BLAKE2s (fallout2-ce-1.2.0.tar.gz) = c85ba055636caa0727e2c6f1f35b16226ffbd7c911fb9bf16ee564ea7d201f16
 SHA512 (fallout2-ce-1.2.0.tar.gz) = 14cf2ea47290c586984fc8f95039f6ec13241d4db13b43b52ab9049cd8cd7f36f0ccfa51038effc13589106067dd6e44ed8504622ea142fb83a4d07e0fe5fd85
 Size (fallout2-ce-1.2.0.tar.gz) = 3276828 bytes
+BLAKE2s (fpattern-1.9.tar.gz) = 1cd0c39597a3c3584c8233081cc240a0da28a73ca6cffdc8d5255f7caecddfc5
+SHA512 (fpattern-1.9.tar.gz) = f8d847a56b652bc53d52f04eba46c39b87b3746d694eb1070463fce2f4f7410894aa6f9acd6c13a0ab1fb28fa0912a0a27c1f4fa27755d74499519b77597f71e
+Size (fpattern-1.9.tar.gz) = 9822 bytes
 SHA1 (patch-CMakeLists.txt) = e27029016a9a2d20c3dde4eda10afa44e0ff25f7
+SHA1 (patch-third__party_fpattern_CMakeLists.txt) = 41f91ba14eab70d35b457e805cb89d357becd941
diff --git a/fallout2-ce/patches/patch-third__party_fpattern_CMakeLists.txt b/fallout2-ce/patches/patch-third__party_fpattern_CMakeLists.txt
new file mode 100644
index 0000000000..1f52f49bda
--- /dev/null
+++ b/fallout2-ce/patches/patch-third__party_fpattern_CMakeLists.txt
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Don't download fpattern at build time.
+
+--- third_party/fpattern/CMakeLists.txt.orig	2023-02-09 19:13:05.000000000 +0000
++++ third_party/fpattern/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ include(FetchContent)
+ 
+-FetchContent_Declare(fpattern
+-    GIT_REPOSITORY "https://github.com/Loadmaster/fpattern";
+-    GIT_TAG "v1.9"
+-)
+-
+-FetchContent_GetProperties(fpattern)
+-if (NOT fpattern_POPULATED)
+-    FetchContent_Populate(fpattern)
+-endif()
++#FetchContent_Declare(fpattern
++#    GIT_REPOSITORY "https://github.com/Loadmaster/fpattern";
++#    GIT_TAG "v1.9"
++#)
++#
++#FetchContent_GetProperties(fpattern)
++#if (NOT fpattern_POPULATED)
++#    FetchContent_Populate(fpattern)
++#endif()
+ 
+ if(MSVC)
+     set(CMAKE_DEBUG_POSTFIX "d")