Date: Sun, 20 Jul 2003 00:31:28 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> Cc: Kris Kennaway <kris@obsecurity.org> Subject: Re: texinfo breakage Message-ID: <20030719213127.GB68178@sunbay.com> In-Reply-To: <Pine.BSF.4.56.0307151336300.26555@naos.dbai.tuwien.ac.at> References: <200307120606.h6C66T69010399@repoman.freebsd.org> <20030712063421.GA61124@rot13.obsecurity.org> <1057992291.42958.21.camel@shumai.marcuscom.com> <Pine.BSF.4.56.0307131243370.945@acrux.dbai.tuwien.ac.at> <20030715034041.GA19804@rot13.obsecurity.org> <Pine.BSF.4.56.0307151336300.26555@naos.dbai.tuwien.ac.at>
next in thread | previous in thread | raw e-mail | index | archive | help
--vGgW1X5XWziG23Ko Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 manuall= y. > > 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 [...] >=20 > Finally enhancing the ports infrastructure to deal with info files is > really overdue (as we are currently experiencing). >=20 > So, here is a patch! :-) >=20 > I successfully tested this per > http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/porti= ng-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. >=20 > 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. ;-) >=20 This is the way to go. A few comments, if I may. > Index: bsd.port.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > 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=3D portmgr@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=3D install-message check-cate > generate-plist check-already-installed > _INSTALL_SUSEQ=3D 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, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software Ltd, ru@FreeBSD.org FreeBSD committer --vGgW1X5XWziG23Ko Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE/GbivUkv4P6juNwoRAvWrAKCDkEppNbWGcdF73vPVAEJ8UX3KpgCghAxa 7G4GNN3o0GyBpVuaRRWWAmU= =sCec -----END PGP SIGNATURE----- --vGgW1X5XWziG23Ko--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030719213127.GB68178>