summaryrefslogtreecommitdiff
path: root/mk/bsd.prefs.mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-05-22 19:11:12 +0000
committerjlam <jlam@pkgsrc.org>2005-05-22 19:11:12 +0000
commit9f94b112f01d9322b4806a06b02bdb565874da4d (patch)
tree9bb9e344bf86184898db4f31dee2dd629dc3e6f2 /mk/bsd.prefs.mk
parentf4a7efea2e910e41e2d900bf23cdfe570457ec00 (diff)
downloadpkgsrc-9f94b112f01d9322b4806a06b02bdb565874da4d.tar.gz
Remove the old tools framework and references to _USE_NEW_TOOLS.
Diffstat (limited to 'mk/bsd.prefs.mk')
-rw-r--r--mk/bsd.prefs.mk15
1 files changed, 1 insertions, 14 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 59e16b9c9ac..cc6f2eb7428 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.192 2005/05/14 01:51:52 rillig Exp $
+# $NetBSD: bsd.prefs.mk,v 1.193 2005/05/22 19:11:12 jlam Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -278,10 +278,7 @@ PKGSRC_USE_TOOLS+= [ awk dirname echo grep pwd sed test true
#
PKGSRC_USE_TOOLS+= date tr
-_USE_NEW_TOOLS?= yes
-.if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
.include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk"
-.endif
.if ${OPSYS} == "NetBSD"
. if ${OBJECT_FMT} == "ELF" && \
@@ -397,20 +394,10 @@ _XPKGWEDGE_REQD= 1.9
# The check for the existence of ${X11BASE}/lib/X11/config/xpkgwedge.def
# is to catch users of xpkgwedge<1.0.
#
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-XMKMF?= ${XMKMF_CMD} ${XMKMF_FLAGS} -a
-XMKMF_FLAGS?= # empty
-.endif
.if !empty(USE_XPKGWEDGE:M[Yy][Ee][Ss])
X11PREFIX= ${LOCALBASE}
-. if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-XMKMF_CMD?= ${X11PREFIX}/bin/pkgxmkmf
-. endif
.else
X11PREFIX= ${X11BASE}
-. if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-XMKMF_CMD?= ${X11PREFIX}/bin/xmkmf
-. endif
.endif
DEPOT_SUBDIR?= packages