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

11 files changed, 3 insertions, 172 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 1c51d5b0ae68..59ff54189060 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -3215,6 +3215,7 @@ 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-build	ports/devel/gnome-build
 gnome-clipboard-daemon	ports/x11/gnome-clipboard-daemon
 gnome-colorscheme	ports/graphics/gnome-colorscheme
 gnome-commander	ports/x11-fm/gnome-commander
@@ -3277,7 +3278,6 @@ gnomeaudio2	ports/audio/gnomeaudio2
 gnomebaker	ports/sysutils/gnomebaker
 gnomebasic	ports/lang/gnomebasic
 gnomebreakout	ports/games/gnomebreakout
-gnomebuild	ports/devel/gnomebuild
 gnomecanvas	ports/graphics/gnomecanvas
 gnomechess	ports/games/gnomechess
 gnomecommon	ports/devel/gnomecommon
diff --git a/MOVED b/MOVED
index 07a04d09e4f6..e1a7a2efe741 100644
--- a/MOVED
+++ b/MOVED
@@ -2303,3 +2303,4 @@ accessibility/gnomemag|accessibility/gnome-mag|2006-05-27|Renamed to use real ve
 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
 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
diff --git a/devel/Makefile b/devel/Makefile
index 763eaad6780f..45e505aa59e6 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -336,9 +336,9 @@
     SUBDIR += glrparser
     SUBDIR += glui
     SUBDIR += gmake
+    SUBDIR += gnome-build
     SUBDIR += gnome-vfsmm
     SUBDIR += gnome2-hacker-tools
-    SUBDIR += gnomebuild
     SUBDIR += gnomecommon
     SUBDIR += gnomecrash
     SUBDIR += gnomevfs
