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/gnome2-power-tools, chase the rename.

PR:		ports/97985
Repocopy by:	marcus

9 files changed, 4 insertions, 119 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 1655e6311122..db2109ac4a3d 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -3212,6 +3212,7 @@ gnofract4d	ports/graphics/gnofract4d
 gnokii		ports/comms/gnokii
 gnome-art	ports/x11-themes/gnome-art
 gnome-backgrounds	ports/x11-themes/gnome-backgrounds
+gnome-blog	ports/deskutils/gnome-blog
 gnome-bluecurve-theme	ports/x11-themes/gnome-bluecurve-theme
 gnome-btdownload	ports/net-p2p/gnome-btdownload
 gnome-clipboard-daemon	ports/x11/gnome-clipboard-daemon
@@ -3274,7 +3275,6 @@ gnomeattacks	ports/games/gnomeattacks
 gnomeaudio2	ports/audio/gnomeaudio2
 gnomebaker	ports/sysutils/gnomebaker
 gnomebasic	ports/lang/gnomebasic
-gnomeblog	ports/deskutils/gnomeblog
 gnomebreakout	ports/games/gnomebreakout
 gnomebuild	ports/devel/gnomebuild
 gnomecanvas	ports/graphics/gnomecanvas
diff --git a/MOVED b/MOVED
index c47e15f5a342..b77f4b49ed88 100644
--- a/MOVED
+++ b/MOVED
@@ -2301,3 +2301,4 @@ devel/p5-Encode|converters/p5-Encode|2006-05-27|Move to better category
 devel/p5-Encode-compat|converters/p5-Encode-compat|2006-05-27|Move to better category
 accessibility/gnomemag|accessibility/gnome-mag|2006-05-27|Renamed to use real vendor package name
 accessibility/gnomespeech|accessibility/gnome-speech|2006-05-27|Renamed to use real vendor package name
+deskutils/gnomeblog|deskutils/gnome-blog|2006-05-27|Renamed to use real vendor package name
diff --git a/deskutils/Makefile b/deskutils/Makefile
index 24ac66fdad38..0b38cb16ec34 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -48,8 +48,8 @@
     SUBDIR += glabels
     SUBDIR += gmcal
     SUBDIR += gnochm
+    SUBDIR += gnome-blog
     SUBDIR += gnome-menu-editor
-    SUBDIR += gnomeblog
     SUBDIR += gnomepim
     SUBDIR += gnomeutils2
     SUBDIR += gnotime
diff --git a/deskutils/gnomeblog/Makefile b/deskutils/gnomeblog/Makefile
deleted file mode 100644
index b08fa1a2af08..000000000000
--- a/deskutils/gnomeblog/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for:	gnomeblog
-# Date created:				20 September 2003
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomeblog
-PORTVERSION=	0.8
-PORTREVISION=	2
-CATEGORIES=	deskutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-blog/0.8
-DISTNAME=	gnome-blog-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME app to post to blogs
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_PYTHON=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix pygnome2 intlhack
-CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/libs"
-
-GCONF_SCHEMAS=	gnomeblog.schemas
-
-.include <bsd.port.mk>
diff --git a/deskutils/gnomeblog/distinfo b/deskutils/gnomeblog/distinfo
deleted file mode 100644
index 651eff506733..000000000000
--- a/deskutils/gnomeblog/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome-blog-0.8.tar.bz2) = 0a953c1dfade735285e768e785423222
-SHA256 (gnome-blog-0.8.tar.bz2) = 24823fd381369502e80e49bc5fbc0bf26600aad8cce17c0049218f4223291545
-SIZE (gnome-blog-0.8.tar.bz2) = 155839
diff --git a/deskutils/gnomeblog/files/patch-Makefile.in b/deskutils/gnomeblog/files/patch-Makefile.in
deleted file mode 100644
index 9d11f403c962..000000000000
--- a/deskutils/gnomeblog/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat May 15 14:18:59 2004
-+++ Makefile.in	Sat May 15 14:20:07 2004
-@@ -794,6 +794,8 @@
- @INTLTOOL_DESKTOP_RULE@
- 
- install-data-local:
-+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-+			    gconftool-2 --makefile-install-rule $(schema_DATA)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/deskutils/gnomeblog/pkg-descr b/deskutils/gnomeblog/pkg-descr
deleted file mode 100644
index 36d44081d028..000000000000
--- a/deskutils/gnomeblog/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-gnome-blog lets you post to bloggerAPI and MetaWeblog compatible blogs
-including blogger.com, blogspot.com, advogato.org, pyblosxom, moveable-type.
-
-Features:
-
-* Operates as a panel object ("applet") or a standalone application
-* Clean interface doesn't get in the way of what you're writing
-* WYSIWYG styled text support
-* Entries can be written gradually over the course of a day, popping
-  gnome blog open and closed as you have thoughts to jot down and
-  then posting at the end of the day
-* Supports many different kinds of blogs
-
-WWW: http://www.gnome.org/~seth/gnome-blog/
diff --git a/deskutils/gnomeblog/pkg-plist b/deskutils/gnomeblog/pkg-plist
deleted file mode 100644
index 23b5eec84ba1..000000000000
--- a/deskutils/gnomeblog/pkg-plist
+++ /dev/null
@@ -1,58 +0,0 @@
-bin/gnome-blog-poster
-%%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/__init__.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/advogato.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/advogato.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/advogato.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/aligned_window.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/aligned_window.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/aligned_window.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/blog.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/blog.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/blog.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/blog_applet.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/blog_applet.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/blog_applet.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/blog_poster.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/blog_poster.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/blog_poster.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/bloggerAPI.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/bloggerAPI.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/bloggerAPI.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/blogger_prefs.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/blogger_prefs.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/blogger_prefs.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/gconf_widgets.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/gconf_widgets.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/gconf_widgets.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/gnome-blog-poster
-%%PYTHON_SITELIBDIR%%/gnomeblog/gnome_blog_globals.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/gnome_blog_globals.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/gnome_blog_globals.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/hig_alert.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/hig_alert.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/hig_alert.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/html_converter.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/html_converter.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/html_converter.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/livejournal.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/livejournal.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/livejournal.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/proxy.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/proxy.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/proxy.pyo
-%%PYTHON_SITELIBDIR%%/gnomeblog/rich_entry.py
-%%PYTHON_SITELIBDIR%%/gnomeblog/rich_entry.pyc
-%%PYTHON_SITELIBDIR%%/gnomeblog/rich_entry.pyo
-libdata/bonobo/servers/GNOME_BlogApplet.server
-libexec/blog_applet.py
-share/gnome/applications/gnome-blog.desktop
-share/gnome/gnome-2.0/ui/GNOME_BlogApplet.xml
-share/gnome/pixmaps/gnome-blog.png
-@dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 313ad12b0154..22fbb19747e0 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${X11BASE}/lib/epiphany/2.14/extensions/libgesturesextension.so:${P
 		splashsetter:${PORTSDIR}/deskutils/splashsetter \
 		gdesklets:${PORTSDIR}/deskutils/gdesklets \
 		cog:${PORTSDIR}/sysutils/cog \
-		gnome-blog-poster:${PORTSDIR}/deskutils/gnomeblog \
+		gnome-blog-poster:${PORTSDIR}/deskutils/gnome-blog \
 		gnomesu:${PORTSDIR}/security/libgnomesu \
 		bpm:${PORTSDIR}/sysutils/bpm \
 		gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \