From 9028aa5acb093b60953375febab6e0ac37a0ce9f Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 31 Jan 2024 13:42:16 +0100
Subject: [PATCH] pkgbase: only include certctl scripts where needed

---
 release/packages/certctl.script  |  9 +++++++++
 release/packages/certctl.ucl     | 10 +---------
 release/packages/generate-ucl.sh |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 release/packages/certctl.script

diff --git a/release/packages/certctl.script b/release/packages/certctl.script
new file mode 100644
index 000000000000..664a6d139585
--- /dev/null
+++ b/release/packages/certctl.script
@@ -0,0 +1,9 @@
+scripts: {
+	# XXX If pkg picks up a mechanism to detect in the post-install script
+	# files being added or removed, we should use it instead to gate the
+	# rehash.
+	post-install = <<EOD
+	[ -x /usr/sbin/certctl ] && env DESTDIR=${PKG_ROOTDIR} \
+	    /usr/sbin/certctl rehash
+EOD
+}
diff --git a/release/packages/certctl.ucl b/release/packages/certctl.ucl
index f6dbb012ce64..52952a112fe2 100644
--- a/release/packages/certctl.ucl
+++ b/release/packages/certctl.ucl
@@ -14,12 +14,4 @@ licenses = [ BSD2CLAUSE ]
 desc = <<EOD
 %DESC%
 EOD
-scripts: {
-	# XXX If pkg picks up a mechanism to detect in the post-install script
-	# files being added or removed, we should use it instead to gate the
-	# rehash.
-	post-install = <<EOD
-	[ -x /usr/sbin/certctl ] && env DESTDIR=${PKG_ROOTDIR} \
-	    /usr/sbin/certctl rehash
-EOD
-}
+.include(try=true) "%SRCTREE%/release/packages/%PKGNAME%.script"
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index e5563c51a4cd..a5762240a1e0 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -161,6 +161,7 @@ EOF
 		-e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \
 		-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
 		-e "s|%PKG_WWW%|${PKG_WWW}|" \
+		-e "s|%SRCTREE%|${srctree}|" \
 		-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
 		${uclfile}
 	return 0
-- 
2.43.0