x11/gnomedesktop -> x11/gnome-desktop

x11/gnomedesktop-reference -> x11/gnome-desktop-reference

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.

PR:		ports/97985
Repocopy by:	marcus

9 files changed, 4 insertions, 323 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 6a18d4c3cb70..bd943e146e59 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -62,6 +62,8 @@
     SUBDIR += gmrun
     SUBDIR += gnome-applets
     SUBDIR += gnome-clipboard-daemon
+    SUBDIR += gnome-desktop
+    SUBDIR += gnome-desktop-reference
     SUBDIR += gnome-launch-box
     SUBDIR += gnome-menus
     SUBDIR += gnome-screensaver
@@ -70,8 +72,6 @@
     SUBDIR += gnome2-fifth-toe
     SUBDIR += gnome2-lite
     SUBDIR += gnome2-power-tools
-    SUBDIR += gnomedesktop
-    SUBDIR += gnomedesktop-reference
     SUBDIR += gnomelibs
     SUBDIR += gnomepanel
     SUBDIR += gnomepanel-reference
diff --git a/x11/gnome-desktop-reference/pkg-descr b/x11/gnome-desktop-reference/pkg-descr
index 571166d9ea6f..8067e83e86e6 100644
--- a/x11/gnome-desktop-reference/pkg-descr
+++ b/x11/gnome-desktop-reference/pkg-descr
@@ -1,3 +1,3 @@
-This port contains the programming reference for x11/gnomedesktop.
+This port contains the programming reference for x11/gnome-desktop.
 
 WWW: http://www.gnome.org/
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index b33bbef95fbd..b808849ad588 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,12 +6,11 @@
 #   $MCom: ports/x11/gnomedesktop/Makefile,v 1.90 2006/04/13 07:52:40 bland Exp $
 #
 
-PORTNAME=	gnomedesktop
+PORTNAME=	gnome-desktop
 PORTVERSION=	2.14.1.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/gnomedesktop-reference/Makefile b/x11/gnomedesktop-reference/Makefile
