Get rid of a few patches, using the subst framework instead.

[Francis GUDIN (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Francis GUDIN <fgudin+pkgsrc%bsdbellule.fr@localhost>
Pushed By:	fgudin
Date:		Mon Nov 9 15:14:55 2026 +0000
Changeset:	93a1ad33935b72cfa02f2321e95f6cecb47237ce

Modified Files:
	burp/Makefile
	burp/distinfo
Removed Files:
	burp/patches/patch-configs_certs_CA_CA.cnf.in
	burp/patches/patch-configs_certs_CA_burp__ca.in
	burp/patches/patch-configs_client_burp.conf.in
	burp/patches/patch-configs_server_burp.conf.in
	burp/patches/patch-configs_server_summary__script.in

Log Message:
Get rid of a few patches, using the subst framework instead.

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

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

diffstat:
 burp/Makefile                                      |  9 +--
 burp/distinfo                                      |  5 --
 burp/patches/patch-configs_certs_CA_CA.cnf.in      | 12 ---
 burp/patches/patch-configs_certs_CA_burp__ca.in    | 13 ---
 burp/patches/patch-configs_client_burp.conf.in     | 34 --------
 burp/patches/patch-configs_server_burp.conf.in     | 93 ----------------------
 .../patch-configs_server_summary__script.in        | 11 ---
 7 files changed, 4 insertions(+), 173 deletions(-)

diffs:
diff --git a/burp/Makefile b/burp/Makefile
index 441b20cc73..bb12fa4b8a 100644
--- a/burp/Makefile
+++ b/burp/Makefile
@@ -23,11 +23,10 @@ SUBST_FILES.dirs=	configs/server/burp.conf.in \
 			configs/server/summary_script.in \
 			configs/client/burp.conf.in \
 			configs/certs/CA/CA.cnf.in \
-			configs/certs/CA/burp_ca.in \
-			manpages/*.8.in
-SUBST_SED.dirs=		-e 's,@LIBEXECDIR@,${PREFIX}/libexec/burp,'
-SUBST_SED.dirs+=	-e 's,@SBINDIR@,${PREFIX}/sbin,'
-SUBST_VARS.dirs=	PKG_SYSCONFDIR
+			configs/certs/CA/burp_ca.in
+SUBST_SED.dirs=		-e 's,@scriptdir@,${PREFIX}/libexec/burp,'
+SUBST_SED.dirs+=	-e 's,@sbindir@,${PREFIX}/sbin,'
+SUBST_SED.dirs+=	-e 's,@sysconfdir@,${PKG_SYSCONFDIR}/libexec/burp,'
 
 BUILD_DEFS+=	VARBASE
 
diff --git a/burp/distinfo b/burp/distinfo
index d891c4417d..3bbc567512 100644
--- a/burp/distinfo
+++ b/burp/distinfo
@@ -4,11 +4,6 @@ BLAKE2s (burp-3.2.0.tar.gz) = 1f79d602e34f4d03b2052fbd5853b054ad571afd0b59c7a802
 SHA512 (burp-3.2.0.tar.gz) = 13affe243f1bb50460ae6bcece580a18718acb01695e2ef804ce519335a733f02c6a89d5c3263963794ff3714a0c693dd8a2f69ae43774088c3b2c63570162df
 Size (burp-3.2.0.tar.gz) = 550673 bytes
 SHA1 (patch-Makefile.am) = 7ba740c6e77d38684bbe984dd14838feec55755c
-SHA1 (patch-configs_certs_CA_CA.cnf.in) = f0945a96f18d2ebab70affdfd70f3c66a876cd50
-SHA1 (patch-configs_certs_CA_burp__ca.in) = e6043ca0b28fd6755b6c69824aa6466719d94ffd
-SHA1 (patch-configs_client_burp.conf.in) = a75e642ec2ee9aeecbe042b19e674acac7761273
-SHA1 (patch-configs_server_burp.conf.in) = 8b37b26262b3bdb748f1bfc0e746138dc00ba7ff
-SHA1 (patch-configs_server_summary__script.in) = 4c825ff342421f92f04926664dce6ab4e362b526
 SHA1 (patch-manpages_bedup.8.in) = 93c12f03cec4a3dff8621472b021fe3ff223de6c
 SHA1 (patch-manpages_burp.8.in) = fd8d3440e16a1a53d66298f58f17d213af8ce13e
 SHA1 (patch-manpages_burp__ca.8.in) = 75590d44c979c6abbe95504d4cb87901cfaf7a68
diff --git a/burp/patches/patch-configs_certs_CA_CA.cnf.in b/burp/patches/patch-configs_certs_CA_CA.cnf.in
deleted file mode 100644
index 7f148c6247..0000000000
--- a/burp/patches/patch-configs_certs_CA_CA.cnf.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- configs/certs/CA/CA.cnf.in.orig	2026-07-21 12:36:40.240762309 +0000
-+++ configs/certs/CA/CA.cnf.in
-@@ -1,6 +1,6 @@
- # simple config for burp_ca
- 
--CA_DIR                  = @sysconfdir@/CA
-+CA_DIR                  = @PKG_SYSCONFDIR@/CA
- 
- 
- [ ca ]
diff --git a/burp/patches/patch-configs_certs_CA_burp__ca.in b/burp/patches/patch-configs_certs_CA_burp__ca.in
deleted file mode 100644
index 2a3028f96a..0000000000
--- a/burp/patches/patch-configs_certs_CA_burp__ca.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- configs/certs/CA/burp_ca.in.orig	2026-07-21 12:44:39.659616295 +0000
-+++ configs/certs/CA/burp_ca.in
-@@ -66,7 +66,7 @@ esac
- # Try NetBSD style.
- [ -n "$name" ] || name="$(hostname)"
- 
--etc="@sysconfdir@"
-+etc="@PKG_SYSCONFDIR@"
- dir="$etc"/CA
- conf="$etc"/CA.cnf
- days=
diff --git a/burp/patches/patch-configs_client_burp.conf.in b/burp/patches/patch-configs_client_burp.conf.in
deleted file mode 100644
index df4290b6e1..0000000000
--- a/burp/patches/patch-configs_client_burp.conf.in
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
---- configs/client/burp.conf.in.orig	2026-07-21 12:46:43.560539930 +0000
-+++ configs/client/burp.conf.in
-@@ -17,7 +17,7 @@ progress_counter = 1
- # network_timeout = 7200
- # The directory to which autoupgrade files will be downloaded.
- # To never autoupgrade, leave it commented out.
--# autoupgrade_dir=@sysconfdir@/autoupgrade/client
-+# autoupgrade_dir=@PKG_SYSCONFDIR@/autoupgrade/client
- # OS path component for the autoupgrade directory on the server.
- # autoupgrade_os=test_os
- # Wait a random number of seconds between 0 and the given number before
-@@ -61,16 +61,16 @@ cross_all_filesystems=0
- # Uncomment the following lines to automatically generate a certificate signing
- # request and send it to the server.
- ca_@name@_ca = @sbindir@/@name@_ca
--ca_csr_dir = @sysconfdir@/CA-client
-+ca_csr_dir = @PKG_SYSCONFDIR@/CA-client
- 
- # SSL certificate authority - same file on both server and client
--ssl_cert_ca = @sysconfdir@/ssl_cert_ca.pem
-+ssl_cert_ca = @PKG_SYSCONFDIR@/ssl_cert_ca.pem
- 
- # Client SSL certificate
--ssl_cert = @sysconfdir@/ssl_cert-client.pem
-+ssl_cert = @PKG_SYSCONFDIR@/ssl_cert-client.pem
- 
- # Client SSL key
--ssl_key = @sysconfdir@/ssl_cert-client.key
-+ssl_key = @PKG_SYSCONFDIR@/ssl_cert-client.key
- 
- # Client SSL ciphers
- #ssl_ciphers = 
diff --git a/burp/patches/patch-configs_server_burp.conf.in b/burp/patches/patch-configs_server_burp.conf.in
deleted file mode 100644
index cab2886b1c..0000000000
--- a/burp/patches/patch-configs_server_burp.conf.in
+++ /dev/null
@@ -1,93 +0,0 @@
-$NetBSD$
-
---- configs/server/burp.conf.in.orig	2026-07-21 12:57:10.135718884 +0000
-+++ configs/server/burp.conf.in
-@@ -19,7 +19,7 @@ max_children = 5
- 
- directory = @localstatedir@/spool/@name@
- dedup_group = global
--clientconfdir = @sysconfdir@/clientconfdir
-+clientconfdir = @PKG_SYSCONFDIR@/clientconfdir
- pidfile = @runstatedir@/@name@.server.pid
- hardlinked_archive = 0
- working_dir_recovery_method = delete
-@@ -56,7 +56,7 @@ version_warn = 1
- 
- # Location of autoupgrade files to serve to clients. Leave it commented out
- # to not autoupgrade clients.
--# autoupgrade_dir = @sysconfdir@/autoupgrade/server
-+# autoupgrade_dir = @PKG_SYSCONFDIR@/autoupgrade/server
- 
- # You can have as many 'keep' lines as you like.
- # For example, if running backups daily, setting keep 7, keep 4, keep 6 will keep
-@@ -75,23 +75,23 @@ keep = 7
- # ca_conf does not exist, the server will create, populate it, and the paths
- # indicated by ssl_cert_ca, ssl_cert, ssl_key and ssl_dhfile below will be
- # overwritten. See docs/@name@_ca.txt for more information.
--ca_conf = @sysconfdir@/CA.cnf
-+ca_conf = @PKG_SYSCONFDIR@/CA.cnf
- ca_name = @name@CA
- ca_server_name = @name@server
--ca_@name@_ca = @sbindir@/@name@_ca
-+ca_@name@_ca = @SBINDIR@/@name@_ca
- 
- # Check for revoked certificates in the certificate revocation list.
- # Turn this off if you use the old ssl_extra_checks_script server script.
- ca_crl_check = 1
- 
- # SSL certificate authority - same file on both server and client
--ssl_cert_ca = @sysconfdir@/ssl_cert_ca.pem
-+ssl_cert_ca = @PKG_SYSCONFDIR@/ssl_cert_ca.pem
- 
- # Server SSL certificate
--ssl_cert = @sysconfdir@/ssl_cert-server.pem
-+ssl_cert = @PKG_SYSCONFDIR@/ssl_cert-server.pem
- 
- # Server SSL key
--ssl_key = @sysconfdir@/ssl_cert-server.key
-+ssl_key = @PKG_SYSCONFDIR@/ssl_cert-server.key
- 
- # Server SSL ciphers
- #ssl_ciphers =
-@@ -103,7 +103,7 @@ ssl_key = @sysconfdir@/ssl_cert-server.k
- #ssl_key_password = password
- 
- # Server DH file.
--ssl_dhfile = @sysconfdir@/dhfile.pem
-+ssl_dhfile = @PKG_SYSCONFDIR@/dhfile.pem
- 
- # The default timer_script treats the first timer_arg as the minimum interval
- # Ensure that 20 hours elapse between backups
-@@ -124,7 +124,7 @@ timer_arg = Sat,Sun,00,01,02,03,04,05,06
- # %b - "backup"/"restore"/"verify"
- # %c - client name
- # %w - number of warnings, if any
--#notify_success_script = @scriptdir@/notify_script
-+#notify_success_script = @LIBEXECDIR@/notify_script
- #notify_success_arg = sendmail -t
- #notify_success_arg = To: youremail%example.com@localhost
- #notify_success_arg = From: @name@
-@@ -138,7 +138,7 @@ timer_arg = Sat,Sun,00,01,02,03,04,05,06
- #notify_success_changes_only = 1
- 
- # Uncomment the following for email notifications of backups that failed.
--#notify_failure_script = @scriptdir@/notify_script
-+#notify_failure_script = @LIBEXECDIR@/notify_script
- #notify_failure_arg = sendmail -t
- #notify_failure_arg = To: youremail%example.com@localhost
- #notify_failure_arg = From: @name@
-@@ -147,10 +147,10 @@ timer_arg = Sat,Sun,00,01,02,03,04,05,06
- 
- # The server can run scripts on each connection after authentication and before
- # disconnecting.
--#server_script_pre = @scriptdir@/ssl_extra_checks_script
--#server_script_pre_arg = @sysconfdir@/crl
--#server_script_pre_arg = @sysconfdir@/@name%-server.conf@localhost
--#server_script_pre_arg = @scriptdir@/server-pre-script.local
-+#server_script_pre = @LIBEXECDIR@/ssl_extra_checks_script
-+#server_script_pre_arg = @PKG_SYSCONFDIR@/crl
-+#server_script_pre_arg = @PKG_SYSCONFDIR@/@name%-server.conf@localhost
-+#server_script_pre_arg = @LIBEXECDIR@/server-pre-script.local
- # Set server_script_pre_notify to 1 to have notifications on server_script_pre
- # returning non-zero. Most people will want to leave this off - it could
- # result in a lot of emails because clients normally connect once every 20
diff --git a/burp/patches/patch-configs_server_summary__script.in b/burp/patches/patch-configs_server_summary__script.in
deleted file mode 100644
index b24bb9daf8..0000000000
--- a/burp/patches/patch-configs_server_summary__script.in
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
---- configs/server/summary_script.in.orig	2026-07-21 13:03:50.453327968 +0000
-+++ configs/server/summary_script.in
-@@ -9,5 +9,5 @@ fi
-  echo "From: @name@"
-  echo "Subject: $3"
-  echo "Content-Type: text/plain; charset=utf-8"
-- @sbindir@/@name@ -c "$1" -a S
-+ @SBINDIR@/@name@ -c "$1" -a S
-  echo) | /usr/sbin/sendmail -t