put the cairo gobject into its own pkg to avoid the heavy glib dependency

in the base pkg

8 files changed, 104 insertions, 8 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 329259bd352..9bcc199b6be 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.581 2011/02/11 13:50:06 obache Exp $
+# $NetBSD: Makefile,v 1.582 2011/02/12 13:40:53 drochner Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -35,6 +35,7 @@ SUBDIR+=	blender-doc
 SUBDIR+=	blinkenthemes
 SUBDIR+=	blinkentools
 SUBDIR+=	cairo
+SUBDIR+=	cairo-gobject
 SUBDIR+=	cairomm
 SUBDIR+=	cal3d
 SUBDIR+=	cal3d-examples
diff --git a/graphics/cairo-gobject/DESCR b/graphics/cairo-gobject/DESCR
new file mode 100644
index 00000000000..3b5cdef47fa
--- /dev/null
+++ b/graphics/cairo-gobject/DESCR
@@ -0,0 +1,17 @@
+Cairo is a 2D graphics library with support for multiple output devices.
+Currently supported output targets include the X Window System, Quartz, Win32,
+image buffers, PostScript, PDF, and SVG file output. Experimental backends
+include OpenGL (through glitz), XCB, BeOS, OS/2, and DirectFB.
+
+Cairo is designed to produce consistent output on all output media while taking
+advantage of display hardware acceleration when available (eg. through the X
+Render Extension).
+
+The cairo API provides operations similar to the drawing operators of
+PostScript and PDF. Operations in cairo including stroking and filling cubic
+Bézier splines, transforming and compositing translucent images, and
+antialiased text rendering. All drawing operations can be transformed by any
+affine transformation (scale, rotation, shear, etc.)
+
+Cairo is implemented as a library written in the C programming language, but
+bindings are available for several different programming languages.
diff --git a/graphics/cairo-gobject/Makefile b/graphics/cairo-gobject/Makefile
new file mode 100644
index 00000000000..8656ad3e810
--- /dev/null
+++ b/graphics/cairo-gobject/Makefile
@@ -0,0 +1,55 @@
+# $NetBSD: Makefile,v 1.1 2011/02/12 13:40:53 drochner Exp $
+
+DISTNAME=	cairo-1.10.2
+PKGNAME=	cairo-gobject-1.10.2
+CATEGORIES=	graphics
+MASTER_SITES=	http://cairographics.org/releases/
+
+MAINTAINER=	recht@NetBSD.org
+HOMEPAGE=	http://cairographics.org/
+COMMENT=	Vector graphics library with cross-device output support
+LICENSE=	gnu-lgpl-v2.1 AND mpl-1.1
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+PATCHDIR=	${.CURDIR}/../../graphics/cairo/patches
+DISTINFO_FILE=	${.CURDIR}/../../graphics/cairo/distinfo
+BUILD_DIRS=	util/cairo-gobject
+INSTALL_DIRS=	util/cairo-gobject
+
+USE_LANGUAGES+=		c99
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		pkg-config
+PKGCONFIG_OVERRIDE+=	src/cairo.pc.in src/cairo-features.pc.in
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-gl
+CONFIGURE_ARGS+=	--enable-pdf
+CONFIGURE_ARGS+=	--enable-ps
+
+# For snprintf() and ctime_r()
+CPPFLAGS.SunOS+=		-D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
+
+# PR#43928
+.include "../../mk/compiler.mk"
+.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*}
+CONFIGURE_ENV+=		ac_cv_type___uint128_t=no
+.endif
+
+post-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
+	${INSTALL_DATA} ${WRKSRC}/src/cairo-gobject.pc \
+		${DESTDIR}${PREFIX}/lib/pkgconfig
+
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.9
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+# include?
+#.include "../../print/libspectre/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cairo-gobject/PLIST b/graphics/cairo-gobject/PLIST
new file mode 100644
index 00000000000..7204c01f877
--- /dev/null
+++ b/graphics/cairo-gobject/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2011/02/12 13:40:53 drochner Exp $
+include/cairo/cairo-gobject.h
+lib/libcairo-gobject.la
+lib/pkgconfig/cairo-gobject.pc
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 05254f16a67..7495dc0ab68 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2011/02/12 12:08:06 obache Exp $
+# $NetBSD: Makefile,v 1.90 2011/02/12 13:40:53 drochner Exp $
 
 DISTNAME=	cairo-1.10.2
 PKGREVISION=	2
@@ -43,7 +43,6 @@ TEST_TARGET=			check
 CONFIGURE_ENV+=		ac_cv_type___uint128_t=no
 .endif
 
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.9
diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST
index 135a9e16761..905fa088d80 100644
--- a/graphics/cairo/PLIST
+++ b/graphics/cairo/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.29 2011/02/12 12:08:06 obache Exp $
+@comment $NetBSD: PLIST,v 1.30 2011/02/12 13:40:53 drochner Exp $
 bin/cairo-trace
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
 ${PLIST.x11}include/cairo/cairo-gl.h
-include/cairo/cairo-gobject.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
 ${PLIST.carbon}include/cairo/cairo-quartz.h
@@ -17,14 +16,12 @@ ${PLIST.x11}include/cairo/cairo-xlib-xrender.h
 ${PLIST.x11}include/cairo/cairo-xlib.h
 include/cairo/cairo.h
 lib/cairo/libcairo-trace.la
-lib/libcairo-gobject.la
 lib/libcairo-script-interpreter.la
 lib/libcairo.la
 lib/pkgconfig/cairo-fc.pc
 lib/pkgconfig/cairo-ft.pc
 ${PLIST.x11}lib/pkgconfig/cairo-gl.pc
 ${PLIST.x11}lib/pkgconfig/cairo-glx.pc
-lib/pkgconfig/cairo-gobject.pc
 lib/pkgconfig/cairo-pdf.pc
 lib/pkgconfig/cairo-png.pc
 lib/pkgconfig/cairo-ps.pc
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index bcdc7788695..da408a44cd1 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.56 2010/12/26 14:58:44 wiz Exp $
+$NetBSD: distinfo,v 1.57 2011/02/12 13:40:53 drochner Exp $
 
 SHA1 (cairo-1.10.2.tar.gz) = ccce5ae03f99c505db97c286a0c9a90a926d3c6e
 RMD160 (cairo-1.10.2.tar.gz) = 8c8de00120398fe2b3a60a08ff59a464b2eebf47
 Size (cairo-1.10.2.tar.gz) = 23558405 bytes
 SHA1 (patch-aa) = f211b2a5fce4ff65f280f79fbb78e1a530b9b165
+SHA1 (patch-ab) = 03a6199a0e0de1fe3701900ea76ce3f0bfdddca0
diff --git a/graphics/cairo/patches/patch-ab b/graphics/cairo/patches/patch-ab
new file mode 100644
index 00000000000..ffa3cf056ac
--- /dev/null
+++ b/graphics/cairo/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.15 2011/02/12 13:40:53 drochner Exp $
+
+--- util/cairo-gobject/Makefile.in.orig	2010-12-25 14:22:55.000000000 +0000
++++ util/cairo-gobject/Makefile.in
+@@ -91,7 +91,7 @@ am__base_list = \
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cairoincludedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libcairo_gobject_la_DEPENDENCIES = $(top_builddir)/src/libcairo.la \
++libcairo_gobject_la_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_libcairo_gobject_la_OBJECTS =  \
+ 	libcairo_gobject_la-cairo-gobject-enums.lo \
+@@ -357,7 +357,7 @@ libcairo_gobject_la_SOURCES = \
+ 
+ libcairo_gobject_la_CFLAGS = $(CAIRO_CFLAGS) $(GOBJECT_CFLAGS)
+ libcairo_gobject_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
+-libcairo_gobject_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS)
++libcairo_gobject_la_LIBADD = $(prefix)/lib/libcairo.la $(CAIRO_LIBS) $(GOBJECT_LIBS)
+ all: all-am
+ 
+ .SUFFIXES: