Sun Dec 27 12:37:29 2015 UTC ()
Make USE_DESTDIR != yes an error.


(joerg)
diff -r1.373 -r1.374 pkgsrc/mk/bsd.prefs.mk
cvs diff -r1.373 -r1.374 pkgsrc/mk/bsd.prefs.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.prefs.mk 2015/11/07 20:00:19 1.373
+++ pkgsrc/mk/bsd.prefs.mk 2015/12/27 12:37:29 1.374
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prefs.mk,v 1.373 2015/11/07 20:00:19 sevan Exp $ 1# $NetBSD: bsd.prefs.mk,v 1.374 2015/12/27 12:37:29 joerg Exp $
2# 2#
3# This file includes the mk.conf file, which contains the user settings. 3# This file includes the mk.conf file, which contains the user settings.
4# 4#
5# Packages should include this file before any of the .if directives, as 5# Packages should include this file before any of the .if directives, as
6# well as before modifying variables like CFLAGS, LDFLAGS, and so on. 6# well as before modifying variables like CFLAGS, LDFLAGS, and so on.
7# Otherwise the behavior may be unexpected. 7# Otherwise the behavior may be unexpected.
8# 8#
9# When mk.conf is included by this file, the following variables are 9# When mk.conf is included by this file, the following variables are
10# defined: 10# defined:
11# 11#
12# ACCEPTABLE_LICENSES 12# ACCEPTABLE_LICENSES
13# This variable is set to the list of Open Source licenses. See 13# This variable is set to the list of Open Source licenses. See
14# mk/license.mk for details. 14# mk/license.mk for details.
@@ -526,26 +526,27 @@ WARNINGS+= "[bsd.prefs.mk] The package $ @@ -526,26 +526,27 @@ WARNINGS+= "[bsd.prefs.mk] The package $
526# 526#
527.if ${_USE_DESTDIR} != "no" 527.if ${_USE_DESTDIR} != "no"
528DESTDIR= ${WRKDIR}/.destdir 528DESTDIR= ${WRKDIR}/.destdir
529. if ${_USE_DESTDIR} == "destdir" 529. if ${_USE_DESTDIR} == "destdir"
530_MAKE_PACKAGE_AS_ROOT= yes 530_MAKE_PACKAGE_AS_ROOT= yes
531_MAKE_CLEAN_AS_ROOT= yes 531_MAKE_CLEAN_AS_ROOT= yes
532_MAKE_INSTALL_AS_ROOT= yes 532_MAKE_INSTALL_AS_ROOT= yes
533. elif ${_USE_DESTDIR} == "user-destdir" 533. elif ${_USE_DESTDIR} == "user-destdir"
534_MAKE_PACKAGE_AS_ROOT= no 534_MAKE_PACKAGE_AS_ROOT= no
535_MAKE_CLEAN_AS_ROOT= no 535_MAKE_CLEAN_AS_ROOT= no
536_MAKE_INSTALL_AS_ROOT= no 536_MAKE_INSTALL_AS_ROOT= no
537. endif 537. endif
538.else 538.else
 539PKG_FAIL_REASON+= "USE_DESTDIR=no is no longer supported."
539DESTDIR= 540DESTDIR=
540.endif 541.endif
541 542
542# controls whether binary packages are preserved in pkgsrc/packages/All 543# controls whether binary packages are preserved in pkgsrc/packages/All
543# default is no (to preserve settings since 2013/05/23, prior to that it 544# default is no (to preserve settings since 2013/05/23, prior to that it
544# was yes) 545# was yes)
545_KEEP_BIN_PKGS?= no 546_KEEP_BIN_PKGS?= no
546.if !empty(PKGSRC_KEEP_BIN_PKGS:U:M[Yy][Ee][Ss]) 547.if !empty(PKGSRC_KEEP_BIN_PKGS:U:M[Yy][Ee][Ss])
547_KEEP_BIN_PKGS= yes 548_KEEP_BIN_PKGS= yes
548.endif 549.endif
549 550
550_MAKE_CLEAN_AS_ROOT?= no 551_MAKE_CLEAN_AS_ROOT?= no
551# Whether to run the clean target as root. 552# Whether to run the clean target as root.