Rename this ports to use the real vendor package name. The advantage of this

is to allow our users' keyword search works and easier for users to file the
Bugzilla report when they use our name of ports. Debian, Gentoo, NetBSD and
other OSs have the correct package name, but not in our ports tree.

My team, FreeBSD GNOME Team, have agreed with it.

As for x11/gcursor, x11/gnome2 and x11/gnome2-lite chase the rename.

PR:		ports/97985
Repocopy by:	marcus

12 files changed, 6 insertions, 351 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 8bd44e2660ee..7cd52f7ab266 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -2424,11 +2424,11 @@ figlet		ports/misc/figlet
 figlet-fonts	ports/misc/figlet-fonts
 figurine	ports/graphics/figurine
 fiked		ports/security/fiked
+file-roller	ports/archivers/file-roller
 filedupe	ports/sysutils/filedupe
 filelight	ports/sysutils/filelight
 filepp		ports/textproc/filepp
 fileprune	ports/sysutils/fileprune
-fileroller	ports/archivers/fileroller
 filerunner	ports/x11-fm/filerunner
 fileschanged	ports/sysutils/fileschanged
 fillets-ng	ports/games/fillets-ng
diff --git a/MOVED b/MOVED
index c5ddb3fcbf27..119708c3ae25 100644
--- a/MOVED
+++ b/MOVED
@@ -2305,3 +2305,4 @@ deskutils/gnomeblog|deskutils/gnome-blog|2006-05-27|Renamed to use real vendor p
 deskutils/gnomepim|deskutils/gnome-pim|2006-05-27|Renamed to use real vendor package name
 devel/gnomebuild|devel/gnome-build|2006-05-27|Renamed to use real vendor package name
 devel/gnomecommon|devel/gnome-common|2006-05-27|Renamed to use real vendor package name
+archivers/fileroller|archivers/file-roller|2006-05-27|Renamed to use real vendor package name
diff --git a/archivers/Makefile b/archivers/Makefile
index 65fd45de6428..518f849566e2 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -21,7 +21,7 @@
     SUBDIR += dzip
     SUBDIR += ecm
     SUBDIR += fastjar
-    SUBDIR += fileroller
+    SUBDIR += file-roller
     SUBDIR += fpc-paszlib
     SUBDIR += freeze
     SUBDIR += gtar
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
deleted file mode 100644
index aa6a2611649c..000000000000
--- a/archivers/fileroller/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# New ports collection makefile for:	fileroller
-# Date created:				18 May 2002
-# Whom:					Anders Nordby <anders@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/archivers/fileroller/Makefile,v 1.95 2006/04/18 18:52:18 ahze Exp $
-#
-
-PORTNAME=	fileroller
-PORTVERSION=	2.14.2
-PORTEPOCH=	1
-CATEGORIES=	archivers gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/file-roller/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	file-roller-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An archive manager for zip files, tar, etc
-
-# XXX: We need the ports version of gtar since gtar-1.13.25 included with
-# FreeBSD is not sufficient.  If the base version of GNU tar is updated, then
-# we can do away with this dependency.
-RUN_DEPENDS=	${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-INSTALLS_OMF=	yes
-INSTALLS_ICONS=	yes
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \
-		gnomedocutils
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	file-roller.schemas
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/src/fr-command-tar.c
-	@${FIND} ${WRKSRC} -name "fr-command-*.c" | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|atoll|fr_atoll|g'
-
-post-install:
-	@-update-desktop-database
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in AUTHORS NEWS README TODO
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo
deleted file mode 100644
index e3f9c06aeb7f..000000000000
--- a/archivers/fileroller/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/file-roller-2.14.2.tar.bz2) = 4900dc4b2e4f0f173bd88cb5e6b9bde1
-SHA256 (gnome2/file-roller-2.14.2.tar.bz2) = 24592f04632d97c33b0b2950c4fd6467217a9ff6fdbd9058f643c11ed375382a
-SIZE (gnome2/file-roller-2.14.2.tar.bz2) = 1039404
diff --git a/archivers/fileroller/files/patch-src_file-utils.h b/archivers/fileroller/files/patch-src_file-utils.h
deleted file mode 100644
index d3223290fe1c..000000000000
--- a/archivers/fileroller/files/patch-src_file-utils.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/file-utils.h.orig	Sun Jul  3 19:11:59 2005
-+++ src/file-utils.h	Sun Jul  3 19:12:52 2005
-@@ -25,8 +25,13 @@
- 
- #include <sys/types.h>
- #include <time.h>
-+#include <stdlib.h>
-+#include <limits.h>
- #include <libgnomevfs/gnome-vfs-file-size.h>
- #include <libgnomevfs/gnome-vfs-mime-handlers.h>
-+
-+#undef fr_atoll
-+#define fr_atoll(nptr) strtoll(nptr, (char **)NULL, 10)
- 
- 
- #define FILENAME_MAX_LENGTH 30 /* FIXME: find out the best value */
diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c
deleted file mode 100644
index c4e3bac836f0..000000000000
--- a/archivers/fileroller/files/patch-src_fr-command-tar.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/fr-command-tar.c.orig	Fri Jul  1 14:41:32 2005
-+++ src/fr-command-tar.c	Sun Jul  3 19:03:01 2005
-@@ -222,6 +223,10 @@ begin_tar_command (FRCommand *comm)
- #if defined (__SVR4) && defined (__sun)
- 	if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
- 		command = g_strdup ("/usr/sfw/bin/gtar");
-+	}
-+#elif defined(__FreeBSD__)
-+	if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
-+		command = g_strdup ("%%LOCALBASE%%/bin/gtar");
- 	}
- #endif
- 	if (command != NULL)
diff --git a/archivers/fileroller/pkg-descr b/archivers/fileroller/pkg-descr
deleted file mode 100644
index 703a89829953..000000000000
--- a/archivers/fileroller/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-File Roller is an archive manager for the GNOME environment.  It is only a
-front-end (a graphical interface) to archiving programs like tar and zip.
-The supported file types are:
-
-* Tar archives uncompressed (.tar) or compressed with gzip (.tar.gz , .tgz),
-  bzip (.tar.bz , .tbz), bzip2 (.tar.bz2 , .tbz2), compress (.tar.Z , .taz),
-  lzop (.tar.lzo , .tzo)
-* Zip archives (.zip)
-* Jar archives (.jar , .ear , .war)
-* Lha archives (.lzh)
-* Rar archives (.rar)
-* Single files compressed with gzip, bzip, bzip2, compress, lzop
- 
-File Roller also has a document viewer based on bonobo that lets you view files
-of any type for which you have a viewer.
-
-Former WinZip users may find this program useful.  It serves the same purpose.
-
-WWW: http://fileroller.sourceforge.net/
-
-- Anders Nordby <anders@FreeBSD.org>
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
deleted file mode 100644
index f7bebfbc5434..000000000000
--- a/archivers/fileroller/pkg-plist
+++ /dev/null
@@ -1,238 +0,0 @@
-bin/file-roller
-lib/nautilus/extensions-1.0/libnautilus-fileroller.a
-lib/nautilus/extensions-1.0/libnautilus-fileroller.la
-lib/nautilus/extensions-1.0/libnautilus-fileroller.so
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/file-roller.desktop
-share/gnome/file-roller/glade/file-roller-extract.glade
-share/gnome/file-roller/glade/file-roller.glade
-share/gnome/help/file-roller/C/figures/file-roller_home.png
-share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/C/figures/file-roller_main_window.png
-share/gnome/help/file-roller/C/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/C/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/C/file-roller.xml
-share/gnome/help/file-roller/C/legal.xml
-share/gnome/help/file-roller/bg/figures/file-roller_home.png
-share/gnome/help/file-roller/bg/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/bg/figures/file-roller_main_window.png
-share/gnome/help/file-roller/bg/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/bg/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/bg/file-roller.xml
-share/gnome/help/file-roller/de/figures/file-roller_home.png
-share/gnome/help/file-roller/de/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/de/figures/file-roller_main_window.png
-share/gnome/help/file-roller/de/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/de/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/de/file-roller.xml
-share/gnome/help/file-roller/es/figures/file-roller_home.png
-share/gnome/help/file-roller/es/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/es/figures/file-roller_main_window.png
-share/gnome/help/file-roller/es/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/es/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/es/file-roller.xml
-share/gnome/help/file-roller/fr/figures/file-roller_home.png
-share/gnome/help/file-roller/fr/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/fr/figures/file-roller_main_window.png
-share/gnome/help/file-roller/fr/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/fr/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/fr/file-roller.xml
-share/gnome/help/file-roller/it/figures/file-roller_home.png
-share/gnome/help/file-roller/it/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/it/figures/file-roller_main_window.png
-share/gnome/help/file-roller/it/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/it/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/it/file-roller.xml
-share/gnome/help/file-roller/ja/figures/file-roller_home.png
-share/gnome/help/file-roller/ja/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/ja/figures/file-roller_main_window.png
-share/gnome/help/file-roller/ja/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/ja/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/ja/file-roller.xml
-share/gnome/help/file-roller/ko/figures/file-roller_home.png
-share/gnome/help/file-roller/ko/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/ko/figures/file-roller_main_window.png
-share/gnome/help/file-roller/ko/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/ko/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/ko/file-roller.xml
-share/gnome/help/file-roller/ru/figures/file-roller_home.png
-share/gnome/help/file-roller/ru/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/ru/figures/file-roller_main_window.png
-share/gnome/help/file-roller/ru/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/ru/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/ru/file-roller.xml
-share/gnome/help/file-roller/sv/figures/file-roller_home.png
-share/gnome/help/file-roller/sv/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/sv/figures/file-roller_main_window.png
-share/gnome/help/file-roller/sv/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/sv/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/sv/file-roller.xml
-share/gnome/help/file-roller/uk/figures/file-roller_home.png
-share/gnome/help/file-roller/uk/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/uk/figures/file-roller_main_window.png
-share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/uk/file-roller.xml
-share/gnome/help/file-roller/zh_CN/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_CN/file-roller.xml
-share/gnome/help/file-roller/zh_HK/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_HK/file-roller.xml
-share/gnome/help/file-roller/zh_TW/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_TW/file-roller.xml
-share/gnome/omf/file-roller/file-roller-C.omf
-share/gnome/omf/file-roller/file-roller-bg.omf
-share/gnome/omf/file-roller/file-roller-de.omf
-share/gnome/omf/file-roller/file-roller-es.omf
-share/gnome/omf/file-roller/file-roller-fr.omf
-share/gnome/omf/file-roller/file-roller-it.omf
-share/gnome/omf/file-roller/file-roller-ja.omf
-share/gnome/omf/file-roller/file-roller-ko.omf
-share/gnome/omf/file-roller/file-roller-ru.omf
-share/gnome/omf/file-roller/file-roller-sv.omf
-share/gnome/omf/file-roller/file-roller-uk.omf
-share/gnome/omf/file-roller/file-roller-zh_CN.omf
-share/gnome/omf/file-roller/file-roller-zh_HK.omf
-share/gnome/omf/file-roller/file-roller-zh_TW.omf
-share/icons/hicolor/48x48/apps/file-roller.png
-share/locale/am/LC_MESSAGES/file-roller.mo
-share/locale/ar/LC_MESSAGES/file-roller.mo
-share/locale/az/LC_MESSAGES/file-roller.mo
-share/locale/be/LC_MESSAGES/file-roller.mo
-share/locale/bg/LC_MESSAGES/file-roller.mo
-share/locale/bn/LC_MESSAGES/file-roller.mo
-share/locale/br/LC_MESSAGES/file-roller.mo
-share/locale/bs/LC_MESSAGES/file-roller.mo
-share/locale/ca/LC_MESSAGES/file-roller.mo
-share/locale/cs/LC_MESSAGES/file-roller.mo
-share/locale/cy/LC_MESSAGES/file-roller.mo
-share/locale/da/LC_MESSAGES/file-roller.mo
-share/locale/de/LC_MESSAGES/file-roller.mo
-share/locale/dz/LC_MESSAGES/file-roller.mo
-share/locale/el/LC_MESSAGES/file-roller.mo
-share/locale/en_CA/LC_MESSAGES/file-roller.mo
-share/locale/en_GB/LC_MESSAGES/file-roller.mo
-share/locale/es/LC_MESSAGES/file-roller.mo
-share/locale/et/LC_MESSAGES/file-roller.mo
-share/locale/eu/LC_MESSAGES/file-roller.mo
-share/locale/fa/LC_MESSAGES/file-roller.mo
-share/locale/fi/LC_MESSAGES/file-roller.mo
-share/locale/fr/LC_MESSAGES/file-roller.mo
-share/locale/ga/LC_MESSAGES/file-roller.mo
-share/locale/gl/LC_MESSAGES/file-roller.mo
-share/locale/gu/LC_MESSAGES/file-roller.mo
-share/locale/he/LC_MESSAGES/file-roller.mo
-share/locale/hi/LC_MESSAGES/file-roller.mo
-share/locale/hr/LC_MESSAGES/file-roller.mo
-share/locale/hu/LC_MESSAGES/file-roller.mo
-share/locale/hy/LC_MESSAGES/file-roller.mo
-share/locale/id/LC_MESSAGES/file-roller.mo
-share/locale/is/LC_MESSAGES/file-roller.mo
-share/locale/it/LC_MESSAGES/file-roller.mo
-share/locale/ja/LC_MESSAGES/file-roller.mo
-share/locale/ka/LC_MESSAGES/file-roller.mo
-share/locale/kn/LC_MESSAGES/file-roller.mo
-share/locale/ko/LC_MESSAGES/file-roller.mo
-share/locale/ku/LC_MESSAGES/file-roller.mo
-share/locale/lt/LC_MESSAGES/file-roller.mo
-share/locale/lv/LC_MESSAGES/file-roller.mo
-share/locale/mk/LC_MESSAGES/file-roller.mo
-share/locale/ml/LC_MESSAGES/file-roller.mo
-share/locale/mn/LC_MESSAGES/file-roller.mo
-share/locale/ms/LC_MESSAGES/file-roller.mo
-share/locale/nb/LC_MESSAGES/file-roller.mo
-share/locale/ne/LC_MESSAGES/file-roller.mo
-share/locale/nl/LC_MESSAGES/file-roller.mo
-share/locale/nn/LC_MESSAGES/file-roller.mo
-share/locale/pa/LC_MESSAGES/file-roller.mo
-share/locale/pl/LC_MESSAGES/file-roller.mo
-share/locale/pt/LC_MESSAGES/file-roller.mo
-share/locale/pt_BR/LC_MESSAGES/file-roller.mo
-share/locale/ro/LC_MESSAGES/file-roller.mo
-share/locale/ru/LC_MESSAGES/file-roller.mo
-share/locale/rw/LC_MESSAGES/file-roller.mo
-share/locale/sk/LC_MESSAGES/file-roller.mo
-share/locale/sl/LC_MESSAGES/file-roller.mo
-share/locale/sq/LC_MESSAGES/file-roller.mo
-share/locale/sr/LC_MESSAGES/file-roller.mo
-share/locale/sr@Latn/LC_MESSAGES/file-roller.mo
-share/locale/sr@ije/LC_MESSAGES/file-roller.mo
-share/locale/sv/LC_MESSAGES/file-roller.mo
-share/locale/ta/LC_MESSAGES/file-roller.mo
-share/locale/te/LC_MESSAGES/file-roller.mo
-share/locale/th/LC_MESSAGES/file-roller.mo
-share/locale/tk/LC_MESSAGES/file-roller.mo
-share/locale/tr/LC_MESSAGES/file-roller.mo
-share/locale/uk/LC_MESSAGES/file-roller.mo
-share/locale/vi/LC_MESSAGES/file-roller.mo
-share/locale/xh/LC_MESSAGES/file-roller.mo
-share/locale/zh_CN/LC_MESSAGES/file-roller.mo
-share/locale/zh_HK/LC_MESSAGES/file-roller.mo
-share/locale/zh_TW/LC_MESSAGES/file-roller.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/omf/file-roller
-@dirrm share/gnome/help/file-roller/zh_TW/figures
-@dirrm share/gnome/help/file-roller/zh_TW
-@dirrm share/gnome/help/file-roller/zh_HK/figures
-@dirrm share/gnome/help/file-roller/zh_HK
-@dirrm share/gnome/help/file-roller/zh_CN/figures
-@dirrm share/gnome/help/file-roller/zh_CN
-@dirrm share/gnome/help/file-roller/uk/figures
-@dirrm share/gnome/help/file-roller/uk
-@dirrm share/gnome/help/file-roller/sv/figures
-@dirrm share/gnome/help/file-roller/sv
-@dirrm share/gnome/help/file-roller/ru/figures
-@dirrm share/gnome/help/file-roller/ru
-@dirrm share/gnome/help/file-roller/ko/figures
-@dirrm share/gnome/help/file-roller/ko
-@dirrm share/gnome/help/file-roller/ja/figures
-@dirrm share/gnome/help/file-roller/ja
-@dirrm share/gnome/help/file-roller/it/figures
-@dirrm share/gnome/help/file-roller/it
-@dirrm share/gnome/help/file-roller/fr/figures
-@dirrm share/gnome/help/file-roller/fr
-@dirrm share/gnome/help/file-roller/es/figures
-@dirrm share/gnome/help/file-roller/es
-@dirrm share/gnome/help/file-roller/de/figures
-@dirrm share/gnome/help/file-roller/de
-@dirrm share/gnome/help/file-roller/bg/figures
-@dirrm share/gnome/help/file-roller/bg
-@dirrm share/gnome/help/file-roller/C/figures
-@dirrm share/gnome/help/file-roller/C
-@dirrm share/gnome/help/file-roller
-@dirrm share/gnome/file-roller/glade
-@dirrm share/gnome/file-roller
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/x11/gcursor/Makefile b/x11/gcursor/Makefile
index 9fc98d409732..c22c5bd16a9e 100644
--- a/x11/gcursor/Makefile
+++ b/x11/gcursor/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://download.qballcow.nl/programs/gcursor/
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A mouse cursor theme selector for GNOME
 
-RUN_DEPENDS=	file-roller:${PORTSDIR}/archivers/fileroller
+RUN_DEPENDS=	file-roller:${PORTSDIR}/archivers/file-roller
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 906590c8b629..f7be6aa0fd1f 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
 		yelp:${PORTSDIR}/x11/yelp \
 		${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \
 		${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \
-		file-roller:${PORTSDIR}/archivers/fileroller \
+		file-roller:${PORTSDIR}/archivers/file-roller \
 		${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
 		evince:${PORTSDIR}/graphics/evince \
 		gcalctool:${PORTSDIR}/math/gcalctool \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index ace0debec7d6..6dec88100ebd 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -34,7 +34,7 @@ RUN_DEPENDS?=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
 		${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \
 		${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \
 		${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \
-		file-roller:${PORTSDIR}/archivers/fileroller \
+		file-roller:${PORTSDIR}/archivers/file-roller \
 		${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
 		gok:${PORTSDIR}/accessibility/gok \
 		nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \