share/gnome -> share

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8625 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 58 insertions, 78 deletions

diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 6808bed3a..87e273ea9 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.98 2007/03/13 01:24:10 marcus Exp $
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.100 2007/04/23 15:53:39 ahze Exp $
 #
 
 PORTNAME=	gtkhtml3
 PORTVERSION=	3.15.1
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/gtkhtml3/files/patch-src_gtkhtml.c b/www/gtkhtml3/files/patch-src_gtkhtml.c
deleted file mode 100644
index cc9534035..000000000
--- a/www/gtkhtml3/files/patch-src_gtkhtml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig	Mon Aug 22 15:56:46 2005
-+++ src/gtkhtml.c	Mon Aug 22 18:56:03 2005
-@@ -3104,7 +3104,7 @@
- 	add_bindings (klass);
- 	gtk_html_accessibility_init ();
- 
--	filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
-+	filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
- 	gtk_rc_parse (filename);
- 	g_free (filename);
- 	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 1a964af4b..790fcad49 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -17,31 +17,31 @@ lib/libgtkhtml-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.so.19
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
-share/gnome/gtkhtml-%%VERSION%%/Editor.idl
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
-share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png
-share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png
-share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png
-share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rect.png
-share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/texture.png
-share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png
-share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs
+share/gtkhtml-%%VERSION%%/Editor.idl
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
+share/gtkhtml-%%VERSION%%/icons/bulb.png
+share/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/draft-paper.png
+share/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/empty_image.png
+share/gtkhtml-%%VERSION%%/icons/flowers.png
+share/gtkhtml-%%VERSION%%/icons/html-viewer.png
+share/gtkhtml-%%VERSION%%/icons/info_bulb.png
+share/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
+share/gtkhtml-%%VERSION%%/icons/paper.png
+share/gtkhtml-%%VERSION%%/icons/rect.png
+share/gtkhtml-%%VERSION%%/icons/ribbon.jpg
+share/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
+share/gtkhtml-%%VERSION%%/icons/texture.png
+share/gtkhtml-%%VERSION%%/icons/transparent.png
+share/gtkhtml-%%VERSION%%/keybindingsrc.emacs
 share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -112,8 +112,8 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
-@dirrm share/gnome/gtkhtml-%%VERSION%%
+@dirrm share/gtkhtml-%%VERSION%%/icons
+@dirrm share/gtkhtml-%%VERSION%%
 @dirrm lib/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 6808bed3a..87e273ea9 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.98 2007/03/13 01:24:10 marcus Exp $
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.100 2007/04/23 15:53:39 ahze Exp $
 #
 
 PORTNAME=	gtkhtml3
 PORTVERSION=	3.15.1
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/gtkhtml38/files/patch-src_gtkhtml.c b/www/gtkhtml38/files/patch-src_gtkhtml.c
deleted file mode 100644
index cc9534035..000000000
--- a/www/gtkhtml38/files/patch-src_gtkhtml.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gtkhtml.c.orig	Mon Aug 22 15:56:46 2005
-+++ src/gtkhtml.c	Mon Aug 22 18:56:03 2005
-@@ -3104,7 +3104,7 @@
- 	add_bindings (klass);
- 	gtk_html_accessibility_init ();
- 
--	filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
-+	filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
- 	gtk_rc_parse (filename);
- 	g_free (filename);
- 	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 1a964af4b..790fcad49 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -17,31 +17,31 @@ lib/libgtkhtml-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.so.19
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
-share/gnome/gtkhtml-%%VERSION%%/Editor.idl
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
-share/gnome/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
-share/gnome/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
-share/gnome/gtkhtml-%%VERSION%%/icons/bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/empty_image.png
-share/gnome/gtkhtml-%%VERSION%%/icons/flowers.png
-share/gnome/gtkhtml-%%VERSION%%/icons/html-viewer.png
-share/gnome/gtkhtml-%%VERSION%%/icons/info_bulb.png
-share/gnome/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/paper.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rect.png
-share/gnome/gtkhtml-%%VERSION%%/icons/ribbon.jpg
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
-share/gnome/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
-share/gnome/gtkhtml-%%VERSION%%/icons/texture.png
-share/gnome/gtkhtml-%%VERSION%%/icons/transparent.png
-share/gnome/gtkhtml-%%VERSION%%/keybindingsrc.emacs
+share/gtkhtml-%%VERSION%%/Editor.idl
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml
+share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml
+share/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade
+share/gtkhtml-%%VERSION%%/icons/bulb.png
+share/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/draft-paper.png
+share/gtkhtml-%%VERSION%%/icons/draft-stamp.jpg
+share/gtkhtml-%%VERSION%%/icons/empty_image.png
+share/gtkhtml-%%VERSION%%/icons/flowers.png
+share/gtkhtml-%%VERSION%%/icons/html-viewer.png
+share/gtkhtml-%%VERSION%%/icons/info_bulb.png
+share/gtkhtml-%%VERSION%%/icons/midnight-stars.jpg
+share/gtkhtml-%%VERSION%%/icons/paper.png
+share/gtkhtml-%%VERSION%%/icons/rect.png
+share/gtkhtml-%%VERSION%%/icons/ribbon.jpg
+share/gtkhtml-%%VERSION%%/icons/rule-blue-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-blue-right.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-center.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-left.png
+share/gtkhtml-%%VERSION%%/icons/rule-yellow-flowers-right.png
+share/gtkhtml-%%VERSION%%/icons/texture.png
+share/gtkhtml-%%VERSION%%/icons/transparent.png
+share/gtkhtml-%%VERSION%%/keybindingsrc.emacs
 share/locale/am/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -112,8 +112,8 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
-@dirrm share/gnome/gtkhtml-%%VERSION%%
+@dirrm share/gtkhtml-%%VERSION%%/icons
+@dirrm share/gtkhtml-%%VERSION%%
 @dirrm lib/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%