From owner-freebsd-ports@FreeBSD.ORG Tue Jul 15 07:11:11 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8E8337B401; Tue, 15 Jul 2003 07:11:11 -0700 (PDT) Received: from vexpert.dbai.tuwien.ac.at (vexpert.dbai.tuwien.ac.at [128.131.111.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 139F443FAF; Tue, 15 Jul 2003 07:11:11 -0700 (PDT) (envelope-from pfeifer@dbai.tuwien.ac.at) Received: from [128.131.111.52] (naos [128.131.111.52]) by vexpert.dbai.tuwien.ac.at (Postfix) with ESMTP id 3286213792; Tue, 15 Jul 2003 16:11:10 +0200 (CEST) Date: Tue, 15 Jul 2003 16:11:08 +0200 (CEST) From: Gerald Pfeifer To: Kris Kennaway In-Reply-To: <20030715034041.GA19804@rot13.obsecurity.org> Message-ID: References: <200307120606.h6C66T69010399@repoman.freebsd.org> <1057992291.42958.21.camel@shumai.marcuscom.com> <20030715034041.GA19804@rot13.obsecurity.org> MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="0-2125998493-1058278268=:26555" cc: ports@FreeBSD.org cc: ru@FreeBSD.org cc: Joe Marcus Clarke cc: ports-committers@FreeBSD.org Subject: Re: texinfo breakage X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2003 14:11:12 -0000 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. --0-2125998493-1058278268=:26555 Content-Type: TEXT/PLAIN; charset=US-ASCII 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. ;-) Cheers, Gerald 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@FreeBSD.org # "no" otherwise. # +# And set the following to specifiy all .info files your port installs. +# +# 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: +.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} + @${ECHO_CMD} "@exec install-info %D/info/$i.info %D/info/dir" \ + >> ${TMPPLIST} +.endfor # Compress (or uncompress) and symlink manpages. --0-2125998493-1058278268=:26555 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=sysutils-cfengine2 Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=sysutils-cfengine2 SW5kZXg6IE1ha2VmaWxlDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1Mg ZmlsZTogL3N3L0ZyZWVCU0QvQ1ZTVVAvcG9ydHMvc3lzdXRpbHMvY2Zlbmdp bmUyL01ha2VmaWxlLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4yNg0KZGlm ZiAtdSAtMyAtcCAtcjEuMjYgTWFrZWZpbGUNCi0tLSBNYWtlZmlsZQk3IE1h ciAyMDAzIDA2OjExOjA4IC0wMDAwCTEuMjYNCisrKyBNYWtlZmlsZQkxNSBK dWwgMjAwMyAxMzo0MjoxMiAtMDAwMA0KQEAgLTI1LDUgKzI1LDYgQEAgSEFT X0NPTkZJR1VSRT0JeWVzDQogQ09ORklHVVJFX0FSR1M9CS0tcHJlZml4PSR7 UFJFRklYfQ0KIA0KIE1BTjg9CQljZmVuZ2luZS44DQorSU5GTz0JCWNmZW5n aW5lLUFub21hbGllcyBjZmVuZ2luZS1SZWZlcmVuY2UgY2ZlbmdpbmUtVHV0 b3JpYWwNCiANCiAuaW5jbHVkZSA8YnNkLnBvcnQubWs+DQpJbmRleDogcGtn LXBsaXN0DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL3N3 L0ZyZWVCU0QvQ1ZTVVAvcG9ydHMvc3lzdXRpbHMvY2ZlbmdpbmUyL3BrZy1w bGlzdCx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNw0KZGlmZiAtdSAtMyAt cCAtcjEuNyBwa2ctcGxpc3QNCi0tLSBwa2ctcGxpc3QJMzAgSnVsIDIwMDIg MTg6MzQ6MjIgLTAwMDAJMS43DQorKysgcGtnLXBsaXN0CTE1IEp1bCAyMDAz IDEzOjMxOjI3IC0wMDAwDQpAQCAtMSwyNiArMSwzIEBADQotQHVuZXhlYyBp bnN0YWxsLWluZm8gLS1kZWxldGUgJUQvaW5mby9jZmVuZ2luZS1Bbm9tYWxp ZXMuaW5mbyAlRC9pbmZvL2Rpcg0KLUB1bmV4ZWMgaW5zdGFsbC1pbmZvIC0t ZGVsZXRlICVEL2luZm8vY2ZlbmdpbmUtUmVmZXJlbmNlLmluZm8gJUQvaW5m by9kaXINCi1AdW5leGVjIGluc3RhbGwtaW5mbyAtLWRlbGV0ZSAlRC9pbmZv L2NmZW5naW5lLVR1dG9yaWFsLmluZm8gJUQvaW5mby9kaXINCi1pbmZvL2Nm ZW5naW5lLUFub21hbGllcy5pbmZvDQotaW5mby9jZmVuZ2luZS1SZWZlcmVu Y2UuaW5mbw0KLWluZm8vY2ZlbmdpbmUtUmVmZXJlbmNlLmluZm8tMQ0KLWlu Zm8vY2ZlbmdpbmUtUmVmZXJlbmNlLmluZm8tMg0KLWluZm8vY2ZlbmdpbmUt UmVmZXJlbmNlLmluZm8tMw0KLWluZm8vY2ZlbmdpbmUtUmVmZXJlbmNlLmlu Zm8tNA0KLWluZm8vY2ZlbmdpbmUtUmVmZXJlbmNlLmluZm8tNQ0KLWluZm8v Y2ZlbmdpbmUtUmVmZXJlbmNlLmluZm8tNg0KLWluZm8vY2ZlbmdpbmUtUmVm ZXJlbmNlLmluZm8tNw0KLWluZm8vY2ZlbmdpbmUtUmVmZXJlbmNlLmluZm8t OA0KLWluZm8vY2ZlbmdpbmUtVHV0b3JpYWwuaW5mbw0KLWluZm8vY2Zlbmdp bmUtVHV0b3JpYWwuaW5mby0xDQotaW5mby9jZmVuZ2luZS1UdXRvcmlhbC5p bmZvLTINCi1pbmZvL2NmZW5naW5lLVR1dG9yaWFsLmluZm8tMw0KLWluZm8v Y2ZlbmdpbmUtVHV0b3JpYWwuaW5mby00DQotaW5mby9jZmVuZ2luZS1UdXRv cmlhbC5pbmZvLTUNCi1pbmZvL2NmZW5naW5lLVR1dG9yaWFsLmluZm8tNg0K LUBleGVjIGluc3RhbGwtaW5mbyAlRC9pbmZvL2NmZW5naW5lLUFub21hbGll cy5pbmZvICVEL2luZm8vZGlyDQotQGV4ZWMgaW5zdGFsbC1pbmZvICVEL2lu Zm8vY2ZlbmdpbmUtUmVmZXJlbmNlLmluZm8gJUQvaW5mby9kaXINCi1AZXhl YyBpbnN0YWxsLWluZm8gJUQvaW5mby9jZmVuZ2luZS1UdXRvcmlhbC5pbmZv ICVEL2luZm8vZGlyDQogc2Jpbi9jZmFnZW50DQogc2Jpbi9jZmRvYw0KIHNi aW4vY2ZlbnZkDQo= --0-2125998493-1058278268=:26555--