- Rename port

  misc/gnomemimedata --> misc/gnome-mime-data

10 files changed, 6 insertions, 136 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 57eeaa1659c0..6b0a276cf1ae 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -3252,6 +3252,7 @@ gnome-mag	ports/accessibility/gnome-mag
 gnome-media	ports/audio/gnome-media
 gnome-menu-editor	ports/deskutils/gnome-menu-editor
 gnome-menus	ports/x11/gnome-menus
+gnome-mime-data	ports/misc/gnome-mime-data
 gnome-mud	ports/net/gnome-mud
 gnome-music-quiz	ports/games/gnome-music-quiz
 gnome-osd	ports/misc/gnome-osd
@@ -3302,7 +3303,6 @@ gnomekiss	ports/games/gnomekiss
 gnomelibs	ports/x11/gnomelibs
 gnomemeeting	ports/net/gnomemeeting
 gnomememoryblocks	ports/games/gnomememoryblocks
-gnomemimedata	ports/misc/gnomemimedata
 gnomemm		ports/x11-toolkits/gnomemm
 gnomenetstatus	ports/net/gnomenetstatus
 gnomenettool	ports/net/gnomenettool
diff --git a/MOVED b/MOVED
index 64f41a1c4810..695f188410b4 100644
--- a/MOVED
+++ b/MOVED
@@ -2315,3 +2315,4 @@ devel/py-orbit2|devel/py-orbit|2006-05-28|Renamed to use real vendor package nam
 games/gcompris2|games/gcompris|2006-05-28|Renamed to use real vendor package name
 games/gnomegames2|games/gnome-games|2006-05-28|Renamed to use real vendor package name
 irc/xchat2|irc/xchat|2006-05-28|Use unversioned name for latest version
