- Rename port misc/gnomeuserdocs2 -> misc/gnome-user-docs

9 files changed, 5 insertions, 367 deletions

diff --git a/MOVED b/MOVED
index 1df233a0ac8c..413da31c5cd6 100644
--- a/MOVED
+++ b/MOVED
@@ -2317,3 +2317,4 @@ games/gnomegames2|games/gnome-games|2006-05-28|Renamed to use real vendor packag
 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
 games/gnomegames2-extra-data|games/gnome-games-extra-data|2006-05-28|Renamed to use real vendor package name
+misc/gnomeuserdocs2|misc/gnome-user-docs|2006-05-28|Renamed to use real vendor package name
diff --git a/misc/Makefile b/misc/Makefile
index 48e0c03682e8..a7610172cd38 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -120,9 +120,9 @@
     SUBDIR += gnome-icon-theme
     SUBDIR += gnome-mime-data
     SUBDIR += gnome-osd
+    SUBDIR += gnome-user-docs
     SUBDIR += gnomehier
     SUBDIR += gnomesword
-    SUBDIR += gnomeuserdocs2
     SUBDIR += gnu-watch
     SUBDIR += gnuls
     SUBDIR += gnustep-examples
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 6c6e620de1da..f0c5ee17a59a 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.25 2006/04/13 07:52:36 bland Exp $
 #
 
