Update to 0.15:

* Changes in the package:
- Add a buildlink3.mk file to be used to add a direct dependency on this
  package.  This file also creates a fake "update-mime-database" wrapper
  in the buildlink directory so that programs can't run it directly
  during its build.
- Add the mimedb.mk file, which can be used by packages that install
  mimedb extensions (into share/mime/packages) to automatically rebuild
  the database at (de)installation time.
- The mime database files (except those installed into share/mime/packages)
  must not be listed in the PLIST, so add some PRINT_PLIST_AWK magic to
  handle this automatically.

* Mime Types Changes:
- Added various aliases
- Make text files inherit from text/plain
- Added text/x-xmi
- Added application/x-javascripta

* Translations:
- new translations: Danish (Ole Laursen), Greek (Nikos Charonitakis),
  Korean (Cha Young-Ho)
- updated translations: Finnish  (Ville Skyttä), German (Christian Neumair)

8 files changed, 117 insertions, 415 deletions

diff --git a/databases/shared-mime-info/INSTALL b/databases/shared-mime-info/INSTALL
new file mode 100644
index 00000000000..f339cab5445
--- /dev/null
+++ b/databases/shared-mime-info/INSTALL
@@ -0,0 +1,13 @@
+# $NetBSD: INSTALL,v 1.1 2004/08/31 11:43:44 jmmv Exp $
+
+MIMEDB_PATH="@MIMEDB_PATH@"
+UPDATE_MIMEDB="@UPDATE_MIMEDB@"
+
+case ${STAGE} in
+POST-INSTALL)
+	${UPDATE_MIMEDB} ${MIMEDB_PATH} >/dev/null
+	;;
+POST-DEINSTALL)
+	${RM} -rf ${MIMEDB_PATH}
+	;;
+esac
diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile
index 1962bfe8186..05b009ff99e 100644
--- a/databases/shared-mime-info/Makefile
+++ b/databases/shared-mime-info/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/06/05 00:07:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/08/31 11:43:44 jmmv Exp $
 #
 
-DISTNAME=	shared-mime-info-0.14
+DISTNAME=	shared-mime-info-0.15
 CATEGORIES=	databases
 MASTER_SITES=	http://freedesktop.org/Software/shared-mime-info/
 
