summaryrefslogtreecommitdiff
path: root/mk/tools
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2005-12-01 18:38:45 +0000
committerwiz <wiz@pkgsrc.org>2005-12-01 18:38:45 +0000
commit1189c2f0edabf53efd7be93dde8d108238f8357b (patch)
treeb07a6e9bb7a480d91241f9f362cfcf78efcc16aa /mk/tools
parent806fceaecc2007d5449787afb701560514dbcf80 (diff)
downloadpkgsrc-1189c2f0edabf53efd7be93dde8d108238f8357b.tar.gz
Remove NO_X11 handling completely -- it is not referenced anywhere
else in pkgsrc.
Diffstat (limited to 'mk/tools')
-rw-r--r--mk/tools/replace.mk17
1 files changed, 3 insertions, 14 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index c061369da61..3060906581b 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -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 @@ _TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.ghostscript},ghostscript-nox11
# 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
-. else
-. if (defined(PKG_OPTIONS) && !empty(PKG_OPTIONS:Mcups))
+. if (defined(PKG_OPTIONS) && !empty(PKG_OPTIONS:Mcups))
_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-esp
-. else
+. else
_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-gnu
-. endif
. endif
TOOLS_DEPENDS.ghostscript= {${_TOOLS_DEP.ghostscript}}>=${GHOSTSCRIPT_REQD}:${_TOOLS_PKGSRCDIR.ghostscript}
MAKEVARS+= ${TOOLS_DEPENDS.ghostscript}