texinfo breakage

Ruslan Ermilov ru at FreeBSD.org
Sat Jul 19 14:31:56 PDT 2003


On Tue, Jul 15, 2003 at 04:11:08PM +0200, Gerald Pfeifer wrote:
> On Mon, 14 Jul 2003, Kris Kennaway wrote:
> >> Ultimately, I strongly feel that the current handling of .info files in
> >> the ports collection is broken in that every port handles them manually.
> > I'd be happy to test any solution you can come up with, but as it
> > stands right now the texinfo port has caused dozens of package builds
> > to fail, and I need someone to either volunteer to fix them, or [...]
> 
> Finally enhancing the ports infrastructure to deal with info files is
> really overdue (as we are currently experiencing).
> 
> So, here is a patch! :-)
> 
> I successfully tested this per
>   http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/porting-testing.html
> (working the `make deinstall` bug which was already present there) using
> the sysutils/cfengine2 port, which has info documentations consisting both
> of single and multiple files.
> 
> A patch to update sysutils/cfengine2 as attached as well, and if you look
> at that, I hope you will agree on the beauty of my approach. ;-)
> 
This is the way to go.  A few comments, if I may.

> Index: bsd.port.mk
> ===================================================================
> RCS file: /sw/FreeBSD/CVSUP/ports/Mk/bsd.port.mk,v
> retrieving revision 1.456
> diff -u -2 -p -r1.456 bsd.port.mk
> --- bsd.port.mk	11 Jul 2003 06:30:43 -0000	1.456
> +++ bsd.port.mk	15 Jul 2003 13:58:38 -0000
> @@ -527,4 +527,9 @@ FreeBSD_MAINTAINER=	portmgr at FreeBSD.org
>  #				  "no" otherwise.
>  #
> +# And set the following to specifiy all .info files your port installs.
                                    ^ typo

I also think that "And" is unnecessary here.

> +#
> +# INFO			- A list of .info files (omitting the trailing ".info");
> +#				  only one entry per document!
> +#
>  # Default targets and their behaviors:
>  #
> @@ -3213,5 +3218,5 @@ _INSTALL_SEQ=	install-message check-cate
>  				generate-plist check-already-installed
>  _INSTALL_SUSEQ= check-umask install-mtree pre-su-install \
> -				pre-su-install-script do-install post-install \
> +				pre-su-install-script do-install add-plist-info post-install \
>  				post-install-script compress-man run-ldconfig fake-pkg \
>  				security-check
> @@ -4252,4 +4257,13 @@ generate-plist:
>  ${TMPPLIST}:
>  	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} generate-plist
> +
> +add-plist-info:

I think this can be folded into an existing "generate-plist" target.

> +.for i in ${INFO}
> +	@${ECHO_CMD} "@unexec install-info --delete %D/info/$i.info %D/info/dir" \
> +		>> ${TMPPLIST}
> +	@${LS} ${PREFIX}/info/$i* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}

Shouldn't that read "${PREFIX}/info/$i.info*"?

> +	@${ECHO_CMD} "@exec install-info %D/info/$i.info %D/info/dir" \
> +		>> ${TMPPLIST}
> +.endfor

Thanks for looking into this, Gerald!


Cheers,
-- 
Ruslan Ermilov		Sysadmin and DBA,
ru at sunbay.com		Sunbay Software Ltd,
ru at FreeBSD.org		FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20030720/a5f44867/attachment.bin


More information about the freebsd-ports mailing list