'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 64bf33ec9e4..3a28226ce48 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2013/10/05 05:13:07 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2014/04/07 07:36:20 richard Exp $
 
 SHA1 (ghostscript-9.05.tar.bz2) = 1a54a846e90ae95b5307f4f0459d044b9597d8cf
 RMD160 (ghostscript-9.05.tar.bz2) = 27935f60083b788b2793b19ee42f3663082ba084
 Size (ghostscript-9.05.tar.bz2) = 28279634 bytes
 SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
 SHA1 (patch-af) = 79b06a2b5b73486a0b7e0a6e2b14e105579f8a1f
-SHA1 (patch-ah) = 35d6e3a4623bb28e59526f61a3062874cc363429
+SHA1 (patch-ah) = f9d9e9a7b53fc8739349e22ccc9057b64a5da377
 SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
 SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc
diff --git a/print/ghostscript-gpl/options.mk b/print/ghostscript-gpl/options.mk
index 02e46ad7bc3..2b9d9e8d3e2 100644
--- a/print/ghostscript-gpl/options.mk
+++ b/print/ghostscript-gpl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2014/02/21 18:09:02 richard Exp $
+# $NetBSD: options.mk,v 1.3 2014/04/07 07:36:20 richard Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript
 PKG_SUPPORTED_OPTIONS=	x11 cups debug fontconfig disable-compile-inits utf8
@@ -24,6 +24,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 5a25bf56cf9..aadd003a3a4 100644
--- a/print/ghostscript-gpl/patches/patch-ah
+++ b/print/ghostscript-gpl/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2013/03/16 21:32:01 dholland Exp $
+$NetBSD: patch-ah,v 1.2 2014/04/07 07:36:20 richard Exp $
 
 (1) First chunk to fix the X11_TYPE=native problem, which
     freetype2 in /usr/X11R7/ is way old, and work around to 
@@ -6,9 +6,18 @@ $NetBSD: patch-ah,v 1.1 2013/03/16 21:32:01 dholland Exp $
 
 (2) Second chunk existed from old days, and no idea, sorry (mef@).
 
---- configure.orig	2012-08-08 17:04:57.000000000 +0900
+--- configure.orig	2012-02-08 08:50:31.000000000 +0000
 +++ configure
-@@ -3786,13 +3786,13 @@
+@@ -3747,7 +3747,7 @@ CONTRIBINCLUDE="include contrib/contrib.
+ INSTALL_CONTRIB="install-contrib-extras"
+ 
+ # 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
+ 
+@@ -3775,13 +3775,13 @@ case `uname` in
          ;;
          *BSD)
          if test $ac_cv_c_compiler_gnu = yes; then
@@ -24,7 +33,7 @@ $NetBSD: patch-ah,v 1.1 2013/03/16 21:32:01 dholland Exp $
              CC_DBG_FLAGS_TO_TRY="-g -O0"
          fi
          SET_DT_SONAME=""
-@@ -5331,7 +5331,7 @@
+@@ -5290,7 +5290,7 @@ fi
  fi
  
  if test x$with_libpaper != xno; then
@@ -33,3 +42,12 @@ $NetBSD: patch-ah,v 1.1 2013/03/16 21:32:01 dholland Exp $
  
  $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
  
+@@ -6426,7 +6426,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