Subject: Re: CVS commit: pkgsrc/print
To: None <joerg@netbsd.org>
From: Takahiro Kambe <taca@back-street.net>
List: pkgsrc-changes
Date: 01/04/2007 13:28:25
Hi and late happy new year.
pkgsrc/mk/tools/replace.mk still refer ghostscript-gnu and
ghostscript-afpl. Here is mechanical work around.
Index: mk/tools/replace.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/replace.mk,v
retrieving revision 1.145
diff -u -d -u -p -r1.145 replace.mk
--- mk/tools/replace.mk 22 Dec 2005 18:55:41 -0000 1.145
+++ mk/tools/replace.mk 4 Jan 2007 04:26:18 -0000
@@ -845,9 +845,9 @@ GHOSTSCRIPT_REQD?= 6.01
#
.if !defined(TOOLS_DEPENDS.ghostscript)
_TOOLS_DEP.ghostscript:= ghostscript
-_TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.ghostscript},ghostscript-afpl
+_TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.ghostscript},ghostscript
_TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.ghostscript},ghostscript-esp
-_TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.ghostscript},ghostscript-gnu
+_TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.ghostscript},ghostscript6
#
# Determine the default Ghostscript package to build based on the
# PKG_OPTIONS for the current package.
@@ -855,7 +855,7 @@ _TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.gh
. if (defined(PKG_OPTIONS) && !empty(PKG_OPTIONS:Mcups))
_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-esp
. else
-_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-gnu
+_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript
. endif
TOOLS_DEPENDS.ghostscript= {${_TOOLS_DEP.ghostscript}}>=${GHOSTSCRIPT_REQD}:${_TOOLS_PKGSRCDIR.ghostscript}
MAKEVARS+= ${TOOLS_DEPENDS.ghostscript}
@@ -864,9 +864,8 @@ MAKEVARS+= ${TOOLS_DEPENDS.ghostscript
.for _t_ in ${_TOOLS.ghostscript}
. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
. if !empty(PKGPATH:Mprint/ghostscript) || \
- !empty(PKGPATH:Mprint/ghostscript-afpl) || \
!empty(PKGPATH:Mprint/ghostscript-esp) || \
- !empty(PKGPATH:Mprint/ghostscript-gnu)
+ !empty(PKGPATH:Mprint/ghostscript6)
MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
TOOLS_DEPENDS.${_t_}?= ${TOOLS_DEPENDS.ghostscript}
--
Takahiro Kambe <taca@back-street.net>