12 files changed, 99 insertions, 79 deletions

diff --git a/misc/metatheme2/Makefile b/misc/metatheme2/Makefile
index d203b8175c83..a12f9a9249b7 100644
--- a/misc/metatheme2/Makefile
+++ b/misc/metatheme2/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	metatheme
-PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTVERSION=	0.6.0
 CATEGORIES=	misc gnome
-MASTER_SITES=	ftp://ftp.helixcode.com/pub/obsolete/metatheme/
+MASTER_SITES=	ftp://ftp.ximian.com/pub/metatheme/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
diff --git a/misc/metatheme2/distinfo b/misc/metatheme2/distinfo
index bd73cd41eb19..1ff21a5b3be0 100644
--- a/misc/metatheme2/distinfo
+++ b/misc/metatheme2/distinfo
@@ -1 +1 @@
-MD5 (metatheme-0.5.0.tar.gz) = e3e5f9a57d58e132092b9c16b877c8ae
+MD5 (metatheme-0.6.0.tar.gz) = ab076f973ee0de37a5b69371e8ac52a8
diff --git a/misc/metatheme2/files/patch-Makefile.in b/misc/metatheme2/files/patch-Makefile.in
new file mode 100644
index 000000000000..97ab5ea2740f
--- /dev/null
+++ b/misc/metatheme2/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in	2001/07/10 06:14:43	1.1
++++ Makefile.in	2001/07/10 06:14:59
+@@ -141,7 +141,7 @@
+ appicondir = $(datadir)/pixmaps
+ appicon_DATA = gnome-application-x-metatheme.png
+ 
+-mtmdir = $(prefix)/share/metathemes
++mtmdir = $(prefix)/share/gnome/metathemes
+ mtm_DATA = default.mtm
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/misc/metatheme2/files/patch-aa b/misc/metatheme2/files/patch-aa
deleted file mode 100644
index c12316601bc7..000000000000
--- a/misc/metatheme2/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- mtm-ui/Makefile.in	2000/11/25 22:18:16	1.1
-+++ mtm-ui/Makefile.in	2000/11/25 22:22:42
-@@ -149,7 +149,7 @@
- 
- 
- test_selector_SOURCES = test-selector.c
--test_selector_LDFLAGS =  	`gnome-config --libs xml gnome` 	`gtk-config --libs`
-+test_selector_LDFLAGS = @GNOME_LIBS@ @GTK_LIBS@ @EXTRA_LIBS@
- 
- 
- test_selector_LDADD =  	../mtm/libmtm.la		libmtm-ui.la
diff --git a/misc/metatheme2/files/patch-ab b/misc/metatheme2/files/patch-ab
index 3535dde01329..3b64984eeaa2 100644
--- a/misc/metatheme2/files/patch-ab
+++ b/misc/metatheme2/files/patch-ab
@@ -1,11 +1,23 @@
---- plugins/gtk/Makefile.in	2000/11/26 21:12:29	1.1
-+++ plugins/gtk/Makefile.in	2000/11/26 21:12:58
-@@ -148,7 +148,7 @@
+
+$FreeBSD$
+
+--- plugins/gtk/Makefile.in.orig	Tue Jul 10 09:01:49 2001
++++ plugins/gtk/Makefile.in	Tue Jul 10 09:04:51 2001
+@@ -143,7 +143,7 @@
+ themehelper_SOURCES =  	themehelper.c
+ 
+ 
+-EXTRA_STUFF = `gtk-config --libs`
++EXTRA_STUFF = @GTK_LIBS@
+ themehelper_LDFLAGS =  	$(EXTRA_STUFF)		
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -156,7 +156,7 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
 -libgtk_la_LDFLAGS = 
 +libgtk_la_LDFLAGS = -module -avoid-version
  libgtk_la_LIBADD = 
