Index: head/graphics/gdk-pixbuf/Makefile
===================================================================
--- head/graphics/gdk-pixbuf/Makefile	(revision 386214)
+++ head/graphics/gdk-pixbuf/Makefile	(revision 386215)
@@ -1,35 +1,38 @@
 # Created by: Ade Lovett <ade@lovett.com>
 # $FreeBSD$
 #    $MCom: ports/graphics/gdk-pixbuf/Makefile,v 1.2 2006/09/10 00:51:10 mezz Exp $
 
 PORTNAME=	gdk-pixbuf
 PORTVERSION=	0.22.0
 PORTREVISION=	17
 CATEGORIES=	graphics
-MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/gdk-pixbuf/0.22
+MASTER_SITES=	GNOME/sources/gdk-pixbuf/0.22
 DISTNAME=	gdk-pixbuf-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Graphic library for GTK+
 
+LICENSE=	LGPL20 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING.LIB
+
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
-USES=		gmake libtool pathfix tar:bzip2
+USES=		cpe gmake libtool pathfix tar:bzip2
+CPE_VENDOR=	gnome
 USE_XORG=	xt xi x11
 USE_GNOME=	gtk12
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${STAGEDIR}${PREFIX}/lib -L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} '/confexecdir =/s/=.*/= $$(sysconfdir)/' \
 		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
Index: head/graphics/gdk-pixbuf/pkg-plist
===================================================================
--- head/graphics/gdk-pixbuf/pkg-plist	(revision 386214)
+++ head/graphics/gdk-pixbuf/pkg-plist	(revision 386215)
@@ -1,50 +1,51 @@
 bin/gdk-pixbuf-config
 etc/gdk_pixbufConf.sh
 etc/gdk_pixbuf_xlibConf.sh
+etc/gnomecanvaspixbufConf.sh
 include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-features.h
 include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-loader.h
 include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlib.h
 include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf-xlibrgb.h
 include/gdk-pixbuf-1.0/gdk-pixbuf/gdk-pixbuf.h
 lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so
 lib/gdk-pixbuf/loaders/libpixbufloader-gif.so
 lib/gdk-pixbuf/loaders/libpixbufloader-ico.so
 lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so
 lib/gdk-pixbuf/loaders/libpixbufloader-png.so
 lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so
 lib/gdk-pixbuf/loaders/libpixbufloader-ras.so
 lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so
 lib/gdk-pixbuf/loaders/libpixbufloader-xbm.so
 lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so
 lib/libgdk_pixbuf.a
 lib/libgdk_pixbuf.so
 lib/libgdk_pixbuf.so.2
 lib/libgdk_pixbuf.so.2.0.0
 lib/libgdk_pixbuf_xlib.a
 lib/libgdk_pixbuf_xlib.so
 lib/libgdk_pixbuf_xlib.so.2
 lib/libgdk_pixbuf_xlib.so.2.0.0
 share/aclocal/gdk-pixbuf.m4
 %%DOCSDIR%%/a3696.html
 %%DOCSDIR%%/compiling.html
 %%DOCSDIR%%/extra-configuration-options.html
 %%DOCSDIR%%/gdk-pixbuf-animation.html
 %%DOCSDIR%%/gdk-pixbuf-creating.html
 %%DOCSDIR%%/gdk-pixbuf-file-loading.html
 %%DOCSDIR%%/gdk-pixbuf-from-drawables.html
 %%DOCSDIR%%/gdk-pixbuf-gdk-pixbuf-xlib-from-drawables.html
 %%DOCSDIR%%/gdk-pixbuf-gdk-pixbuf-xlib-init.html
 %%DOCSDIR%%/gdk-pixbuf-gdk-pixbuf-xlib-rendering.html
 %%DOCSDIR%%/gdk-pixbuf-gdk-pixbuf-xlib-rgb.html
 %%DOCSDIR%%/gdk-pixbuf-gdk-pixbuf.html
 %%DOCSDIR%%/gdk-pixbuf-refcounting.html
 %%DOCSDIR%%/gdk-pixbuf-rendering.html
 %%DOCSDIR%%/gdk-pixbuf-scaling.html
 %%DOCSDIR%%/gdk-pixbuf-util.html
 %%DOCSDIR%%/gdkpixbufloader.html
 %%DOCSDIR%%/gnomecanvaspixbuf.html
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/license.html
 %%DOCSDIR%%/r27.html
 %%DOCSDIR%%/x3715.html
 %%DOCSDIR%%/x3767.html