+misc/gnomemimedata|misc/gnome-mime-data|2006-05-28|Renamed to use real vendor package name
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index d0e25c273a65..507485a9c953 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -188,8 +188,8 @@ oaf_DETECT=		${OAF_CONFIG}
 oaf_USE_GNOME_IMPL=	glib12 orbit libxml
 
 gnomemimedata_DETECT=	${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc
-gnomemimedata_BUILD_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnomemimedata
-gnomemimedata_RUN_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnomemimedata
+gnomemimedata_BUILD_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnome-mime-data
+gnomemimedata_RUN_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnome-mime-data
 gnomemimedata_USE_GNOME_IMPL=gnomehier pkgconfig
 
 GCONF_CONFIG?=		${X11BASE}/bin/gconf-config
diff --git a/misc/Makefile b/misc/Makefile
index 2a28d3a366e9..48e0c03682e8 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -118,9 +118,9 @@
     SUBDIR += gkx86info2
     SUBDIR += gman
     SUBDIR += gnome-icon-theme
+    SUBDIR += gnome-mime-data
     SUBDIR += gnome-osd
     SUBDIR += gnomehier
-    SUBDIR += gnomemimedata
     SUBDIR += gnomesword
     SUBDIR += gnomeuserdocs2
     SUBDIR += gnu-watch
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index 8c1b9bcaba95..bd960f58f774 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomemimedata
+PORTNAME=	gnome-mime-data
 PORTVERSION=	2.4.2
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile
deleted file mode 100644
index 8c1b9bcaba95..000000000000
--- a/misc/gnomemimedata/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:	gnomemimedata
-# Date created:				22 January 2002
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomemimedata
-PORTVERSION=	2.4.2
-CATEGORIES=	misc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-mime-data/2.4
-DISTNAME=	gnome-mime-data-${PORTVERSION}
-DIST_SUBDIR=	gnome
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A MIME and Application database for GNOME
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomehier intlhack gnomeprefix gnometarget pkgconfig
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
-
-.include <bsd.port.mk>
diff --git a/misc/gnomemimedata/distinfo b/misc/gnomemimedata/distinfo
deleted file mode 100644
index b6e5511b95b9..000000000000
--- a/misc/gnomemimedata/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome/gnome-mime-data-2.4.2.tar.bz2) = 37242776b08625fa10c73c18b790e552
-SHA256 (gnome/gnome-mime-data-2.4.2.tar.bz2) = e8ee6534bd142ee0ed55134a5eb95f6e7f4b8640df2d3669ebd202f6d82f9a0d
-SIZE (gnome/gnome-mime-data-2.4.2.tar.bz2) = 849716
diff --git a/misc/gnomemimedata/files/patch-gnome-vfs.applications b/misc/gnomemimedata/files/patch-gnome-vfs.applications
deleted file mode 100644
index ef57a10cbfc6..000000000000
--- a/misc/gnomemimedata/files/patch-gnome-vfs.applications
+++ /dev/null
@@ -1,18 +0,0 @@
---- gnome-vfs.applications.orig	Mon Dec 22 19:56:33 2003
-+++ gnome-vfs.applications	Thu Apr  8 19:50:18 2004
-@@ -1,5 +1,5 @@
- abiword
--	command=AbiWord-2.0
-+	command=abiword
- 	name=AbiWord
- 	can_open_multiple_files=true
- 	expects_uris=false
-@@ -55,7 +55,7 @@
- 	mime_types=application/x-deb
- 
- electric_eyes
--	command=ee
-+	command=ElectricEyes
- 	name=Electric Eyes
- 	can_open_multiple_files=true
- 	expects_uris=false
diff --git a/misc/gnomemimedata/pkg-descr b/misc/gnomemimedata/pkg-descr
deleted file mode 100644
index 349bb253a59c..000000000000
--- a/misc/gnomemimedata/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-The base MIME and Application database for GNOME. It is meant to be accessed
-through the MIME functions in GnomeVFS
-
-WWW: http://www.gnome.org/
diff --git a/misc/gnomemimedata/pkg-plist b/misc/gnomemimedata/pkg-plist
deleted file mode 100644
index a7b6babf339e..000000000000
--- a/misc/gnomemimedata/pkg-plist
+++ /dev/null
@@ -1,79 +0,0 @@
-etc/gnome-vfs-mime-magic
-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/locale/af/LC_MESSAGES/gnome-mime-data.mo
-share/locale/am/LC_MESSAGES/gnome-mime-data.mo
-share/locale/ar/LC_MESSAGES/gnome-mime-data.mo
-share/locale/az/LC_MESSAGES/gnome-mime-data.mo
-share/locale/be/LC_MESSAGES/gnome-mime-data.mo
-share/locale/bg/LC_MESSAGES/gnome-mime-data.mo
-share/locale/bn/LC_MESSAGES/gnome-mime-data.mo
-share/locale/bs/LC_MESSAGES/gnome-mime-data.mo
-share/locale/ca/LC_MESSAGES/gnome-mime-data.mo
-share/locale/cs/LC_MESSAGES/gnome-mime-data.mo
-share/locale/cy/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/en_CA/LC_MESSAGES/gnome-mime-data.mo
-share/locale/en_GB/LC_MESSAGES/gnome-mime-data.mo
-share/locale/eo/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/eu/LC_MESSAGES/gnome-mime-data.mo
-share/locale/fa/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
-share/locale/gl/LC_MESSAGES/gnome-mime-data.mo
-share/locale/gu/LC_MESSAGES/gnome-mime-data.mo
-share/locale/he/LC_MESSAGES/gnome-mime-data.mo
-share/locale/hi/LC_MESSAGES/gnome-mime-data.mo
-share/locale/hr/LC_MESSAGES/gnome-mime-data.mo
-share/locale/hu/LC_MESSAGES/gnome-mime-data.mo
-share/locale/id/LC_MESSAGES/gnome-mime-data.mo
-share/locale/is/LC_MESSAGES/gnome-mime-data.mo
-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/li/LC_MESSAGES/gnome-mime-data.mo
-share/locale/lt/LC_MESSAGES/gnome-mime-data.mo
-share/locale/lv/LC_MESSAGES/gnome-mime-data.mo
-share/locale/mk/LC_MESSAGES/gnome-mime-data.mo
-share/locale/ml/LC_MESSAGES/gnome-mime-data.mo
-share/locale/mn/LC_MESSAGES/gnome-mime-data.mo
-share/locale/ms/LC_MESSAGES/gnome-mime-data.mo
-share/locale/nb/LC_MESSAGES/gnome-mime-data.mo
-share/locale/ne/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
-share/locale/pa/LC_MESSAGES/gnome-mime-data.mo
-share/locale/pl/LC_MESSAGES/gnome-mime-data.mo
-share/locale/pt/LC_MESSAGES/gnome-mime-data.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-mime-data.mo
-share/locale/ro/LC_MESSAGES/gnome-mime-data.mo
-share/locale/ru/LC_MESSAGES/gnome-mime-data.mo
-share/locale/sk/LC_MESSAGES/gnome-mime-data.mo
-share/locale/sl/LC_MESSAGES/gnome-mime-data.mo
-share/locale/sq/LC_MESSAGES/gnome-mime-data.mo
-share/locale/sr/LC_MESSAGES/gnome-mime-data.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-mime-data.mo
-share/locale/sr@ije/LC_MESSAGES/gnome-mime-data.mo
-share/locale/sv/LC_MESSAGES/gnome-mime-data.mo
-share/locale/ta/LC_MESSAGES/gnome-mime-data.mo
-share/locale/th/LC_MESSAGES/gnome-mime-data.mo
-share/locale/tk/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/vi/LC_MESSAGES/gnome-mime-data.mo
-share/locale/wa/LC_MESSAGES/gnome-mime-data.mo
-share/locale/yi/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
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/yi/LC_MESSAGES
-@dirrmtry share/locale/yi