- add support for CUPS ("-cups" subpackage)

this makes printing using gtkprint and CUPS much more pleasant ;-)
- fix a small typo in COMMENT-docs while here

"no objections" jasper@, looks good "landry@

x11/gtk+2/Makefile

@@ -1,14 +1,16 @@
-# $OpenBSD: Makefile,v 1.61 2008/04/09 13:15:44 jasper Exp $
+# $OpenBSD: Makefile,v 1.62 2008/04/15 19:34:53 ajacoutot Exp $
 
 SHARED_ONLY=			Yes
 
 COMMENT-main=			multi-platform graphical toolkit
-COMMENT-docs=           	gtk+-2 documentation
+COMMENT-docs=           	gtk+2 documentation
+COMMENT-cups=			gtk+2 CUPS print backend
 
 VERSION=			2.12.9
 DISTNAME=			gtk+-${VERSION}
-PKGNAME-main=			gtk+2-${VERSION}
-PKGNAME-docs=			gtk+2-docs-${VERSION}
+PKGNAME-main=			gtk+2-${VERSION}p0
+PKGNAME-docs=			gtk+2-docs-${VERSION}p0
+PKGNAME-cups=			gtk+2-cups-${VERSION}
 SHARED_LIBS +=	gdk_pixbuf-2.0       1200.9   # .1200.9
 SHARED_LIBS +=	gdk-x11-2.0          1200.9   # .1200.9
 SHARED_LIBS +=	gtk-x11-2.0          1200.9   # .1200.9
@@ -26,26 +28,37 @@ PERMIT_DISTFILES_FTP=		Yes
 MASTER_SITES=			${MASTER_SITE_GNOME:=sources/gtk+/2.12/}
 EXTRACT_SUFX=			.tar.bz2
 
-MULTI_PACKAGES=         	-main -docs
+MULTI_PACKAGES=         	-main -docs -cups
 
-WANTLIB-main=		X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
-			Xfixes Xi Xinerama Xrender Xrandr c cairo expat \
-			fontconfig freetype glib-2.0 glitz m gmodule-2.0 \
-			gobject-2.0 gthread-2.0 pcre pthread z
+WANTLIB=		X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+			Xfixes Xi Xinerama Xrandr Xrender cairo expat \
+			fontconfig freetype glitz m pcre z
 
-MODULES=			devel/gettext
+MODULES=		devel/gettext
 
-LIB_DEPENDS=			glib-2.0.>=1600.0,gmodule-2.0.>=1600.0,gobject-2.0.>=1600.0::devel/glib2 \
-				pango-1.0.>=1300.0,pangocairo-1.0.>=1300.0,pangoft2-1.0.>=1300.0::devel/pango \
-				atk-1.0.>=1809.0::devel/atk \
-				tiff.>=35::graphics/tiff \
-				png.>=3::graphics/png \
-				jpeg.>=62::graphics/jpeg
-RUN_DEPENDS=			::x11/hicolor-icon-theme
+BUILD_DEPENDS=		::print/cups
+RUN_DEPENDS=		::x11/hicolor-icon-theme
+
+LIB_DEPENDS-main=	${LIB_DEPENDS} \
+			glib-2.0.>=1000.0,gmodule-2.0.>=1000.0,gobject-2.0.>=1000.0,gthread-2.0::devel/glib2 \
+			pango-1.0.>=1300.0,pangocairo-1.0.>=1300.0,pangoft2-1.0.>=1300.0::devel/pango \
+			atk-1.0.>=1809.0::devel/atk \
+			tiff.>=35::graphics/tiff \
+			png.>=3::graphics/png \
+			jpeg.>=62::graphics/jpeg
+WANTLIB-main=		${WANTLIB} c pthread
 
 LIB_DEPENDS-docs=
 RUN_DEPENDS-docs=
-PKG_ARCH-docs=			*
+WANTLIB-docs=
+PKG_ARCH-docs=		*
+
+LIB_DEPENDS-cups=	${LIB_DEPENDS} \
+			cups.>=3::print/cups \
+			gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::${BASE_PKGPATH},-main
+WANTLIB-cups=		${WANTLIB} atk-1.0 crypto glib-2.0 gmodule-2.0 \
+			gobject-2.0 pango-1.0 pangocairo-1.0 \
+			pangoft2-1.0 png ssl
 
 USE_X11=			Yes
 USE_GMAKE=			Yes
@@ -54,8 +67,7 @@ CONFIGURE_STYLE=		gnu
 CONFIGURE_ARGS+=		--disable-gtk-doc \
 				--with-xinput=yes
 CONFIGURE_ENV=			CPPFLAGS="-I${X11BASE}/include/freetype2/ -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
-				LDFLAGS="-L${LOCALBASE}/lib" \
-				ENABLE_CUPS="no"
+				LDFLAGS="-L${LOCALBASE}/lib"
 
 # The regression tests require a running instance of X.
 # You will also need to set the XAUTHORITY environment variable to point

x11/gtk+2/patches/patch-configure

@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.20 2008/04/09 13:15:44 jasper Exp $
---- configure.orig	Wed Mar 12 05:18:17 2008
-+++ configure	Thu Mar 13 00:01:34 2008
-@@ -32948,7 +32948,9 @@ fi
- 
-   fi
- 
--
-+if test "x$ENABLE_CUPS"  != "xyes"; then
-+  CUPS_CONFIG=no
-+fi
- if test "x$CUPS_CONFIG" != "xno"; then
-   HAVE_CUPS_TRUE=
-   HAVE_CUPS_FALSE='#'

x11/gtk+2/pkg/DESCR-cups

@@ -0,0 +1 @@
+CUPS print backend for gtk+2.

x11/gtk+2/pkg/PLIST-cups

@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST-cups,v 1.1 2008/04/15 19:34:53 ajacoutot Exp $
+lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.a
+lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la
+lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so