4 files changed, 163 insertions, 20 deletions

diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index 6faff93f13db..c37cca8c0c49 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -6,20 +6,27 @@
 #
 
 PORTNAME=	gnomemimedata
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	1.0.7
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/gnome-mime-data
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
 DISTNAME=	gnome-mime-data-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
 USE_GNOMELIBS=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+MAN5=	gnome-vfs-mime.5
+
+pre-patch:
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
+		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
+
 .include <bsd.port.mk>
diff --git a/misc/gnome-mime-data/distinfo b/misc/gnome-mime-data/distinfo
index 5ded9134ec82..68300c10573c 100644
--- a/misc/gnome-mime-data/distinfo
+++ b/misc/gnome-mime-data/distinfo
@@ -1 +1 @@
-MD5 (gnome-mime-data-1.0.1.tar.gz) = 547e42a50faf8bec69b4af996814b28b
+MD5 (gnome/gnome-mime-data-1.0.7.tar.bz2) = 7ddd3fb9302de57d5572fb84a406f8e6
diff --git a/misc/gnome-mime-data/files/patch-Makefile.in b/misc/gnome-mime-data/files/patch-Makefile.in
index e1d1ba0a76fd..e69de29bb2d1 100644
--- a/misc/gnome-mime-data/files/patch-Makefile.in
+++ b/misc/gnome-mime-data/files/patch-Makefile.in
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in	2002/01/22 10:16:10	1.1
-+++ Makefile.in	2002/01/22 10:16:42
-@@ -94,7 +94,7 @@
- 
- SUBDIRS = po
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = gnome-mime-data-2.0.pc
- 
- NULL = 
diff --git a/misc/gnome-mime-data/pkg-plist b/misc/gnome-mime-data/pkg-plist
index d0b26318e110..303b487c4cf1 100644
--- a/misc/gnome-mime-data/pkg-plist
+++ b/misc/gnome-mime-data/pkg-plist
@@ -3,12 +3,159 @@ libdata/pkgconfig/gnome-mime-data-2.0.pc
 share/gnome/application-registry/gnome-vfs.applications
 share/gnome/mime-info/gnome-vfs.keys
 share/gnome/mime-info/gnome-vfs.mime
