[pkgsrc/trunk]: pkgsrc/graphics/cairo Cairo uses pthreads, so link it against...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2ee9bd5612dd
branches:  trunk
changeset: 500092:2ee9bd5612dd
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Oct 02 10:54:37 2005 +0000

description:
Cairo uses pthreads, so link it against the threading library.
Fixes build problems of other packages using cairo (nothing could be linked
with -lcairo before), at least under NetBSD 2.0.  Bump PKGREVISION to 2.

diffstat:

 graphics/cairo/Makefile         |   5 +++--
 graphics/cairo/buildlink3.mk    |   4 ++--
 graphics/cairo/distinfo         |   3 ++-
 graphics/cairo/patches/patch-aa |  22 ++++++++++++++++++++++
 4 files changed, 29 insertions(+), 5 deletions(-)

diffs (74 lines):

diff -r 9fc683edf845 -r 2ee9bd5612dd graphics/cairo/Makefile
--- a/graphics/cairo/Makefile   Sun Oct 02 10:50:57 2005 +0000
+++ b/graphics/cairo/Makefile   Sun Oct 02 10:54:37 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2005/10/02 08:09:43 rh Exp $
+# $NetBSD: Makefile,v 1.25 2005/10/02 10:54:37 jmmv Exp $
 
 DISTNAME=      cairo-1.0.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  http://cairographics.org/releases/
 
@@ -43,4 +43,5 @@
 .include "../../graphics/libpixman/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9fc683edf845 -r 2ee9bd5612dd graphics/cairo/buildlink3.mk
--- a/graphics/cairo/buildlink3.mk      Sun Oct 02 10:50:57 2005 +0000
+++ b/graphics/cairo/buildlink3.mk      Sun Oct 02 10:54:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/03/27 12:29:17 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2005/10/02 10:54:37 jmmv Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 CAIRO_BUILDLINK3_MK:=  ${CAIRO_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=   cairo
 
 .if !empty(CAIRO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cairo+=      cairo>=0.4.0
+BUILDLINK_DEPENDS.cairo+=      cairo>=1.0.0nb2
 BUILDLINK_PKGSRCDIR.cairo?=    ../../graphics/cairo
 
 BUILDLINK_DEPENDS.freetype2+=  freetype2>=2.1.5
diff -r 9fc683edf845 -r 2ee9bd5612dd graphics/cairo/distinfo
--- a/graphics/cairo/distinfo   Sun Oct 02 10:50:57 2005 +0000
+++ b/graphics/cairo/distinfo   Sun Oct 02 10:54:37 2005 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.12 2005/09/30 13:51:24 adam Exp $
+$NetBSD: distinfo,v 1.13 2005/10/02 10:54:37 jmmv Exp $
 
 SHA1 (cairo-1.0.0.tar.gz) = abc50d6a657cba15b3956c8c3aaea080b71172bb
 RMD160 (cairo-1.0.0.tar.gz) = cd81c235d62d816983233b3e87004144001cfe7f
 Size (cairo-1.0.0.tar.gz) = 1439299 bytes
+SHA1 (patch-aa) = dd3557cd52a7ceb1ed688c08a2de87483c5d8a1f
diff -r 9fc683edf845 -r 2ee9bd5612dd graphics/cairo/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cairo/patches/patch-aa   Sun Oct 02 10:54:37 2005 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.5 2005/10/02 10:54:37 jmmv Exp $
+
+--- src/Makefile.in.orig       2005-08-24 18:28:42.000000000 +0200
++++ src/Makefile.in
+@@ -145,7 +145,7 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-CAIRO_CFLAGS = @CAIRO_CFLAGS@
++CAIRO_CFLAGS = @CAIRO_CFLAGS@ ${PTHREAD_CFLAGS}
+ CAIRO_HAS_ATSUI_FONT_FALSE = @CAIRO_HAS_ATSUI_FONT_FALSE@
+ CAIRO_HAS_ATSUI_FONT_TRUE = @CAIRO_HAS_ATSUI_FONT_TRUE@
+ CAIRO_HAS_FT_FONT_FALSE = @CAIRO_HAS_FT_FONT_FALSE@
+@@ -168,7 +168,7 @@ CAIRO_HAS_XCB_SURFACE_FALSE = @CAIRO_HAS
+ CAIRO_HAS_XCB_SURFACE_TRUE = @CAIRO_HAS_XCB_SURFACE_TRUE@
+ CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HAS_XLIB_SURFACE_FALSE@
+ CAIRO_HAS_XLIB_SURFACE_TRUE = @CAIRO_HAS_XLIB_SURFACE_TRUE@
+-CAIRO_LIBS = @CAIRO_LIBS@
++CAIRO_LIBS = @CAIRO_LIBS@ ${PTHREAD_LDFLAGS}
+ CAIRO_VERSION_MAJOR = @CAIRO_VERSION_MAJOR@
+ CAIRO_VERSION_MICRO = @CAIRO_VERSION_MICRO@
+ CAIRO_VERSION_MINOR = @CAIRO_VERSION_MINOR@