10 files changed, 8 insertions, 109 deletions

diff --git a/MOVED b/MOVED
index 6874b481a546..3df58037dbda 100644
--- a/MOVED
+++ b/MOVED
@@ -2332,3 +2332,4 @@ sysutils/gnomecontrolcenter2|sysutils/gnome-control-center|2006-05-28|Renamed to
 sysutils/gnomesystemmonitor|sysutils/gnome-system-monitor|2006-05-28|Renamed to use real vendor package name
 sysutils/gnomesystemtools|sysutils/gnome-system-tools|2006-05-28|Renamed to use real vendor package name
 textproc/gnomedocutils|textproc/gnome-doc-utils|2006-05-28|Renamed to use real vendor package name
+textproc/gnomespell|textproc/gnome-spell|2006-05-28|Renamed to use real vendor package name
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index fb6efaf096c4..091d95239b00 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An integrated mail, calendar and address book distributed suite
 
 LIB_DEPENDS=	nss3.1:${PORTSDIR}/security/nss
-RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
+RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/misc/gnomesword/Makefile b/misc/gnomesword/Makefile
index 584177322ba1..6ab62306b5b6 100644
--- a/misc/gnomesword/Makefile
+++ b/misc/gnomesword/Makefile
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	dboudrot@yahoo.com
 COMMENT=	A bible interface utilizing the sword framework
 
-BUILD_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
+BUILD_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
 LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
-RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
+RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
 
 BROKEN=		Configure fails
 
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 584177322ba1..6ab62306b5b6 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	dboudrot@yahoo.com
 COMMENT=	A bible interface utilizing the sword framework
 
-BUILD_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
+BUILD_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
 LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
-RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnomespell
+RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
 
 BROKEN=		Configure fails
 
diff --git a/textproc/Makefile b/textproc/Makefile
index deb4de41ac08..cf5edeb8acd9 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -145,8 +145,8 @@
     SUBDIR += gmat
     SUBDIR += gmetadom
     SUBDIR += gnome-doc-utils
+    SUBDIR += gnome-spell
     SUBDIR += gnome-translate
-    SUBDIR += gnomespell
     SUBDIR += google-ctemplate
     SUBDIR += gpp
     SUBDIR += grap
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index a8aa5e2da70d..6a57a79f0dac 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomespell
+PORTNAME=	gnome-spell
 PORTVERSION=	1.0.7
 PORTREVISION=	1
 CATEGORIES=	textproc gnome
diff --git a/textproc/gnomespell/Makefile b/textproc/gnomespell/Makefile
deleted file mode 100644
index a8aa5e2da70d..000000000000
--- a/textproc/gnomespell/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:	gnomespell
-# Date created:				29 December 2001
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomespell
-PORTVERSION=	1.0.7
-PORTREVISION=	1
-CATEGORIES=	textproc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-spell/1.0
-DISTNAME=	gnome-spell-${PORTVERSION}
-DIST_SUBDIR=	gnome
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A GNOME/Bonobo component for spell checking
-
-LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_PERL5=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
-USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-PLIST_SUB=	VERSION=${PORTVERSION}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|@mkdir_p@|mkdir -p|g' \
-		${WRKSRC}/po/Makefile.in.in
-
-.include <bsd.port.mk>
diff --git a/textproc/gnomespell/distinfo b/textproc/gnomespell/distinfo
deleted file mode 100644
index 47e05f752f02..000000000000
--- a/textproc/gnomespell/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome/gnome-spell-1.0.7.tar.bz2) = da3ad2c664afd06a0c56c84d5055f8ad
-SHA256 (gnome/gnome-spell-1.0.7.tar.bz2) = 6f3117635267acd29bb934bd6e588c58a8f5643fcaf41310d6633c2d7909f5f6
-SIZE (gnome/gnome-spell-1.0.7.tar.bz2) = 331063
diff --git a/textproc/gnomespell/pkg-descr b/textproc/gnomespell/pkg-descr
deleted file mode 100644
index 10f0e6faa6bf..000000000000
--- a/textproc/gnomespell/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Gnome Spell is GNOME/Bonobo component for spell-checking.
-
-WWW: http://www.gnome.org/
diff --git a/textproc/gnomespell/pkg-plist b/textproc/gnomespell/pkg-plist
deleted file mode 100644
index b06e57d5d1ac..000000000000
--- a/textproc/gnomespell/pkg-plist
+++ /dev/null
@@ -1,59 +0,0 @@
-lib/gnome-spell/libgnome-spell-component-0.3.so
-lib/gnome-spell/libgnome-spell-component.a
-lib/gnome-spell/libgnome-spell-component.la
-lib/gnome-spell/libgnome-spell-component.so
-libdata/bonobo/servers/GNOME_Spell.server
-share/gnome/control-center-2.0/icons/spell-checker.png
-share/gnome/gnome-spell-%%VERSION%%/spell-checker.glade
-share/gnome/idl/Spell-%%VERSION%%.idl
-share/locale/am/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/az/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/be/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/bg/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/ca/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/da/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/de/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/el/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/fi/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/ga/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/gl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/he/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/hr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/kn/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/lt/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/lv/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/nb/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/ne/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/pa/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/ru/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/rw/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/sk/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/sq/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/ta/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/tr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/vi/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/wa/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/xh/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-@dirrmtry share/gnome/control-center-2.0/icons 2>/dev/null
-@dirrmtry share/gnome/control-center-2.0
-@dirrm share/gnome/gnome-spell-%%VERSION%%
-@dirrm lib/gnome-spell