# HG changeset patch
# User Franz Glasner <fzglas.hg@dom66.de>
# Date 1725995427 -7200
# Node ID 847ae246f3ccb8dd9dc4d2101ab2f7ff7c731df6
# Parent  48b31d24d71d9ed49c9bef4f3fedd8ad0c6db99f
Make the port really DATADIR and EXAMPLESDIR safe because the user may redefine DATADIR and EXAMPLESDIR.

pkg-plist must use DATADIR and EXAMPLESDIR.
The scripts must search for common.subr and farray.sh more intelligently.

diff -r 48b31d24d71d -r 847ae246f3cc Makefile
--- a/Makefile	Tue Sep 10 19:48:07 2024 +0200
+++ b/Makefile	Tue Sep 10 21:10:27 2024 +0200
@@ -84,6 +84,7 @@
 	${CP} -v ${SRC}/${_rp} ${WRKSRC}/${_rp}
 	${SED} -i "" -e "s|@@VERSION@@|${PORTVERSION}|" ${WRKSRC}/${_rp}
 	${SED} -i "" -e "s|@@ETCDIR@@|${ETCDIR}|" ${WRKSRC}/${_rp}
+	${SED} -i "" -e "s|@@DATADIR@@|${DATADIR}|" ${WRKSRC}/${_rp}
 	${SED} -i "" -e "s|@@VERSIONTAG@@|${VERSIONTAG}|" ${WRKSRC}/${_rp}
 	${SED} -i "" -e "s|@@SIMPLEVERSIONTAG@@|${SIMPLEVERSIONTAG}|" ${WRKSRC}/${_rp}
 	${SED} -i "" -e "s|@@SIMPLEVERSIONSTR@@|${SIMPLEVERSIONSTR}|" ${WRKSRC}/${_rp}
diff -r 48b31d24d71d -r 847ae246f3cc pkg-plist
--- a/pkg-plist	Tue Sep 10 19:48:07 2024 +0200
+++ b/pkg-plist	Tue Sep 10 21:10:27 2024 +0200
@@ -8,10 +8,10 @@
 sbin/ftjail
 sbin/fpkg
 sbin/fzfs
-share/local-bsdtools/common.subr
-share/local-bsdtools/farray.sh
-share/examples/local-bsdtools/freebsd-update-ftjail-template.sh
-share/examples/local-bsdtools/freebsd-update-ftjail.sh
+%%DATADIR%%/common.subr
+%%DATADIR%%/farray.sh
+%%EXAMPLESDIR%%/freebsd-update-ftjail-template.sh
+%%EXAMPLESDIR%%/freebsd-update-ftjail.sh
 %%DOCS%%share/man/man5/bsmtp2dma.conf.5.gz
 %%DOCS%%share/man/man5/local-bsdtools-periodic.5.gz
 %%DOCS%%share/man/man5/package-mapping.conf.5.gz
diff -r 48b31d24d71d -r 847ae246f3cc sbin/bsmtp2dma
--- a/sbin/bsmtp2dma	Tue Sep 10 19:48:07 2024 +0200
+++ b/sbin/bsmtp2dma	Tue Sep 10 21:10:27 2024 +0200
@@ -14,7 +14,7 @@
 
 '
 
-VERSION="@@VERSION@@"
+VERSION='@@VERSION@@'
 
 USAGE='
 USAGE: bsmtp2dma [OPTIONS] RECIPIENT ...
diff -r 48b31d24d71d -r 847ae246f3cc sbin/fjail
--- a/sbin/fjail	Tue Sep 10 19:48:07 2024 +0200
+++ b/sbin/fjail	Tue Sep 10 21:10:27 2024 +0200
@@ -15,7 +15,7 @@
 
 set -eu
 
-VERSION="@@VERSION@@"
+VERSION='@@VERSION@@'
 
 USAGE='
 USAGE: fjail [ OPTIONS ] COMMAND [ COMMAND OPTIONS ] [ ARG ... ]
@@ -95,7 +95,8 @@
 '
 
 
-_p_datadir="$(dirname "$0")"/../share/local-bsdtools
+_p_datadir='@@DATADIR@@'
+[ "${_p_datadir#@@DATADIR}" = '@@' ] && _p_datadir="$(dirname "$0")"/../share/local-bsdtools
 . "${_p_datadir}/common.subr"
 
 
diff -r 48b31d24d71d -r 847ae246f3cc sbin/fpkg
--- a/sbin/fpkg	Tue Sep 10 19:48:07 2024 +0200
+++ b/sbin/fpkg	Tue Sep 10 21:10:27 2024 +0200
@@ -14,7 +14,7 @@
 
 '
 
-VERSION="@@VERSION@@"
+VERSION='@@VERSION@@'
 
 USAGE='
 USAGE: fpkg [ OPTIONS] COMMAND [ COMMAND-OPTIONS ]
diff -r 48b31d24d71d -r 847ae246f3cc sbin/ftjail
--- a/sbin/ftjail	Tue Sep 10 19:48:07 2024 +0200
+++ b/sbin/ftjail	Tue Sep 10 21:10:27 2024 +0200
@@ -15,7 +15,7 @@
 
 set -eu
 
-VERSION="@@VERSION@@"
+VERSION='@@VERSION@@'
 
 USAGE='
 USAGE: ftjail [ OPTIONS ] COMMAND [ COMMAND OPTIONS ] [ ARG ... ]
@@ -57,7 +57,8 @@
 '
 
 
-_p_datadir="$(dirname "$0")"/../share/local-bsdtools
+_p_datadir='@@DATADIR@@'
+[ "${_p_datadir#@@DATADIR}" = '@@' ] && _p_datadir="$(dirname "$0")"/../share/local-bsdtools
 . "${_p_datadir}/common.subr"
 
 
diff -r 48b31d24d71d -r 847ae246f3cc sbin/fzfs
--- a/sbin/fzfs	Tue Sep 10 19:48:07 2024 +0200
+++ b/sbin/fzfs	Tue Sep 10 21:10:27 2024 +0200
@@ -15,7 +15,7 @@
 
 set -eu
 
-VERSION="@@VERSION@@"
+VERSION='@@VERSION@@'
 
 USAGE='
 USAGE: fzfs [ OPTIONS ] COMMAND [ COMMAND OPTIONS ] [ ARG ... ]
@@ -43,7 +43,8 @@
 '
 
 
-_p_datadir="$(dirname "$0")"/../share/local-bsdtools
+_p_datadir='@@DATADIR@@'
+[ "${_p_datadir#@@DATADIR}" = '@@' ] && _p_datadir="$(dirname "$0")"/../share/local-bsdtools
 . "${_p_datadir}/common.subr"
 . "${_p_datadir}/farray.sh"