Update to 1.2.2, some pkglint cleanup:

Release 1.2.2 (2006-08-08 Carl Worth)
=========================================================
This is the first bug fix release in the 1.2 series since the original
1.2.0 release made six weeks ago.

There were some very serious bugs in the 1.2.0 release, (see below),
so everybody is encouraged to upgrade from 1.2.0 to 1.2.2. The 1.2.2
release maintains source and binary compatibility with 1.2.0 and does
not make any API additions.

Fix crashes with BGR X servers
------------------------------
With cairo 1.2.0 many people reported problems with all cairo-using
programs, (including all GTK+ programs with GTK+ >= 2.8) immediately
crashing with a complaint about an unsupported image format. This bug
affected X servers that do not provide the Render extension and that
provide a visual with BGR rather than RGB channel order.

report:	https://bugs.freedesktop.org/show_bug.cgi?id=7294
fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=9ae66174e774b57f16ad791452ed44efc2770a59

Fix the "disappearing text" bug
-------------------------------
With cairo 1.2.0 many people reported that text would disappear from
applications, sometimes reappearing with mouse motion or
selection. The text would disappear after the first space in a string
of text. This bug was caused by an underlying bug in (very common) X
servers, and only affected text rendered without antialiasing, (either
a bitmap font or a vector font with antialiasing disabled). The bug
was also exacerbated by a KDE migration bug that caused antialiasing
to be disabled more than desired.

report:	https://bugs.freedesktop.org/show_bug.cgi?id=7494
fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=456cdb3058f3b416109a9600167cd8842300ae14
see also:
Xorg:	https://bugs.freedesktop.org/show_bug.cgi?id=7681
KDE:	http://qa.mandriva.com/show_bug.cgi?id=23990

Fix broken image fallback scaling (aka. "broken printing")
----------------------------------------------------------
The various "print" backends, (pdf, ps, and svg), sometimes fallback
to using image-based rendering for some operations. In cairo 1.2.0
these image fallbacks were scaled improperly. Applications using cairo
can influence the resolution of the image fallbacks with
cairo_surface_set_fallback_resolution. With the bug, any calue other
than 72.0 would lead to incorrect results, (larger values would lead
to increasingly shrunken output).

report:	https://bugs.freedesktop.org/show_bug.cgi?id=7533
fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=1feb4291cf7813494355459bb547eec604c54ffb

Fix inadvertent semantic change of font matrix translation (Behdad Esfahbod)
----------------------------------------------------------------------------
The 1.2.0 release introduced an inadvertent change to how the
translation components of a font matrix are interpreted. In the 1.0
series, font matrix translation could be used to offset the glyph
origin, (though glyph metrics were reported incorrectly in
1.0). However in 1.2.0, the translation was applied to the advance
values betwen each glyph. The 1.2.0 behavior is fairly useless in
practice, and it was not intentional to introduce a semantic
change. With 1.2.2 we return to the 1.0 semantics, with a much better
implementation that provides correct glyph metrics.

fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=84840e6bba6e72aa88fad7a0ee929e8955ba9051

Fix create_similar to preserve fallback resolution and font options (Behdad Esfahbod)
-------------------------------------------------------------------------------------
There has been a long-standing issue with cairo_surface_create_similar
such that font options and other settings from the original
destination surface would not be preserved to the intermediate
"similar" surface. This could result in incorrect rendering
(particulary with respect to text hinting/antialiasing) with
fallbacks, for example.

report:	https://bugs.freedesktop.org/show_bug.cgi?id=4106
fixes:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=9fcb3c32c1f16fe6ab913e27eb54d18b7d9a06b0
	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=bdb4e1edadb78a2118ff70b28163f8bd4317f1ec

