Date: 01 May 2000 15:15:21 -0700 From: asami@FreeBSD.ORG (Satoshi - Ports Wraith - Asami) To: alex@big.endian.de Cc: ports@FreeBSD.ORG Subject: Re: deleting empty info/dir files Message-ID: <vqc1z3lex3a.fsf@silvia.hip.berkeley.edu> In-Reply-To: asami@FreeBSD.ORG's message of "Mon, 1 May 2000 14:05:52 -0700 (PDT)" References: <200005010853.BAA25327@silvia.hip.berkeley.edu> <20000501111727.A3627@cichlids.cichlids.com> <200005012105.OAA35414@silvia.hip.berkeley.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
* You didn't install the info distribution and got a dir file you copied
* to /usr/local/info/dir? Then yes, it could be a problem. I should
Actually no, it shouldn't be a problem. I forgot that the newer
install-info's actually create the dir file if it doesn't exist.
Thus, no longer need the code that creates info/dir in bsd.port.mk.
Satoshi
-------
Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.337
diff -u -r1.337 bsd.port.mk
--- bsd.port.mk 2000/04/20 01:06:12 1.337
+++ bsd.port.mk 2000/05/01 22:03:38
@@ -1894,9 +1894,6 @@
${ECHO_MSG} "You may want to become root and try again to ensure correct permissions."; \
fi
.endif
- @if [ -d ${PREFIX}/info -a ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
- fi
.endif
.if make(real-configure) && defined(USE_LIBTOOL)
@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} patch-libtool
@@ -2700,10 +2697,8 @@
@${ECHO} '@cwd ${PREFIX}' >> ${TMPPLIST}
.endif
.endfor
- @${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} | \
- ${SED} -e "/\@exec install-info.*$$/h" \
- -e "s^^\@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir^g" \
- -e "t fix" -e "b" -e ":fix" -e "G" >> ${TMPPLIST}
+ @${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}
+ @${ECHO} "@unexec if [ -f %D/info/dir ]; then if sed -e '1,/Menu:/d' %D/info/dir | grep -q '^[*] '; then true; else rm %D/info/dir; fi; fi" >> ${TMPPLIST}
.if !defined(NO_FILTER_SHLIBS)
.if (${PORTOBJFORMAT} == "aout")
@${SED} -e 's,\(/lib.*\.so\.[0-9]*\)$$,\1.0,' ${TMPPLIST} > ${TMPPLIST}.tmp
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?vqc1z3lex3a.fsf>