[pkgsrc/trunk]: pkgsrc/x11/gtk2 Add an option for cups support, based on patc...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bcfae6aa36d0
branches:  trunk
changeset: 523333:bcfae6aa36d0
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jan 06 15:13:15 2007 +0000

description:
Add an option for cups support, based on patches provided by
Joachim Koenig-Baltes in PR 35065.

diffstat:

 x11/gtk2/PLIST            |   3 ++-
 x11/gtk2/distinfo         |   4 ++--
 x11/gtk2/options.mk       |  12 ++++++++++--
 x11/gtk2/patches/patch-ai |   8 +++++---
 4 files changed, 19 insertions(+), 8 deletions(-)

diffs (81 lines):

diff -r 55b7b65fccc4 -r bcfae6aa36d0 x11/gtk2/PLIST
--- a/x11/gtk2/PLIST    Sat Jan 06 15:12:24 2007 +0000
+++ b/x11/gtk2/PLIST    Sat Jan 06 15:13:15 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.50 2006/12/05 21:26:59 minskim Exp $
+@comment $NetBSD: PLIST,v 1.51 2007/01/06 15:13:15 wiz Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-demo
@@ -275,6 +275,7 @@
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.la
 lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.la
 lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.la
+${CUPS}lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la
 lib/gtk-2.0/include/gdkconfig.h
 ${QUARTZ}lib/libgdk-quartz-2.0.la
 ${X11}lib/libgdk-x11-2.0.la
diff -r 55b7b65fccc4 -r bcfae6aa36d0 x11/gtk2/distinfo
--- a/x11/gtk2/distinfo Sat Jan 06 15:12:24 2007 +0000
+++ b/x11/gtk2/distinfo Sat Jan 06 15:13:15 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2006/12/01 08:15:38 minskim Exp $
+$NetBSD: distinfo,v 1.77 2007/01/06 15:13:15 wiz Exp $
 
 SHA1 (gtk+-2.10.6.tar.bz2) = aad6e1ef964d8acb8a04942b8dd2e00a9db56450
 RMD160 (gtk+-2.10.6.tar.bz2) = 929386610a634e82b7ddb10f43930b27194fa67b
@@ -10,4 +10,4 @@
 SHA1 (patch-ae) = f64113f824efced935f2c464c340cf0ab1c0b460
 SHA1 (patch-af) = 36734d064fc2b103755cf86bea85a0dc33154f90
 SHA1 (patch-ag) = 1df97f257dc4a170d0ad37eb6755fc5ba327b6a9
-SHA1 (patch-ai) = 7eb2545ee97b8841f8f575890d4e167fbe856e58
+SHA1 (patch-ai) = c54cd41297cae98355cc9cb61a762463bac43902
diff -r 55b7b65fccc4 -r bcfae6aa36d0 x11/gtk2/options.mk
--- a/x11/gtk2/options.mk       Sat Jan 06 15:12:24 2007 +0000
+++ b/x11/gtk2/options.mk       Sat Jan 06 15:13:15 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2006/12/06 10:17:03 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2007/01/06 15:13:15 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk2+
-PKG_SUPPORTED_OPTIONS= debug
+PKG_SUPPORTED_OPTIONS= cups debug
 PKG_OPTIONS_REQUIRED_GROUPS=   gdk-target
 PKG_OPTIONS_GROUP.gdk-target=  x11
 .if exists(/System/Library/Frameworks/Quartz.framework)
@@ -11,6 +11,14 @@
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mcups)
+.include "../../print/cups/buildlink3.mk"
+CONFIGURE_ENV+=                ENABLE_CUPS=yes
+PLIST_SUBST+=          CUPS=
+.else
+PLIST_SUBST+=          CUPS="@comment "
+.endif
+
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=       --enable-debug=yes
 .endif
diff -r 55b7b65fccc4 -r bcfae6aa36d0 x11/gtk2/patches/patch-ai
--- a/x11/gtk2/patches/patch-ai Sat Jan 06 15:12:24 2007 +0000
+++ b/x11/gtk2/patches/patch-ai Sat Jan 06 15:13:15 2007 +0000
@@ -1,12 +1,14 @@
-$NetBSD: patch-ai,v 1.17 2006/09/22 21:27:11 tron Exp $
+$NetBSD: patch-ai,v 1.18 2007/01/06 15:13:15 wiz Exp $
 
 --- configure.orig     2006-09-05 04:40:15.000000000 +0200
 +++ configure
-@@ -32042,6 +32042,7 @@ _ACEOF
+@@ -32042,6 +32042,9 @@ _ACEOF
  fi
  
  
-+CUPS_CONFIG=no
++if test "x$ENABLE_CUPS"  != "xyes"; then
++  CUPS_CONFIG=no
++fi
  if test "x$CUPS_CONFIG" != "xno"; then
    HAVE_CUPS_TRUE=
    HAVE_CUPS_FALSE='#'