xlib: Fix text performance regression from 1.0 to 1.2.0 (Vladimir Vukicevic)
----------------------------------------------------------------------------
Several people noticed that upgrading from cairo 1.0 to cairo 1.2.0
caused a significant peformance regression when using the xlib
backend. This performance regression was particularly noticeable when
doing lots of text rendering and when using a high-latency connection
to the X server, (such as a remote X server over an ssh
connection). The slowdown was identified and fixed in 1.2.2.

report:	https://bugs.freedesktop.org/show_bug.cgi?id=7514
fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=b7191885c88068dad57d68ced69a752d1162b12c

PDF: Eliminate dependency on FreeType library dependency (Adrian Johnson)
-------------------------------------------------------------------------
The cairo 1.2 series adds a supported pdf backend to cairo. In cairo
1.2.0 this backend required the freetype library, which was an
undesirable dependency on systems such as win32, (cairo is designed to
always prefer the "native" font system). As of cairo 1.2.2 the
freetype library is not required to use the pdf backend on the win32
platform.

report:	https://bugs.freedesktop.org/show_bug.cgi?id=7538
fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=a0989f427be87c60415963dd6822b3c5c3781691

PDF: Fix broken output on amd64 (Adrian Johnson)
------------------------------------------------
report:	http://bugzilla.gnome.org/show_bug.cgi?id=349826
fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=f4b12e497b7ac282b2f6831b8fb68deebc412e60

PS: Fix broken output for truetype fonts > 64k (Adrian Johnson)
---------------------------------------------------------------
fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=067d97eb1793a6b0d0dddfbd0b54117844511a94

PDF: Fix so that dashing doesn't get stuck on (Kent Worsnop)
------------------------------------------------------------
Kent notices that with the PDF backend in cairo 1.2.0 as soon as a
stroke was performed with dashing, all subsequent strokes would also
be dashed. There was no way to turn dashing off again.

fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=778c4730a86296bf0a71080cf7008d7291792256

Fix memory leaks in failure paths in gradient creation (Alfred Peng)
--------------------------------------------------------------------
fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=db06681b487873788b51a6766894fc619eb8d8f2

Fix memory leak in _cairo_surface_show_glyphs (Chris Wilson)
------------------------------------------------------------
report:	https://bugs.freedesktop.org/show_bug.cgi?id=7766
fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=e2fddcccb43d06486d3680a19cfdd5a54963fcbd

Solaris: Add definition of cairo_private for some Sun compilers (Alfred Peng)
-----------------------------------------------------------------------------
report:	https://bugzilla.mozilla.org/show_bug.cgi?id=341874
fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=04757a3aa8deeff3265719ebe01b021638990ec6

Solaris: Change version number of Sun's Xorg server with buggy repeat (Brian Cameron)
-------------------------------------------------------------------------------------
report: https://bugs.freedesktop.org/show_bug.cgi?id=7483
fix:	http://gitweb.freedesktop.org/?p=cairo;a=commit;h=e0ad1aa995bcec4246c0b8ab0d5a5a79871ce235

Various memory leak fixes
-------------------------
Fix memory leak in _cairo_surface_show_glyphs (bug 7766)
Fix file handle leak in failure path (bug 7616)
Fix some memory leaks in the test cases.
Fix some memory leaks in font subsetting code used in print backends.

Documentation improvements (Behdad Esfahbod)
--------------------------------------------
Added new documentation for several functions (cairo_show_page,
cairo_copy_page, cairo_in_stroke, cairo_in_fill).

Fixed some syntax errors that were preventing some existing
documentation from being published.

Fixed several minor typographical errors.

Added an index for new symbols in 1.2.

9 files changed, 34 insertions, 65 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 6411121f1cf..534471ae5ec 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2006/07/24 20:01:12 minskim Exp $
+# $NetBSD: Makefile,v 1.43 2006/08/10 13:50:37 wiz Exp $
 
