Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 087787AAA1 for ; Sun, 19 Jun 2016 20:06:04 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id A48A485EE4; Sun, 19 Jun 2016 20:06:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 658EF85EDC for ; Sun, 19 Jun 2016 20:03:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id BgzzHIldEbMy for ; Sun, 19 Jun 2016 20:03:09 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8DED885E7F for ; Sun, 19 Jun 2016 20:03:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 88C5AFBB5; Sun, 19 Jun 2016 20:03:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_146636658961600" MIME-Version: 1.0 Date: Sun, 19 Jun 2016 20:03:09 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20160619200309.88C5AFBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_146636658961600 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sun Jun 19 20:03:09 UTC 2016 Modified Files: pkgsrc/mk: bsd.pkg.use.mk pkgsrc/mk/help: directories.help Log Message: Get rid of INSTALLATION_PREFIX. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 pkgsrc/mk/bsd.pkg.use.mk cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/help/directories.help Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_146636658961600 Content-Disposition: inline Content-Length: 1608 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/bsd.pkg.use.mk diff -u pkgsrc/mk/bsd.pkg.use.mk:1.61 pkgsrc/mk/bsd.pkg.use.mk:1.62 --- pkgsrc/mk/bsd.pkg.use.mk:1.61 Sun Jun 19 18:01:58 2016 +++ pkgsrc/mk/bsd.pkg.use.mk Sun Jun 19 20:03:09 2016 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.61 2016/06/19 18:01:58 wiz Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.62 2016/06/19 20:03:09 wiz Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -50,11 +50,7 @@ PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAK MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q} .endif -.if defined(INSTALLATION_PREFIX) -PREFIX= ${INSTALLATION_PREFIX} -.else PREFIX= ${LOCALBASE} -.endif ############################################################################ # General settings Index: pkgsrc/mk/help/directories.help diff -u pkgsrc/mk/help/directories.help:1.5 pkgsrc/mk/help/directories.help:1.6 --- pkgsrc/mk/help/directories.help:1.5 Sun Jun 19 18:01:58 2016 +++ pkgsrc/mk/help/directories.help Sun Jun 19 20:03:09 2016 @@ -1,17 +1,15 @@ -# $NetBSD: directories.help,v 1.5 2016/06/19 18:01:58 wiz Exp $ +# $NetBSD: directories.help,v 1.6 2016/06/19 20:03:09 wiz Exp $ # # This file contains some short documentation on the directories that # are used within pkgsrc. # PREFIX # This is the directory where the package should install its -# files. The actual value depends on the variable -# INSTALLATION_PREFIX. +# files. This is usually LOCALBASE. # # Tags: read-only, system-defined, non-overridable, etc. # # See also: -# INSTALLATION_PREFIX, # LOCALBASE. # --_----------=_146636658961600--