- Include shared-mime-info/mimedb.mk to handle the mime database properly.

- Include desktop-file-utils/desktopdb.mk to handle the mime types defined
  in the desktop file properly.
- Depend on pkg-config, needed at build time.
- Use xdg-dirs, not gnome2-dirs.  The former is enough.
- Sort dependencies.
- Regenerate the PLIST so that it's sorted and to avoid lots of files that
  shouldn't be there (handled automatically by mimedb.mk and desktopdb.mk).
- Bump PKGREVISION to 1.

2 files changed, 28 insertions, 416 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 9c0174c7272..11568209746 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2005/01/20 10:27:51 adam Exp $
+# $NetBSD: Makefile,v 1.49 2005/03/08 17:27:58 jmmv Exp $
 
 DISTNAME=	bluefish-1.0
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/	\
 		ftp://bluefish.advancecreations.com/bluefish/downloads/ \
@@ -17,7 +18,7 @@ DEPENDS+=		weblint-[0-9]*:../../www/weblint
 BUILD_USES_MSGFMT=	YES
 
 USE_BUILDLINK3=		yes
-USE_DIRS+=		gnome2-1.5
+USE_DIRS+=		xdg-1.1
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
@@ -25,10 +26,13 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-icon-path=${PREFIX}/share/pixmaps
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/www/bluefish/PLIST b/www/bluefish/PLIST
index 80b9ae06439..3bc9a5a9056 100644
--- a/www/bluefish/PLIST
+++ b/www/bluefish/PLIST
@@ -1,24 +1,10 @@
-@comment $NetBSD: PLIST,v 1.11 2005/03/08 13:26:31 cube Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/03/08 17:27:58 jmmv Exp $
 bin/bluefish
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/bluefish.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/bluefish.mo
 share/application-registry/bluefish.applications
 share/applications/bluefish.desktop
 share/bluefish/bluefish_splash.png
-share/bluefish/custom_menu.default
 share/bluefish/custom_menu.de.default
+share/bluefish/custom_menu.default
 share/bluefish/custom_menu.fr.default
 share/bluefish/encodings.default
 share/bluefish/filetypes.default
@@ -39,406 +25,28 @@ share/bluefish/icon_python.png
 share/bluefish/icon_r.png
 share/bluefish/icon_unknown.png
 share/bluefish/icon_xml.png
-share/pixmaps/bluefish-icon.png
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/bluefish.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/bluefish.mo
 share/mime-info/bluefish.keys
 share/mime-info/bluefish.mime
-share/mime/XMLnamespaces
-share/mime/application/andrew-inset.xml
-share/mime/application/illustrator.xml
-share/mime/application/mac-binhex40.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/vnd.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-javascript.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/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/bluefish.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-template.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-xmi.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
+share/pixmaps/bluefish-icon.png
 share/pixmaps/gnome-application-bluefish-project.png
 @comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/mime/text
-@dirrm share/mime/video
-@comment in shared-mime-info @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
+@comment in shared-mime-info: @dirrm share/mime/packages
+@comment in xdg-dirs: @dirrm share/mime-info
 @dirrm share/bluefish
+@comment in xdg-dirs: @dirrm share/applications
+@comment in xdg-dirs: @dirrm share/application-registry