summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorwiz <wiz>2005-12-01 18:26:01 +0000
committerwiz <wiz>2005-12-01 18:26:01 +0000
commit16a5961ec6a319d02cc3659665eca687030fce2f (patch)
tree1328b08b194a623d0f367be85330f94fe18a8d82 /pkgtools
parent8b5f7f385821b6a9c62952d0039215100958efda (diff)
downloadpkgsrc-16a5961ec6a319d02cc3659665eca687030fce2f.tar.gz
Move some obsolete variables from makevars.map to deprecated.map.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/files/deprecated.map6
-rw-r--r--pkgtools/pkglint/files/makevars.map6
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/pkglint/files/deprecated.map b/pkgtools/pkglint/files/deprecated.map
index 6388cb7b639..80ea2ee7366 100644
--- a/pkgtools/pkglint/files/deprecated.map
+++ b/pkgtools/pkglint/files/deprecated.map
@@ -1,4 +1,4 @@
-# $NetBSD: deprecated.map,v 1.14 2005/11/24 21:51:10 rillig Exp $
+# $NetBSD: deprecated.map,v 1.15 2005/12/01 18:26:01 wiz Exp $
#
# This file contains names of Makefile variables and a short explanation
@@ -14,6 +14,10 @@ USE_RSAREF2 Use the PKG_OPTIONS framework instead.
# The following entries can be removed after the 2005Q4 branch.
USE_PERL5 Use USE_TOOLS+=perl or USE_TOOLS+=perl:run instead.
+USE_CUPS Use the PKG_OPTIONS framework (option cups) instead.
+USE_I586 Use the PKG_OPTIONS framework (option i586) instead.
+USE_SASL Use the PKG_OPTIONS framework (option sasl) instead.
+USE_SASL2 Use the PKG_OPTIONS framework (option sasl) instead.
# The following entries can be removed after the 2006Q1 branch.
NO_TOOLS You can just remove it.
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index 77a7a83a058..b34e495ca79 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.39 2005/11/27 21:18:43 rillig Exp $
+# $NetBSD: makevars.map,v 1.40 2005/12/01 18:26:01 wiz Exp $
#
# This file contains the guessed type of some variables, according to
@@ -30,14 +30,10 @@ EXTRACT_USING_PAX Yes
SETGIDGAME YesNo
USE_CRYPTO { YES NO }
-USE_CUPS Yes
-USE_I586 YesNo
USE_INET6 YesNo
USE_INN Yes
USE_OPENLDAP { YES NO }
USE_OSS Yes
-USE_SASL { YES NO }
-USE_SASL2 { YES NO }
USE_SJ3 { YES NO }
USE_SOCKS { 4 5 }
USE_WNN4 { YES NO }