On Wed, Mar 09, 2022 at 12:59:35PM +0000, Stuart Henderson wrote:
> Various projects have switched to asciidoctor in recent times,
> either completely, or in preference to asciidoc if it's available at
> build time, so I think it makes sense to extend the poison scripts.
>
> OK? (It has been in my bulks for ages and has found problems which
> I've fixed).
OK
>
>
> Index: bsd.port.mk
> ===================================================================
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1569
> diff -u -p -r1.1569 bsd.port.mk
> --- bsd.port.mk 11 Feb 2022 17:17:27 -0000 1.1569
> +++ bsd.port.mk 9 Mar 2022 12:57:54 -0000
> @@ -2689,6 +2689,12 @@ ${_WRKDIR_COOKIE}:
> @${_PBUILD} ln -sf asciidoc ${WRKDIR}/bin/${name}
> . endfor
> .endif
> +.if empty(_BUILD_DEP:Mtextproc/asciidoctor)
> + @printf '#!/bin/sh\n\
> + echo "*** $$0 was called without textproc/asciidoctor
> dependency ***" >&2\n\
> + exit 1\n' ${_PREDIR} ${WRKDIR}/bin/asciidoctor
> + @${_PBUILD} chmod 555 ${WRKDIR}/bin/asciidoctor
> +.endif
> @${_PMAKE_COOKIE} $@
>
> ${_EXTRACT_COOKIE}: ${_WRKDIR_COOKIE}
>
--
Antoine
