diff options
| author | wiz <wiz> | 2005-12-01 18:25:27 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2005-12-01 18:25:27 +0000 |
| commit | 8b5f7f385821b6a9c62952d0039215100958efda (patch) | |
| tree | ae202e9a512b1e06953bd11b7c748fc6679c93e7 /mk | |
| parent | 90bd2d669cb8e112f7481f3242fb1fae21269b20 (diff) | |
| download | pkgsrc-8b5f7f385821b6a9c62952d0039215100958efda.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/tools/replace.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 64becfe2e94..c061369da61 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -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 @@ _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 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 |