Update gdk-pixbuf and gdk-pixbuf-gnome to 0.17. Changes include:

* Merged the endianness conversion fixes from the GDK version into the
  Xlib version; oops (Federico).

* Merged fixes from GTK+ 2.0

* Minor documentation improvements (Federico).

* Fixed endianness conversion in the 16-bit gdk-pixbuf-drawable
  functions (Federico).

* Minor fixes for the IBM/AIX compiler (Christian Schaller).

* The image loaders are now linked against the pixbuf and GTK+
  libraries so that the Python bindings work (Johan Dahlin).

* Backported the BMP loader from GTK+ 1.3 (Federico).

* Added support for BI_BITFIELDS coding to the BMP loader [Ximian bug
  #12125] (Federico).

* Fixed stupid bug in the ICO loader.  ICO pixbufs should always have
  an alpha channel [Ximian bug #11224].  (Federico)

* Slight tweaks to the documentation Makefile.  (Federico)

* Added support for 16-bpp BMPs and ICOs (Federico).

* Added support for 32-bpp ICOs (Federico).

* Use the correct visual and colormap for the pixbuf-demo widgets

* Install the headers in a versioned directory so that they don't
  collide with the GNOME 2 platform (Havoc).

3 files changed, 12 insertions, 8 deletions

diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index 05e23b04586..7ab250edbb4 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2002/04/10 01:32:22 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/05/11 11:56:58 rh Exp $
 
 PKGNAME=	${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/}
-PKGREVISION=	1
 COMMENT=	the GNOME image loading library GNOME canvas support add-on
 
 CONFLICTS+=	gdk-pixbuf<0.10.1
@@ -13,7 +12,7 @@ BUILDLINK_DEPENDS.gdk-pixbuf=	gdk-pixbuf>=0.11.0nb1
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/gdk-pixbuf/gnome-canvas-pixbuf.h \
-	  ${PREFIX}/include/gdk-pixbuf
+	  ${PREFIX}/include/gdk-pixbuf-1.0/gdk-pixbuf
 	${INSTALL_DATA} ${WRKSRC}/gnomecanvaspixbufConf.sh \
 	  ${PREFIX}/lib
 	cd ${WRKSRC}/gdk-pixbuf && \
diff --git a/graphics/gdk-pixbuf-gnome/PLIST b/graphics/gdk-pixbuf-gnome/PLIST
index 63f1b2bbc45..3d39e623539 100644
--- a/graphics/gdk-pixbuf-gnome/PLIST
+++ b/graphics/gdk-pixbuf-gnome/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:51 zuntum Exp $
-include/gdk-pixbuf/gnome-canvas-pixbuf.h
+@comment $NetBSD: PLIST,v 1.2 2002/05/11 11:56:59 rh Exp $
+include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h
 lib/gnomecanvaspixbufConf.sh
 lib/libgnomecanvaspixbuf.so.1.0
 lib/libgnomecanvaspixbuf.so.1
@@ -9,8 +9,14 @@ lib/libgnomecanvaspixbuf.a
 share/gnome/html/gdk-pixbuf/a2605.html
 share/gnome/html/gdk-pixbuf/a3640.html
 share/gnome/html/gdk-pixbuf/a3652.html
+share/gnome/html/gdk-pixbuf/a3657.html
 share/gnome/html/gdk-pixbuf/a3694.html
+share/gnome/html/gdk-pixbuf/a3696.html
 share/gnome/html/gdk-pixbuf/a3716.html
+share/gnome/html/gdk-pixbuf/x3676.html
+share/gnome/html/gdk-pixbuf/x3715.html
+share/gnome/html/gdk-pixbuf/x3728.html
+share/gnome/html/gdk-pixbuf/x3767.html
 share/gnome/html/gdk-pixbuf/book1.html
 share/gnome/html/gdk-pixbuf/compiling.html
 share/gnome/html/gdk-pixbuf/extra-configuration-options.html
@@ -30,7 +36,6 @@ share/gnome/html/gdk-pixbuf/gdk-pixbuf-util.html
 share/gnome/html/gdk-pixbuf/gdkpixbufloader.html
 share/gnome/html/gdk-pixbuf/gnomecanvaspixbuf.html
 share/gnome/html/gdk-pixbuf/index.html
-share/gnome/html/gdk-pixbuf/index.sgml
 share/gnome/html/gdk-pixbuf/license.html
 share/gnome/html/gdk-pixbuf/r15.html
 share/gnome/html/gdk-pixbuf/r27.html
diff --git a/graphics/gdk-pixbuf-gnome/buildlink.mk b/graphics/gdk-pixbuf-gnome/buildlink.mk
index 00e77a0ec90..0c9755f1490 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/03/13 17:37:07 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/05/11 11:56:59 rh Exp $
 #
 # This Makefile fragment is included by packages that use gdk-pixbuf-gnome.
 #
@@ -22,7 +22,7 @@ DEPENDS+=	${BUILDLINK_DEPENDS.gdk-pixbuf-gnome}:../../graphics/gdk-pixbuf-gnome
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gdk-pixbuf-gnome=gdk-pixbuf-gnome
 BUILDLINK_PREFIX.gdk-pixbuf-gnome_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.gdk-pixbuf-gnome=	include/gdk-pixbuf/gnome-canvas-pixbuf.h
+BUILDLINK_FILES.gdk-pixbuf-gnome=	include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h
 BUILDLINK_FILES.gdk-pixbuf-gnome+=	lib/libgnomecanvaspixbuf.*
 
 .include "../../graphics/gdk-pixbuf/buildlink.mk"