From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 19 19:08:04 2008 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E86111065673 for ; Fri, 19 Dec 2008 19:08:03 +0000 (UTC) (envelope-from jhein@timing.com) Received: from Daffy.timing.com (daffy.timing.com [206.168.13.218]) by mx1.freebsd.org (Postfix) with ESMTP id AA0AE8FC3D for ; Fri, 19 Dec 2008 19:08:03 +0000 (UTC) (envelope-from jhein@timing.com) Received: from gromit.timing.com (gromit.timing.com [206.168.13.209]) by Daffy.timing.com (8.13.1/8.13.1) with ESMTP id mBJIOs8o086381 for ; Fri, 19 Dec 2008 11:24:54 -0700 (MST) (envelope-from jhein@timing.com) Received: from gromit.timing.com (localhost [127.0.0.1]) by gromit.timing.com (8.14.3/8.14.3) with ESMTP id mBJHt9vo074252; Fri, 19 Dec 2008 10:55:09 -0700 (MST) (envelope-from jhein@gromit.timing.com) Received: (from jhein@localhost) by gromit.timing.com (8.14.3/8.14.3/Submit) id mBJHt9Cd074249; Fri, 19 Dec 2008 10:55:09 -0700 (MST) (envelope-from jhein) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="a0Zt3rJww0" Content-Transfer-Encoding: 7bit Message-ID: <18763.57341.352053.841870@gromit.timing.com> Date: Fri, 19 Dec 2008 10:55:09 -0700 From: John Hein To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org In-Reply-To: <200812181910.mBIJA46J054950@freefall.freebsd.org> References: <200812181814.mBIIEhYK093725@gromit.timing.com> <200812181910.mBIJA46J054950@freefall.freebsd.org> X-Mailer: VM 7.19 under Emacs 22.3.1 X-Virus-Scanned: ClamAV version 0.91.2, clamav-milter version 0.91.2 on Daffy.timing.com X-Virus-Status: Clean Cc: Subject: Re: ports/129741: [patch] support systems that have been built WITHOUT_INFO=yes (no makeinfo & install-info) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Dec 2008 19:08:04 -0000 --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--