-PORTNAME=	gnomeuserdocs2
+PORTNAME=	gnome-user-docs
 PORTVERSION=	2.14.2
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/misc/gnomeuserdocs2/Makefile b/misc/gnomeuserdocs2/Makefile
deleted file mode 100644
index 6c6e620de1da..000000000000
--- a/misc/gnomeuserdocs2/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for:	gnomeuserdocs2
-# Date created:        			07 July 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/misc/gnomeuserdocs2/Makefile,v 1.25 2006/04/13 07:52:36 bland Exp $
-#
-
-PORTNAME=	gnomeuserdocs2
-PORTVERSION=	2.14.2
-CATEGORIES=	misc gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-user-docs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-user-docs-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 2 users guide
-
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier gnometarget gnomedocutils
-
-.include <bsd.port.mk>
diff --git a/misc/gnomeuserdocs2/distinfo b/misc/gnomeuserdocs2/distinfo
deleted file mode 100644
index dad066c40925..000000000000
--- a/misc/gnomeuserdocs2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-user-docs-2.14.2.tar.bz2) = 4f5a7114ccf9e4e31137da50b7333570
-SHA256 (gnome2/gnome-user-docs-2.14.2.tar.bz2) = e055b6a7cb4c3c9e3a27c27c0c8d09f74de81918b3b036dbbcb7a754cb6fb790
-SIZE (gnome2/gnome-user-docs-2.14.2.tar.bz2) = 2024845
diff --git a/misc/gnomeuserdocs2/pkg-descr b/misc/gnomeuserdocs2/pkg-descr
deleted file mode 100644
index 0ed2fb1bc819..000000000000
--- a/misc/gnomeuserdocs2/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-User documentation for the GNOME 2 desktop.
diff --git a/misc/gnomeuserdocs2/pkg-plist b/misc/gnomeuserdocs2/pkg-plist
deleted file mode 100644
index 6ec699b35039..000000000000
--- a/misc/gnomeuserdocs2/pkg-plist
+++ /dev/null
@@ -1,329 +0,0 @@
-share/gnome/help/gnome-access-guide/C/accessintro.xml
-share/gnome/help/gnome-access-guide/C/ats.xml
-share/gnome/help/gnome-access-guide/C/dtconfig.xml
-share/gnome/help/gnome-access-guide/C/figures/accessx.png
-share/gnome/help/gnome-access-guide/C/figures/bouncekeys.png
-share/gnome/help/gnome-access-guide/C/figures/button.png
-share/gnome/help/gnome-access-guide/C/figures/check_box.png
-share/gnome/help/gnome-access-guide/C/figures/dropdown_combination_box.png
-share/gnome/help/gnome-access-guide/C/figures/dropdown_list_box.png
-share/gnome/help/gnome-access-guide/C/figures/mousekeys.png
-share/gnome/help/gnome-access-guide/C/figures/move_object_arrows.png
-share/gnome/help/gnome-access-guide/C/figures/move_object_before.png
-share/gnome/help/gnome-access-guide/C/figures/move_object_jump.png
-share/gnome/help/gnome-access-guide/C/figures/move_object_push.png
-share/gnome/help/gnome-access-guide/C/figures/radio_button.png
-share/gnome/help/gnome-access-guide/C/figures/slider.png
-share/gnome/help/gnome-access-guide/C/figures/slowkeys.png
-share/gnome/help/gnome-access-guide/C/figures/spin_box.png
-share/gnome/help/gnome-access-guide/C/figures/stickyaltlatch.png
-share/gnome/help/gnome-access-guide/C/figures/stickyaltlock.png
-share/gnome/help/gnome-access-guide/C/figures/stickyctrllatch.png
-share/gnome/help/gnome-access-guide/C/figures/stickyctrllock.png
-share/gnome/help/gnome-access-guide/C/figures/stickyshiftlatch.png
-share/gnome/help/gnome-access-guide/C/figures/stickyshiftlock.png
-share/gnome/help/gnome-access-guide/C/figures/stickywindowlatch.png
-share/gnome/help/gnome-access-guide/C/figures/stickywindowlock.png
-share/gnome/help/gnome-access-guide/C/figures/tabbed_section.png
-share/gnome/help/gnome-access-guide/C/figures/text_box.png
-share/gnome/help/gnome-access-guide/C/figures/tree.png
-share/gnome/help/gnome-access-guide/C/gnome-access-guide.xml
-share/gnome/help/gnome-access-guide/C/keynav.xml
-share/gnome/help/gnome-access-guide/C/legal.xml
-share/gnome/help/gnome-access-guide/C/preface.xml
-share/gnome/help/gnome-access-guide/C/sysadmin.xml
-share/gnome/help/gnome-access-guide/C/themes.xml
-share/gnome/help/gnome-access-guide/it/figures/accessx.png
-share/gnome/help/gnome-access-guide/it/figures/bouncekeys.png
-share/gnome/help/gnome-access-guide/it/figures/button.png
-share/gnome/help/gnome-access-guide/it/figures/check_box.png
-share/gnome/help/gnome-access-guide/it/figures/dropdown_combination_box.png
-share/gnome/help/gnome-access-guide/it/figures/dropdown_list_box.png
-share/gnome/help/gnome-access-guide/it/figures/mousekeys.png
-share/gnome/help/gnome-access-guide/it/figures/move_object_arrows.png
-share/gnome/help/gnome-access-guide/it/figures/move_object_before.png
-share/gnome/help/gnome-access-guide/it/figures/move_object_jump.png
-share/gnome/help/gnome-access-guide/it/figures/move_object_push.png
-share/gnome/help/gnome-access-guide/it/figures/radio_button.png
-share/gnome/help/gnome-access-guide/it/figures/slider.png
-share/gnome/help/gnome-access-guide/it/figures/slowkeys.png
-share/gnome/help/gnome-access-guide/it/figures/spin_box.png
-share/gnome/help/gnome-access-guide/it/figures/stickyaltlatch.png
-share/gnome/help/gnome-access-guide/it/figures/stickyaltlock.png
-share/gnome/help/gnome-access-guide/it/figures/stickyctrllatch.png
-share/gnome/help/gnome-access-guide/it/figures/stickyctrllock.png
-share/gnome/help/gnome-access-guide/it/figures/stickyshiftlatch.png
-share/gnome/help/gnome-access-guide/it/figures/stickyshiftlock.png
-share/gnome/help/gnome-access-guide/it/figures/stickywindowlatch.png
-share/gnome/help/gnome-access-guide/it/figures/stickywindowlock.png
-share/gnome/help/gnome-access-guide/it/figures/tabbed_section.png
-share/gnome/help/gnome-access-guide/it/figures/text_box.png
-share/gnome/help/gnome-access-guide/it/figures/tree.png
-share/gnome/help/gnome-access-guide/it/gnome-access-guide.xml
-share/gnome/help/system-admin-guide/C/appendixa.xml
-share/gnome/help/system-admin-guide/C/appendixb.xml
-share/gnome/help/system-admin-guide/C/fontconfig.xml
-share/gnome/help/system-admin-guide/C/gconf.xml
-share/gnome/help/system-admin-guide/C/glossary.xml
-share/gnome/help/system-admin-guide/C/help.xml
-share/gnome/help/system-admin-guide/C/legal.xml
-share/gnome/help/system-admin-guide/C/lockdown.xml
-share/gnome/help/system-admin-guide/C/menustructure.xml
-share/gnome/help/system-admin-guide/C/mimetypes.xml
-share/gnome/help/system-admin-guide/C/performance.xml
-share/gnome/help/system-admin-guide/C/screensavers.xml
-share/gnome/help/system-admin-guide/C/sessions.xml
-share/gnome/help/system-admin-guide/C/system-admin-guide.xml
-share/gnome/help/system-admin-guide/C/themes.xml
-share/gnome/help/system-admin-guide/it/system-admin-guide.xml
-share/gnome/help/user-guide/C/figures/ask_pointer.png
-share/gnome/help/user-guide/C/figures/busy_pointer.png
-share/gnome/help/user-guide/C/figures/com_file_manager_menu.png
-share/gnome/help/user-guide/C/figures/copy_pointer.png
-share/gnome/help/user-guide/C/figures/force_quit.png
-share/gnome/help/user-guide/C/figures/four_hide_button.png
-share/gnome/help/user-guide/C/figures/gedit_window.png
-share/gnome/help/user-guide/C/figures/gnome_panel.png
-share/gnome/help/user-guide/C/figures/hyperlink_pointer.png
-share/gnome/help/user-guide/C/figures/ibeam_pointer.png
-share/gnome/help/user-guide/C/figures/link_pointer.png
-share/gnome/help/user-guide/C/figures/lockscreen_icon.png
-share/gnome/help/user-guide/C/figures/logout_icon.png
-share/gnome/help/user-guide/C/figures/menu_bar_applet.png
-share/gnome/help/user-guide/C/figures/menu_panel.png
-share/gnome/help/user-guide/C/figures/move_panel_object_pointer.png
-share/gnome/help/user-guide/C/figures/move_pointer.png
-share/gnome/help/user-guide/C/figures/movewindow_pointer.png
-share/gnome/help/user-guide/C/figures/naut_browser_mode.png
-share/gnome/help/user-guide/C/figures/naut_button_bar.png
-share/gnome/help/user-guide/C/figures/naut_computer_launcher.png
-share/gnome/help/user-guide/C/figures/naut_emblem.png
-share/gnome/help/user-guide/C/figures/naut_go_to_location.png
-share/gnome/help/user-guide/C/figures/naut_link_emblem.png
-share/gnome/help/user-guide/C/figures/naut_noread_emblem.png
-share/gnome/help/user-guide/C/figures/naut_normal_size_button.png
-share/gnome/help/user-guide/C/figures/naut_nowrite_emblem.png
-share/gnome/help/user-guide/C/figures/naut_refine_search.png
-share/gnome/help/user-guide/C/figures/naut_sampleemblem1_icon.png
-share/gnome/help/user-guide/C/figures/naut_sampleemblem2_icon.png
-share/gnome/help/user-guide/C/figures/naut_sampleemblem3_icon.png
-share/gnome/help/user-guide/C/figures/naut_sampleemblem_icon.png
-share/gnome/help/user-guide/C/figures/naut_samplesymlink_icon.png
-share/gnome/help/user-guide/C/figures/naut_search_bar.png
-share/gnome/help/user-guide/C/figures/naut_search_results.png
-share/gnome/help/user-guide/C/figures/naut_spatial_icon_view.png
-share/gnome/help/user-guide/C/figures/naut_spatial_list_view.png
-share/gnome/help/user-guide/C/figures/naut_spatial_mode.png
-share/gnome/help/user-guide/C/figures/naut_spatial_view.png
-share/gnome/help/user-guide/C/figures/naut_starthere_launcher.png
-share/gnome/help/user-guide/C/figures/naut_trash_launcher.png
-share/gnome/help/user-guide/C/figures/naut_zoom_in_button.png
-share/gnome/help/user-guide/C/figures/naut_zoom_out_button.png
-share/gnome/help/user-guide/C/figures/nautilus_restore_saved_search.png
-share/gnome/help/user-guide/C/figures/normal_pointer.png
-share/gnome/help/user-guide/C/figures/not_available_pointer.png
-share/gnome/help/user-guide/C/figures/notification_area_icon.png
-share/gnome/help/user-guide/C/figures/open_drawer.png
-share/gnome/help/user-guide/C/figures/openwindows_menu.png
-share/gnome/help/user-guide/C/figures/panel_object_popup_menu.png
-share/gnome/help/user-guide/C/figures/resize_pointer.png
-share/gnome/help/user-guide/C/figures/run_button.png
-share/gnome/help/user-guide/C/figures/sample_applet.png
-share/gnome/help/user-guide/C/figures/screenshot_button.png
-share/gnome/help/user-guide/C/figures/searchtool_button.png
-share/gnome/help/user-guide/C/figures/show_desktop_button.png
-share/gnome/help/user-guide/C/figures/titlebar_anno_window.png
-share/gnome/help/user-guide/C/figures/typical_menu.png
-share/gnome/help/user-guide/C/figures/window_list_applet.png
-share/gnome/help/user-guide/C/figures/window_list_group_applet.png
-share/gnome/help/user-guide/C/figures/workspace_switcher_applet.png
-share/gnome/help/user-guide/C/figures/yelp_add_bookmark.png
-share/gnome/help/user-guide/C/figures/yelp_edit_bookmarks.png
-share/gnome/help/user-guide/C/figures/yelp_preferences.png
-share/gnome/help/user-guide/C/figures/yelp_window.png
-share/gnome/help/user-guide/C/glossary.xml
-share/gnome/help/user-guide/C/gosbasic.xml
-share/gnome/help/user-guide/C/goscustdesk.xml
-share/gnome/help/user-guide/C/goseditmainmenu.xml
-share/gnome/help/user-guide/C/gosnautilus.xml
-share/gnome/help/user-guide/C/gosoverview.xml
-share/gnome/help/user-guide/C/gospanel.xml
-share/gnome/help/user-guide/C/gosstartsession.xml
-share/gnome/help/user-guide/C/gostools.xml
-share/gnome/help/user-guide/C/legal.xml
-share/gnome/help/user-guide/C/user-guide.xml
-share/gnome/help/user-guide/es/figures/ask_pointer.png
-share/gnome/help/user-guide/es/figures/busy_pointer.png
-share/gnome/help/user-guide/es/figures/com_file_manager_menu.png
-share/gnome/help/user-guide/es/figures/copy_pointer.png
-share/gnome/help/user-guide/es/figures/force_quit.png
-share/gnome/help/user-guide/es/figures/four_hide_button.png
-share/gnome/help/user-guide/es/figures/gedit_window.png
-share/gnome/help/user-guide/es/figures/gnome_panel.png
-share/gnome/help/user-guide/es/figures/hyperlink_pointer.png
-share/gnome/help/user-guide/es/figures/ibeam_pointer.png
-share/gnome/help/user-guide/es/figures/link_pointer.png
-share/gnome/help/user-guide/es/figures/lockscreen_icon.png
-share/gnome/help/user-guide/es/figures/logout_icon.png
-share/gnome/help/user-guide/es/figures/menu_bar_applet.png
-share/gnome/help/user-guide/es/figures/menu_panel.png
-share/gnome/help/user-guide/es/figures/move_panel_object_pointer.png
-share/gnome/help/user-guide/es/figures/move_pointer.png
-share/gnome/help/user-guide/es/figures/movewindow_pointer.png
-share/gnome/help/user-guide/es/figures/naut_browser_mode.png
-share/gnome/help/user-guide/es/figures/naut_button_bar.png
-share/gnome/help/user-guide/es/figures/naut_computer_launcher.png
-share/gnome/help/user-guide/es/figures/naut_emblem.png
-share/gnome/help/user-guide/es/figures/naut_go_to_location.png
-share/gnome/help/user-guide/es/figures/naut_link_emblem.png
-share/gnome/help/user-guide/es/figures/naut_noread_emblem.png
-share/gnome/help/user-guide/es/figures/naut_normal_size_button.png
-share/gnome/help/user-guide/es/figures/naut_nowrite_emblem.png
-share/gnome/help/user-guide/es/figures/naut_refine_search.png
-share/gnome/help/user-guide/es/figures/naut_sampleemblem1_icon.png
-share/gnome/help/user-guide/es/figures/naut_sampleemblem2_icon.png
-share/gnome/help/user-guide/es/figures/naut_sampleemblem3_icon.png
-share/gnome/help/user-guide/es/figures/naut_sampleemblem_icon.png
-share/gnome/help/user-guide/es/figures/naut_samplesymlink_icon.png
-share/gnome/help/user-guide/es/figures/naut_search_bar.png
-share/gnome/help/user-guide/es/figures/naut_search_results.png
-share/gnome/help/user-guide/es/figures/naut_spatial_icon_view.png
-share/gnome/help/user-guide/es/figures/naut_spatial_list_view.png
-share/gnome/help/user-guide/es/figures/naut_spatial_mode.png
-share/gnome/help/user-guide/es/figures/naut_spatial_view.png
-share/gnome/help/user-guide/es/figures/naut_starthere_launcher.png
-share/gnome/help/user-guide/es/figures/naut_trash_launcher.png
-share/gnome/help/user-guide/es/figures/naut_zoom_in_button.png
-share/gnome/help/user-guide/es/figures/naut_zoom_out_button.png
-share/gnome/help/user-guide/es/figures/nautilus_restore_saved_search.png
-share/gnome/help/user-guide/es/figures/normal_pointer.png
-share/gnome/help/user-guide/es/figures/not_available_pointer.png
-share/gnome/help/user-guide/es/figures/notification_area_icon.png
-share/gnome/help/user-guide/es/figures/open_drawer.png
-share/gnome/help/user-guide/es/figures/openwindows_menu.png
-share/gnome/help/user-guide/es/figures/panel_object_popup_menu.png
-share/gnome/help/user-guide/es/figures/resize_pointer.png
-share/gnome/help/user-guide/es/figures/run_button.png
-share/gnome/help/user-guide/es/figures/sample_applet.png
-share/gnome/help/user-guide/es/figures/screenshot_button.png
-share/gnome/help/user-guide/es/figures/searchtool_button.png
-share/gnome/help/user-guide/es/figures/show_desktop_button.png
-share/gnome/help/user-guide/es/figures/titlebar_anno_window.png
-share/gnome/help/user-guide/es/figures/typical_menu.png
-share/gnome/help/user-guide/es/figures/window_list_applet.png
-share/gnome/help/user-guide/es/figures/window_list_group_applet.png
-share/gnome/help/user-guide/es/figures/workspace_switcher_applet.png
-share/gnome/help/user-guide/es/figures/yelp_add_bookmark.png
-share/gnome/help/user-guide/es/figures/yelp_edit_bookmarks.png
-share/gnome/help/user-guide/es/figures/yelp_preferences.png
-share/gnome/help/user-guide/es/figures/yelp_window.png
-share/gnome/help/user-guide/es/glossary.xml
-share/gnome/help/user-guide/es/gosbasic.xml
-share/gnome/help/user-guide/es/goscustdesk.xml
-share/gnome/help/user-guide/es/goseditmainmenu.xml
-share/gnome/help/user-guide/es/gosnautilus.xml
-share/gnome/help/user-guide/es/gosoverview.xml
-share/gnome/help/user-guide/es/gospanel.xml
-share/gnome/help/user-guide/es/gosstartsession.xml
-share/gnome/help/user-guide/es/gostools.xml
-share/gnome/help/user-guide/es/user-guide.xml
-share/gnome/help/user-guide/it/figures/ask_pointer.png
-share/gnome/help/user-guide/it/figures/busy_pointer.png
-share/gnome/help/user-guide/it/figures/com_file_manager_menu.png
-share/gnome/help/user-guide/it/figures/copy_pointer.png
-share/gnome/help/user-guide/it/figures/force_quit.png
-share/gnome/help/user-guide/it/figures/four_hide_button.png
-share/gnome/help/user-guide/it/figures/gedit_window.png
-share/gnome/help/user-guide/it/figures/gnome_panel.png
-share/gnome/help/user-guide/it/figures/hyperlink_pointer.png
-share/gnome/help/user-guide/it/figures/ibeam_pointer.png
-share/gnome/help/user-guide/it/figures/link_pointer.png
-share/gnome/help/user-guide/it/figures/lockscreen_icon.png
-share/gnome/help/user-guide/it/figures/logout_icon.png
-share/gnome/help/user-guide/it/figures/menu_bar_applet.png
-share/gnome/help/user-guide/it/figures/menu_panel.png
-share/gnome/help/user-guide/it/figures/move_panel_object_pointer.png
-share/gnome/help/user-guide/it/figures/move_pointer.png
-share/gnome/help/user-guide/it/figures/movewindow_pointer.png
-share/gnome/help/user-guide/it/figures/naut_browser_mode.png
-share/gnome/help/user-guide/it/figures/naut_button_bar.png
-share/gnome/help/user-guide/it/figures/naut_computer_launcher.png
-share/gnome/help/user-guide/it/figures/naut_emblem.png
-share/gnome/help/user-guide/it/figures/naut_go_to_location.png
-share/gnome/help/user-guide/it/figures/naut_link_emblem.png
-share/gnome/help/user-guide/it/figures/naut_noread_emblem.png
-share/gnome/help/user-guide/it/figures/naut_normal_size_button.png
-share/gnome/help/user-guide/it/figures/naut_nowrite_emblem.png
-share/gnome/help/user-guide/it/figures/naut_refine_search.png
-share/gnome/help/user-guide/it/figures/naut_sampleemblem1_icon.png
-share/gnome/help/user-guide/it/figures/naut_sampleemblem2_icon.png
-share/gnome/help/user-guide/it/figures/naut_sampleemblem3_icon.png
-share/gnome/help/user-guide/it/figures/naut_sampleemblem_icon.png
-share/gnome/help/user-guide/it/figures/naut_samplesymlink_icon.png
-share/gnome/help/user-guide/it/figures/naut_search_bar.png
-share/gnome/help/user-guide/it/figures/naut_search_results.png
-share/gnome/help/user-guide/it/figures/naut_spatial_icon_view.png
-share/gnome/help/user-guide/it/figures/naut_spatial_list_view.png
-share/gnome/help/user-guide/it/figures/naut_spatial_mode.png
-share/gnome/help/user-guide/it/figures/naut_spatial_view.png
-share/gnome/help/user-guide/it/figures/naut_starthere_launcher.png
-share/gnome/help/user-guide/it/figures/naut_trash_launcher.png
-share/gnome/help/user-guide/it/figures/naut_zoom_in_button.png
-share/gnome/help/user-guide/it/figures/naut_zoom_out_button.png
-share/gnome/help/user-guide/it/figures/nautilus_restore_saved_search.png
-share/gnome/help/user-guide/it/figures/normal_pointer.png
-share/gnome/help/user-guide/it/figures/not_available_pointer.png
-share/gnome/help/user-guide/it/figures/notification_area_icon.png
-share/gnome/help/user-guide/it/figures/open_drawer.png
-share/gnome/help/user-guide/it/figures/openwindows_menu.png
-share/gnome/help/user-guide/it/figures/panel_object_popup_menu.png
-share/gnome/help/user-guide/it/figures/resize_pointer.png
-share/gnome/help/user-guide/it/figures/run_button.png
-share/gnome/help/user-guide/it/figures/sample_applet.png
-share/gnome/help/user-guide/it/figures/screenshot_button.png
-share/gnome/help/user-guide/it/figures/searchtool_button.png
-share/gnome/help/user-guide/it/figures/show_desktop_button.png
-share/gnome/help/user-guide/it/figures/titlebar_anno_window.png
-share/gnome/help/user-guide/it/figures/typical_menu.png
-share/gnome/help/user-guide/it/figures/window_list_applet.png
-share/gnome/help/user-guide/it/figures/window_list_group_applet.png
-share/gnome/help/user-guide/it/figures/workspace_switcher_applet.png
-share/gnome/help/user-guide/it/figures/yelp_add_bookmark.png
-share/gnome/help/user-guide/it/figures/yelp_edit_bookmarks.png
-share/gnome/help/user-guide/it/figures/yelp_preferences.png
-share/gnome/help/user-guide/it/figures/yelp_window.png
-share/gnome/help/user-guide/it/glossary.xml
-share/gnome/help/user-guide/it/gosbasic.xml
-share/gnome/help/user-guide/it/goscustdesk.xml
-share/gnome/help/user-guide/it/goseditmainmenu.xml
-share/gnome/help/user-guide/it/gosnautilus.xml
-share/gnome/help/user-guide/it/gosoverview.xml
-share/gnome/help/user-guide/it/gospanel.xml
-share/gnome/help/user-guide/it/gosstartsession.xml
-share/gnome/help/user-guide/it/gostools.xml
-share/gnome/help/user-guide/it/user-guide.xml
-share/gnome/omf/gnome-access-guide/gnome-access-guide-C.omf
-share/gnome/omf/gnome-access-guide/gnome-access-guide-it.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-C.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-it.omf
-share/gnome/omf/user-guide/user-guide-C.omf
-share/gnome/omf/user-guide/user-guide-es.omf
-share/gnome/omf/user-guide/user-guide-it.omf
-@dirrm share/gnome/omf/user-guide
-@dirrm share/gnome/omf/system-admin-guide
-@dirrm share/gnome/omf/gnome-access-guide
-@dirrm share/gnome/help/user-guide/it/figures
-@dirrm share/gnome/help/user-guide/it
-@dirrm share/gnome/help/user-guide/es/figures
-@dirrm share/gnome/help/user-guide/es
-@dirrm share/gnome/help/user-guide/C/figures
-@dirrm share/gnome/help/user-guide/C
-@dirrm share/gnome/help/user-guide
-@dirrm share/gnome/help/system-admin-guide/it
-@dirrm share/gnome/help/system-admin-guide/C
-@dirrm share/gnome/help/system-admin-guide
-@dirrm share/gnome/help/gnome-access-guide/it/figures
-@dirrm share/gnome/help/gnome-access-guide/it
-@dirrm share/gnome/help/gnome-access-guide/C/figures
-@dirrm share/gnome/help/gnome-access-guide/C
-@dirrm share/gnome/help/gnome-access-guide
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 1ee00d9e4a86..39a88524f033 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
 		gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \
 		nautilus:${PORTSDIR}/x11-fm/nautilus2 \
 		yelp:${PORTSDIR}/x11/yelp \
-		${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \
+		${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
 		${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
 		file-roller:${PORTSDIR}/archivers/file-roller \
 		${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 9c5bc84da654..c7147419dda6 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS?=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
 		nautilus:${PORTSDIR}/x11-fm/nautilus2 \
 		yelp:${PORTSDIR}/x11/yelp \
 		${X11BASE}/sbin/gdm:${PORTSDIR}/x11/gdm \
-		${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \
+		${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \
 		${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \
 		${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \
 		file-roller:${PORTSDIR}/archivers/file-roller \