Date: Thu, 24 Jul 2003 10:32:53 +0200 (CEST) From: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> To: Ruslan Ermilov <ru@FreeBSD.org> Cc: Kris Kennaway <kris@obsecurity.org> Subject: Re: texinfo breakage Message-ID: <Pine.BSF.4.56.0307241017570.86658@acrux.dbai.tuwien.ac.at> In-Reply-To: <20030719213127.GB68178@sunbay.com> References: <200307120606.h6C66T69010399@repoman.freebsd.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> <20030719213127.GB68178@sunbay.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 20 Jul 2003, Ruslan Ermilov wrote:
>> I successfully tested this per
> This is the way to go. A few comments, if I may.
Of course, thanks! I made the appropriate changes wrt. all comments...
>> +add-plist-info:
> I think this can be folded into an existing "generate-plist" target.
...except this one. The problem is that we can only determine the actual
number/names of the .info-{1,2,3,...} files _after_ installation (at least
if we want a straightforward approach) while generate-plist runs _before_
installation.
(Given that David O'Brien's similar machinery in the lang/gcc3x ports has
been tested in the field for a long time, and my tests with the cfengine2
port which has info documentations consisting both of single and multiple
files also worked fine, I hope this is acceptable.)
> Thanks for looking into this, Gerald!
You're most welcome! I'm just a bit astonished that after the apparent
urgency in Kris' original message this has not received more response.
An updated patch is below.
Gerald (@FreeBSD.org)
Index: bsd.port.mk
===================================================================
RCS file: /sw/FreeBSD/CVSUP/ports/Mk/bsd.port.mk,v
retrieving revision 1.457
diff -u -3 -p -r1.457 bsd.port.mk
--- bsd.port.mk 22 Jul 2003 03:51:15 -0000 1.457
+++ bsd.port.mk 23 Jul 2003 23:10:07 -0000
@@ -526,6 +526,11 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# is set and NO_INSTALL_MANPAGES is not set, and
# "no" otherwise.
#
+# Set the following to specify 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:
#
# fetch - Retrieves ${DISTFILES} (and ${PATCHFILES} if defined)
@@ -3212,7 +3217,7 @@ _INSTALL_SEQ= install-message check-cate
run-depends lib-depends pre-install pre-install-script \
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
_PACKAGE_DEP= install
@@ -4251,6 +4256,15 @@ 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.info* | ${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.
.if !target(compress-man)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.56.0307241017570.86658>