From owner-svn-ports-all@freebsd.org Fri May 11 10:51:37 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 823B5FCD80F; Fri, 11 May 2018 10:51:37 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 364F680D46; Fri, 11 May 2018 10:51:37 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1762A68D5; Fri, 11 May 2018 10:51:37 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4BApa3i049347; Fri, 11 May 2018 10:51:36 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4BApakm049346; Fri, 11 May 2018 10:51:36 GMT (envelope-from des@FreeBSD.org) Message-Id: <201805111051.w4BApakm049346@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 11 May 2018 10:51:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469624 - head/sysutils/e2fsprogs X-SVN-Group: ports-head X-SVN-Commit-Author: des X-SVN-Commit-Paths: head/sysutils/e2fsprogs X-SVN-Commit-Revision: 469624 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 May 2018 10:51:37 -0000 Author: des Date: Fri May 11 10:51:36 2018 New Revision: 469624 URL: https://svnweb.freebsd.org/changeset/ports/469624 Log: Don't set USE_LDCONFIG for child ports. They will do so themselves if they need it. Also, use PREFIX instead of LOCALBASE. Not bumping PORTREVISION as the only observable effect is the absence of a warning message caused by running ldconfig on a non-existent directory. Approved by: maintainer (mandree@) Modified: head/sysutils/e2fsprogs/Makefile Modified: head/sysutils/e2fsprogs/Makefile ============================================================================== --- head/sysutils/e2fsprogs/Makefile Fri May 11 10:40:41 2018 (r469623) +++ head/sysutils/e2fsprogs/Makefile Fri May 11 10:51:36 2018 (r469624) @@ -30,7 +30,9 @@ USE_CSTD= gnu99 # this seems a bit redundant to the --rpath below, but # the latter should be more robust in case someone needs # to deal with the file systems from a system not yet fully booted. -USE_LDCONFIG= ${LOCALBASE}/lib/e2fsprogs +.if !defined(PKGNAMESUFFIX) +USE_LDCONFIG= ${PREFIX}/lib/e2fsprogs +.endif GNU_CONFIGURE= yes LLD_UNSAFE= yes CONFIGURE_ARGS?=--disable-fsck \