Update graphics/ruby-cairo to 1.6.0. Changes from version 1.5.1 include:

   * Support cairo 1.6.0.
   * Improve Quartz surface support. (thanks to kimura wataru, OBATA Akio)
   * Support Cairo::Win32PrintingSurface.
   * Support Cairo::QuartzImageSurface.
   * Support ruby 1.9.1.
   * Add Cairo::Paper.
     * Improve size specification of Cairo::PSSurface,
       Cairo::PDFSurface, Cairo::SVGSurface.

3 files changed, 203 insertions, 10 deletions

diff --git a/graphics/ruby-rcairo/Makefile b/graphics/ruby-rcairo/Makefile
index 0f649a7ae05..d8fcf02495e 100644
--- a/graphics/ruby-rcairo/Makefile
+++ b/graphics/ruby-rcairo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2008/04/04 15:19:26 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.6 2008/04/14 20:09:32 jlam Exp $
 
-DISTNAME=		cairo-1.5.1
+DISTNAME=		cairo-1.6.0
 PKGNAME=		${RUBY_PKGPREFIX}-r${DISTNAME}
 CATEGORIES=		graphics
 
@@ -11,7 +10,13 @@ COMMENT=		Ruby bindings for cairo
 
 USE_TOOLS+=		pkg-config
 GEM_BUILD=		gemspec
