[pkgsrc/trunk]: pkgsrc/mk/tools Remove support for obsolete USE_CUPS variable.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b7e7ec4bfed
branches:  trunk
changeset: 503880:4b7e7ec4bfed
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Dec 01 18:25:27 2005 +0000

description:
Remove support for obsolete USE_CUPS variable.
Fix NO_X11 handling according to my guess how it should behave
(instead of being a clause with no effect).

diffstat:

 mk/tools/replace.mk |  15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diffs (37 lines):

diff -r 7261aa367960 -r 4b7e7ec4bfed mk/tools/replace.mk
--- a/mk/tools/replace.mk       Thu Dec 01 18:23:37 2005 +0000
+++ b/mk/tools/replace.mk       Thu Dec 01 18:25:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.139 2005/12/01 15:02:22 joerg Exp $
+# $NetBSD: replace.mk,v 1.140 2005/12/01 18:25:27 wiz Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -873,23 +873,18 @@
 # Determine the default Ghostscript package to build based on the
 # PKG_OPTIONS for the current package.
 #
-# XXX There are some legacy variable issues here.  "NO_X11" is undocumented,
-# XXX and "USE_CUPS" should eventually go away.  We preserve them here for
-# XXX backwards-compatibility.
+# XXX There are some legacy variable issues here.  "NO_X11" is undocumented.
+# XXX We preserve it here for backwards-compatibility.
 #
 .  if defined(NO_X11)
 .    if (defined(PKG_OPTIONS) && !empty(PKG_OPTIONS:Mcups))
-_TOOLS_PKGSRCDIR.ghostscript=  ../../print/ghostscript-esp
-.    elif (defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS]))
-_TOOLS_PKGSRCDIR.ghostscript=  ../../print/ghostscript-esp
+_TOOLS_PKGSRCDIR.ghostscript=  ../../print/ghostscript-esp-nox11
 .    else
-_TOOLS_PKGSRCDIR.ghostscript=  ../../print/ghostscript-gnu
+_TOOLS_PKGSRCDIR.ghostscript=  ../../print/ghostscript-gnu-nox11
 .    endif
 .  else
 .    if (defined(PKG_OPTIONS) && !empty(PKG_OPTIONS:Mcups))
 _TOOLS_PKGSRCDIR.ghostscript=  ../../print/ghostscript-esp
-.    elif (defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS]))
-_TOOLS_PKGSRCDIR.ghostscript=  ../../print/ghostscript-esp
 .    else
 _TOOLS_PKGSRCDIR.ghostscript=  ../../print/ghostscript-gnu
 .    endif