From owner-svn-ports-head@FreeBSD.ORG Tue Jul 29 17:38:20 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4FA24271; Tue, 29 Jul 2014 17:38:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 24CFE2C9E; Tue, 29 Jul 2014 17:38:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6THcKgj039781; Tue, 29 Jul 2014 17:38:20 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6THcJoS039780; Tue, 29 Jul 2014 17:38:19 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201407291738.s6THcJoS039780@svn.freebsd.org> From: Antoine Brodin Date: Tue, 29 Jul 2014 17:38:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363366 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jul 2014 17:38:20 -0000 Author: antoine Date: Tue Jul 29 17:38:19 2014 New Revision: 363366 URL: http://svnweb.freebsd.org/changeset/ports/363366 QAT: https://qat.redports.org/buildarchive/r363366/ Log: - Reset @cwd to prefix after creating ldconfig configuration file in localbase - Reset @cwd to prefix before listing info pages (same as is done for PORTDOCS, PORTEXAMPLES and PORTDATA) - Fix a typo from 2006, LDCONFIG_32DIR instead of LDCONFIG32_DIR Reported by: John Hein Phabric: D493 Reviewed by: bapt Exp-run: self With hat: portmgr Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Tue Jul 29 17:36:03 2014 (r363365) +++ head/Mk/bsd.port.mk Tue Jul 29 17:38:19 2014 (r363366) @@ -4015,6 +4015,7 @@ install-ldconfig-file: > ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME} @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} + @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} .endif .endif .endif @@ -4031,12 +4032,13 @@ install-ldconfig-file: .if !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file" .if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE} - @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_32DIR} + @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ > ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} + @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} .endif .endif .if defined(INSTALLS_SHLIB) @@ -5618,6 +5620,10 @@ add-plist-buildinfo: .if !target(add-plist-info) .if defined(INFO) add-plist-info: + @if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \ + [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \ + ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \ + fi # Process GNU INFO files at package install/deinstall time .for i in ${INFO} .if defined(NO_STAGE)