x11/gnometerminal -> x11/gnome-terminal

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 other ports, chase the rename.

PR:		ports/97985
Repocopy by:	marcus

9 files changed, 4 insertions, 263 deletions

diff --git a/x11/Makefile b/x11/Makefile
index e67cc8c1a848..80906f1ca877 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -72,11 +72,11 @@
     SUBDIR += gnome-screensaver
     SUBDIR += gnome-session
     SUBDIR += gnome-swallow
+    SUBDIR += gnome-terminal
     SUBDIR += gnome2
     SUBDIR += gnome2-fifth-toe
     SUBDIR += gnome2-lite
     SUBDIR += gnome2-power-tools
-    SUBDIR += gnometerminal
     SUBDIR += gpctool
     SUBDIR += grabc
     SUBDIR += gromit
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index a8578865b0f7..d4f5d5832400 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,12 +6,11 @@
 #   $MCom: ports/x11/gnometerminal/Makefile,v 1.69 2006/04/13 07:52:41 bland Exp $
 #
 
-PORTNAME=	gnometerminal
+PORTNAME=	gnome-terminal
 PORTVERSION=	2.14.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-terminal/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 22548300ae79..87201527c82c 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets
 	 	gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \
 		eog:${PORTSDIR}/graphics/eog \
 		gedit:${PORTSDIR}/editors/gedit \
-		gnome-terminal:${PORTSDIR}/x11/gnometerminal \
+		gnome-terminal:${PORTSDIR}/x11/gnome-terminal \
 		gnome-session:${PORTSDIR}/x11/gnome-session \
 		gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
 		nautilus:${PORTSDIR}/x11-fm/nautilus2 \
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 5a6db31a77a3..4086b1b9fd23 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS?=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets
 		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
 		gnect:${PORTSDIR}/games/gnome-games \
 		gedit:${PORTSDIR}/editors/gedit \