+share/gnome/pixmaps/document-icons/gnome-application-encapsulated_postscript.png
+share/gnome/pixmaps/document-icons/gnome-application-msword.png
+share/gnome/pixmaps/document-icons/gnome-application-pdf.png
+share/gnome/pixmaps/document-icons/gnome-application-pgp.png
+share/gnome/pixmaps/document-icons/gnome-application-postscript.png
+share/gnome/pixmaps/document-icons/gnome-application-qif.png
+share/gnome/pixmaps/document-icons/gnome-application-rtf.png
+share/gnome/pixmaps/document-icons/gnome-application-smil.png
+share/gnome/pixmaps/document-icons/gnome-application-vnd.lotus-1-2-3.png
+share/gnome/pixmaps/document-icons/gnome-application-vnd.ms-excel.png
+share/gnome/pixmaps/document-icons/gnome-application-vnd.ms-powerpoint.png
+share/gnome/pixmaps/document-icons/gnome-application-vnd.rn-realmedia.png
+share/gnome/pixmaps/document-icons/gnome-application-vnd.stardivision.calc.png
+share/gnome/pixmaps/document-icons/gnome-application-vnd.stardivision.impress.png
+share/gnome/pixmaps/document-icons/gnome-application-vnd.stardivision.writer.png
+share/gnome/pixmaps/document-icons/gnome-application-vnd.sun.xml.calc.png
+share/gnome/pixmaps/document-icons/gnome-application-vnd.sun.xml.impress.png
+share/gnome/pixmaps/document-icons/gnome-application-vnd.sun.xml.writer.png
+share/gnome/pixmaps/document-icons/gnome-application-x-abiword.png
+share/gnome/pixmaps/document-icons/gnome-application-x-arj.png
+share/gnome/pixmaps/document-icons/gnome-application-x-backup.png
+share/gnome/pixmaps/document-icons/gnome-application-x-blender.png
+share/gnome/pixmaps/document-icons/gnome-application-x-bzip.png
+share/gnome/pixmaps/document-icons/gnome-application-x-c-header.png
+share/gnome/pixmaps/document-icons/gnome-application-x-c-source.png
+share/gnome/pixmaps/document-icons/gnome-application-x-cc-source.png
+share/gnome/pixmaps/document-icons/gnome-application-x-compress.png
+share/gnome/pixmaps/document-icons/gnome-application-x-dc-rom.png
+share/gnome/pixmaps/document-icons/gnome-application-x-dia-diagram.png
+share/gnome/pixmaps/document-icons/gnome-application-x-e-theme.png
+share/gnome/pixmaps/document-icons/gnome-application-x-font-sunos-news.png
+share/gnome/pixmaps/document-icons/gnome-application-x-gameboy-rom.png
+share/gnome/pixmaps/document-icons/gnome-application-x-genesis-rom.png
+share/gnome/pixmaps/document-icons/gnome-application-x-gnome-app-info.png
+share/gnome/pixmaps/document-icons/gnome-application-x-gnumeric.png
+share/gnome/pixmaps/document-icons/gnome-application-x-gtktalog.png
+share/gnome/pixmaps/document-icons/gnome-application-x-gzip.png
+share/gnome/pixmaps/document-icons/gnome-application-x-jar.png
+share/gnome/pixmaps/document-icons/gnome-application-x-java-source.png
+share/gnome/pixmaps/document-icons/gnome-application-x-kde-app-info.png
+share/gnome/pixmaps/document-icons/gnome-application-x-killustrator.png
+share/gnome/pixmaps/document-icons/gnome-application-x-kpresenter.png
+share/gnome/pixmaps/document-icons/gnome-application-x-kspread.png
+share/gnome/pixmaps/document-icons/gnome-application-x-kword.png
+share/gnome/pixmaps/document-icons/gnome-application-x-msx-rom.png
+share/gnome/pixmaps/document-icons/gnome-application-x-n64-rom.png
+share/gnome/pixmaps/document-icons/gnome-application-x-nes-rom.png
+share/gnome/pixmaps/document-icons/gnome-application-x-ogg.png
+share/gnome/pixmaps/document-icons/gnome-application-x-php.png
+share/gnome/pixmaps/document-icons/gnome-application-x-reject.png
+share/gnome/pixmaps/document-icons/gnome-application-x-scheme-source.png
+share/gnome/pixmaps/document-icons/gnome-application-x-sms-rom.png
+share/gnome/pixmaps/document-icons/gnome-application-x-sql.png
+share/gnome/pixmaps/document-icons/gnome-application-x-stuffit.png
+share/gnome/pixmaps/document-icons/gnome-audio-ac3.png
+share/gnome/pixmaps/document-icons/gnome-audio-basic.png
+share/gnome/pixmaps/document-icons/gnome-audio-midi.png
+share/gnome/pixmaps/document-icons/gnome-audio-mpeg.png
+share/gnome/pixmaps/document-icons/gnome-audio-ulaw.png
+share/gnome/pixmaps/document-icons/gnome-audio-x-aiff.png
+share/gnome/pixmaps/document-icons/gnome-audio-x-bmx.png
+share/gnome/pixmaps/document-icons/gnome-audio-x-mod.png
+share/gnome/pixmaps/document-icons/gnome-audio-x-pn-realaudio.png
+share/gnome/pixmaps/document-icons/gnome-audio-x-s3m.png
+share/gnome/pixmaps/document-icons/gnome-audio-x-stm.png
+share/gnome/pixmaps/document-icons/gnome-audio-x-voc.png
+share/gnome/pixmaps/document-icons/gnome-audio-x-wav.png
+share/gnome/pixmaps/document-icons/gnome-audio-x-xi.png
+share/gnome/pixmaps/document-icons/gnome-audio-x-xm.png
+share/gnome/pixmaps/document-icons/gnome-audio.png
+share/gnome/pixmaps/document-icons/gnome-compressed.png
+share/gnome/pixmaps/document-icons/gnome-font-afm.png
+share/gnome/pixmaps/document-icons/gnome-font-bdf.png
+share/gnome/pixmaps/document-icons/gnome-font-linux-psf.png
+share/gnome/pixmaps/document-icons/gnome-font-ttf.png
+share/gnome/pixmaps/document-icons/gnome-font-x-pcf.png
+share/gnome/pixmaps/document-icons/gnome-http-url.png
+share/gnome/pixmaps/document-icons/gnome-image-bmp.png
+share/gnome/pixmaps/document-icons/gnome-image-generic.png
+share/gnome/pixmaps/document-icons/gnome-image-gif.png
+share/gnome/pixmaps/document-icons/gnome-image-ief.png
+share/gnome/pixmaps/document-icons/gnome-image-jpeg.png
+share/gnome/pixmaps/document-icons/gnome-image-pbm.png
+share/gnome/pixmaps/document-icons/gnome-image-pgm.png
+share/gnome/pixmaps/document-icons/gnome-image-png.png
+share/gnome/pixmaps/document-icons/gnome-image-pnm.png
+share/gnome/pixmaps/document-icons/gnome-image-ppm.png
+share/gnome/pixmaps/document-icons/gnome-image-psd.png
+share/gnome/pixmaps/document-icons/gnome-image-ras.png
+share/gnome/pixmaps/document-icons/gnome-image-rgb.png
+share/gnome/pixmaps/document-icons/gnome-image-svg.png
+share/gnome/pixmaps/document-icons/gnome-image-tga.png
+share/gnome/pixmaps/document-icons/gnome-image-tiff.png
+share/gnome/pixmaps/document-icons/gnome-image-x-3ds.png
+share/gnome/pixmaps/document-icons/gnome-image-x-applix-graphic.png
+share/gnome/pixmaps/document-icons/gnome-image-x-lwo.png
+share/gnome/pixmaps/document-icons/gnome-image-x-lws.png
+share/gnome/pixmaps/document-icons/gnome-image-x-xfig.png
+share/gnome/pixmaps/document-icons/gnome-image-xbm.png
+share/gnome/pixmaps/document-icons/gnome-image-xcf.png
+share/gnome/pixmaps/document-icons/gnome-image-xpm.png
+share/gnome/pixmaps/document-icons/gnome-image-xwd.png
+share/gnome/pixmaps/document-icons/gnome-library.png
+share/gnome/pixmaps/document-icons/gnome-objectfile.png
+share/gnome/pixmaps/document-icons/gnome-pack-deb.png
+share/gnome/pixmaps/document-icons/gnome-pack-rpm.png
+share/gnome/pixmaps/document-icons/gnome-package.png
+share/gnome/pixmaps/document-icons/gnome-tex.png
+share/gnome/pixmaps/document-icons/gnome-text-abiword.png
+share/gnome/pixmaps/document-icons/gnome-text-html.png
+share/gnome/pixmaps/document-icons/gnome-text-x-authors.png
+share/gnome/pixmaps/document-icons/gnome-text-x-c.png
+share/gnome/pixmaps/document-icons/gnome-text-x-copying.png
+share/gnome/pixmaps/document-icons/gnome-text-x-credits.png
+share/gnome/pixmaps/document-icons/gnome-text-x-haskell.png
+share/gnome/pixmaps/document-icons/gnome-text-x-install.png
+share/gnome/pixmaps/document-icons/gnome-text-x-literate-haskell.png
+share/gnome/pixmaps/document-icons/gnome-text-x-makefile.png
+share/gnome/pixmaps/document-icons/gnome-text-x-patch.png
+share/gnome/pixmaps/document-icons/gnome-text-x-perl.png
+share/gnome/pixmaps/document-icons/gnome-text-x-readme.png
+share/gnome/pixmaps/document-icons/gnome-text-x-sql.png
+share/gnome/pixmaps/document-icons/gnome-text-x-zsh.png
+share/gnome/pixmaps/document-icons/gnome-text-xml.png
+share/gnome/pixmaps/document-icons/gnome-textfile.png
+share/gnome/pixmaps/document-icons/gnome-video-mpeg.png
+share/gnome/pixmaps/document-icons/gnome-video-quicktime.png
+share/gnome/pixmaps/document-icons/gnome-video-x-ms-asf.png
+share/gnome/pixmaps/document-icons/gnome-video-x-ms-wmv.png
+share/gnome/pixmaps/document-icons/gnome-video-x-msvideo.png
+share/gnome/pixmaps/document-icons/gnome-x-font-afm.png
+share/gnome/pixmaps/document-icons/gnome-x-troff-man.png
+share/gnome/pixmaps/document-icons/i-blockdev.png
+share/gnome/pixmaps/document-icons/i-cdrom.png
+share/gnome/pixmaps/document-icons/i-chardev.png
+share/gnome/pixmaps/document-icons/i-core.png
+share/gnome/pixmaps/document-icons/i-executable.png
+share/gnome/pixmaps/document-icons/i-fifo.png
+share/gnome/pixmaps/document-icons/i-floppy.png
+share/gnome/pixmaps/document-icons/i-harddisk.png
+share/gnome/pixmaps/document-icons/i-manual.png
+share/gnome/pixmaps/document-icons/i-music-12.png
+share/gnome/pixmaps/document-icons/i-music-24.png
+share/gnome/pixmaps/document-icons/i-music-36.png
+share/gnome/pixmaps/document-icons/i-music.png
+share/gnome/pixmaps/document-icons/i-nfs.png
 share/locale/az/LC_MESSAGES/gnome-mime-data.mo
 share/locale/ca/LC_MESSAGES/gnome-mime-data.mo
 share/locale/da/LC_MESSAGES/gnome-mime-data.mo
 share/locale/de/LC_MESSAGES/gnome-mime-data.mo
 share/locale/el/LC_MESSAGES/gnome-mime-data.mo
 share/locale/es/LC_MESSAGES/gnome-mime-data.mo
