update to 2.18.0

This moves this pkg to the new stable gnome branch, too much to list here.

pkgsrc change: get rid of the dependency on gtk-doc

3 files changed, 16 insertions, 11 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 45dd93f632c..7d8b20d2389 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2007/02/20 18:18:37 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.57 2007/04/10 18:56:12 drochner Exp $
 #
 
-DISTNAME=	libgnomeprint-2.12.1
-PKGREVISION=	5
+DISTNAME=	libgnomeprint-2.18.0
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprint/2.12/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprint/2.18/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -17,6 +16,7 @@ USE_TOOLS+=		bison gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--disable-gtk-doc
 
 BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.4
 
@@ -53,6 +53,5 @@ PRINT_PLIST_AWK+=	/cups/ { print "$${USE_CUPS}" $$0; next; }
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
-.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST
index a982c917839..faa6ad1c224 100644
--- a/print/libgnomeprint/PLIST
+++ b/print/libgnomeprint/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2007/02/20 18:19:02 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.19 2007/04/10 18:56:12 drochner Exp $
 include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-font.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h
@@ -42,6 +42,7 @@ lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-frgba.la
 lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-multipage.la
 lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-position.la
 lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-reorder.la
+lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-reverse.la
 lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-rotate.la
 lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-select.la
 lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-zoom.la
@@ -89,12 +90,14 @@ share/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/be/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/bn/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/bn_IN/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/bs/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/ca/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/cs/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/cy/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/da/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/de/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/dz/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/el/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/en_CA/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/en_GB/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -115,7 +118,9 @@ share/locale/id/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/is/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/it/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/ja/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ka/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/ko/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/ky/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/lt/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/lv/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/mk/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -127,7 +132,7 @@ share/locale/nb/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/ne/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/nn/LC_MESSAGES/libgnomeprint-2.2.mo
-share/locale/no/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/or/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/pa/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/pl/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/pt/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -150,6 +155,7 @@ share/locale/vi/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/wa/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/xh/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/zh_HK/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
 @dirrm share/libgnomeprint/${PKGVERSION}/printers/uninstalled
 @dirrm share/libgnomeprint/${PKGVERSION}/printers
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 4d5f6a6d6e6..9dfd71f14f5 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2005/10/10 13:57:40 jmmv Exp $
+$NetBSD: distinfo,v 1.22 2007/04/10 18:56:12 drochner Exp $
 
-SHA1 (libgnomeprint-2.12.1.tar.bz2) = 9e7fb75b18d162a274a7cf77f64d84b2741174a5
-RMD160 (libgnomeprint-2.12.1.tar.bz2) = 40e906f9b59e68802afbe322739956b57084b6ab
-Size (libgnomeprint-2.12.1.tar.bz2) = 787980 bytes
+SHA1 (libgnomeprint-2.18.0.tar.bz2) = 601eac4347515e285aee79bc0962d50ab0b27d4b
+RMD160 (libgnomeprint-2.18.0.tar.bz2) = 145a6854e334893ce0f74f08b61edb746a018f73
+Size (libgnomeprint-2.18.0.tar.bz2) = 830629 bytes
 SHA1 (patch-aa) = 73dffa07cb1218b41784563dc822c08b3455fd59
 SHA1 (patch-ab) = 04499f4ce10315b894d85228588c24e9576f4df3