diff --git a/devel/gnomebuild/Makefile b/devel/gnomebuild/Makefile
deleted file mode 100644
index 5d4cd4b5c40c..000000000000
--- a/devel/gnomebuild/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for:	gnomebuild
-# Date created:				24 July 2001
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomebuild
-PORTVERSION=	0.1.3
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/gnome/gnome-/}/0.1
-DISTNAME=	${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A GNOME Build Framework (GBF)
-
-LIB_DEPENDS=	gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui gnomevfs2
-USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-USE_PERL5_RUN=	yes
-CONFIGURE_ARGS=	--enable-compile-warnings=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lgnuregex"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500000
-EXTRA_PATCHES+=	${FILESDIR}/current-src_backends_libgbf_am_gbf-am-project.c
-.elif ${ARCH} != "i386"
-EXTRA_PATCHES+=	${FILESDIR}/stable-src_backends_libgbf_am_gbf-am-project.c
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/gnomebuild/distinfo b/devel/gnomebuild/distinfo
deleted file mode 100644
index a76a636e6e79..000000000000
--- a/devel/gnomebuild/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome-build-0.1.3.tar.bz2) = 7a879bfa906036c8546cea88eb6fe793
-SHA256 (gnome-build-0.1.3.tar.bz2) = 817d99a70f661b44186eac34d3cf8620df35f70373f0f24e7d677cb30073bb05
-SIZE (gnome-build-0.1.3.tar.bz2) = 444539
diff --git a/devel/gnomebuild/files/current-src_backends_libgbf_am_gbf-am-project.c b/devel/gnomebuild/files/current-src_backends_libgbf_am_gbf-am-project.c
deleted file mode 100644
index 10ae4bed5cbb..000000000000
--- a/devel/gnomebuild/files/current-src_backends_libgbf_am_gbf-am-project.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/backends/libgbf_am/gbf-am-project.c.orig	Fri May  2 06:12:51 2003
-+++ src/backends/libgbf_am/gbf-am-project.c	Sat Jan 31 13:22:04 2004
-@@ -1750,7 +1750,7 @@
- 
- 		switch (status) {
- 		    case G_IO_STATUS_NORMAL:
--			    DEBUG (g_message ("wrote %d bytes", bytes_written));
-+			    DEBUG (g_message ("wrote %zu bytes", bytes_written));
- 			    
- 			    if (data->input.length < data->input.size) {
- 				    /* don't remove the source */
diff --git a/devel/gnomebuild/files/patch-src::backends::libgbf_am::gbf-am-build.c b/devel/gnomebuild/files/patch-src::backends::libgbf_am::gbf-am-build.c
deleted file mode 100644
index 4c8380eb3706..000000000000
--- a/devel/gnomebuild/files/patch-src::backends::libgbf_am::gbf-am-build.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/backends/libgbf_am/gbf-am-build.c.orig	Thu Oct 16 11:34:19 2003
-+++ src/backends/libgbf_am/gbf-am-build.c	Thu Oct 16 11:35:42 2003
-@@ -27,9 +27,9 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
--#include <regex.h>
- #include "gbf-i18n.h"
- #include "gbf-am-build.h"
-+#include <gnuregex.h>
- 
- /* FIXME: mark strings for translation and this file to POTFILES.in */
- 
diff --git a/devel/gnomebuild/files/patch-src_backends_libgbf_mkfile_gbf-mkfile-build.c b/devel/gnomebuild/files/patch-src_backends_libgbf_mkfile_gbf-mkfile-build.c
deleted file mode 100644
index 698c8f484da1..000000000000
--- a/devel/gnomebuild/files/patch-src_backends_libgbf_mkfile_gbf-mkfile-build.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/backends/libgbf_mkfile/gbf-mkfile-build.c.orig	Mon May 15 18:06:23 2006
-+++ src/backends/libgbf_mkfile/gbf-mkfile-build.c	Mon May 15 18:07:32 2006
-@@ -32,7 +32,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
--#include <regex.h>
- #include "gbf-i18n.h"
- #include "gbf-mkfile-build.h"
-+#include <gnuregex.h>
- 
diff --git a/devel/gnomebuild/files/stable-src_backends_libgbf_am_gbf-am-project.c b/devel/gnomebuild/files/stable-src_backends_libgbf_am_gbf-am-project.c
deleted file mode 100644
index 262756b88ad1..000000000000
--- a/devel/gnomebuild/files/stable-src_backends_libgbf_am_gbf-am-project.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/backends/libgbf_am/gbf-am-project.c.orig	Fri May  2 06:12:51 2003
-+++ src/backends/libgbf_am/gbf-am-project.c	Sat Jan 31 13:22:04 2004
-@@ -1750,7 +1750,7 @@
- 
- 		switch (status) {
- 		    case G_IO_STATUS_NORMAL:
--			    DEBUG (g_message ("wrote %d bytes", bytes_written));
-+			    DEBUG (g_message ("wrote %lu bytes", bytes_written));
- 			    
- 			    if (data->input.length < data->input.size) {
- 				    /* don't remove the source */
diff --git a/devel/gnomebuild/pkg-descr b/devel/gnomebuild/pkg-descr
deleted file mode 100644
index 60385151a1e2..000000000000
--- a/devel/gnomebuild/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a GNOME Build Framework (GBF).
-
-WWW: http://www.gnome.org/
diff --git a/devel/gnomebuild/pkg-plist b/devel/gnomebuild/pkg-plist
deleted file mode 100644
index 74aae2e93edc..000000000000
--- a/devel/gnomebuild/pkg-plist
+++ /dev/null
@@ -1,78 +0,0 @@
-bin/gbf-am-parse
-bin/gbf-mkfile-parse
-include/gnome-build-1.0/gbf/gbf-backend.h
-include/gnome-build-1.0/gbf/gbf-build-info.h
-include/gnome-build-1.0/gbf/gbf-project-model.h
-include/gnome-build-1.0/gbf/gbf-project-util.h
-include/gnome-build-1.0/gbf/gbf-project-view.h
-include/gnome-build-1.0/gbf/gbf-project.h
-include/gnome-build-1.0/gbf/gbf-tree-data.h
-include/gnome-build-1.0/gbf/gbf-widgets.h
-include/gnome-build-1.0/gbf/glue-plugin.h
-lib/gnome-build-1.0/backends/gbf-am.server
-lib/gnome-build-1.0/backends/gbf-mkfile.server
-lib/gnome-build-1.0/backends/libgbf-am.la
-lib/gnome-build-1.0/backends/libgbf-am.so
-lib/gnome-build-1.0/backends/libgbf-am.so.0
-lib/gnome-build-1.0/backends/libgbf-mkfile.la
-lib/gnome-build-1.0/backends/libgbf-mkfile.so
-lib/gnome-build-1.0/backends/libgbf-mkfile.so.0
-lib/libgbf-1.la
-lib/libgbf-1.so
-lib/libgbf-1.so.0
-lib/libgbf-widgets-1.so
-lib/libgbf-widgets-1.la
-lib/libgbf-widgets-1.so.0
-libdata/pkgconfig/gnome-build-1.0.pc
-share/gnome/gnome-build/GBF/AmFiles.pm
-share/gnome/gnome-build/GBF/General.pm
-share/gnome/gnome-build/GBF/Make.pm
-share/gnome/gnome-build/glade/create_dialogs.glade
-share/gnome/gnome-build/glade/gbf-am-dialogs.glade
-share/gnome/pixmaps/gbf-build.png
-share/gnome/pixmaps/gbf-install.png
-share/locale/am/LC_MESSAGES/gbf-1.mo
-share/locale/az/LC_MESSAGES/gbf-1.mo
-share/locale/be/LC_MESSAGES/gbf-1.mo
-share/locale/ca/LC_MESSAGES/gbf-1.mo
-share/locale/cs/LC_MESSAGES/gbf-1.mo
-share/locale/de/LC_MESSAGES/gbf-1.mo
-share/locale/el/LC_MESSAGES/gbf-1.mo
-share/locale/en_CA/LC_MESSAGES/gbf-1.mo
-share/locale/en_GB/LC_MESSAGES/gbf-1.mo
-share/locale/es/LC_MESSAGES/gbf-1.mo
-share/locale/fi/LC_MESSAGES/gbf-1.mo
-share/locale/fr/LC_MESSAGES/gbf-1.mo
-share/locale/gl/LC_MESSAGES/gbf-1.mo
-share/locale/hr/LC_MESSAGES/gbf-1.mo
-share/locale/hu/LC_MESSAGES/gbf-1.mo
-share/locale/it/LC_MESSAGES/gbf-1.mo
-share/locale/ja/LC_MESSAGES/gbf-1.mo
-share/locale/lv/LC_MESSAGES/gbf-1.mo
-share/locale/mk/LC_MESSAGES/gbf-1.mo
-share/locale/ml/LC_MESSAGES/gbf-1.mo
-share/locale/ms/LC_MESSAGES/gbf-1.mo
-share/locale/nb/LC_MESSAGES/gbf-1.mo
-share/locale/ne/LC_MESSAGES/gbf-1.mo
-share/locale/nl/LC_MESSAGES/gbf-1.mo
-share/locale/pa/LC_MESSAGES/gbf-1.mo
-share/locale/pl/LC_MESSAGES/gbf-1.mo
-share/locale/pt/LC_MESSAGES/gbf-1.mo
-share/locale/pt_BR/LC_MESSAGES/gbf-1.mo
-share/locale/ru/LC_MESSAGES/gbf-1.mo
-share/locale/rw/LC_MESSAGES/gbf-1.mo
-share/locale/sk/LC_MESSAGES/gbf-1.mo
-share/locale/sq/LC_MESSAGES/gbf-1.mo
-share/locale/sr/LC_MESSAGES/gbf-1.mo
-share/locale/sr@Latn/LC_MESSAGES/gbf-1.mo
-share/locale/sv/LC_MESSAGES/gbf-1.mo
-share/locale/uk/LC_MESSAGES/gbf-1.mo
-share/locale/vi/LC_MESSAGES/gbf-1.mo
-share/locale/zh_CN/LC_MESSAGES/gbf-1.mo
-@dirrm share/gnome/gnome-build/glade
-@dirrm share/gnome/gnome-build/GBF
-@dirrm share/gnome/gnome-build
-@dirrm lib/gnome-build-1.0/backends
-@dirrm lib/gnome-build-1.0
-@dirrm include/gnome-build-1.0/gbf
-@dirrm include/gnome-build-1.0