Date: Fri, 19 Dec 2008 10:55:09 -0700 From: John Hein <jhein@timing.com> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/129741: [patch] support systems that have been built WITHOUT_INFO=yes (no makeinfo & install-info) Message-ID: <18763.57341.352053.841870@gromit.timing.com> In-Reply-To: <200812181910.mBIJA46J054950@freefall.freebsd.org> References: <200812181814.mBIIEhYK093725@gromit.timing.com> <200812181910.mBIJA46J054950@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--a0Zt3rJww0
Content-Type: text/plain; charset=us-ascii
Content-Description: message body text
Content-Transfer-Encoding: 7bit
The previous patch for bsd.ports.mk had some stray debug in it.
That has been removed in a respin of the patch attached here...
--a0Zt3rJww0
Content-Type: text/plain
Content-Description: patch #2 (same as #1, but without stray debug in b.p.m)
Content-Disposition: inline;
filename="p"
Content-Transfer-Encoding: 7bit
Index: bsd.commands.mk
===================================================================
RCS file: /base/FreeBSD-CVS/ports/Mk/bsd.commands.mk,v
retrieving revision 1.3
diff -u -p -r1.3 bsd.commands.mk
--- bsd.commands.mk 14 Apr 2008 16:46:41 -0000 1.3
+++ bsd.commands.mk 18 Dec 2008 17:58:12 -0000
@@ -92,6 +92,18 @@ XARGS?= /usr/bin/xargs
XMKMF?= ${LOCALBASE}/bin/xmkmf -a
YACC?= /usr/bin/yacc
+.if exists(/usr/bin/install-info) && !defined(WITHOUT_INFO)
+HAS_INFO= yes
+INSTALLINFO?= /usr/bin/install-info
+MAKEINFO?= /usr/bin/makeinfo
+.else
+# Ideally, ports should key on HAS_INFO. In some cases, it
+# may make more sense to just have a port use ${MAKEINFO} and
+# ${INSTALLINFO} which are defined to a no-op here.
+INSTALLINFO?= true
+MAKEINFO?= true
+.endif
+
.if exists(/sbin/md5)
MD5?= /sbin/md5
.else
Index: bsd.port.mk
===================================================================
RCS file: /base/FreeBSD-CVS/ports/Mk/bsd.port.mk,v
retrieving revision 1.604
diff -u -p -r1.604 bsd.port.mk
--- bsd.port.mk 5 Sep 2008 19:41:43 -0000 1.604
+++ bsd.port.mk 19 Dec 2008 17:52:24 -0000
@@ -5672,13 +5672,13 @@ add-plist-data:
.if !target(add-plist-info)
add-plist-info:
# Process GNU INFO files at package install/deinstall time
-.if defined(INFO)
+.if defined(INFO) && defined(HAS_INFO)
.for i in ${INFO}
- install-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
- @${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
+ ${INSTALLINFO} --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
+ @${ECHO_CMD} "@unexec ${INSTALLINFO} --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
>> ${TMPPLIST}
@${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
- @${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
+ @${ECHO_CMD} "@exec ${INSTALLINFO} --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
>> ${TMPPLIST}
.endfor
.if defined(INFO_SUBDIR)
--a0Zt3rJww0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?18763.57341.352053.841870>