- libgtk_la_OBJECTS =  gtk-plugin.lo
- CFLAGS = @CFLAGS@
+ libgtk_la_OBJECTS =  gtk-plugin.lo gtk-config-gui.lo
+ PROGRAMS =  $(bin_PROGRAMS)
diff --git a/misc/metatheme2/files/patch-ae b/misc/metatheme2/files/patch-ae
deleted file mode 100644
index 2c014ca52fcd..000000000000
--- a/misc/metatheme2/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/preview/Makefile.in	2000/11/26 21:12:29	1.1
-+++ plugins/preview/Makefile.in	2000/11/26 21:13:09
-@@ -148,7 +148,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libpreview_la_LDFLAGS = 
-+libpreview_la_LDFLAGS = -module -avoid-version
- libpreview_la_LIBADD = 
- libpreview_la_OBJECTS =  preview-plugin.lo
- CFLAGS = @CFLAGS@
diff --git a/misc/metatheme2/files/patch-ah b/misc/metatheme2/files/patch-ah
index f076ab19267e..bf60fc5a820b 100644
--- a/misc/metatheme2/files/patch-ah
+++ b/misc/metatheme2/files/patch-ah
@@ -1,9 +1,12 @@
---- plugins/sawfish/sawfish-plugin.c	2000/11/26 21:31:47	1.1
-+++ plugins/sawfish/sawfish-plugin.c	2000/11/26 21:35:26
-@@ -227,7 +227,7 @@
- 	gchar *name, gboolean is_root)
+
+$FreeBSD$
+
+--- plugins/sawfish/sawfish-plugin.c.orig	Sat Jun 23 00:02:09 2001
++++ plugins/sawfish/sawfish-plugin.c	Tue Jul 10 08:59:34 2001
+@@ -224,7 +224,7 @@
+ sawfish_plugin_theme_find (MtmExtHandler *handler, const gchar *name,gboolean is_root) 
  {
- 	gchar *root_prefixes[] = {"share/sawfish/themes", NULL};
+ 	gchar *root_prefixes[] = {"share/sawfish/themes", NULL, NULL};
 -	gchar *pre_prefixes[] = {"/usr/", "/usr/local/", NULL};
 +	gchar *pre_prefixes[] = {"%%X11BASE%%", "%%LOCALBASE%%", NULL};
  	gchar *user_prefixes[] = {".sawfish/themes", NULL};
diff --git a/misc/metatheme2/files/patch-capplet::metatheme-preview.c b/misc/metatheme2/files/patch-capplet::metatheme-preview.c
deleted file mode 100644
index afd6faf170dd..000000000000
--- a/misc/metatheme2/files/patch-capplet::metatheme-preview.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- capplet/metatheme-preview.c.orig	Fri Nov 10 20:59:14 2000
-+++ capplet/metatheme-preview.c	Thu Apr 19 14:23:34 2001
-@@ -195,3 +195,3 @@
- 		case ARG_HAS_FOCUS:
--			e_canvas_item_grab_focus (item);
-+			e_canvas_item_grab_focus (item, TRUE);
- 			break;
-@@ -378,3 +378,3 @@
- 			if (event->button.button == 1)
--				e_canvas_item_grab_focus (item);
-+				e_canvas_item_grab_focus (item, TRUE);
- 			break;
-@@ -474,3 +474,3 @@
- 
--	e_canvas_item_grab_focus (GNOME_CANVAS_ITEM (preview));
-+	e_canvas_item_grab_focus (GNOME_CANVAS_ITEM (preview), TRUE);
- }
diff --git a/misc/metatheme2/files/patch-capplet::mtm-reflow-view.c b/misc/metatheme2/files/patch-capplet::mtm-reflow-view.c
deleted file mode 100644
index 845e5888200a..000000000000
--- a/misc/metatheme2/files/patch-capplet::mtm-reflow-view.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplet/mtm-reflow-view.c.orig	Fri Nov 10 20:59:14 2000
-+++ capplet/mtm-reflow-view.c	Thu Apr 19 14:30:24 2001
-@@ -191,2 +191,3 @@
- 	GnomeCanvasItem *item;
-+	gint position = 0;
- 
-@@ -208,3 +209,3 @@
- 
--	e_reflow_add_item (E_REFLOW (view->priv->reflow), item);
-+	e_reflow_add_item (E_REFLOW (view->priv->reflow), item, &position);
- 	view->priv->previews = g_list_append (view->priv->previews, item);
diff --git a/misc/metatheme2/files/patch-capplet::mtm-selector.c b/misc/metatheme2/files/patch-capplet::mtm-selector.c
new file mode 100644
index 000000000000..dea390992adf
--- /dev/null
+++ b/misc/metatheme2/files/patch-capplet::mtm-selector.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- capplet/mtm-selector.c	2001/07/10 06:15:32	1.1
++++ capplet/mtm-selector.c	2001/07/10 06:16:15
+@@ -203,7 +203,7 @@
+ 
+ 	g_return_if_fail (MTM_IS_SELECTOR (selector));
+ 				   
+-	sysdir  = g_strdup_printf ("%s/share/metathemes", mtm_get_prefix ());
++	sysdir  = g_strdup_printf ("%s/share/gnome/metathemes", mtm_get_prefix ());
+ 	userdir = g_strdup_printf ("%s/.metathemes", g_get_home_dir ());
+      /* Create it if it doesn't exist */
+ 	mtm_check_dir (userdir);
diff --git a/misc/metatheme2/files/patch-metatheme-edit::Makefile.in b/misc/metatheme2/files/patch-metatheme-edit::Makefile.in
new file mode 100644
index 000000000000..a1a1130487c6
--- /dev/null
+++ b/misc/metatheme2/files/patch-metatheme-edit::Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- metatheme-edit/Makefile.in.orig	Tue Jul 10 09:01:49 2001
++++ metatheme-edit/Makefile.in	Tue Jul 10 09:10:07 2001
+@@ -133,7 +133,7 @@
+ metatheme_edit_SOURCES =  	main.c		editor-shell.c		editor-shell.h		editor-page.c		editor-page.h		editor-main-page.c 	editor-main-page.h 	save.c 			save.h
+ 
+ 
+-EXTRA_STUFF = `gnome-config --libs libglade xml`
++EXTRA_STUFF = @GNOME_LIBS@ @GTK_LIBS@ @EXTRA_LIBS@
+ metatheme_edit_LDFLAGS =  	$(EXTRA_STUFF)			../mtm/libmtm.la		
+ 
+ 
+@@ -152,7 +152,7 @@
+ gladedir = $(SHAREDIR)
+ glade_DATA = metatheme-edit.glade
+ 
+-pixmapsdir = $(prefix)/share/pixmaps
++pixmapsdir = $(prefix)/share/gnome/pixmaps
+ pixmaps_DATA = 32_butteflylogo.png settings.png
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff --git a/misc/metatheme2/pkg-plist b/misc/metatheme2/pkg-plist
index 4e40d234ef0c..26c3cb541b88 100644
--- a/misc/metatheme2/pkg-plist
+++ b/misc/metatheme2/pkg-plist
@@ -1,47 +1,52 @@
 bin/metatheme-edit
