reapply lost patch:

'cups' option needs to ensure BUILD_TARGET 'cups' is added.
configure adjusted to correctly accept CUPSVERSION and, while we're at it,
add missing space between '!' and parens in test for contrib directory.

3 files changed, 26 insertions, 7 deletions

diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index 40e74964423..add9c2c450f 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2014/04/26 13:51:40 wiz Exp $
+$NetBSD: distinfo,v 1.5 2014/05/01 04:11:01 richard Exp $
 
 SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238
 RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d
 Size (ghostscript-9.06.tar.bz2) = 29246039 bytes
 SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
 SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
-SHA1 (patch-ah) = bfa744e18bdebdc60d2f51fe47750782b75ffbce
+SHA1 (patch-ah) = cd401578b89ca1fa2cfb46405268980e14e2d21d
 SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
 SHA1 (patch-al) = e5a5be44f997a450afef15e172acc771b4818ac9
diff --git a/print/ghostscript-gpl/options.mk b/print/ghostscript-gpl/options.mk
index 59efa6ccddd..a305992934a 100644
--- a/print/ghostscript-gpl/options.mk
+++ b/print/ghostscript-gpl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2014/04/26 13:51:40 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2014/05/01 04:11:01 richard Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript
 PKG_SUPPORTED_OPTIONS=	x11 cups debug fontconfig disable-compile-inits utf8
@@ -29,6 +29,7 @@ PLIST_VARS+=		cups
 .if !empty(PKG_OPTIONS:Mcups)
 CONFIGURE_ARGS+=	--enable-cups
 PLIST.cups=		yes
+BUILD_TARGET+=		cups
 INSTALL_TARGET+=	install-cups
 
 CUPS_CONFDIR?=	${PKG_SYSCONFBASEDIR}/cups
diff --git a/print/ghostscript-gpl/patches/patch-ah b/print/ghostscript-gpl/patches/patch-ah
index 9476425057e..f5acc1d28ad 100644
--- a/print/ghostscript-gpl/patches/patch-ah
+++ b/print/ghostscript-gpl/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.3 2014/04/26 13:51:40 wiz Exp $
+$NetBSD: patch-ah,v 1.4 2014/05/01 04:11:01 richard Exp $
 
 (1) First chunk to fix the X11_TYPE=native problem, which
     freetype2 in /usr/X11R7/ is way old, and work around to 
@@ -9,9 +9,18 @@ $NetBSD: patch-ah,v 1.3 2014/04/26 13:51:40 wiz Exp $
     this patch:
     |  Shared object "libpaper.so.1" not found
 
---- configure.orig	2012-08-08 17:04:57.000000000 +0900
+--- configure.orig	2012-08-08 08:04:57.000000000 +0000
 +++ configure
-@@ -3786,13 +3786,13 @@
+@@ -3756,7 +3756,7 @@ $as_echo "$as_me: WARNING: disabling con
+     ;;
+     *)
+ #     This is just an arbitrary file in contrib to check
+-      if !(test -f contrib/gdevbjc_.c); then
++      if ! (test -f contrib/gdevbjc_.c); then
+         enable_contrib=no
+       fi
+     ;;
+@@ -3786,13 +3786,13 @@ case `uname` in
          ;;
          *BSD)
          if test $ac_cv_c_compiler_gnu = yes; then
@@ -27,7 +36,7 @@ $NetBSD: patch-ah,v 1.3 2014/04/26 13:51:40 wiz Exp $
              CC_DBG_FLAGS_TO_TRY="-g -O0"
          fi
          SET_DT_SONAME=""
-@@ -5331,7 +5331,7 @@
+@@ -5331,7 +5331,7 @@ fi
  fi
  
  if test x$with_libpaper != xno; then
@@ -36,3 +45,12 @@ $NetBSD: patch-ah,v 1.3 2014/04/26 13:51:40 wiz Exp $
  
  $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
  
+@@ -6474,7 +6474,7 @@ 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"
+                     fi
+                 fi