Mercurial > hgrepos > FreeBSD > ports > sysutils > local-bsdtools
changeset 131:993fecdf2a70
Rename etc/tools.conf to etc/pkgtools.conf.
Because it is a pkg-related configuration -- and there are other configuration
files.
| author | Franz Glasner <fzglas.hg@dom66.de> |
|---|---|
| date | Thu, 17 Oct 2019 09:24:07 +0200 |
| parents | 54de2955bfa9 |
| children | d6e5c90f50de |
| files | Makefile etc/pkgtools.conf.sample etc/tools.conf.sample pkg-plist sbin/check-ports sbin/fpkg |
| diffstat | 6 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Oct 17 09:18:44 2019 +0200 +++ b/Makefile Thu Oct 17 09:24:07 2019 +0200 @@ -47,7 +47,7 @@ ${SED} -i "" -e "s|@@PKGORIGIN@@|${PKGORIGIN}|" ${WRKSRC}/${_rp} .endfor ${MKDIR} ${WRKSRC}/etc -.for _ef in etc/package-mapping.conf.sample etc/tools.conf.sample etc/bsmtp2dma.conf.sample +.for _ef in etc/package-mapping.conf.sample etc/pkgtools.conf.sample etc/bsmtp2dma.conf.sample ${CP} -v ${SRC}/${_ef} ${WRKSRC}/${_ef} ${SED} -i "" -e "s|\\\$$HGid\\\$$|\$$HGid: ${HGPATH}/${_ef} ${HGREVISION} ${HGDATE} ${HGAUTHOR} ${HGPHASE} \$$|" ${WRKSRC}/${_ef} ${SED} -i "" -e "s|@@PKGORIGIN@@|${PKGORIGIN}|" ${WRKSRC}/${_ef} @@ -58,7 +58,7 @@ ${INSTALL_SCRIPT} ${WRKSRC}/${_rp} ${STAGEDIR}${PREFIX}/${_rp} .endfor ${MKDIR} ${STAGEDIR}${ETCDIR} -.for _ef in package-mapping.conf.sample tools.conf.sample bsmtp2dma.conf.sample +.for _ef in package-mapping.conf.sample pkgtools.conf.sample bsmtp2dma.conf.sample ${INSTALL_DATA} ${WRKSRC}/etc/${_ef} ${STAGEDIR}${ETCDIR}/${_ef} .endfor
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/pkgtools.conf.sample Thu Oct 17 09:24:07 2019 +0200 @@ -0,0 +1,3 @@ +# Shell (sh) script to configure tools in local-bsdtools +# @(#)@@PKGORIGIN@@ $HGid$ +#
--- a/etc/tools.conf.sample Thu Oct 17 09:18:44 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -# Shell (sh) script to configure tools in local-bsdtools -# @(#)@@PKGORIGIN@@ $HGid$ -#
--- a/pkg-plist Thu Oct 17 09:18:44 2019 +0200 +++ b/pkg-plist Thu Oct 17 09:24:07 2019 +0200 @@ -5,6 +5,6 @@ sbin/check-ports sbin/fjail sbin/fpkg -@sample %%ETCDIR%%/tools.conf.sample +@sample %%ETCDIR%%/bsmtp2dma.conf.sample @sample %%ETCDIR%%/package-mapping.conf.sample -@sample %%ETCDIR%%/bsmtp2dma.conf.sample +@sample %%ETCDIR%%/pkgtools.conf.sample
--- a/sbin/check-ports Thu Oct 17 09:18:44 2019 +0200 +++ b/sbin/check-ports Thu Oct 17 09:24:07 2019 +0200 @@ -21,7 +21,7 @@ # : ${CONFIGDIR:=@@ETCDIR@@} -test -r "${CONFIGDIR}/tools.conf" && . "${CONFIGDIR}/tools.conf" +test -r "${CONFIGDIR}/pkgtools.conf" && . "${CONFIGDIR}/pkgtools.conf" # # Mapping configuration: installed package name -> original package name
--- a/sbin/fpkg Thu Oct 17 09:18:44 2019 +0200 +++ b/sbin/fpkg Thu Oct 17 09:24:07 2019 +0200 @@ -79,7 +79,7 @@ # : ${CONFIGDIR:=@@ETCDIR@@} -test -r "${CONFIGDIR}/tools.conf" && . "${CONFIGDIR}/tools.conf" +test -r "${CONFIGDIR}/pkgtools.conf" && . "${CONFIGDIR}/pkgtools.conf" : ${FPKG_AUDIT_FLAGS:=-Fr} : ${FPKG_UPDATE_FLAGS:=}