Update to 2.18.0, for GNOME-2.18.

Changes not detailed in the NEWS file.

4 files changed, 16 insertions, 16 deletions

diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile
index 5083d01eca9..db383b20024 100644
--- a/databases/gnome-mime-data/Makefile
+++ b/databases/gnome-mime-data/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2006/11/14 16:58:13 drochner Exp $
+# $NetBSD: Makefile,v 1.35 2007/04/15 10:36:19 wiz Exp $
 #
 
-DISTNAME=		gnome-mime-data-2.4.3
+DISTNAME=		gnome-mime-data-2.18.0
 CATEGORIES=		databases gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-mime-data/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-mime-data/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/databases/gnome-mime-data/PLIST b/databases/gnome-mime-data/PLIST
index 617ec242a2f..f3fe5eb016f 100644
--- a/databases/gnome-mime-data/PLIST
+++ b/databases/gnome-mime-data/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/11/14 16:58:13 drochner Exp $
-lib/pkgconfig/gnome-mime-data-2.0.pc
+@comment $NetBSD: PLIST,v 1.13 2007/04/15 10:36:19 wiz Exp $
 share/application-registry/gnome-vfs.applications
 share/examples/gnome-mime-data/gnome-vfs-mime-magic
 share/locale/af/LC_MESSAGES/gnome-mime-data.mo
@@ -77,6 +76,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
 share/locale/zu/LC_MESSAGES/gnome-mime-data.mo
 share/mime-info/gnome-vfs.keys
 share/mime-info/gnome-vfs.mime
+share/pkgconfig/gnome-mime-data-2.0.pc
 @comment in xdg-dirs: @dirrm share/mime-info
 @dirrm share/examples/gnome-mime-data
 @comment in xdg-dirs: @dirrm share/application-registry
diff --git a/databases/gnome-mime-data/distinfo b/databases/gnome-mime-data/distinfo
index 8fe07d5d21e..490708df7da 100644
--- a/databases/gnome-mime-data/distinfo
+++ b/databases/gnome-mime-data/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2006/11/14 16:58:13 drochner Exp $
+$NetBSD: distinfo,v 1.10 2007/04/15 10:36:19 wiz Exp $
 
-SHA1 (gnome-mime-data-2.4.3.tar.bz2) = c2f9045cb6cb417bb4bd66adab30b8ae35dfdb37
-RMD160 (gnome-mime-data-2.4.3.tar.bz2) = 5f526f32ecb3cfd01d2bb817ac66beb63cae6f53
-Size (gnome-mime-data-2.4.3.tar.bz2) = 563654 bytes
-SHA1 (patch-aa) = 9d6e4a46ee59f4029b0cd7654ec1ac9988706209
+SHA1 (gnome-mime-data-2.18.0.tar.bz2) = 9ce7b1a24a97f275f60b416fae82d81c1010cb65
+RMD160 (gnome-mime-data-2.18.0.tar.bz2) = 62436da673b9a9e1d27259511401ff69f0397a1a
+Size (gnome-mime-data-2.18.0.tar.bz2) = 607012 bytes
+SHA1 (patch-aa) = 34af252c1469ddc35f8f6afeea92d1b332ac679d
diff --git a/databases/gnome-mime-data/patches/patch-aa b/databases/gnome-mime-data/patches/patch-aa
index 0aaccac2765..c62ae9708f1 100644
--- a/databases/gnome-mime-data/patches/patch-aa
+++ b/databases/gnome-mime-data/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2004/10/26 20:58:59 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2007/04/15 10:36:19 wiz Exp $
 
---- Makefile.in.orig	2004-10-25 21:03:21.000000000 +0200
+--- Makefile.in.orig	2007-04-03 17:35:51.000000000 +0000
 +++ Makefile.in
-@@ -141,7 +141,7 @@ prefix = @prefix@
- program_transform_name = @program_transform_name@
+@@ -223,7 +223,7 @@ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
 -sysconfdir = @sysconfdir@
 +sysconfdir = @datadir@/examples/@PACKAGE@
  target_alias = @target_alias@
- SUBDIRS = man po
- 
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@