-DISTNAME=	cairo-1.2.0
-PKGREVISION=	2
+DISTNAME=	cairo-1.2.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST
index 21502833616..8afa95f690e 100644
--- a/graphics/cairo/PLIST
+++ b/graphics/cairo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/07/23 05:08:49 minskim Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/08/10 13:50:37 wiz Exp $
 ${CARBON}include/cairo/cairo-atsui.h
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
@@ -63,6 +63,7 @@ share/doc/cairo/home.png
 share/doc/cairo/index.html
 share/doc/cairo/index.sgml
 share/doc/cairo/ix01.html
+share/doc/cairo/ix02.html
 share/doc/cairo/language-bindings.html
 share/doc/cairo/left.png
 share/doc/cairo/pt01.html
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index d1b9c97d7ff..3246b7f85b7 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/07/23 04:07:34 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/08/10 13:50:37 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CAIRO_BUILDLINK3_MK:=	${CAIRO_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	cairo
 .endif
 
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncairo}
 BUILDLINK_PACKAGES+=	cairo
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cairo
 
-.if !empty(CAIRO_BUILDLINK3_MK:M+)
+.if ${CAIRO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.0.0nb2
 BUILDLINK_ABI_DEPENDS.cairo?=	cairo>=1.0.4nb1
 BUILDLINK_PKGSRCDIR.cairo?=	../../graphics/cairo
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 58c608fe748..89b67cc0134 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.20 2006/07/25 01:48:54 minskim Exp $
+$NetBSD: distinfo,v 1.21 2006/08/10 13:50:37 wiz Exp $
 
-SHA1 (cairo-1.2.0.tar.gz) = c5da7f89cdd3782102357f99a47f516d11661e92
-RMD160 (cairo-1.2.0.tar.gz) = 9dd76e43e881dfd3f20a81fc0f946e302ed7993c
-Size (cairo-1.2.0.tar.gz) = 2659930 bytes
-SHA1 (patch-aa) = 7d4b4fa8f685a64bbd703d2ee8ae5f6ad28d196d
-SHA1 (patch-ab) = d408881c714686a3481f66dcb069c763359313a6
-SHA1 (patch-ac) = de91ee6dd733c56957de83a1880a583eaf601126
-SHA1 (patch-ad) = 6778eecd56c622382ebd6c870193cd805aaf9d9c
-SHA1 (patch-ae) = 735df8410da29046f862b9ab19b7a8cbda24050b
+SHA1 (cairo-1.2.2.tar.gz) = 859b9ed4eaa200a03b9e41ccc45f3799742e6c5c
+RMD160 (cairo-1.2.2.tar.gz) = ecb23495efb809b1a7e0af036ad3a260d68be9d5
+Size (cairo-1.2.2.tar.gz) = 2831305 bytes
+SHA1 (patch-aa) = 1b8ac1d495214c80b2e0ba28490bbc212f727773
+SHA1 (patch-ab) = de02467d1de4667b02fbd8dedf3cc46fab8fbdec
+SHA1 (patch-ac) = 71c66c051673a40b816c80cd8a67bfb4d0b6000b
+SHA1 (patch-ad) = 60ebdcbbcd0a7bd97ba4d25e79500547008ede34
diff --git a/graphics/cairo/patches/patch-aa b/graphics/cairo/patches/patch-aa
index 4bdba46ef33..1b82e6565ed 100644
--- a/graphics/cairo/patches/patch-aa
+++ b/graphics/cairo/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2006/07/04 15:14:49 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2006/08/10 13:50:37 wiz Exp $
 
---- src/Makefile.in.orig	2006-07-01 03:25:10.000000000 +0200
+--- src/Makefile.in.orig	2006-08-08 23:11:38.000000000 +0000
 +++ src/Makefile.in
-@@ -230,7 +230,7 @@ CAIRO_CAN_TEST_PDF_SURFACE_FALSE = @CAIR
+@@ -225,7 +225,7 @@ CAIRO_CAN_TEST_PDF_SURFACE_FALSE = @CAIR
  CAIRO_CAN_TEST_PDF_SURFACE_TRUE = @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@
  CAIRO_CAN_TEST_SVG_SURFACE_FALSE = @CAIRO_CAN_TEST_SVG_SURFACE_FALSE@
  CAIRO_CAN_TEST_SVG_SURFACE_TRUE = @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@
@@ -11,12 +11,12 @@ $NetBSD: patch-aa,v 1.7 2006/07/04 15:14:49 drochner Exp $
  CAIRO_HAS_ATSUI_FONT_FALSE = @CAIRO_HAS_ATSUI_FONT_FALSE@
  CAIRO_HAS_ATSUI_FONT_TRUE = @CAIRO_HAS_ATSUI_FONT_TRUE@
  CAIRO_HAS_BEOS_SURFACE_FALSE = @CAIRO_HAS_BEOS_SURFACE_FALSE@
-@@ -265,7 +265,7 @@ CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HA
+@@ -260,7 +260,7 @@ CAIRO_HAS_XLIB_SURFACE_FALSE = @CAIRO_HA
  CAIRO_HAS_XLIB_SURFACE_TRUE = @CAIRO_HAS_XLIB_SURFACE_TRUE@
  CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE@
  CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@
 -CAIRO_LIBS = @CAIRO_LIBS@
 +CAIRO_LIBS = @CAIRO_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ CAIRO_NONPKGCONFIG_CFLAGS = @CAIRO_NONPKGCONFIG_CFLAGS@
+ CAIRO_NONPKGCONFIG_LIBS = @CAIRO_NONPKGCONFIG_LIBS@
  CAIRO_REQUIRES = @CAIRO_REQUIRES@
- CAIRO_VERSION_MAJOR = @CAIRO_VERSION_MAJOR@
- CAIRO_VERSION_MICRO = @CAIRO_VERSION_MICRO@
diff --git a/graphics/cairo/patches/patch-ab b/graphics/cairo/patches/patch-ab
index f895636aac6..6366a26f357 100644
--- a/graphics/cairo/patches/patch-ab
+++ b/graphics/cairo/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/07/04 15:14:49 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2006/08/10 13:50:37 wiz Exp $
 
---- test/Makefile.in.orig	2006-07-01 03:25:14.000000000 +0200
+--- test/Makefile.in.orig	2006-08-08 23:11:40.000000000 +0000
 +++ test/Makefile.in
-@@ -57,7 +57,7 @@ check_PROGRAMS = $(am__EXEEXT_9) imagedi
+@@ -55,7 +55,7 @@ host_triplet = @host@
  @CAIRO_CAN_TEST_GLITZ_EGL_SURFACE_TRUE@am__append_12 = $(GLITZ_EGL_LIBS)
  @CAIRO_CAN_TEST_GLITZ_GLX_SURFACE_TRUE@am__append_13 = $(GLITZ_GLX_LIBS)
  @CAIRO_CAN_TEST_GLITZ_WGL_SURFACE_TRUE@am__append_14 = $(GLITZ_WGL_LIBS)
@@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.3 2006/07/04 15:14:49 drochner Exp $
 +@HAVE_PTHREAD_TRUE@am__append_15 = ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  @CAIRO_CAN_TEST_PDF_SURFACE_TRUE@am__append_16 = pdf2png
  @CAIRO_CAN_TEST_SVG_SURFACE_TRUE@am__append_17 = svg2png
- subdir = test
+ EXTRA_PROGRAMS = $(am__EXEEXT_9) $(am__EXEEXT_12)
diff --git a/graphics/cairo/patches/patch-ac b/graphics/cairo/patches/patch-ac
index 87300d9feae..4a15393033c 100644
--- a/graphics/cairo/patches/patch-ac
+++ b/graphics/cairo/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2006/07/08 21:14:14 markd Exp $
+$NetBSD: patch-ac,v 1.2 2006/08/10 13:50:37 wiz Exp $
 
---- src/cairoint.h.orig	2006-07-09 00:58:33.598209000 +1200
+--- src/cairoint.h.orig	2006-08-08 07:19:51.000000000 +0000
 +++ src/cairoint.h
 @@ -67,7 +67,7 @@
  
  CAIRO_BEGIN_DECLS
  
 -#if __GNUC__ >= 3 && defined(__ELF__)
-+#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun__)
++#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun)
  # define slim_hidden_proto(name)	slim_hidden_proto1(name, INT_##name)
  # define slim_hidden_def(name)		slim_hidden_def1(name, INT_##name)
  # define slim_hidden_proto1(name, internal)				\
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.1 2006/07/08 21:14:14 markd Exp $
  
  /* slim_internal.h */
 -#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
-+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun__)
++#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)
  #define cairo_private		__attribute__((__visibility__("hidden")))