-bin/metatheme-install
 bin/metatheme_selector_capplet
-include/mtm-ui/mtm-ext-selector.h
+include/mtm/mtm-config-gui.h
 include/mtm/mtm-env.h
 include/mtm/mtm-ext-handler.h
 include/mtm/mtm-ext.h
+include/mtm/mtm-gui-handler.h
 include/mtm/mtm-handler.h
 include/mtm/mtm-init.h
 include/mtm/mtm-plugin.h
 include/mtm/mtm-stateful.h
-include/mtm/mtm-theme-ball.h
 include/mtm/mtm-theme.h
 include/mtm/mtm-util.h
 include/mtm/mtm.h
-lib/libmtm-ui.a
-lib/libmtm-ui.so
-lib/libmtm-ui.so.0
 lib/libmtm.a
 lib/libmtm.so
 lib/libmtm.so.0
+lib/metatheme/plugins/gtk/themehelper
 lib/metatheme/plugins/libbackground.so
 lib/metatheme/plugins/libgtk.so
-lib/metatheme/plugins/libpreview.so
 lib/metatheme/plugins/libsawfish.so
 share/gnome/apps/Applications/metatheme-edit.desktop
 share/gnome/apps/Settings/Desktop/metatheme_selector.desktop
 share/gnome/control-center/Desktop/metatheme_selector.desktop
+share/gnome/metatheme-glade/bg-config-gui.glade
+share/gnome/metatheme-glade/metatheme-edit.glade
+share/gnome/metatheme-glade/mtm-sel.glade
+share/gnome/metatheme-glade/mtm-selector.glade
+share/gnome/metathemes/default.mtm
 share/gnome/mime-info/metatheme-edit.keys
-share/gnome/mime-info/metatheme-install.keys
 share/gnome/mime-info/metatheme.keys
 share/gnome/mime-info/metatheme.mime
+share/gnome/pixmaps/32_butteflylogo.png
 share/gnome/pixmaps/gnome-application-x-metatheme.png
+share/gnome/pixmaps/settings.png
 share/locale/da/LC_MESSAGES/metatheme.mo
+share/locale/de/LC_MESSAGES/metatheme.mo
 share/locale/fr/LC_MESSAGES/metatheme.mo
+share/locale/hu/LC_MESSAGES/metatheme.mo
+share/locale/it/LC_MESSAGES/metatheme.mo
+share/locale/ko/LC_MESSAGES/metatheme.mo
+share/locale/no/LC_MESSAGES/metatheme.mo
 share/locale/pt_BR/LC_MESSAGES/metatheme.mo
+share/locale/ru/LC_MESSAGES/metatheme.mo
+share/locale/sv/LC_MESSAGES/metatheme.mo
 share/locale/tr/LC_MESSAGES/metatheme.mo
-share/metatheme-glade/metatheme-edit.glade
-share/metatheme-glade/metatheme-install.glade
-share/metatheme-glade/mtm-sel.glade
-share/metathemes/default.mtm
-@dirrm share/metathemes
-@dirrm share/metatheme-glade
+@dirrm share/gnome/metathemes
+@dirrm share/gnome/metatheme-glade
+@dirrm lib/metatheme/plugins/gtk
 @dirrm lib/metatheme/plugins
 @dirrm lib/metatheme
-@dirrm include/mtm-ui
 @dirrm include/mtm