@@ -14,10 +14,24 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
+USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 
+CONFIGURE_ARGS+=	--disable-update-mimedb
+
 CPPFLAGS+=		-DPREFIX=\"\\\"${PREFIX}\\\"\"
 
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
+FILES_SUBST+=		MIMEDB_PATH="${PREFIX}/share/mime"
+FILES_SUBST+=		UPDATE_MIMEDB="${PREFIX}/bin/update-mime-database"
+
+PRINT_PLIST_AWK+=	/^share\/mime\/packages/ { print; next; }
+PRINT_PLIST_AWK+=	/^share\/mime/ { next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/mime\/packages$$/ { print; next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/mime/ { next; }
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/databases/shared-mime-info/PLIST b/databases/shared-mime-info/PLIST
index c6666125baf..e39d9aa9d68 100644
--- a/databases/shared-mime-info/PLIST
+++ b/databases/shared-mime-info/PLIST
@@ -1,411 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/05 18:14:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/08/31 11:43:44 jmmv Exp $
 bin/update-mime-database
 lib/pkgconfig/shared-mime-info.pc
 man/man1/update-mime-database.1
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/shared-mime-info.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/shared-mime-info.mo
 ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/shared-mime-info.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/shared-mime-info.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/shared-mime-info.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/shared-mime-info.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/shared-mime-info.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/shared-mime-info.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/shared-mime-info.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/shared-mime-info.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/shared-mime-info.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/shared-mime-info.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/shared-mime-info.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/shared-mime-info.mo
-share/mime/XMLnamespaces
-share/mime/application/andrew-inset.xml
-share/mime/application/illustrator.xml
-share/mime/application/mac-binhex40.xml
-share/mime/application/msword.xml
-share/mime/application/octet-stream.xml
-share/mime/application/oda.xml
-share/mime/application/ogg.xml
-share/mime/application/pdf.xml
-share/mime/application/pgp-encrypted.xml
-share/mime/application/pgp-keys.xml
-share/mime/application/pgp-signature.xml
-share/mime/application/pgp.xml
-share/mime/application/pkcs7-mime.xml
-share/mime/application/pkcs7-signature.xml
-share/mime/application/postscript.xml
-share/mime/application/rtf.xml
-share/mime/application/smil.xml
-share/mime/application/vnd.corel-draw.xml
-share/mime/application/vnd.hp-hpgl.xml
-share/mime/application/vnd.hp-pcl.xml
-share/mime/application/vnd.lotus-1-2-3.xml
-share/mime/application/vnd.ms-excel.xml
-share/mime/application/vnd.ms-powerpoint.xml
-share/mime/application/vnd.ms-word.xml
-share/mime/application/vnd.palm.xml
-share/mime/application/vnd.rn-realmedia.xml
-share/mime/application/vnd.stardivision.calc.xml
-share/mime/application/vnd.stardivision.chart.xml
-share/mime/application/vnd.stardivision.draw.xml
-share/mime/application/vnd.stardivision.impress.xml
-share/mime/application/vnd.stardivision.mail.xml
-share/mime/application/vnd.stardivision.math.xml
-share/mime/application/vnd.stardivision.writer.xml
-share/mime/application/vnd.sun.xml.calc.template.xml
-share/mime/application/vnd.sun.xml.calc.xml
-share/mime/application/vnd.sun.xml.draw.template.xml
-share/mime/application/vnd.sun.xml.draw.xml
-share/mime/application/vnd.sun.xml.impress.template.xml
-share/mime/application/vnd.sun.xml.impress.xml
-share/mime/application/vnd.sun.xml.math.xml
-share/mime/application/vnd.sun.xml.writer.global.xml
-share/mime/application/vnd.sun.xml.writer.template.xml
-share/mime/application/vnd.sun.xml.writer.xml
-share/mime/application/wordperfect.xml
-share/mime/application/x-abiword.xml
-share/mime/application/x-amipro.xml
-share/mime/application/x-applix-spreadsheet.xml
-share/mime/application/x-applix-word.xml
-share/mime/application/x-arc.xml
-share/mime/application/x-archive.xml
-share/mime/application/x-arj.xml
-share/mime/application/x-asp.xml
-share/mime/application/x-awk.xml
-share/mime/application/x-bcpio.xml
-share/mime/application/x-bittorrent.xml
-share/mime/application/x-blender.xml
-share/mime/application/x-bzip-compressed-tar.xml
-share/mime/application/x-bzip.xml
-share/mime/application/x-cd-image.xml
-share/mime/application/x-cgi.xml
-share/mime/application/x-chess-pgn.xml
-share/mime/application/x-class-file.xml
-share/mime/application/x-compress.xml
-share/mime/application/x-compressed-tar.xml
-share/mime/application/x-core.xml
-share/mime/application/x-cpio-compressed.xml
-share/mime/application/x-cpio.xml
-share/mime/application/x-csh.xml
-share/mime/application/x-dbase.xml
-share/mime/application/x-dbm.xml
-share/mime/application/x-dc-rom.xml
-share/mime/application/x-deb.xml
-share/mime/application/x-designer.xml
-share/mime/application/x-desktop.xml
-share/mime/application/x-dia-diagram.xml
-share/mime/application/x-dvi.xml
-share/mime/application/x-e-theme.xml
-share/mime/application/x-egon.xml
-share/mime/application/x-executable.xml
-share/mime/application/x-font-afm.xml
-share/mime/application/x-font-bdf.xml
-share/mime/application/x-font-dos.xml
-share/mime/application/x-font-framemaker.xml
-share/mime/application/x-font-libgrx.xml
-share/mime/application/x-font-linux-psf.xml
-share/mime/application/x-font-otf.xml
-share/mime/application/x-font-pcf.xml
-share/mime/application/x-font-speedo.xml
-share/mime/application/x-font-sunos-news.xml
-share/mime/application/x-font-tex-tfm.xml
-share/mime/application/x-font-tex.xml
-share/mime/application/x-font-ttf.xml
-share/mime/application/x-font-type1.xml
-share/mime/application/x-font-vfont.xml
-share/mime/application/x-frame.xml
-share/mime/application/x-gameboy-rom.xml
-share/mime/application/x-gdbm.xml
-share/mime/application/x-genesis-rom.xml
-share/mime/application/x-gettext-translation.xml
-share/mime/application/x-glade.xml
-share/mime/application/x-gmc-link.xml
-share/mime/application/x-gnucash.xml
-share/mime/application/x-gnumeric.xml
-share/mime/application/x-graphite.xml
-share/mime/application/x-gtar.xml
-share/mime/application/x-gtktalog.xml
-share/mime/application/x-gzip.xml
-share/mime/application/x-gzpostscript.xml
-share/mime/application/x-hdf.xml
-share/mime/application/x-ipod-firmware.xml
-share/mime/application/x-jar.xml
-share/mime/application/x-java.xml
-share/mime/application/x-jbuilder-project.xml
-share/mime/application/x-karbon.xml
-share/mime/application/x-kchart.xml
-share/mime/application/x-kformula.xml
-share/mime/application/x-killustrator.xml
-share/mime/application/x-kivio.xml
-share/mime/application/x-kontour.xml
-share/mime/application/x-kpovmodeler.xml
-share/mime/application/x-kpresenter.xml
-share/mime/application/x-krita.xml
-share/mime/application/x-kspread-crypt.xml
-share/mime/application/x-kspread.xml
-share/mime/application/x-ksysv-package.xml
-share/mime/application/x-kugar.xml
-share/mime/application/x-kword-crypt.xml
-share/mime/application/x-kword.xml
-share/mime/application/x-lha.xml
-share/mime/application/x-lhz.xml
-share/mime/application/x-linguist.xml
-share/mime/application/x-lyx.xml
-share/mime/application/x-lzop.xml
-share/mime/application/x-macbinary.xml
-share/mime/application/x-magicpoint.xml
-share/mime/application/x-matroska.xml
-share/mime/application/x-mif.xml
-share/mime/application/x-mozilla-bookmarks.xml
-share/mime/application/x-ms-dos-executable.xml
-share/mime/application/x-mswinurl.xml
-share/mime/application/x-mswrite.xml
-share/mime/application/x-msx-rom.xml
-share/mime/application/x-n64-rom.xml
-share/mime/application/x-nautilus-link.xml
-share/mime/application/x-nes-rom.xml
-share/mime/application/x-netcdf.xml
-share/mime/application/x-netscape-bookmarks.xml
-share/mime/application/x-object.xml
-share/mime/application/x-ole-storage.xml
-share/mime/application/x-oleo.xml
-share/mime/application/x-palm-database.xml
-share/mime/application/x-pef-executable.xml
-share/mime/application/x-perl.xml
-share/mime/application/x-php.xml
-share/mime/application/x-pkcs12.xml
-share/mime/application/x-profile.xml
-share/mime/application/x-pw.xml
-share/mime/application/x-python-bytecode.xml
-share/mime/application/x-python.xml
-share/mime/application/x-quattropro.xml
-share/mime/application/x-qw.xml
-share/mime/application/x-rar.xml
-share/mime/application/x-reject.xml
-share/mime/application/x-rpm.xml
-share/mime/application/x-ruby.xml
-share/mime/application/x-sc.xml
-share/mime/application/x-shar.xml
-share/mime/application/x-shared-library-la.xml
-share/mime/application/x-sharedlib.xml
-share/mime/application/x-shellscript.xml
-share/mime/application/x-shockwave-flash.xml
-share/mime/application/x-siag.xml
-share/mime/application/x-slp.xml
-share/mime/application/x-sms-rom.xml
-share/mime/application/x-stuffit.xml
-share/mime/application/x-sv4cpio.xml
-share/mime/application/x-sv4crc.xml
-share/mime/application/x-tar.xml
-share/mime/application/x-tarz.xml
-share/mime/application/x-tex-gf.xml
-share/mime/application/x-tex-pk.xml
-share/mime/application/x-tgif.xml
-share/mime/application/x-theme.xml
-share/mime/application/x-toutdoux.xml
-share/mime/application/x-trash.xml
-share/mime/application/x-troff-man-compressed.xml
-share/mime/application/x-troff-man.xml
-share/mime/application/x-troff.xml
-share/mime/application/x-tzo.xml
-share/mime/application/x-ustar.xml
-share/mime/application/x-wais-source.xml
-share/mime/application/x-wpg.xml
-share/mime/application/x-x509-ca-cert.xml
-share/mime/application/x-xbel.xml
-share/mime/application/x-zerosize.xml
-share/mime/application/x-zoo.xml
-share/mime/application/xhtml+xml.xml
-share/mime/application/zip.xml
-share/mime/audio/ac3.xml
-share/mime/audio/basic.xml
-share/mime/audio/midi.xml
-share/mime/audio/prs.sid.xml
-share/mime/audio/vnd.rn-realaudio.xml
-share/mime/audio/x-adpcm.xml
-share/mime/audio/x-aifc.xml
-share/mime/audio/x-aiff.xml
-share/mime/audio/x-aiffc.xml
-share/mime/audio/x-flac.xml
-share/mime/audio/x-it.xml
-share/mime/audio/x-mod.xml
-share/mime/audio/x-mp3-playlist.xml
-share/mime/audio/x-mp3.xml
-share/mime/audio/x-mpeg.xml
-share/mime/audio/x-mpegurl.xml
-share/mime/audio/x-ms-asx.xml
-share/mime/audio/x-pn-realaudio.xml
-share/mime/audio/x-riff.xml
-share/mime/audio/x-s3m.xml
-share/mime/audio/x-scpls.xml
-share/mime/audio/x-stm.xml
-share/mime/audio/x-voc.xml
-share/mime/audio/x-wav.xml
-share/mime/audio/x-xi.xml
-share/mime/audio/x-xm.xml
-share/mime/globs
-share/mime/image/bmp.xml
-share/mime/image/cgm.xml
-share/mime/image/dpx.xml
-share/mime/image/fax-g3.xml
-share/mime/image/g3fax.xml
-share/mime/image/gif.xml
-share/mime/image/ief.xml
-share/mime/image/jpeg.xml
-share/mime/image/jpeg2000.xml
-share/mime/image/png.xml
-share/mime/image/rle.xml
-share/mime/image/svg+xml.xml
-share/mime/image/tiff.xml
-share/mime/image/vnd.djvu.xml
-share/mime/image/vnd.dwg.xml
-share/mime/image/vnd.dxf.xml
-share/mime/image/x-3ds.xml
-share/mime/image/x-applix-graphics.xml
-share/mime/image/x-cmu-raster.xml
-share/mime/image/x-compressed-xcf.xml
-share/mime/image/x-dcm.xml
-share/mime/image/x-dib.xml
-share/mime/image/x-eps.xml
-share/mime/image/x-fits.xml
-share/mime/image/x-fpx.xml
-share/mime/image/x-icb.xml
-share/mime/image/x-ico.xml
-share/mime/image/x-iff.xml
-share/mime/image/x-ilbm.xml
-share/mime/image/x-jng.xml
-share/mime/image/x-lwo.xml
-share/mime/image/x-lws.xml
-share/mime/image/x-msod.xml
-share/mime/image/x-niff.xml
-share/mime/image/x-pcx.xml
-share/mime/image/x-photo-cd.xml
-share/mime/image/x-pict.xml
-share/mime/image/x-portable-anymap.xml
-share/mime/image/x-portable-bitmap.xml
-share/mime/image/x-portable-graymap.xml
-share/mime/image/x-portable-pixmap.xml
-share/mime/image/x-psd.xml
-share/mime/image/x-rgb.xml
-share/mime/image/x-sgi.xml
-share/mime/image/x-sun-raster.xml
-share/mime/image/x-tga.xml
-share/mime/image/x-win-bitmap.xml
-share/mime/image/x-wmf.xml
-share/mime/image/x-xbitmap.xml
-share/mime/image/x-xcf.xml
-share/mime/image/x-xfig.xml
-share/mime/image/x-xpixmap.xml
-share/mime/image/x-xwindowdump.xml
-share/mime/inode/blockdevice.xml
-share/mime/inode/chardevice.xml
-share/mime/inode/directory.xml
-share/mime/inode/fifo.xml
-share/mime/inode/mount-point.xml
-share/mime/inode/socket.xml
-share/mime/inode/symlink.xml
-share/mime/magic
-share/mime/message/delivery-status.xml
-share/mime/message/disposition-notification.xml
-share/mime/message/external-body.xml
-share/mime/message/news.xml
-share/mime/message/partial.xml
-share/mime/message/rfc822.xml
-share/mime/message/x-gnu-rmail.xml
-share/mime/model/vrml.xml
-share/mime/multipart/alternative.xml
-share/mime/multipart/appledouble.xml
-share/mime/multipart/digest.xml
-share/mime/multipart/encrypted.xml
-share/mime/multipart/mixed.xml
-share/mime/multipart/related.xml
-share/mime/multipart/report.xml
-share/mime/multipart/signed.xml
-share/mime/multipart/x-mixed-replace.xml
 share/mime/packages/freedesktop.org.xml
-share/mime/text/calendar.xml
-share/mime/text/css.xml
-share/mime/text/directory.xml
-share/mime/text/enriched.xml
-share/mime/text/html.xml
-share/mime/text/htmlh.xml
-share/mime/text/mathml.xml
-share/mime/text/plain.xml
-share/mime/text/rdf.xml
-share/mime/text/rfc822-headers.xml
-share/mime/text/richtext.xml
-share/mime/text/rss.xml
-share/mime/text/sgml.xml
-share/mime/text/spreadsheet.xml
-share/mime/text/tab-separated-values.xml
-share/mime/text/vnd.wap.wml.xml
-share/mime/text/x-adasrc.xml
-share/mime/text/x-authors.xml
-share/mime/text/x-bibtex.xml
-share/mime/text/x-c++hdr.xml
-share/mime/text/x-c++src.xml
-share/mime/text/x-chdr.xml
-share/mime/text/x-comma-separated-values.xml
-share/mime/text/x-copying.xml
-share/mime/text/x-credits.xml
-share/mime/text/x-csharp.xml
-share/mime/text/x-csrc.xml
-share/mime/text/x-dcl.xml
-share/mime/text/x-dsl.xml
-share/mime/text/x-dtd.xml
-share/mime/text/x-emacs-lisp.xml
-share/mime/text/x-fortran.xml
-share/mime/text/x-gettext-translation.xml
-share/mime/text/x-gtkrc.xml
-share/mime/text/x-haskell.xml
-share/mime/text/x-idl.xml
-share/mime/text/x-install.xml
-share/mime/text/x-java.xml
-share/mime/text/x-ksh.xml
-share/mime/text/x-ksysv-log.xml
-share/mime/text/x-literate-haskell.xml
-share/mime/text/x-log.xml
-share/mime/text/x-makefile.xml
-share/mime/text/x-moc.xml
-share/mime/text/x-objcsrc.xml
-share/mime/text/x-pascal.xml
-share/mime/text/x-patch.xml
-share/mime/text/x-readme.xml
-share/mime/text/x-scheme.xml
-share/mime/text/x-setext.xml
-share/mime/text/x-speech.xml
-share/mime/text/x-sql.xml
-share/mime/text/x-tcl.xml
-share/mime/text/x-tex.xml
-share/mime/text/x-texinfo.xml
-share/mime/text/x-troff-me.xml
-share/mime/text/x-troff-mm.xml
-share/mime/text/x-troff-ms.xml
-share/mime/text/x-uil.xml
-share/mime/text/x-uri.xml
-share/mime/text/x-vcalendar.xml
-share/mime/text/x-vcard.xml
-share/mime/text/x-xslfo.xml
-share/mime/text/x-xslt.xml
-share/mime/text/xmcd.xml
-share/mime/text/xml.xml
-share/mime/video/isivideo.xml
-share/mime/video/mpeg.xml
-share/mime/video/quicktime.xml
-share/mime/video/vivo.xml
-share/mime/video/wavelet.xml
-share/mime/video/x-anim.xml
-share/mime/video/x-avi.xml
-share/mime/video/x-flic.xml
-share/mime/video/x-mng.xml
-share/mime/video/x-ms-asf.xml
-share/mime/video/x-ms-wmv.xml
-share/mime/video/x-msvideo.xml
-share/mime/video/x-nsv.xml
-share/mime/video/x-real-video.xml
-share/mime/video/x-sgi-movie.xml
-@dirrm share/mime/video
-@dirrm share/mime/text
 @dirrm share/mime/packages
-@dirrm share/mime/multipart
-@dirrm share/mime/model
-@dirrm share/mime/message
-@dirrm share/mime/inode
-@dirrm share/mime/image
-@dirrm share/mime/audio
-@dirrm share/mime/application
-@dirrm share/mime
diff --git a/databases/shared-mime-info/buildlink3.mk b/databases/shared-mime-info/buildlink3.mk
new file mode 100644
index 00000000000..ec0377d521e
--- /dev/null
+++ b/databases/shared-mime-info/buildlink3.mk
@@ -0,0 +1,38 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/08/31 11:43:44 jmmv Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+SHARED_MIME_INFO_BUILDLINK3_MK:=	${SHARED_MIME_INFO_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	shared-mime-info
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nshared-mime-info}
+BUILDLINK_PACKAGES+=	shared-mime-info
+
+.if !empty(SHARED_MIME_INFO_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.shared-mime-info+=	shared-mime-info>=0.15
+BUILDLINK_PKGSRCDIR.shared-mime-info?=	../../databases/shared-mime-info
+.endif	# SHARED_MIME_INFO_BUILDLINK3_MK
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+
+.if !empty(SHARED_MIME_INFO_BUILDLINK3_MK:M+)
+BUILDLINK_TARGETS+=	shared-mime-info-buildlink-fake
+
+_SMI_FAKE_UPDATEDB=	${BUILDLINK_DIR}/bin/update-mime-database
+
+shared-mime-info-buildlink-fake:
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	if [ ! -f ${_SMI_FAKE_UPDATEDB} ]; then				\
+		${ECHO_BUILDLINK_MSG} "Creating ${_SMI_FAKE_UPDATEDB}";	\
+		${MKDIR} ${_SMI_FAKE_UPDATEDB:H};			\
+		${ECHO} "#!/bin/sh" > ${_SMI_FAKE_UPDATEDB};		\
+		${ECHO} "echo '[pkgsrc] Doing nothing for update-mime-database' \$$*" >> ${_SMI_FAKE_UPDATEDB};		\
+		${CHMOD} +x ${_SMI_FAKE_UPDATEDB};			\
+	fi
+.endif	# SHARED_MIME_INFO_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/shared-mime-info/distinfo b/databases/shared-mime-info/distinfo
index 876a8cdbbd4..e86c7477f4e 100644
--- a/databases/shared-mime-info/distinfo
+++ b/databases/shared-mime-info/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/04/05 18:14:42 adam Exp $
+$NetBSD: distinfo,v 1.3 2004/08/31 11:43:44 jmmv Exp $
 
-SHA1 (shared-mime-info-0.14.tar.gz) = 2bbfb34fd40f8437386f65c62170fe46d3c73d89
-Size (shared-mime-info-0.14.tar.gz) = 355379 bytes
+SHA1 (shared-mime-info-0.15.tar.gz) = 88d43cbb3123f5434dbe74f999efca85f2501477
+Size (shared-mime-info-0.15.tar.gz) = 422311 bytes
 SHA1 (patch-aa) = bfef540d9190ce676ca2c7199ce9fdbf02715266
-SHA1 (patch-ab) = 16373d51879a6a6a5e3f6caea168985fba95859c
diff --git a/databases/shared-mime-info/files/install.tmpl b/databases/shared-mime-info/files/install.tmpl
new file mode 100644
index 00000000000..d517131d314
--- /dev/null
+++ b/databases/shared-mime-info/files/install.tmpl
@@ -0,0 +1,10 @@
+# $NetBSD: install.tmpl,v 1.1 2004/08/31 11:43:44 jmmv Exp $
+
+MIMEDB_PATH="@MIMEDB_PATH@"
+UPDATE_MIMEDB="@UPDATE_MIMEDB@"
+
+case ${STAGE} in
+POST-INSTALL|DEINSTALL)
+	${UPDATE_MIMEDB} ${MIMEDB_PATH} >/dev/null
+	;;
+esac
diff --git a/databases/shared-mime-info/mimedb.mk b/databases/shared-mime-info/mimedb.mk
new file mode 100644
index 00000000000..6b42316b63a
--- /dev/null
+++ b/databases/shared-mime-info/mimedb.mk
@@ -0,0 +1,32 @@
+# $NetBSD: mimedb.mk,v 1.1 2004/08/31 11:43:44 jmmv Exp $
+#
+# This Makefile fragment is intended to be included by packages that install
+# mime customization files.  It takes care of registering them in the global
+# mime database.
+#
+
+.if !defined(SHARED_MIME_INFO_MIMEDB_MK)
+SHARED_MIME_INFO_MIMEDB_MK=	# defined
+
+. include "../../mk/bsd.prefs.mk"
+
+USE_PKGINSTALL=		YES
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/../../databases/shared-mime-info/files/install.tmpl
+
+FILES_SUBST+=		MIMEDB_PATH="${BUILDLINK_PREFIX.shared-mime-info}/share/mime"
+FILES_SUBST+=		UPDATE_MIMEDB="${BUILDLINK_PREFIX.shared-mime-info}/bin/update-mime-database"
+
+PRINT_PLIST_AWK+=	/^share\/mime\/packages/ { print; next; }
+PRINT_PLIST_AWK+=	/^share\/mime\// { next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/mime\/packages$$/ \
+				{ print "@comment in shared-mime-info: " $$0; \
+				  next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/mime\// { next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/mime$$/ { next; }
+
+.if !defined(NO_BUILDLINK) && !empty(USE_BUILDLINK3:M[yY][eE][sS])
+.  include "../../databases/shared-mime-info/buildlink3.mk"
+.endif
+
+.endif	# SHARED_MIME_INFO_MIMEDB_MK
diff --git a/databases/shared-mime-info/patches/patch-ab b/databases/shared-mime-info/patches/patch-ab
deleted file mode 100644
index f684045df94..00000000000
--- a/databases/shared-mime-info/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/04/05 18:16:20 adam Exp $
-
---- configure.orig	Mon Apr  5 19:39:49 2004
-+++ configure
-@@ -1779,7 +1779,7 @@ if test -z "`$INTLTOOL_PERL -v | fgrep '
- echo "$as_me: error: perl 5.x required for intltool" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--if `perl -e "require XML::Parser" 2>/dev/null`; then
-+if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- :
- else
-    { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5