[pkgsrc/trunk]: pkgsrc/mk/tools Remove NO_X11 handling completely -- it is no...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ea7ceb975b83
branches:  trunk
changeset: 503885:ea7ceb975b83
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Dec 01 18:38:45 2005 +0000

description:
Remove NO_X11 handling completely -- it is not referenced anywhere
else in pkgsrc.

diffstat:

 mk/tools/replace.mk |  17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diffs (33 lines):

diff -r c140cc6a428c -r ea7ceb975b83 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Thu Dec 01 18:37:23 2005 +0000
+++ b/mk/tools/replace.mk       Thu Dec 01 18:38:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.140 2005/12/01 18:25:27 wiz Exp $
+# $NetBSD: replace.mk,v 1.141 2005/12/01 18:38:45 wiz Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -873,21 +873,10 @@
 # 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 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-nox11
-.    else
-_TOOLS_PKGSRCDIR.ghostscript=  ../../print/ghostscript-gnu-nox11
-.    endif
+.  if (defined(PKG_OPTIONS) && !empty(PKG_OPTIONS:Mcups))
+_TOOLS_PKGSRCDIR.ghostscript=  ../../print/ghostscript-esp
 .  else
-.    if (defined(PKG_OPTIONS) && !empty(PKG_OPTIONS:Mcups))
-_TOOLS_PKGSRCDIR.ghostscript=  ../../print/ghostscript-esp
-.    else
 _TOOLS_PKGSRCDIR.ghostscript=  ../../print/ghostscript-gnu
-.    endif
 .  endif
 TOOLS_DEPENDS.ghostscript=     {${_TOOLS_DEP.ghostscript}}>=${GHOSTSCRIPT_REQD}:${_TOOLS_PKGSRCDIR.ghostscript}
 MAKEVARS+=                     ${TOOLS_DEPENDS.ghostscript}