-		gnome-terminal:${PORTSDIR}/x11/gnometerminal \
+		gnome-terminal:${PORTSDIR}/x11/gnome-terminal \
 		gnome-session:${PORTSDIR}/x11/gnome-session \
 		bug-buddy:${PORTSDIR}/devel/bug-buddy \
 		gnome-system-monitor:${PORTSDIR}/sysutils/gnome-system-monitor \
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
deleted file mode 100644
index a8578865b0f7..000000000000
--- a/x11/gnometerminal/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	gnometerminal
-# Date created:				1 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/x11/gnometerminal/Makefile,v 1.69 2006/04/13 07:52:41 bland Exp $
-#
-
-PORTNAME=	gnometerminal
-PORTVERSION=	2.14.1
-CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-terminal-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Terminal component for the GNOME 2 Desktop
-
-USE_GETTEXT=	yes
-USE_BZIP2=	yes
-INSTALLS_OMF=	yes
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui vte
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	gnome-terminal.schemas
-
-.include <bsd.port.mk>
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
deleted file mode 100644
index 73abf3d6655d..000000000000
--- a/x11/gnometerminal/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-terminal-2.14.1.tar.bz2) = 7abe60db5359c88392d2b4f0d5587ef5
-SHA256 (gnome2/gnome-terminal-2.14.1.tar.bz2) = c1e7674bb75343db89ad6769bc2d7ecfb115d9eda02035d374d8c4d952091647
-SIZE (gnome2/gnome-terminal-2.14.1.tar.bz2) = 1783063
diff --git a/x11/gnometerminal/files/patch-src_terminal-screen.c b/x11/gnometerminal/files/patch-src_terminal-screen.c
deleted file mode 100644
index 0f5c397cbadd..000000000000
--- a/x11/gnometerminal/files/patch-src_terminal-screen.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/terminal-screen.c.orig	Sun Apr  2 18:27:36 2006
-+++ src/terminal-screen.c	Sun Apr  2 18:42:41 2006
-@@ -278,22 +278,22 @@ terminal_screen_init (TerminalScreen *sc
- #define URLPATH   "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]"
- 
-   terminal_widget_match_add (screen->priv->term,
--			     "\\<" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
--			     "(:[0-9]+)?(" URLPATH ")?\\>", FLAVOR_AS_IS);
-+			     "[[:<:]]" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+"
-+			     "(:[0-9]+)?(" URLPATH ")?[[:>:]]", FLAVOR_AS_IS);
- 
-   terminal_widget_match_add (screen->priv->term,
--			     "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
--			     "(:[0-9]+)?(" URLPATH ")?\\>",
-+			     "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+"
-+			     "(:[0-9]+)?(" URLPATH ")?[[:>:]]",
- 			     FLAVOR_DEFAULT_TO_HTTP);
- 
-   terminal_widget_match_add (screen->priv->term,
--			     "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]"
--			     "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>",
-+			     "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]"
-+			     "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]",
- 			     FLAVOR_EMAIL);
- 
-   terminal_widget_match_add (screen->priv->term,
--			     "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
--			     "@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS);
-+			     "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+"
-+			     "@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS);
- 
-   terminal_screen_setup_dnd (screen);
- 
diff --git a/x11/gnometerminal/pkg-descr b/x11/gnometerminal/pkg-descr
deleted file mode 100644
index 1193c30f736a..000000000000
--- a/x11/gnometerminal/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Default terminal emulator for the GNOME 2.0 Desktop.
-
-WWW: http://www.gnome.org/
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
deleted file mode 100644
index 380a52ff47c5..000000000000
--- a/x11/gnometerminal/pkg-plist
+++ /dev/null
@@ -1,187 +0,0 @@
-bin/gnome-terminal
-libdata/bonobo/servers/gnome-terminal.server
-share/gnome/applications/gnome-terminal.desktop
-share/gnome/gnome-terminal/glade/gnome-terminal.glade2
-share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/C/figures/terminal_window.png
-share/gnome/help/gnome-terminal/C/gnome-terminal.xml
-share/gnome/help/gnome-terminal/C/legal.xml
-share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/bg/figures/terminal_window.png
-share/gnome/help/gnome-terminal/bg/gnome-terminal.xml
-share/gnome/help/gnome-terminal/bg/legal.xml
-share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/de/figures/terminal_window.png
-share/gnome/help/gnome-terminal/de/gnome-terminal.xml
-share/gnome/help/gnome-terminal/de/legal.xml
-share/gnome/help/gnome-terminal/es/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/es/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/es/figures/terminal_window.png
-share/gnome/help/gnome-terminal/es/gnome-terminal.xml
-share/gnome/help/gnome-terminal/es/legal.xml
-share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/fr/figures/terminal_window.png
-share/gnome/help/gnome-terminal/fr/gnome-terminal.xml
-share/gnome/help/gnome-terminal/fr/legal.xml
-share/gnome/help/gnome-terminal/it/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/it/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/it/figures/terminal_window.png
-share/gnome/help/gnome-terminal/it/gnome-terminal.xml
-share/gnome/help/gnome-terminal/it/legal.xml
-share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ja/figures/terminal_window.png
-share/gnome/help/gnome-terminal/ja/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ja/legal.xml
-share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ko/figures/terminal_window.png
-share/gnome/help/gnome-terminal/ko/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ko/legal.xml
-share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ro/figures/terminal_window.png
-share/gnome/help/gnome-terminal/ro/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ro/legal.xml
-share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/sv/figures/terminal_window.png
-share/gnome/help/gnome-terminal/sv/gnome-terminal.xml
-share/gnome/help/gnome-terminal/sv/legal.xml
-share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/uk/gnome-terminal.xml
-share/gnome/help/gnome-terminal/uk/legal.xml
-share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png
-share/gnome/help/gnome-terminal/zh_CN/gnome-terminal.xml
-share/gnome/help/gnome-terminal/zh_CN/legal.xml
-share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-default.png
-share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png
-share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml
-share/gnome/help/gnome-terminal/zh_TW/legal.xml
-share/gnome/omf/gnome-terminal/gnome-terminal-C.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-bg.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-de.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-es.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-fr.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-it.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-ja.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-ko.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-sv.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-uk.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-zh_CN.omf
-share/gnome/omf/gnome-terminal/gnome-terminal-zh_TW.omf
-share/gnome/pixmaps/gnome-terminal.png
-share/locale/am/LC_MESSAGES/gnome-terminal.mo
-share/locale/ar/LC_MESSAGES/gnome-terminal.mo
-share/locale/az/LC_MESSAGES/gnome-terminal.mo
-share/locale/be/LC_MESSAGES/gnome-terminal.mo
-share/locale/bg/LC_MESSAGES/gnome-terminal.mo
-share/locale/bn/LC_MESSAGES/gnome-terminal.mo
-share/locale/bs/LC_MESSAGES/gnome-terminal.mo
-share/locale/br/LC_MESSAGES/gnome-terminal.mo
-share/locale/ca/LC_MESSAGES/gnome-terminal.mo
-share/locale/cs/LC_MESSAGES/gnome-terminal.mo
-share/locale/cy/LC_MESSAGES/gnome-terminal.mo
-share/locale/da/LC_MESSAGES/gnome-terminal.mo
-share/locale/de/LC_MESSAGES/gnome-terminal.mo
-share/locale/dz/LC_MESSAGES/gnome-terminal.mo
-share/locale/el/LC_MESSAGES/gnome-terminal.mo
-share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo
-share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
-share/locale/es/LC_MESSAGES/gnome-terminal.mo
-share/locale/et/LC_MESSAGES/gnome-terminal.mo
-share/locale/eu/LC_MESSAGES/gnome-terminal.mo
-share/locale/fa/LC_MESSAGES/gnome-terminal.mo
-share/locale/fi/LC_MESSAGES/gnome-terminal.mo
-share/locale/fr/LC_MESSAGES/gnome-terminal.mo
-share/locale/ga/LC_MESSAGES/gnome-terminal.mo
-share/locale/gl/LC_MESSAGES/gnome-terminal.mo
-share/locale/gu/LC_MESSAGES/gnome-terminal.mo
-share/locale/he/LC_MESSAGES/gnome-terminal.mo
-share/locale/hi/LC_MESSAGES/gnome-terminal.mo
-share/locale/hr/LC_MESSAGES/gnome-terminal.mo
-share/locale/hu/LC_MESSAGES/gnome-terminal.mo
-share/locale/hy/LC_MESSAGES/gnome-terminal.mo
-share/locale/id/LC_MESSAGES/gnome-terminal.mo
-share/locale/it/LC_MESSAGES/gnome-terminal.mo
-share/locale/ja/LC_MESSAGES/gnome-terminal.mo
-share/locale/ko/LC_MESSAGES/gnome-terminal.mo
-share/locale/ku/LC_MESSAGES/gnome-terminal.mo
-share/locale/lt/LC_MESSAGES/gnome-terminal.mo
-share/locale/lv/LC_MESSAGES/gnome-terminal.mo
-share/locale/mk/LC_MESSAGES/gnome-terminal.mo
-share/locale/ml/LC_MESSAGES/gnome-terminal.mo
-share/locale/mn/LC_MESSAGES/gnome-terminal.mo
-share/locale/ms/LC_MESSAGES/gnome-terminal.mo
-share/locale/nb/LC_MESSAGES/gnome-terminal.mo
-share/locale/ne/LC_MESSAGES/gnome-terminal.mo
-share/locale/nl/LC_MESSAGES/gnome-terminal.mo
-share/locale/nn/LC_MESSAGES/gnome-terminal.mo
-share/locale/no/LC_MESSAGES/gnome-terminal.mo
-share/locale/pa/LC_MESSAGES/gnome-terminal.mo
-share/locale/pl/LC_MESSAGES/gnome-terminal.mo
-share/locale/pt/LC_MESSAGES/gnome-terminal.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo
-share/locale/ro/LC_MESSAGES/gnome-terminal.mo
-share/locale/ru/LC_MESSAGES/gnome-terminal.mo
-share/locale/rw/LC_MESSAGES/gnome-terminal.mo
-share/locale/sk/LC_MESSAGES/gnome-terminal.mo
-share/locale/sl/LC_MESSAGES/gnome-terminal.mo
-share/locale/sq/LC_MESSAGES/gnome-terminal.mo
-share/locale/sr/LC_MESSAGES/gnome-terminal.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-terminal.mo
-share/locale/sv/LC_MESSAGES/gnome-terminal.mo
-share/locale/ta/LC_MESSAGES/gnome-terminal.mo
-share/locale/th/LC_MESSAGES/gnome-terminal.mo
-share/locale/tr/LC_MESSAGES/gnome-terminal.mo
-share/locale/uk/LC_MESSAGES/gnome-terminal.mo
-share/locale/vi/LC_MESSAGES/gnome-terminal.mo
-share/locale/wa/LC_MESSAGES/gnome-terminal.mo
-share/locale/xh/LC_MESSAGES/gnome-terminal.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/omf/gnome-terminal
-@dirrm share/gnome/help/gnome-terminal/zh_TW/figures
-@dirrm share/gnome/help/gnome-terminal/zh_TW
-@dirrm share/gnome/help/gnome-terminal/zh_CN/figures
-@dirrm share/gnome/help/gnome-terminal/zh_CN
-@dirrm share/gnome/help/gnome-terminal/uk/figures
-@dirrm share/gnome/help/gnome-terminal/uk
-@dirrm share/gnome/help/gnome-terminal/sv/figures
-@dirrm share/gnome/help/gnome-terminal/sv
-@dirrm share/gnome/help/gnome-terminal/ro/figures
-@dirrm share/gnome/help/gnome-terminal/ro
-@dirrm share/gnome/help/gnome-terminal/ko/figures
-@dirrm share/gnome/help/gnome-terminal/ko
-@dirrm share/gnome/help/gnome-terminal/ja/figures
-@dirrm share/gnome/help/gnome-terminal/ja
-@dirrm share/gnome/help/gnome-terminal/it/figures
-@dirrm share/gnome/help/gnome-terminal/it
-@dirrm share/gnome/help/gnome-terminal/fr/figures
-@dirrm share/gnome/help/gnome-terminal/fr
-@dirrm share/gnome/help/gnome-terminal/es/figures
-@dirrm share/gnome/help/gnome-terminal/es
-@dirrm share/gnome/help/gnome-terminal/de/figures
-@dirrm share/gnome/help/gnome-terminal/de
-@dirrm share/gnome/help/gnome-terminal/bg/figures
-@dirrm share/gnome/help/gnome-terminal/bg
-@dirrm share/gnome/help/gnome-terminal/C/figures
-@dirrm share/gnome/help/gnome-terminal/C
-@dirrm share/gnome/help/gnome-terminal
-@dirrm share/gnome/gnome-terminal/glade
-@dirrm share/gnome/gnome-terminal