Fri Jan 29 17:20:27 2010 UTC ()
Retire USE_DESTDIR=full workaround.


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

--- pkgsrc/mk/bsd.prefs.mk 2010/01/17 08:04:32 1.304
+++ pkgsrc/mk/bsd.prefs.mk 2010/01/29 17:20:27 1.305
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prefs.mk,v 1.304 2010/01/17 08:04:32 dholland Exp $ 1# $NetBSD: bsd.prefs.mk,v 1.305 2010/01/29 17:20:27 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.
@@ -398,31 +398,26 @@ DISTFILES= # none @@ -398,31 +398,26 @@ DISTFILES= # none
398PLIST_SRC= # none 398PLIST_SRC= # none
399CHECK_PERMS= no 399CHECK_PERMS= no
400USE_LANGUAGES= # empty 400USE_LANGUAGES= # empty
401do-patch: 401do-patch:
402 @${DO_NADA} 402 @${DO_NADA}
403do-install: 403do-install:
404 @${DO_NADA} 404 @${DO_NADA}
405.endif 405.endif
406 406
407# PKG_DESTDIR_SUPPORT can only be one of "destdir" or "user-destdir". 407# PKG_DESTDIR_SUPPORT can only be one of "destdir" or "user-destdir".
408USE_DESTDIR?= no 408USE_DESTDIR?= no
409PKG_DESTDIR_SUPPORT?= # empty 409PKG_DESTDIR_SUPPORT?= # empty
410 410
411.if !empty(USE_DESTDIR:M[Ff][Uu][Ll][Ll]) 
412WARNINGS+= "USE_DESTDIR=full is deprecated, just use USE_DESTDIR=yes" 
413USE_DESTDIR:= yes 
414.endif 
415 
416.if empty(PKG_DESTDIR_SUPPORT) || empty(USE_DESTDIR:M[Yy][Ee][Ss]) 411.if empty(PKG_DESTDIR_SUPPORT) || empty(USE_DESTDIR:M[Yy][Ee][Ss])
417. if empty(USE_DESTDIR:M[Yy][Ee][Ss]) && empty(USE_DESTDIR:M[Nn][Oo]) 412. if empty(USE_DESTDIR:M[Yy][Ee][Ss]) && empty(USE_DESTDIR:M[Nn][Oo])
418PKG_FAIL_REASON+= "USE_DESTDIR must be either \`\`yes'' or \`\`no''" 413PKG_FAIL_REASON+= "USE_DESTDIR must be either \`\`yes'' or \`\`no''"
419. endif 414. endif
420_USE_DESTDIR= no 415_USE_DESTDIR= no
421.elif ${PKG_DESTDIR_SUPPORT} == "user-destdir" 416.elif ${PKG_DESTDIR_SUPPORT} == "user-destdir"
422_USE_DESTDIR= user-destdir 417_USE_DESTDIR= user-destdir
423.elif ${PKG_DESTDIR_SUPPORT} == "destdir" 418.elif ${PKG_DESTDIR_SUPPORT} == "destdir"
424_USE_DESTDIR= destdir 419_USE_DESTDIR= destdir
425.else 420.else
426PKG_FAIL_REASON+= "PKG_DESTDIR_SUPPORT must be \`\`destdir'' or \`\`user-destdir''." 421PKG_FAIL_REASON+= "PKG_DESTDIR_SUPPORT must be \`\`destdir'' or \`\`user-destdir''."
427.endif 422.endif
428 423