Allow cups>=2.0

This commit is contained in:
markd 2015-02-24 08:21:07 +00:00
parent 9fcdaead80
commit 44a23886c7
2 changed files with 6 additions and 4 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.7 2014/12/30 07:52:41 dholland Exp $
$NetBSD: distinfo,v 1.8 2015/02/24 08:21:07 markd Exp $
SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238
RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d
@ -6,7 +6,7 @@ Size (ghostscript-9.06.tar.bz2) = 29246039 bytes
SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
SHA1 (patch-CVE-2014-9029) = 9636c7d6909fc0dec7ad2102b59fb14d599bac6a
SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
SHA1 (patch-ah) = c8ca372123b98e054e460550b820479ba1f943b0
SHA1 (patch-ah) = 73a05ee51845ca70e1b18c50dee98d6799a46d52
SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ah,v 1.5 2014/07/18 08:56:37 ryoon Exp $
$NetBSD: patch-ah,v 1.6 2015/02/24 08:21:07 markd Exp $
(1) First chunk to fix the X11_TYPE=native problem, which
freetype2 in /usr/X11R7/ is way old, and work around to
@ -57,12 +57,14 @@ $NetBSD: patch-ah,v 1.5 2014/07/18 08:56:37 ryoon Exp $
$as_echo "#define USE_LIBPAPER 1" >>confdefs.h
@@ -6474,7 +6477,7 @@ done
@@ -6474,7 +6477,9 @@ done
LCUPSINCLUDE="include \$(GLSRCDIR)/lcups.mak"
LCUPSIINCLUDE="include \$(GLSRCDIR)/lcupsi.mak"
if ( test x$with_pdftoraster != xno ); then
- if test "$CUPSVERSION" ">" "1.2"; then
+ if echo "$CUPSVERSION" | grep -q '^1\.[2-9]'; then
+ CUPSPDFTORASTER="1"
+ elif echo "$CUPSVERSION" | grep -q '^[2-9]\.[0-9]'; then
CUPSPDFTORASTER="1"
fi
fi