-GEM_CLEANBUILD=		Makefile src/*.o src/cairo.${RUBY_DLEXT} mkmf.log
+GEM_CLEANBUILD=		Makefile *.o src/cairo.${RUBY_DLEXT} mkmf.log
+
+# pkg-config.rb directly searches ${PKG_CONFIG_PATH} for the *.pc files
+# to see if the dependency exists.  Point it to the pkgconfig directory
+# under ${BUILDLINK_DIR} so it only finds what we want it to see.
+#
+MAKE_ENV+=		PKG_CONFIG_PATH=${BUILDLINK_DIR:Q}/lib/pkgconfig
 
 .include "../../misc/rubygems/rubygem.mk"
 
diff --git a/graphics/ruby-rcairo/PLIST b/graphics/ruby-rcairo/PLIST
index ed3cff7931d..626d64c610b 100644
--- a/graphics/ruby-rcairo/PLIST
+++ b/graphics/ruby-rcairo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/04/04 15:19:26 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/04/14 20:09:32 jlam Exp $
 ${GEM_HOME}/cache/cairo-${PKGVERSION}.gem
 ${GEM_LIBDIR}/.require_paths
 ${GEM_LIBDIR}/AUTHORS
@@ -8,10 +8,189 @@ ${GEM_LIBDIR}/GPL
 ${GEM_LIBDIR}/NEWS
 ${GEM_LIBDIR}/README
 ${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/doc/doc.css
+${GEM_LIBDIR}/doc/en/cairo-antialias.html
+${GEM_LIBDIR}/doc/en/cairo-clip-not-representable-error.html
+${GEM_LIBDIR}/doc/en/cairo-color-base.html
+${GEM_LIBDIR}/doc/en/cairo-color-cmyk.html
+${GEM_LIBDIR}/doc/en/cairo-color-hsv.html
+${GEM_LIBDIR}/doc/en/cairo-color-rgb.html
+${GEM_LIBDIR}/doc/en/cairo-color-x11.html
+${GEM_LIBDIR}/doc/en/cairo-color.html
+${GEM_LIBDIR}/doc/en/cairo-content.html
+${GEM_LIBDIR}/doc/en/cairo-context-blur.html
+${GEM_LIBDIR}/doc/en/cairo-context-circle.html
+${GEM_LIBDIR}/doc/en/cairo-context-color.html
+${GEM_LIBDIR}/doc/en/cairo-context-path.html
+${GEM_LIBDIR}/doc/en/cairo-context-rectangle.html
+${GEM_LIBDIR}/doc/en/cairo-context-triangle.html
+${GEM_LIBDIR}/doc/en/cairo-context.html
+${GEM_LIBDIR}/doc/en/cairo-error.html
+${GEM_LIBDIR}/doc/en/cairo-extend.html
+${GEM_LIBDIR}/doc/en/cairo-file-not-found.html
+${GEM_LIBDIR}/doc/en/cairo-fill-rule.html
+${GEM_LIBDIR}/doc/en/cairo-filter.html
+${GEM_LIBDIR}/doc/en/cairo-font-extents.html
+${GEM_LIBDIR}/doc/en/cairo-font-face.html
+${GEM_LIBDIR}/doc/en/cairo-font-options.html
+${GEM_LIBDIR}/doc/en/cairo-font-slant.html
+${GEM_LIBDIR}/doc/en/cairo-font-weight.html
+${GEM_LIBDIR}/doc/en/cairo-format.html
+${GEM_LIBDIR}/doc/en/cairo-glyph.html
+${GEM_LIBDIR}/doc/en/cairo-gradient-pattern.html
+${GEM_LIBDIR}/doc/en/cairo-hint-metrics.html
+${GEM_LIBDIR}/doc/en/cairo-hint-style.html
+${GEM_LIBDIR}/doc/en/cairo-image-surface.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-content-error.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-dash-error.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-dsc-comment-error.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-format-error.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-index-error.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-matrix-error.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-path-data-error.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-pop-group-error.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-restore-error.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-status-error.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-stride-error.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-string-error.html
+${GEM_LIBDIR}/doc/en/cairo-invalid-visual-error.html
+${GEM_LIBDIR}/doc/en/cairo-line-cap.html
+${GEM_LIBDIR}/doc/en/cairo-line-join.html
+${GEM_LIBDIR}/doc/en/cairo-linear-pattern.html
+${GEM_LIBDIR}/doc/en/cairo-matrix.html
+${GEM_LIBDIR}/doc/en/cairo-no-current-point-error.html
+${GEM_LIBDIR}/doc/en/cairo-null-pointer-error.html
+${GEM_LIBDIR}/doc/en/cairo-operator.html
+${GEM_LIBDIR}/doc/en/cairo-paper-parse-error.html
+${GEM_LIBDIR}/doc/en/cairo-paper-unknown-paper-name.html
+${GEM_LIBDIR}/doc/en/cairo-paper-unknown-unit.html
+${GEM_LIBDIR}/doc/en/cairo-paper-unrecognized-paper-description.html
+${GEM_LIBDIR}/doc/en/cairo-paper.html
+${GEM_LIBDIR}/doc/en/cairo-path-close-path.html
+${GEM_LIBDIR}/doc/en/cairo-path-curve-to.html
+${GEM_LIBDIR}/doc/en/cairo-path-data-type.html
+${GEM_LIBDIR}/doc/en/cairo-path-data.html
+${GEM_LIBDIR}/doc/en/cairo-path-line-to.html
+${GEM_LIBDIR}/doc/en/cairo-path-move-to.html
+${GEM_LIBDIR}/doc/en/cairo-path.html
+${GEM_LIBDIR}/doc/en/cairo-pattern-type-mismatch-error.html
+${GEM_LIBDIR}/doc/en/cairo-pattern.html
+${GEM_LIBDIR}/doc/en/cairo-pdf-surface.html
+${GEM_LIBDIR}/doc/en/cairo-point.html
+${GEM_LIBDIR}/doc/en/cairo-ps-level.html
+${GEM_LIBDIR}/doc/en/cairo-ps-surface.html
+${GEM_LIBDIR}/doc/en/cairo-quartz-surface.html
+${GEM_LIBDIR}/doc/en/cairo-radial-pattern.html
+${GEM_LIBDIR}/doc/en/cairo-read-error.html
+${GEM_LIBDIR}/doc/en/cairo-rectangle.html
+${GEM_LIBDIR}/doc/en/cairo-scaled-font.html
+${GEM_LIBDIR}/doc/en/cairo-solid-pattern.html
+${GEM_LIBDIR}/doc/en/cairo-subpixel-order.html
+${GEM_LIBDIR}/doc/en/cairo-surface-finished-error.html
+${GEM_LIBDIR}/doc/en/cairo-surface-pattern.html
+${GEM_LIBDIR}/doc/en/cairo-surface-type-mismatch-error.html
+${GEM_LIBDIR}/doc/en/cairo-surface.html
+${GEM_LIBDIR}/doc/en/cairo-svg-surface.html
+${GEM_LIBDIR}/doc/en/cairo-svg-version.html
+${GEM_LIBDIR}/doc/en/cairo-temp-file-error.html
+${GEM_LIBDIR}/doc/en/cairo-text-extents.html
+${GEM_LIBDIR}/doc/en/cairo-win32-surface.html
+${GEM_LIBDIR}/doc/en/cairo-write-error.html
+${GEM_LIBDIR}/doc/en/cairo.html
+${GEM_LIBDIR}/doc/en/index.html
+${GEM_LIBDIR}/doc/index.html
+${GEM_LIBDIR}/doc/ja/cairo-antialias.html
+${GEM_LIBDIR}/doc/ja/cairo-clip-not-representable-error.html
+${GEM_LIBDIR}/doc/ja/cairo-color-base.html
+${GEM_LIBDIR}/doc/ja/cairo-color-cmyk.html
+${GEM_LIBDIR}/doc/ja/cairo-color-hsv.html
+${GEM_LIBDIR}/doc/ja/cairo-color-rgb.html
+${GEM_LIBDIR}/doc/ja/cairo-color-x11.html
+${GEM_LIBDIR}/doc/ja/cairo-color.html
+${GEM_LIBDIR}/doc/ja/cairo-content.html
+${GEM_LIBDIR}/doc/ja/cairo-context-blur.html
+${GEM_LIBDIR}/doc/ja/cairo-context-circle.html
+${GEM_LIBDIR}/doc/ja/cairo-context-color.html
+${GEM_LIBDIR}/doc/ja/cairo-context-path.html
+${GEM_LIBDIR}/doc/ja/cairo-context-rectangle.html
+${GEM_LIBDIR}/doc/ja/cairo-context-triangle.html
+${GEM_LIBDIR}/doc/ja/cairo-context.html
+${GEM_LIBDIR}/doc/ja/cairo-error.html
+${GEM_LIBDIR}/doc/ja/cairo-extend.html
+${GEM_LIBDIR}/doc/ja/cairo-file-not-found.html
+${GEM_LIBDIR}/doc/ja/cairo-fill-rule.html
+${GEM_LIBDIR}/doc/ja/cairo-filter.html
+${GEM_LIBDIR}/doc/ja/cairo-font-extents.html
+${GEM_LIBDIR}/doc/ja/cairo-font-face.html
+${GEM_LIBDIR}/doc/ja/cairo-font-options.html
+${GEM_LIBDIR}/doc/ja/cairo-font-slant.html
+${GEM_LIBDIR}/doc/ja/cairo-font-weight.html
+${GEM_LIBDIR}/doc/ja/cairo-format.html
+${GEM_LIBDIR}/doc/ja/cairo-glyph.html
+${GEM_LIBDIR}/doc/ja/cairo-gradient-pattern.html
+${GEM_LIBDIR}/doc/ja/cairo-hint-metrics.html
+${GEM_LIBDIR}/doc/ja/cairo-hint-style.html
+${GEM_LIBDIR}/doc/ja/cairo-image-surface.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-content-error.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-dash-error.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-dsc-comment-error.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-format-error.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-index-error.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-matrix-error.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-path-data-error.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-pop-group-error.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-restore-error.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-status-error.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-stride-error.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-string-error.html
+${GEM_LIBDIR}/doc/ja/cairo-invalid-visual-error.html
+${GEM_LIBDIR}/doc/ja/cairo-line-cap.html
+${GEM_LIBDIR}/doc/ja/cairo-line-join.html
+${GEM_LIBDIR}/doc/ja/cairo-linear-pattern.html
+${GEM_LIBDIR}/doc/ja/cairo-matrix.html
+${GEM_LIBDIR}/doc/ja/cairo-no-current-point-error.html
+${GEM_LIBDIR}/doc/ja/cairo-null-pointer-error.html
+${GEM_LIBDIR}/doc/ja/cairo-operator.html
+${GEM_LIBDIR}/doc/ja/cairo-paper-parse-error.html
+${GEM_LIBDIR}/doc/ja/cairo-paper-unknown-paper-name.html
+${GEM_LIBDIR}/doc/ja/cairo-paper-unknown-unit.html
+${GEM_LIBDIR}/doc/ja/cairo-paper-unrecognized-paper-description.html
+${GEM_LIBDIR}/doc/ja/cairo-paper.html
+${GEM_LIBDIR}/doc/ja/cairo-path-close-path.html
+${GEM_LIBDIR}/doc/ja/cairo-path-curve-to.html
+${GEM_LIBDIR}/doc/ja/cairo-path-data-type.html
+${GEM_LIBDIR}/doc/ja/cairo-path-data.html
+${GEM_LIBDIR}/doc/ja/cairo-path-line-to.html
+${GEM_LIBDIR}/doc/ja/cairo-path-move-to.html
+${GEM_LIBDIR}/doc/ja/cairo-path.html
+${GEM_LIBDIR}/doc/ja/cairo-pattern-type-mismatch-error.html
+${GEM_LIBDIR}/doc/ja/cairo-pattern.html
+${GEM_LIBDIR}/doc/ja/cairo-pdf-surface.html
+${GEM_LIBDIR}/doc/ja/cairo-point.html
+${GEM_LIBDIR}/doc/ja/cairo-ps-level.html
+${GEM_LIBDIR}/doc/ja/cairo-ps-surface.html
+${GEM_LIBDIR}/doc/ja/cairo-quartz-surface.html
+${GEM_LIBDIR}/doc/ja/cairo-radial-pattern.html
+${GEM_LIBDIR}/doc/ja/cairo-read-error.html
+${GEM_LIBDIR}/doc/ja/cairo-rectangle.html
+${GEM_LIBDIR}/doc/ja/cairo-scaled-font.html
+${GEM_LIBDIR}/doc/ja/cairo-solid-pattern.html
+${GEM_LIBDIR}/doc/ja/cairo-subpixel-order.html
+${GEM_LIBDIR}/doc/ja/cairo-surface-finished-error.html
+${GEM_LIBDIR}/doc/ja/cairo-surface-pattern.html
+${GEM_LIBDIR}/doc/ja/cairo-surface-type-mismatch-error.html
+${GEM_LIBDIR}/doc/ja/cairo-surface.html
+${GEM_LIBDIR}/doc/ja/cairo-svg-surface.html
+${GEM_LIBDIR}/doc/ja/cairo-svg-version.html
+${GEM_LIBDIR}/doc/ja/cairo-temp-file-error.html
+${GEM_LIBDIR}/doc/ja/cairo-text-extents.html
+${GEM_LIBDIR}/doc/ja/cairo-win32-surface.html
+${GEM_LIBDIR}/doc/ja/cairo-write-error.html
+${GEM_LIBDIR}/doc/ja/cairo.html
+${GEM_LIBDIR}/doc/ja/index.html
 ${GEM_LIBDIR}/extconf.rb
 ${GEM_LIBDIR}/misc/update-colors.rb
 ${GEM_LIBDIR}/pkg-config.rb
-${GEM_LIBDIR}/samples/.#blur.rb.1.1
 ${GEM_LIBDIR}/samples/agg/README
 ${GEM_LIBDIR}/samples/agg/aa_demo.rb
 ${GEM_LIBDIR}/samples/agg/aa_test.rb
@@ -35,6 +214,8 @@ ${GEM_LIBDIR}/src/lib/cairo/context/color.rb
 ${GEM_LIBDIR}/src/lib/cairo/context/path.rb
 ${GEM_LIBDIR}/src/lib/cairo/context/rectangle.rb
 ${GEM_LIBDIR}/src/lib/cairo/context/triangle.rb
+${GEM_LIBDIR}/src/lib/cairo/paper.rb
+${GEM_LIBDIR}/src/lib/cairo/papers.rb
 ${GEM_LIBDIR}/src/lib/cairo/path.rb
 ${GEM_LIBDIR}/src/lib/cairo/point.rb
 ${GEM_LIBDIR}/src/rb_cairo.c
@@ -54,7 +235,11 @@ ${GEM_LIBDIR}/src/rb_cairo_private.h
 ${GEM_LIBDIR}/src/rb_cairo_scaled_font.c
 ${GEM_LIBDIR}/src/rb_cairo_surface.c
 ${GEM_LIBDIR}/src/rb_cairo_text_extents.c
+${GEM_LIBDIR}/test/run-test.rb
+${GEM_LIBDIR}/test/test_paper.rb
+${GEM_LIBDIR}/test/test_pkg_config.rb
 ${GEM_HOME}/specifications/cairo-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/test
 @dirrm ${GEM_LIBDIR}/src/lib/cairo/context
 @dirrm ${GEM_LIBDIR}/src/lib/cairo
 @dirrm ${GEM_LIBDIR}/src/lib
@@ -62,5 +247,8 @@ ${GEM_HOME}/specifications/cairo-${PKGVERSION}.gemspec
 @dirrm ${GEM_LIBDIR}/samples/agg
 @dirrm ${GEM_LIBDIR}/samples
 @dirrm ${GEM_LIBDIR}/misc
+@dirrm ${GEM_LIBDIR}/doc/ja
+@dirrm ${GEM_LIBDIR}/doc/en
+@dirrm ${GEM_LIBDIR}/doc
 @dirrm ${GEM_LIBDIR}
 @exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/graphics/ruby-rcairo/distinfo b/graphics/ruby-rcairo/distinfo
index 60397915c43..944f1951a84 100644
--- a/graphics/ruby-rcairo/distinfo
+++ b/graphics/ruby-rcairo/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/04/04 15:19:26 jlam Exp $
+$NetBSD: distinfo,v 1.5 2008/04/14 20:09:32 jlam Exp $
 
-SHA1 (cairo-1.5.1.gem) = c1e9d678842bea0496a2514c1fadb75aa99c6b7b
-RMD160 (cairo-1.5.1.gem) = 4a42434d8a0d0643dbe7ce5538dc6c71a9cfb616
-Size (cairo-1.5.1.gem) = 69632 bytes
+SHA1 (cairo-1.6.0.gem) = c135531b4817defcd8f06b43aa0ad43c93d8bef8
+RMD160 (cairo-1.6.0.gem) = e465d9a5598a66e68fc57ac4f1ff21f43bc49d87
+Size (cairo-1.6.0.gem) = 181760 bytes