+share/locale/et/LC_MESSAGES/gnome-mime-data.mo
 share/locale/fi/LC_MESSAGES/gnome-mime-data.mo
 share/locale/fr/LC_MESSAGES/gnome-mime-data.mo
 share/locale/ga/LC_MESSAGES/gnome-mime-data.mo
@@ -18,6 +165,7 @@ share/locale/it/LC_MESSAGES/gnome-mime-data.mo
 share/locale/ja/LC_MESSAGES/gnome-mime-data.mo
 share/locale/ko/LC_MESSAGES/gnome-mime-data.mo
 share/locale/lt/LC_MESSAGES/gnome-mime-data.mo
+share/locale/ms/LC_MESSAGES/gnome-mime-data.mo
 share/locale/nl/LC_MESSAGES/gnome-mime-data.mo
 share/locale/nn/LC_MESSAGES/gnome-mime-data.mo
 share/locale/no/LC_MESSAGES/gnome-mime-data.mo
@@ -32,5 +180,7 @@ share/locale/sv/LC_MESSAGES/gnome-mime-data.mo
 share/locale/tr/LC_MESSAGES/gnome-mime-data.mo
 share/locale/uk/LC_MESSAGES/gnome-mime-data.mo
 share/locale/wa/LC_MESSAGES/gnome-mime-data.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
-@dirrm share/gnome/application-registry
+@dirrm share/gnome/pixmaps/document-icons
+@dirrm share/gnome/mime-info