Sun Apr 10 15:10:12 2016 UTC ()
Remove last glue for PKG_DESTDIR_SUPPORT=none.


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

--- pkgsrc/mk/bsd.prefs.mk 2016/04/10 15:08:39 1.383
+++ pkgsrc/mk/bsd.prefs.mk 2016/04/10 15:10:12 1.384
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prefs.mk,v 1.383 2016/04/10 15:08:39 joerg Exp $ 1# $NetBSD: bsd.prefs.mk,v 1.384 2016/04/10 15:10:12 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.
@@ -408,32 +408,26 @@ do-install: @@ -408,32 +408,26 @@ do-install:
408# After 2011Q1, the default is to use DESTDIR. 408# After 2011Q1, the default is to use DESTDIR.
409USE_DESTDIR?= yes 409USE_DESTDIR?= yes
410# PKG_DESTDIR_SUPPORT can only be one of "destdir", or "user-destdir". 410# PKG_DESTDIR_SUPPORT can only be one of "destdir", or "user-destdir".
411PKG_DESTDIR_SUPPORT?= user-destdir 411PKG_DESTDIR_SUPPORT?= user-destdir
412 412
413.if ${PKG_DESTDIR_SUPPORT} == "user-destdir" 413.if ${PKG_DESTDIR_SUPPORT} == "user-destdir"
414_USE_DESTDIR= user-destdir 414_USE_DESTDIR= user-destdir
415.elif ${PKG_DESTDIR_SUPPORT} == "destdir" 415.elif ${PKG_DESTDIR_SUPPORT} == "destdir"
416_USE_DESTDIR= destdir 416_USE_DESTDIR= destdir
417.else 417.else
418PKG_FAIL_REASON+= "PKG_DESTDIR_SUPPORT must be \`\`destdir'' or \`\`user-destdir''." 418PKG_FAIL_REASON+= "PKG_DESTDIR_SUPPORT must be \`\`destdir'' or \`\`user-destdir''."
419.endif 419.endif
420 420
421# This stanza serves to warn the user; deciding to not build 
422# non-DESTDIR-capable packages when not in DESTDIR mode is above. 
423.if ${PKG_DESTDIR_SUPPORT} == "none" 
424WARNINGS+= "[bsd.prefs.mk] The package ${PKGNAME} is missing DESTDIR support." 
425.endif 
426 
427# When using staged installation, everything gets installed into 421# When using staged installation, everything gets installed into
428# ${DESTDIR}${PREFIX} instead of ${PREFIX} directly. 422# ${DESTDIR}${PREFIX} instead of ${PREFIX} directly.
429# 423#
430.if ${_USE_DESTDIR} != "no" 424.if ${_USE_DESTDIR} != "no"
431DESTDIR= ${WRKDIR}/.destdir 425DESTDIR= ${WRKDIR}/.destdir
432. if ${_USE_DESTDIR} == "destdir" 426. if ${_USE_DESTDIR} == "destdir"
433_MAKE_PACKAGE_AS_ROOT= yes 427_MAKE_PACKAGE_AS_ROOT= yes
434_MAKE_CLEAN_AS_ROOT= yes 428_MAKE_CLEAN_AS_ROOT= yes
435_MAKE_INSTALL_AS_ROOT= yes 429_MAKE_INSTALL_AS_ROOT= yes
436. elif ${_USE_DESTDIR} == "user-destdir" 430. elif ${_USE_DESTDIR} == "user-destdir"
437_MAKE_PACKAGE_AS_ROOT= no 431_MAKE_PACKAGE_AS_ROOT= no
438_MAKE_CLEAN_AS_ROOT= no 432_MAKE_CLEAN_AS_ROOT= no
439_MAKE_INSTALL_AS_ROOT= no 433_MAKE_INSTALL_AS_ROOT= no