# HG changeset patch # User Franz Glasner # Date 1724685746 -7200 # Node ID c3125616d0ec90cda4289b16bdb250118a488e3e # Parent 692c6357ce395705970534f5ae68608ba54b3778 Make the configuration directory of fwireguard configurable diff -r 692c6357ce39 -r c3125616d0ec Makefile --- a/Makefile Thu Aug 22 17:17:20 2024 +0200 +++ b/Makefile Mon Aug 26 17:22:26 2024 +0200 @@ -25,7 +25,10 @@ USE_RC_SUBR= fbhyve fwireguard -SUB_LIST= SIMPLEVERSIONTAG="${SIMPLEVERSIONTAG}" +SUB_LIST= SIMPLEVERSIONTAG="${SIMPLEVERSIONTAG}" \ + FWIREGUARD_ETCDIR="${FWIREGUARD_ETCDIR}" + +PLIST_SUB= FWIREGUARD_ETCDIR="${FWIREGUARD_ETCDIR}" .include @@ -44,6 +47,8 @@ SIMPLEVERSIONTAG= ${PKGORIGIN} v${PKGVERSION} (rv:${HGREVISION}) VERSIONTAG= ${PKGORIGIN} v${PKGVERSION} (rv:${HGREVISION} with repo at ${HGPATH}) +FWIREGUARD_ETCDIR?= "${PREFIX}/etc/fwireguard" + do-extract: ${MKDIR} ${WRKSRC}/bin ${MKDIR} ${WRKSRC}/sbin @@ -105,6 +110,7 @@ .for _exf in freebsd-update-ftjail-template.sh freebsd-update-ftjail.sh ${INSTALL_DATA} ${WRKSRC}/share/examples/${PORTNAME}/${_exf} ${STAGEDIR}${EXAMPLESDIR} .endfor + ${MKDIR} ${STAGEDIR}${FWIREGUARD_ETCDIR} post-install-DOCS-on: .for _mp in ${MANPAGES5:R} diff -r 692c6357ce39 -r c3125616d0ec files/fwireguard.in --- a/files/fwireguard.in Thu Aug 22 17:17:20 2024 +0200 +++ b/files/fwireguard.in Mon Aug 26 17:22:26 2024 +0200 @@ -35,7 +35,7 @@ : ${fwireguard_enable:="NO"} : ${fwireguard_wait="2s"} -: ${fwireguard_configdir:="%%PREFIX%%/etc/fwireguard"} +: ${fwireguard_configdir:="%%FWIREGUARD_ETCDIR%%"} : ${fwireguard_interfaces="AUTO"} diff -r 692c6357ce39 -r c3125616d0ec pkg-plist --- a/pkg-plist Thu Aug 22 17:17:20 2024 +0200 +++ b/pkg-plist Mon Aug 26 17:22:26 2024 +0200 @@ -45,3 +45,4 @@ @sample %%ETCDIR%%/pkgtools.conf.sample @comment DIRECTORIES @dir %%ETCDIR%% +@dir %%FWIREGUARD_ETCDIR%%