Update to 2.4.0 from Min Sik Kim PR pkg/23714.

Changes:

	o Support more languages.
	o Provide mime database only;
	o Icons have been moved to gnome-icon-theme.

4 files changed, 26 insertions, 185 deletions

diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile
index 651c0c3a58f..ff8aa767552 100644
--- a/databases/gnome-mime-data/Makefile
+++ b/databases/gnome-mime-data/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 21:28:08 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/14 22:17:36 xtraeme Exp $
 #
 
-DISTNAME=		gnome-mime-data-2.2.0
-PKGREVISION=		3
+DISTNAME=		gnome-mime-data-2.4.0
 CATEGORIES=		databases gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-mime-data/2.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-mime-data/2.4/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -27,7 +26,8 @@ PKGCONFIG_OVERRIDE=	${WRKSRC}/gnome-mime-data-2.0.pc.in
 CONFIGURE_ARGS=		--sysconfdir="${PKG_SYSCONFDIR}"
 
 EGDIR=			${PREFIX}/share/examples/gnome-mime-data
-CONF_FILES=		${EGDIR}/gnome-vfs-mime-magic ${PKG_SYSCONFDIR}/gnome-vfs-mime-magic
+CONF_FILES=		${EGDIR}/gnome-vfs-mime-magic \
+				${PKG_SYSCONFDIR}/gnome-vfs-mime-magic
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
diff --git a/databases/gnome-mime-data/PLIST b/databases/gnome-mime-data/PLIST
index 3d91340fe72..3a2f4d4839b 100644
--- a/databases/gnome-mime-data/PLIST
+++ b/databases/gnome-mime-data/PLIST
@@ -1,19 +1,25 @@
-@comment $NetBSD: PLIST,v 1.7 2003/05/30 16:19:53 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/12/14 22:17:36 xtraeme Exp $
 lib/pkgconfig/gnome-mime-data-2.0.pc
 man/man5/gnome-vfs-mime.5
 share/application-registry/gnome-vfs.applications
 share/examples/gnome-mime-data/gnome-vfs-mime-magic
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-mime-data.mo
@@ -21,14 +27,19 @@ ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/li/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-mime-data.mo
@@ -39,189 +50,19 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-mime-data.mo
+${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
 share/mime-info/gnome-vfs.keys
 share/mime-info/gnome-vfs.mime
-share/pixmaps/document-icons/gnome-application-encapsulated_postscript.png
-share/pixmaps/document-icons/gnome-application-msword.png
-share/pixmaps/document-icons/gnome-application-pdf.png
-share/pixmaps/document-icons/gnome-application-pgp-encrypted.png
-share/pixmaps/document-icons/gnome-application-pgp-keys.png
-share/pixmaps/document-icons/gnome-application-pgp.png
-share/pixmaps/document-icons/gnome-application-postscript.png
-share/pixmaps/document-icons/gnome-application-qif.png
-share/pixmaps/document-icons/gnome-application-rtf.png
-share/pixmaps/document-icons/gnome-application-smil.png
-share/pixmaps/document-icons/gnome-application-vnd.lotus-1-2-3.png
-share/pixmaps/document-icons/gnome-application-vnd.ms-excel.png
-share/pixmaps/document-icons/gnome-application-vnd.ms-powerpoint.png
-share/pixmaps/document-icons/gnome-application-vnd.rn-realmedia.png
-share/pixmaps/document-icons/gnome-application-vnd.stardivision.calc.png
-share/pixmaps/document-icons/gnome-application-vnd.stardivision.impress.png
-share/pixmaps/document-icons/gnome-application-vnd.stardivision.writer.png
-share/pixmaps/document-icons/gnome-application-vnd.sun.xml.calc.png
-share/pixmaps/document-icons/gnome-application-vnd.sun.xml.impress.png
-share/pixmaps/document-icons/gnome-application-vnd.sun.xml.writer.png
-share/pixmaps/document-icons/gnome-application-x-abiword.png
-share/pixmaps/document-icons/gnome-application-x-applix-spreadsheet.png
-share/pixmaps/document-icons/gnome-application-x-applix-word.png
-share/pixmaps/document-icons/gnome-application-x-arj.png
-share/pixmaps/document-icons/gnome-application-x-backup.png
-share/pixmaps/document-icons/gnome-application-x-blender.png
-share/pixmaps/document-icons/gnome-application-x-bzip.png
-share/pixmaps/document-icons/gnome-application-x-compress.png
-share/pixmaps/document-icons/gnome-application-x-dc-rom.png
-share/pixmaps/document-icons/gnome-application-x-deb.png
-share/pixmaps/document-icons/gnome-application-x-dia-diagram.png
-share/pixmaps/document-icons/gnome-application-x-dvi.png
-share/pixmaps/document-icons/gnome-application-x-e-theme.png
-share/pixmaps/document-icons/gnome-application-x-flac.png
-share/pixmaps/document-icons/gnome-application-x-font-sunos-news.png
-share/pixmaps/document-icons/gnome-application-x-gameboy-rom.png
-share/pixmaps/document-icons/gnome-application-x-genesis-rom.png
-share/pixmaps/document-icons/gnome-application-x-gnome-app-info.png
-share/pixmaps/document-icons/gnome-application-x-gnumeric.png
-share/pixmaps/document-icons/gnome-application-x-gtktalog.png
-share/pixmaps/document-icons/gnome-application-x-gzip.png
-share/pixmaps/document-icons/gnome-application-x-jar.png
-share/pixmaps/document-icons/gnome-application-x-java-byte-code.png
-share/pixmaps/document-icons/gnome-application-x-kde-app-info.png
-share/pixmaps/document-icons/gnome-application-x-killustrator.png
-share/pixmaps/document-icons/gnome-application-x-kpresenter.png
-share/pixmaps/document-icons/gnome-application-x-kspread.png
-share/pixmaps/document-icons/gnome-application-x-kword.png
-share/pixmaps/document-icons/gnome-application-x-msx-rom.png
-share/pixmaps/document-icons/gnome-application-x-n64-rom.png
-share/pixmaps/document-icons/gnome-application-x-nes-rom.png
-share/pixmaps/document-icons/gnome-application-x-ogg.png
-share/pixmaps/document-icons/gnome-application-x-php.png
-share/pixmaps/document-icons/gnome-application-x-python-bytecode.png
-share/pixmaps/document-icons/gnome-application-x-reject.png
-share/pixmaps/document-icons/gnome-application-x-rpm.png
-share/pixmaps/document-icons/gnome-application-x-scheme-source.png
-share/pixmaps/document-icons/gnome-application-x-sms-rom.png
-share/pixmaps/document-icons/gnome-application-x-sql.png
-share/pixmaps/document-icons/gnome-application-x-stuffit.png
-share/pixmaps/document-icons/gnome-audio-ac3.png
-share/pixmaps/document-icons/gnome-audio-basic.png
-share/pixmaps/document-icons/gnome-audio-midi.png
-share/pixmaps/document-icons/gnome-audio-mpeg.png
-share/pixmaps/document-icons/gnome-audio-ulaw.png
-share/pixmaps/document-icons/gnome-audio-x-aiff.png
-share/pixmaps/document-icons/gnome-audio-x-bmx.png
-share/pixmaps/document-icons/gnome-audio-x-it.png
-share/pixmaps/document-icons/gnome-audio-x-mod.png
-share/pixmaps/document-icons/gnome-audio-x-pn-realaudio.png
-share/pixmaps/document-icons/gnome-audio-x-s3m.png
-share/pixmaps/document-icons/gnome-audio-x-stm.png
-share/pixmaps/document-icons/gnome-audio-x-voc.png
-share/pixmaps/document-icons/gnome-audio-x-wav.png
-share/pixmaps/document-icons/gnome-audio-x-xi.png
-share/pixmaps/document-icons/gnome-audio-x-xm.png
-share/pixmaps/document-icons/gnome-audio.png
-share/pixmaps/document-icons/gnome-compressed.png
-share/pixmaps/document-icons/gnome-font-afm.png
-share/pixmaps/document-icons/gnome-font-bdf.png
-share/pixmaps/document-icons/gnome-font-linux-psf.png
-share/pixmaps/document-icons/gnome-font-ttf.png
-share/pixmaps/document-icons/gnome-font-x-pcf.png
-share/pixmaps/document-icons/gnome-http-url.png
-share/pixmaps/document-icons/gnome-image-bmp.png
-share/pixmaps/document-icons/gnome-image-generic.png
-share/pixmaps/document-icons/gnome-image-gif.png
-share/pixmaps/document-icons/gnome-image-ief.png
-share/pixmaps/document-icons/gnome-image-jpeg.png
-share/pixmaps/document-icons/gnome-image-pbm.png
-share/pixmaps/document-icons/gnome-image-pgm.png
-share/pixmaps/document-icons/gnome-image-png.png
-share/pixmaps/document-icons/gnome-image-pnm.png
-share/pixmaps/document-icons/gnome-image-ppm.png
-share/pixmaps/document-icons/gnome-image-psd.png
-share/pixmaps/document-icons/gnome-image-ras.png
-share/pixmaps/document-icons/gnome-image-rgb.png
-share/pixmaps/document-icons/gnome-image-svg.png
-share/pixmaps/document-icons/gnome-image-tga.png
-share/pixmaps/document-icons/gnome-image-tiff.png
-share/pixmaps/document-icons/gnome-image-x-3ds.png
-share/pixmaps/document-icons/gnome-image-x-applix-graphic.png
-share/pixmaps/document-icons/gnome-image-x-lwo.png
-share/pixmaps/document-icons/gnome-image-x-lws.png
-share/pixmaps/document-icons/gnome-image-x-xfig.png
-share/pixmaps/document-icons/gnome-image-xbm.png
-share/pixmaps/document-icons/gnome-image-xcf.png
-share/pixmaps/document-icons/gnome-image-xpm.png
-share/pixmaps/document-icons/gnome-image-xwd.png
-share/pixmaps/document-icons/gnome-library.png
-share/pixmaps/document-icons/gnome-objectfile.png
-share/pixmaps/document-icons/gnome-package.png
-share/pixmaps/document-icons/gnome-tex.png
-share/pixmaps/document-icons/gnome-text-abiword.png
-share/pixmaps/document-icons/gnome-text-css.png
-share/pixmaps/document-icons/gnome-text-html.png
-share/pixmaps/document-icons/gnome-text-x-authors.png
-share/pixmaps/document-icons/gnome-text-x-c++.png
-share/pixmaps/document-icons/gnome-text-x-c-header.png
-share/pixmaps/document-icons/gnome-text-x-c.png
-share/pixmaps/document-icons/gnome-text-x-copying.png
-share/pixmaps/document-icons/gnome-text-x-credits.png
-share/pixmaps/document-icons/gnome-text-x-csh.png
-share/pixmaps/document-icons/gnome-text-x-haskell.png
-share/pixmaps/document-icons/gnome-text-x-install.png
-share/pixmaps/document-icons/gnome-text-x-java.png
-share/pixmaps/document-icons/gnome-text-x-literate-haskell.png
-share/pixmaps/document-icons/gnome-text-x-lyx.png
-share/pixmaps/document-icons/gnome-text-x-makefile.png
-share/pixmaps/document-icons/gnome-text-x-patch.png
-share/pixmaps/document-icons/gnome-text-x-perl.png
-share/pixmaps/document-icons/gnome-text-x-python.png
-share/pixmaps/document-icons/gnome-text-x-readme.png
-share/pixmaps/document-icons/gnome-text-x-sh.png
-share/pixmaps/document-icons/gnome-text-x-sql.png
-share/pixmaps/document-icons/gnome-text-x-zsh.png
-share/pixmaps/document-icons/gnome-text-xml.png
-share/pixmaps/document-icons/gnome-textfile.png
-share/pixmaps/document-icons/gnome-video-mpeg.png
-share/pixmaps/document-icons/gnome-video-quicktime.png
-share/pixmaps/document-icons/gnome-video-x-ms-asf.png
-share/pixmaps/document-icons/gnome-video-x-ms-wmv.png
-share/pixmaps/document-icons/gnome-video-x-msvideo.png
-share/pixmaps/document-icons/gnome-x-font-afm.png
-share/pixmaps/document-icons/gnome-x-troff-man.png
-share/pixmaps/document-icons/i-blockdev.png
-share/pixmaps/document-icons/i-cdrom-audio.png
-share/pixmaps/document-icons/i-cdrom.png
-share/pixmaps/document-icons/i-chardev.png
-share/pixmaps/document-icons/i-core.png
-share/pixmaps/document-icons/i-dvd.png
-share/pixmaps/document-icons/i-executable.png
-share/pixmaps/document-icons/i-fifo.png
-share/pixmaps/document-icons/i-floppy.png
-share/pixmaps/document-icons/i-ftp.png
-share/pixmaps/document-icons/i-harddisk.png
-share/pixmaps/document-icons/i-manual.png
-share/pixmaps/document-icons/i-music-12.png
-share/pixmaps/document-icons/i-music-24.png
-share/pixmaps/document-icons/i-music-36.png
-share/pixmaps/document-icons/i-music.png
-share/pixmaps/document-icons/i-network.png
-share/pixmaps/document-icons/i-nfs.png
-share/pixmaps/document-icons/i-printer.png
-share/pixmaps/document-icons/i-regular-72.png
-share/pixmaps/document-icons/i-regular-96.png
-share/pixmaps/document-icons/i-regular.png
-share/pixmaps/document-icons/i-regular.xml
-share/pixmaps/document-icons/i-smb.png
-share/pixmaps/document-icons/i-sock.png
-share/pixmaps/document-icons/i-spreadsheet.png
-share/pixmaps/document-icons/i-web.png
-share/pixmaps/document-icons/i-zipdisk.png
-@dirrm share/pixmaps/document-icons
 @comment in gnome-dirs: @dirrm share/mime-info
 @dirrm share/examples/gnome-mime-data
 @comment in gnome2-dirs: @dirrm share/application-registry
diff --git a/databases/gnome-mime-data/buildlink2.mk b/databases/gnome-mime-data/buildlink2.mk
index 8781c490698..4c7a1ee4939 100644
--- a/databases/gnome-mime-data/buildlink2.mk
+++ b/databases/gnome-mime-data/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:50:56 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/14 22:17:36 xtraeme Exp $
 
 .if !defined(GNOME_MIME_DATA_BUILDLINK2_MK)
 GNOME_MIME_DATA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-mime-data
-BUILDLINK_DEPENDS.gnome-mime-data?=	gnome-mime-data>=2.2.0nb3
+BUILDLINK_DEPENDS.gnome-mime-data?=	gnome-mime-data>=2.4.0
 BUILDLINK_PKGSRCDIR.gnome-mime-data?=	../../databases/gnome-mime-data
 #BUILDLINK_DEPMETHOD.gnome-mime-data?=	build
 
diff --git a/databases/gnome-mime-data/distinfo b/databases/gnome-mime-data/distinfo
index 1f34c45429c..be2c76e4eac 100644
--- a/databases/gnome-mime-data/distinfo
+++ b/databases/gnome-mime-data/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/04/27 04:20:17 rh Exp $
+$NetBSD: distinfo,v 1.5 2003/12/14 22:17:36 xtraeme Exp $
 
-SHA1 (gnome-mime-data-2.2.0.tar.bz2) = 0c3ce7ddc20683974b5ef50b1814baf7d480c6d2
-Size (gnome-mime-data-2.2.0.tar.bz2) = 1082897 bytes
+SHA1 (gnome-mime-data-2.4.0.tar.bz2) = b1f06ae4333f2c15ab7c5e37c7d42f08f61c70f0
+Size (gnome-mime-data-2.4.0.tar.bz2) = 619492 bytes
 SHA1 (patch-aa) = 31b97c4ac99e96caa0c95ddd530e384d09de9230