diff options
| -rw-r--r-- | doc/HOWTO-crosscompile-xorg | 4 | ||||
| -rw-r--r-- | doc/guide/files/configuring.xml | 18 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 13 | ||||
| -rw-r--r-- | mk/help/destdir.help | 10 |
4 files changed, 21 insertions, 24 deletions
diff --git a/doc/HOWTO-crosscompile-xorg b/doc/HOWTO-crosscompile-xorg index b615ee231fc..9400dd52ed4 100644 --- a/doc/HOWTO-crosscompile-xorg +++ b/doc/HOWTO-crosscompile-xorg @@ -1,4 +1,4 @@ -$NetBSD: HOWTO-crosscompile-xorg,v 1.4 2008/04/25 11:46:07 ghen Exp $ +$NetBSD: HOWTO-crosscompile-xorg,v 1.5 2009/05/09 14:59:09 joerg Exp $ How to cross-compile modular Xorg on NetBSD ------------------------------------------- @@ -11,7 +11,7 @@ cross-compiled packages). where you wrote the tools to and where the destdir is. (c) You have to add the following options to your mk.conf: -USE_DESTDIR= full +USE_DESTDIR= yes DEPENDS_TARGET= package-install X11_TYPE = modular diff --git a/doc/guide/files/configuring.xml b/doc/guide/files/configuring.xml index 08e31fbb9a7..1dff6c28efc 100644 --- a/doc/guide/files/configuring.xml +++ b/doc/guide/files/configuring.xml @@ -1,4 +1,4 @@ -<!-- $NetBSD: configuring.xml,v 1.34 2009/04/03 01:52:24 snj Exp $ --> +<!-- $NetBSD: configuring.xml,v 1.35 2009/05/09 14:59:09 joerg Exp $ --> <chapter id="configuring"> <title>Configuring pkgsrc</title> @@ -146,13 +146,9 @@ works.</para> installation and packaging as normal user. Root privileges are only needed to add packages.</para></listitem> </itemizedlist> - <para>To use the DESTDIR support, set either - <varname>USE_DESTDIR=yes</varname> to use the basic support for - packages that offer it or <varname>USE_DESTDIR=full</varname> to - get the full support with fallback to basic - support. <varname>USE_DESTDIR=full</varname> needs <filename - role="pkg">pkgtools/pkg_install</filename> version 20070802 (or - newer). It might become the default DESTDIR support later.</para> + <para>To use the DESTDIR support, set + <varname>USE_DESTDIR=yes</varname> to get the full support for packages + that support it and with fallback to basic support. </para> <para>DESTDIR support changes the behaviour of various targets slightly. To install a package after building it, use <literal>package-install</literal>. <literal>package</literal> and @@ -178,20 +174,20 @@ uid=1000(myusername) gid=100(users) groups=100(users),0(wheel) should be needed <programlisting> -&uprompt; make USE_DESTDIR=full install +&uprompt; make USE_DESTDIR=yes install </programlisting> Create a package without root privileges <programlisting> -&uprompt; make USE_DESTDIR=full PACKAGES=$HOME/packages package +&uprompt; make USE_DESTDIR=yes PACKAGES=$HOME/packages package </programlisting> For the following command, you must be able to gain root privileges using &man.su.1; <programlisting> -&uprompt; make USE_DESTDIR=full PACKAGES=$HOME/packages package-install +&uprompt; make USE_DESTDIR=yes PACKAGES=$HOME/packages package-install </programlisting> Then, as a simple user diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index da42d819ad1..7c5002c80d1 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.290 2009/04/08 23:03:14 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.291 2009/05/09 14:59:08 joerg Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -381,14 +381,15 @@ do-install: USE_DESTDIR?= no PKG_DESTDIR_SUPPORT?= # empty -.if empty(PKG_DESTDIR_SUPPORT) || (empty(USE_DESTDIR:M[Yy][Ee][Ss]) && empty(USE_DESTDIR:M[Ff][Uu][Ll][Ll])) +.if !empty(USE_DESTDIR:M[Ff][Uu][Ll][Ll]) +WARNINGS+= "USE_DESTDIR=full is deprecated, just use USE_DESTDIR=yes" +USE_DESTDIR:= yes +.endif + +.if empty(PKG_DESTDIR_SUPPORT) || empty(USE_DESTDIR:M[Yy][Ee][Ss]) _USE_DESTDIR= no .elif ${PKG_DESTDIR_SUPPORT} == "user-destdir" -. if !empty(USE_DESTDIR:M[Ff][Uu][Ll][Ll]) _USE_DESTDIR= user-destdir -. else -_USE_DESTDIR= destdir -. endif .elif ${PKG_DESTDIR_SUPPORT} == "destdir" _USE_DESTDIR= destdir .else diff --git a/mk/help/destdir.help b/mk/help/destdir.help index 44871136ccb..d7e77c794ec 100644 --- a/mk/help/destdir.help +++ b/mk/help/destdir.help @@ -1,4 +1,4 @@ -# $NetBSD: destdir.help,v 1.3 2008/08/10 17:39:15 joerg Exp $ +# $NetBSD: destdir.help,v 1.4 2009/05/09 14:59:08 joerg Exp $ # # === # Warning: This file is still under construction. Don't rely on it. @@ -20,10 +20,10 @@ # # USE_DESTDIR # * "yes" to enable DESTDIR support for those packages that -# explicitly support it. -# -# * "full": This makes the build completely unprivileged and in -# turn detects any attempt to write e.g. to ${LOCALBASE}. +# explicitly support it. If the package supports it, +# the build will run completely under the privileges of the +# calling users, only package installation via pkg_add is done +# as root. # # === Package-settable variables === # |