From owner-svn-ports-head@FreeBSD.ORG Sun Jun 8 21:25:55 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 7D30E17B; Sun, 8 Jun 2014 21:25:55 +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 5F7032A7B; Sun, 8 Jun 2014 21:25:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s58LPt9l050277; Sun, 8 Jun 2014 21:25:55 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s58LPt1q050276; Sun, 8 Jun 2014 21:25:55 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201406082125.s58LPt1q050276@svn.freebsd.org> From: Antoine Brodin Date: Sun, 8 Jun 2014 21:25:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357076 - 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: Sun, 08 Jun 2014 21:25:55 -0000 Author: antoine Date: Sun Jun 8 21:25:54 2014 New Revision: 357076 URL: http://svnweb.freebsd.org/changeset/ports/357076 QAT: https://qat.redports.org/buildarchive/r357076/ Log: Kill NO_LDCONFIG_MTREE, it is long dead Make USE_LDCONFIG work when PREFIX!=LOCALBASE, LDCONFIG_DIR and LDCONFIG_32DIR are expected in LOCALBASE Phabric: D195 Reviewed by: bapt With hat: portmgr Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sun Jun 8 21:22:25 2014 (r357075) +++ head/Mk/bsd.port.mk Sun Jun 8 21:25:54 2014 (r357076) @@ -970,12 +970,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # - Same as USE_LDCONFIG but the target file is # ${PREFIX}/libdata/ldconfig32/${UNIQUENAME} instead. # Note: that should only be used on 64-bit architectures. -# NO_LDCONFIG_MTREE -# - Denotes whether the libdata/ldconfig directory is part of -# the mtree on a given OSVERSION system. If it is not, we -# create the directory, pull in the ldconfig_compat port, -# and clean up on de-installation. NOTE: this variable is -# internal to bsd.port.mk and must not be set in your Makefile. # # DOCSDIR - Name of the directory to install the packages docs in. # Default: ${PREFIX}/share/doc/${PORTNAME} @@ -4022,18 +4016,15 @@ install-ldconfig-file: -${LDCONFIG} -m ${USE_LDCONFIG} .endif .endif -.if ${USE_LDCONFIG} != "${PREFIX}/lib" && !defined(INSTALL_AS_USER) +.if ${USE_LDCONFIG} != "${LOCALBASE}/lib" && !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Installing ldconfig configuration file" -.if defined(NO_LDCONFIG_MTREE) - @${MKDIR} ${STAGEDIR}${PREFIX}/${LDCONFIG_DIR} +.if defined(NO_MTREE) + @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ - > ${STAGEDIR}${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME} - @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} + > ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME} + @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} -.if defined(NO_LDCONFIG_MTREE) - @${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1 || true" >> ${TMPPLIST} -.endif .endif .endif .endif @@ -4049,16 +4040,13 @@ install-ldconfig-file: .endif .if !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file" -.if defined(NO_LDCONFIG_MTREE) - @${MKDIR} ${STAGEDIR}${PREFIX}/${LDCONFIG_32DIR} +.if defined(NO_MTREE) + @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_32DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ - > ${STAGEDIR}${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} - @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} + > ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} + @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} -.if defined(NO_LDCONFIG_MTREE) - @${ECHO_CMD} "@unexec rmdir ${LDCONFIG32_DIR} >/dev/null 2>&1" >> ${TMPPLIST} -.endif .endif .endif .if defined(INSTALLS_SHLIB)