CVS commit: pkgsrc/mk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jun 19 18:01:58 UTC 2016

Modified Files:
        pkgsrc/mk: bsd.pkg.use.mk
        pkgsrc/mk/help: directories.help

Log Message:
Remove support for USE_CROSSBASE.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/mk/bsd.pkg.use.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mk/help/directories.help

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/bsd.pkg.use.mk
diff -u pkgsrc/mk/bsd.pkg.use.mk:1.60 pkgsrc/mk/bsd.pkg.use.mk:1.61
--- pkgsrc/mk/bsd.pkg.use.mk:1.60       Sat Jul  4 16:18:38 2015
+++ pkgsrc/mk/bsd.pkg.use.mk    Sun Jun 19 18:01:58 2016
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.use.mk,v 1.60 2015/07/04 16:18:38 joerg Exp $
+#      $NetBSD: bsd.pkg.use.mk,v 1.61 2016/06/19 18:01:58 wiz Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -52,8 +52,6 @@ MAKE_FLAGS+=          CC=${CC:Q} CXX=${CXX:Q}
 
 .if defined(INSTALLATION_PREFIX)
 PREFIX=                        ${INSTALLATION_PREFIX}
-.elif defined(USE_CROSSBASE)
-PREFIX=                        ${CROSSBASE}
 .else
 PREFIX=                        ${LOCALBASE}
 .endif

Index: pkgsrc/mk/help/directories.help
diff -u pkgsrc/mk/help/directories.help:1.4 pkgsrc/mk/help/directories.help:1.5
--- pkgsrc/mk/help/directories.help:1.4 Sat Jul  4 16:18:38 2015
+++ pkgsrc/mk/help/directories.help     Sun Jun 19 18:01:58 2016
@@ -1,17 +1,16 @@
-# $NetBSD: directories.help,v 1.4 2015/07/04 16:18:38 joerg Exp $
+# $NetBSD: directories.help,v 1.5 2016/06/19 18:01:58 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 variables
-#      INSTALLATION_PREFIX and USE_CROSSBASE.
+#      files. The actual value depends on the variable
+#      INSTALLATION_PREFIX.
 #
 #      Tags: read-only, system-defined, non-overridable, etc.
 #
 #      See also:
-#              CROSSBASE,
 #              INSTALLATION_PREFIX,
 #              LOCALBASE.
 #