diff options
| author | sbd <sbd@pkgsrc.org> | 2013-04-24 09:55:03 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2013-04-24 09:55:03 +0000 |
| commit | fd09dd045b97575aec6368e2632e9e9ee0c78b63 (patch) | |
| tree | 7acada25590f883d1898c7478a1c1aa977fbc3d3 /mk | |
| parent | a17a6e8c796277e625d90e379223c805062a0755 (diff) | |
| download | pkgsrc-fd09dd045b97575aec6368e2632e9e9ee0c78b63.tar.gz | |
Use the ghostscript meta-package instead of ghostscript-gpl or
ghostscript-agpl.
Reverts revisions 1.255 and 1.254
----------------------------
revision 1.255
date: 2013/03/16 23:03:33; author: dholland; state: Exp; lines: +3 -3
print/ghostscript -> print/ghostscript-agpl
----------------------------
revision 1.254
date: 2013/03/16 21:47:14; author: dholland; state: Exp; lines: +13 -3
Choose ghostscript package for ghostscript tools based on whether
gnu-agpl-* is in ACCEPTABLE_LICENSES.
This is mostly the same as the old ghostscript type logic that was
removed in version 1.223.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/replace.mk | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index e872b3ac00e..825e3992f3c 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.255 2013/03/16 23:03:33 dholland Exp $ +# $NetBSD: replace.mk,v 1.256 2013/04/24 09:55:03 sbd Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -1074,18 +1074,8 @@ GHOSTSCRIPT_REQD?= 6.01 # various package options. # .if !defined(TOOLS_DEPENDS.ghostscript) -_TOOLS_DEP.ghostscript:= ghostscript-gpl -_TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.ghostscript},ghostscript-agpl -# -# Determine the default Ghostscript package to build based on -# ACCEPTABLE_LICENSES. -# -. if !empty(ACCEPTABLE_LICENSES:Mgnu-agpl-*) -_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-agpl -. else -_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-gpl -. endif -TOOLS_DEPENDS.ghostscript= {${_TOOLS_DEP.ghostscript}}>=${GHOSTSCRIPT_REQD}:${_TOOLS_PKGSRCDIR.ghostscript} +_TOOLS_DEP.ghostscript:= ghostscript +TOOLS_DEPENDS.ghostscript= ghostscript>=${GHOSTSCRIPT_REQD}:../../print/ghostscript MAKEVARS+= TOOLS_DEPENDS.ghostscript .endif |