On Sun, Jul 29, 2018 at 02:03:36PM +0200, Ingo Schwarze wrote:
> Hi Marc,
>
> Marc Espie wrote on Sun, Jul 29, 2018 at 01:29:51PM +0200:
>
> > I'd prefer a GC
>
> That's even finer with me.
>
> I just noticed there is magic to redirect FOO to _internal-FOO,
> so the public target "manpages-check" will have to go, too.
> But given that it has been badly broken for years and nobody
> complained, i think nobody needs it. Even i never felt like
> using it.
>
> OK?
> Ingo
Yep
manpages-check was mostly mine back when I was in charge of makewhatis
Guess you have your own method instead :)
>
> Index: src/share/man/man5/bsd.port.mk.5
> ===================================================================
> RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
> retrieving revision 1.489
> diff -u -p -r1.489 bsd.port.mk.5
> --- src/share/man/man5/bsd.port.mk.5 26 Jul 2018 20:36:10 -0000 1.489
> +++ src/share/man/man5/bsd.port.mk.5 29 Jul 2018 11:52:06 -0000
> @@ -422,10 +422,6 @@ and store the result in ${CHECKSUM_FILE}
> .Pa distinfo .
> Also store the lengths of all files for a quick check during
> .Cm fetch .
> -.It Cm manpages-check
> -Verify that
> -.Xr makewhatis 8
> -can do a correct job with the port's manpages.
> .It Cm no-lib-depends-args
> Degenerate form of
> .Cm lib-depends-args
> Index: ports/infrastructure/mk/bsd.port.mk
> ===================================================================
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1429
> diff -u -p -r1.1429 bsd.port.mk
> --- ports/infrastructure/mk/bsd.port.mk 27 Jul 2018 17:22:24 -0000
> 1.1429
> +++ ports/infrastructure/mk/bsd.port.mk 29 Jul 2018 11:58:45 -0000
> @@ -2191,7 +2191,7 @@ _internal-fetch-all:
> .if (!empty(IGNORE${SUBPACKAGE}) || defined(_EXTRA_IGNORE)) &&
> !defined(NO_IGNORE)
> _internal-all _internal-build _internal-checksum _internal-configure \
> _internal-deinstall _internal-extract _internal-fake _internal-fetch \
> - _internal-install _internal-install-all _internal-manpages-check \
> + _internal-install _internal-install-all \
> _internal-package _internal-patch _internal-plist _internal-test \
> _internal-subpackage _internal-subupdate _internal-uninstall \
> _internal-update _internal-update-or-install _internal-generate-readmes
> \
> @@ -2220,11 +2220,6 @@ port-lib-depends-check: ${WRKINST}/.save
> ${_CHECK_LIB_DEPENDS} -i -s ${WRKINST}/.saved_libs; \
> done
>
> -_internal-manpages-check: ${_FAKE_COOKIE}
> - @cd ${WRKINST}${TRUEPREFIX}/man && \
> - ${_PBUILD} /usr/libexec/makewhatis -p . && \
> - cat mandoc.db
> -
> # Most standard port targets create a cookie to avoid being re-run.
> #
> # fetch is an exception, as it uses the files it fetches as `cookies',
> @@ -2359,7 +2354,7 @@ update-patches:
>
> .for _t in extract patch distpatch configure build all install fake \
> subupdate fetch fetch-all checksum test prepare install-depends \
> - test-depends clean manpages-check plist update-plist generate-readmes \
> + test-depends clean plist update-plist generate-readmes \
> update update-or-install update-or-install-all package install-all
> . if defined(_LOCK)
> ${_t}:
> @@ -3444,8 +3439,7 @@ _all_phony = ${_recursive_depends_target
> _internal-all _internal-build _internal-build-depends \
> _internal-checksum _internal-clean _internal-configure \
> _internal-distpatch _internal-extract _internal-fake _internal-fetch \
> - _internal-fetch-all _internal-install-depends \
> - _internal-install-all _internal-manpages-check \
> + _internal-fetch-all _internal-install-depends _internal-install-all \
> _internal-package _internal-package-only _internal-plist
> _internal-prepare \
> _internal-test _internal-test-depends \
> _internal-subpackage _internal-subupdate \
> Index: ports/infrastructure/mk/pkgpath.mk
> ===================================================================
> RCS file: /cvs/ports/infrastructure/mk/pkgpath.mk,v
> retrieving revision 1.73
> diff -u -p -r1.73 pkgpath.mk
> --- ports/infrastructure/mk/pkgpath.mk 9 Jul 2018 13:55:14 -0000
> 1.73
> +++ ports/infrastructure/mk/pkgpath.mk 29 Jul 2018 11:58:45 -0000
> @@ -166,7 +166,7 @@ _recursive_targets = \
> fetch-all full-all-depends full-build-depends generate-readmes \
> full-test-depends full-run-depends \
> install install-all \
> - license-check manpages-check package patch \
> + license-check package patch \
> prepare show-prepare-results repackage test regress reinstall \
> update update-or-install update-or-install-all \
> describe dump-vars print-plist print-plist-all \