- #else
- #define cairo_private
+ #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+ #define cairo_private		__hidden
diff --git a/graphics/cairo/patches/patch-ad b/graphics/cairo/patches/patch-ad
index 17fd4745c28..a658d787e1e 100644
--- a/graphics/cairo/patches/patch-ad
+++ b/graphics/cairo/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2006/07/08 21:14:14 markd Exp $
+$NetBSD: patch-ad,v 1.2 2006/08/10 13:50:37 wiz Exp $
 
 --- pixman/src/slim_internal.h.orig	2006-07-09 01:01:35.889958000 +1200
 +++ pixman/src/slim_internal.h
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1 2006/07/08 21:14:14 markd Exp $
     like the function name instead of just an attribute.  */
  
 -#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
-+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun__)
++#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)
  #define pixman_private	__attribute__((__visibility__("hidden")))
  #else
  #define pixman_private
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.1 2006/07/08 21:14:14 markd Exp $
     level.  */
  
 -#if __GNUC__ >= 3 && defined(__ELF__)
-+#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun__)
++#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun)
  # define slim_hidden_proto(name)	slim_hidden_proto1(name, INT_##name)
  # define slim_hidden_def(name)		slim_hidden_def1(name, INT_##name)
  # define slim_hidden_proto1(name, internal)				\