deleted file mode 100644
index b3c18d5b7f53..000000000000
--- a/x11/gnomedesktop-reference/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-REFERENCE_SRC=	${WRKSRC}/docs/reference/gnome-desktop
-
-.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11/gnomedesktop-reference/pkg-descr b/x11/gnomedesktop-reference/pkg-descr
deleted file mode 100644
index 571166d9ea6f..000000000000
--- a/x11/gnomedesktop-reference/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This port contains the programming reference for x11/gnomedesktop.
-
-WWW: http://www.gnome.org/
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
deleted file mode 100644
index b33bbef95fbd..000000000000
--- a/x11/gnomedesktop/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for:	gnomedesktop
-# Date created:				13 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/x11/gnomedesktop/Makefile,v 1.90 2006/04/13 07:52:40 bland Exp $
-#
-
-PORTNAME=	gnomedesktop
-PORTVERSION=	2.14.1.1
-CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-desktop-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Additional UI API for GNOME 2
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-
-.if !defined(REFERENCE_PORT)
-
-PORTREVISION=	1
-
-USE_XLIB=	yes
-USE_XPM=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \
-		ltverhack referencehack
-GNOME_DESKTOP_VERSION=2
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_BISON=	yes
-INSTALLS_OMF=	yes
-INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project" \
-		--with-kde-datadir=${LOCALBASE}/share
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1=	gnome-about.1
-
-.include <bsd.port.mk>
-
-.endif
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
deleted file mode 100644
index f6ae5c885bda..000000000000
--- a/x11/gnomedesktop/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = f3ffb360681c1dc17d1856f19a59e88f
-SHA256 (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = 82c9de6ca3507dceb347deda069faf3dd22a412d3bf8944618fbb57656815244
-SIZE (gnome2/gnome-desktop-2.14.1.1.tar.bz2) = 1173965
diff --git a/x11/gnomedesktop/pkg-descr b/x11/gnomedesktop/pkg-descr
deleted file mode 100644
index bda4df7913d6..000000000000
--- a/x11/gnomedesktop/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a collection of APIs not included in libgnomeui.
-
-WWW: http://www.gnome.org/
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
deleted file mode 100644
index f55bcc791f6a..000000000000
--- a/x11/gnomedesktop/pkg-plist
+++ /dev/null
@@ -1,257 +0,0 @@
-bin/gnome-about
-include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
-include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
-include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
-lib/libgnome-desktop-2.a
-lib/libgnome-desktop-2.la
-lib/libgnome-desktop-2.so
-lib/libgnome-desktop-2.so.2
-libdata/pkgconfig/gnome-desktop-2.0.pc
-share/gnome/applications/gnome-about.desktop
-share/gnome/gnome-about/gnome-64.png
-share/gnome/gnome-about/gnome-version.xml
-share/gnome/gnome-about/headers/header-bg-ancient01a.png
-share/gnome/gnome-about/headers/header-bg-city01.png
-share/gnome/gnome-about/headers/header-bg-clouds01.png
-share/gnome/gnome-about/headers/header-bg-clouds02.png
-share/gnome/gnome-about/headers/header-bg-hills01.png
-share/gnome/gnome-about/headers/header-bg-landscape01.png
-share/gnome/gnome-about/headers/header-bg-mountains01.png
-share/gnome/gnome-about/headers/header-bg-snow01.png
-share/gnome/gnome-about/headers/header-bg-sunset01.png
-share/gnome/help/fdl/C/fdl.xml
-share/gnome/help/fdl/es/fdl.xml
-share/gnome/help/fdl/fr/fdl.xml
-share/gnome/help/fdl/uk/fdl.xml
-share/gnome/help/gnome-feedback/C/gnome-feedback.xml
-share/gnome/help/gnome-feedback/es/gnome-feedback.xml
-share/gnome/help/gnome-feedback/fr/gnome-feedback.xml
-share/gnome/help/gnome-feedback/it/gnome-feedback.xml
-share/gnome/help/gnome-feedback/uk/gnome-feedback.xml
-share/gnome/help/gpl/C/gpl.xml
-share/gnome/help/gpl/es/gpl.xml
-share/gnome/help/gpl/fi/gpl.xml
-share/gnome/help/gpl/fr/gpl.xml
-share/gnome/help/gpl/pa/gpl.xml
-share/gnome/help/gpl/uk/gpl.xml
-share/gnome/help/lgpl/C/lgpl.xml
-share/gnome/help/lgpl/es/lgpl.xml
-share/gnome/help/lgpl/fr/lgpl.xml
-share/gnome/help/lgpl/pa/lgpl.xml
-share/gnome/help/lgpl/uk/lgpl.xml
-share/gnome/omf/fdl/fdl-C.omf
-share/gnome/omf/fdl/fdl-es.omf
-share/gnome/omf/fdl/fdl-fr.omf
-share/gnome/omf/fdl/fdl-uk.omf
-share/gnome/omf/gnome-feedback/gnome-feedback-C.omf
-share/gnome/omf/gnome-feedback/gnome-feedback-es.omf
-share/gnome/omf/gnome-feedback/gnome-feedback-fr.omf
-share/gnome/omf/gnome-feedback/gnome-feedback-it.omf
-share/gnome/omf/gnome-feedback/gnome-feedback-uk.omf
-share/gnome/omf/gpl/gpl-C.omf
-share/gnome/omf/gpl/gpl-es.omf
-share/gnome/omf/gpl/gpl-fi.omf
-share/gnome/omf/gpl/gpl-fr.omf
-share/gnome/omf/gpl/gpl-pa.omf
-share/gnome/omf/gpl/gpl-uk.omf
-share/gnome/omf/lgpl/lgpl-C.omf
-share/gnome/omf/lgpl/lgpl-es.omf
-share/gnome/omf/lgpl/lgpl-fr.omf
-share/gnome/omf/lgpl/lgpl-pa.omf
-share/gnome/omf/lgpl/lgpl-uk.omf
-share/gnome/pixmaps/apple-green.png
-share/gnome/pixmaps/apple-red.png
-share/gnome/pixmaps/gnome-aorta.png
-share/gnome/pixmaps/gnome-applets.png
-share/gnome/pixmaps/gnome-background-image.png
-share/gnome/pixmaps/gnome-background-pattern.png
-share/gnome/pixmaps/gnome-background.png
-share/gnome/pixmaps/gnome-calc2.png
-share/gnome/pixmaps/gnome-calc3.png
-share/gnome/pixmaps/gnome-calendar.png
-share/gnome/pixmaps/gnome-ccbackground.png
-share/gnome/pixmaps/gnome-ccdesktop.png
-share/gnome/pixmaps/gnome-ccdialog.png
-share/gnome/pixmaps/gnome-ccmime.png
-share/gnome/pixmaps/gnome-ccperiph.png
-share/gnome/pixmaps/gnome-ccscreensaver.png
-share/gnome/pixmaps/gnome-ccwindowmanager.png
-share/gnome/pixmaps/gnome-color-browser.png
-share/gnome/pixmaps/gnome-color-xterm.png
-share/gnome/pixmaps/gnome-computer.png
-share/gnome/pixmaps/gnome-cromagnon.png
-share/gnome/pixmaps/gnome-day.png
-share/gnome/pixmaps/gnome-debian.png
-share/gnome/pixmaps/gnome-diskfree.png
-share/gnome/pixmaps/gnome-emacs.png
-share/gnome/pixmaps/gnome-eterm.png
-share/gnome/pixmaps/gnome-file-c.png
-share/gnome/pixmaps/gnome-file-h.png
-share/gnome/pixmaps/gnome-folder.png
-share/gnome/pixmaps/gnome-gemvt.png
-share/gnome/pixmaps/gnome-gimp.png
-share/gnome/pixmaps/gnome-gmenu.png
-share/gnome/pixmaps/gnome-gmush.png
-share/gnome/pixmaps/gnome-gnomoku.png
-share/gnome/pixmaps/gnome-home.png
-share/gnome/pixmaps/gnome-html.png
-share/gnome/pixmaps/gnome-image-gif.png
-share/gnome/pixmaps/gnome-image-jpeg.png
-share/gnome/pixmaps/gnome-irc.png
-share/gnome/pixmaps/gnome-laptop.png
-share/gnome/pixmaps/gnome-log.png
-share/gnome/pixmaps/gnome-logo-icon-transparent.png
-share/gnome/pixmaps/gnome-logo-icon.png
-share/gnome/pixmaps/gnome-logo-large.png
-share/gnome/pixmaps/gnome-mdi.png
-share/gnome/pixmaps/gnome-mnemonic.png
-share/gnome/pixmaps/gnome-month.png
-share/gnome/pixmaps/gnome-mouse.png
-share/gnome/pixmaps/gnome-news.png
-share/gnome/pixmaps/gnome-note.png
-share/gnome/pixmaps/gnome-qeye.png
-share/gnome/pixmaps/gnome-set-time.png
-share/gnome/pixmaps/gnome-spider.png
-share/gnome/pixmaps/gnome-squeak.png
-share/gnome/pixmaps/gnome-suse.png
-share/gnome/pixmaps/gnome-talk.png
-share/gnome/pixmaps/gnome-term-linux.png
-share/gnome/pixmaps/gnome-term-linux2.png
-share/gnome/pixmaps/gnome-term-night.png
-share/gnome/pixmaps/gnome-term-tiger.png
-share/gnome/pixmaps/gnome-term.png
-share/gnome/pixmaps/gnome-tigert.png
-share/gnome/pixmaps/gnome-touristinfo.png
-share/gnome/pixmaps/gnome-user-interface.png
-share/gnome/pixmaps/gnome-week.png
-share/gnome/pixmaps/gnome-windows.png
-share/gnome/pixmaps/gnome-word.png
-share/gnome/pixmaps/gnome-workspace.png
-share/gnome/pixmaps/gnome-xterm.png
-share/gnome/pixmaps/gtkvim.png
-share/gnome/pixmaps/kterm.xpm
-share/gnome/pixmaps/monitor.png
-share/gnome/pixmaps/vnterm.xpm
-share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/br/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/dz/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/eo/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/es/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/et/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/eu/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/fa/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/gu/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/he/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/hr/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/hy/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ka/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/mi/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/nso/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/pl/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/pt/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/rw/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/te/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
-@dirrmtry share/locale/yo/LC_MESSAGES
-@dirrmtry share/locale/yo
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@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
-@dirrm share/gnome/omf/lgpl
-@dirrm share/gnome/omf/gpl
-@dirrm share/gnome/omf/gnome-feedback
-@dirrm share/gnome/omf/fdl
-@dirrm share/gnome/help/lgpl/uk
-@dirrm share/gnome/help/lgpl/pa
-@dirrm share/gnome/help/lgpl/fr
-@dirrm share/gnome/help/lgpl/es
-@dirrm share/gnome/help/gpl/uk
-@dirrm share/gnome/help/gpl/pa
-@dirrm share/gnome/help/gpl/fr
-@dirrm share/gnome/help/gpl/fi
-@dirrm share/gnome/help/gpl/es
-@dirrm share/gnome/help/gnome-feedback/uk
-@dirrm share/gnome/help/gnome-feedback/it
-@dirrm share/gnome/help/gnome-feedback/fr
-@dirrm share/gnome/help/gnome-feedback/es
-@dirrm share/gnome/help/gnome-feedback/C
-@dirrm share/gnome/help/gnome-feedback
-@dirrm share/gnome/help/fdl/uk
-@dirrm share/gnome/help/fdl/fr
-@dirrm share/gnome/help/fdl/es
-@dirrm share/gnome/gnome-about/headers
-@dirrm include/gnome-desktop-2.0/libgnomeui
-@dirrm include/gnome-desktop-2.0/libgnome
-@dirrm include/gnome-desktop-2.0