diff --git a/graphics/cairo/patches/patch-ae b/graphics/cairo/patches/patch-ae
deleted file mode 100644
index fa53ffd4885..00000000000
--- a/graphics/cairo/patches/patch-ae
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/07/25 01:48:54 minskim Exp $
-
-https://bugs.freedesktop.org/show_bug.cgi?id=7401
-
---- test/cairo-test.c.orig	2006-06-30 17:03:52.000000000 -0700
-+++ test/cairo-test.c
-@@ -1635,7 +1635,7 @@ cairo_test_expecting (cairo_test_t *test
- {
-     volatile int i, j, num_targets;
-     const char *tname;
--    sighandler_t old_segfault_handler;
-+    void (*old_segfault_handler)(int);
-     cairo_test_status_t status, ret;
-     cairo_test_target_t **targets_to_test;
-     cairo_test_target_t targets[] =
-@@ -1841,12 +1841,12 @@ cairo_test_expecting (cairo_test_t *test
- 		    dev_offset);
- 
- 	    /* Set up a checkpoint to get back to in case of segfaults. */
--	    old_segfault_handler = signal (SIGSEGV, (sighandler_t) segfault_handler);
-+	    old_segfault_handler = signal (SIGSEGV, segfault_handler);
- 	    if (0 == setjmp (jmpbuf))
- 		status = cairo_test_for_target (test, draw, target, dev_offset);
- 	    else
- 	        status = CAIRO_TEST_CRASHED;
--	    signal (SIGSEGV, (sighandler_t) old_segfault_handler);
-+	    signal (SIGSEGV, old_segfault_handler);
- 
- 	    cairo_test_log ("TEST: %s TARGET: %s FORMAT: %s OFFSET: %d RESULT: ",
- 			    test->name, target->name,