Add metatheme2 after a repo copy from metatheme. Metatheme is the

multi-application theme manager for the GNOME 2.0 desktop.

20 files changed, 158 insertions, 143 deletions

diff --git a/misc/Makefile b/misc/Makefile
index a61697cb3a7c..450325d5acaa 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -187,6 +187,7 @@
     SUBDIR += mc
     SUBDIR += menushki
     SUBDIR += metatheme
+    SUBDIR += metatheme2
     SUBDIR += mgp-mode.el
     SUBDIR += misterproper
     SUBDIR += mmv
diff --git a/misc/metatheme2/Makefile b/misc/metatheme2/Makefile
index 6c412b632fa7..8f27bcf10502 100644
--- a/misc/metatheme2/Makefile
+++ b/misc/metatheme2/Makefile
@@ -1,40 +1,43 @@
-# New ports collection makefile for:	metatheme
-# Date created:				25 November 2000
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+# New ports collection makefile for:    metatheme2
+# Date created:                         19 May 2002
+# Whom:                                 Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	metatheme
-PORTVERSION=	0.6.0
+PORTNAME=	metatheme2
+PORTVERSION=	0.9.7
 CATEGORIES=	misc gnome
-MASTER_SITES=	ftp://ftp.ximian.com/pub/metatheme/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+DISTNAME=	metatheme-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
-MAINTAINER=	sobomax@FreeBSD.org
+MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnet.0:${PORTSDIR}/net/gnet
-
-BROKEN=		"Out of sync with latest Gal"
+LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
 USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+PLIST_SUB=	VERSION=${PORTVERSION}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 post-configure:
-.for file in gtk/gtk-plugin.c background/background-plugin.c sawfish/sawfish-plugin.c
-	@${PERL} -pi -e 's|%%GTK_CONFIG%%|${GTK_CONFIG}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g ; s|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/plugins/${file}
-.endfor
+	@find ${WRKSRC}/plugins -name "*.c" | xargs ${PERL} -pi -e \
+		's|%%X11BASE%%|${X11BASE}|g ; s|%%LOCALBASE%%|${LOCALBASE}|g'
 
 .include <bsd.port.mk>
diff --git a/misc/metatheme2/distinfo b/misc/metatheme2/distinfo
index 1ff21a5b3be0..1d8e19bc28e8 100644
--- a/misc/metatheme2/distinfo
+++ b/misc/metatheme2/distinfo
@@ -1 +1 @@
-MD5 (metatheme-0.6.0.tar.gz) = ab076f973ee0de37a5b69371e8ac52a8
+MD5 (gnome2/metatheme-0.9.7.tar.bz2) = bba39ec97ddd48f1e1b1f558bfabd6ae
diff --git a/misc/metatheme2/files/patch-Makefile.in b/misc/metatheme2/files/patch-Makefile.in
deleted file mode 100644
index 97ab5ea2740f..000000000000
--- a/misc/metatheme2/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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-ab b/misc/metatheme2/files/patch-ab
index 3b64984eeaa2..512018ee7fb9 100644
--- a/misc/metatheme2/files/patch-ab
+++ b/misc/metatheme2/files/patch-ab
@@ -1,23 +1,11 @@
-
-$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 @@
+--- plugins/gtk/Makefile.in.orig	Sun May 19 16:28:24 2002
++++ plugins/gtk/Makefile.in	Sun May 19 16:28:33 2002
+@@ -134,7 +134,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 gtk-config-gui.lo
- PROGRAMS =  $(bin_PROGRAMS)
+-libgtkplugin1_la_LDFLAGS = 
++libgtkplugin1_la_LDFLAGS = -avoid-version -module
+ libgtkplugin1_la_LIBADD = 
+ libgtkplugin1_la_OBJECTS =  gtk-plugin.lo gtk-config-gui.lo
+ CFLAGS = @CFLAGS@
diff --git a/misc/metatheme2/files/patch-ac b/misc/metatheme2/files/patch-ac
index 2715b1dfa872..a7253f72c5c1 100644
--- a/misc/metatheme2/files/patch-ac
+++ b/misc/metatheme2/files/patch-ac
@@ -1,23 +1,11 @@
-
-$FreeBSD$
-
---- plugins/background/Makefile.in.orig	Wed Dec 19 13:42:05 2001
-+++ plugins/background/Makefile.in	Wed Dec 19 13:44:54 2001
-@@ -137,7 +137,7 @@
- 
- libbackground_la_LIBADD = $(GDK_PIXBUF_LIBS) $(LIBGLADE_LIBS)
- 
--INCLUDES =  	-I$(top_srcdir)						-I$(METATHEME_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)						$(GNOME_INCLUDEDIR)					-DSHAREDIR=\"$(SHAREDIR)\"				$(LIBGLADE_CFLAGS)
-+INCLUDES =  	$(GDK_PIXBUF_CFLAGS)	-I$(top_srcdir)						-I$(METATHEME_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)						$(GNOME_INCLUDEDIR)					-DSHAREDIR=\"$(SHAREDIR)\"				$(LIBGLADE_CFLAGS)
- 
- 
- EXTRA_DIST = bg-config-gui.glade translatable.c
-@@ -155,7 +155,7 @@
+--- plugins/background/Makefile.in.orig	Sun May 19 04:18:15 2002
++++ plugins/background/Makefile.in	Sun May 19 04:19:16 2002
+@@ -145,7 +145,7 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
--libbackground_la_LDFLAGS = 
-+libbackground_la_LDFLAGS = -module -avoid-version
- libbackground_la_DEPENDENCIES = 
- libbackground_la_OBJECTS =  background-plugin.lo config-io.lo \
- bg-ext-handler.lo bg-config-gui.lo
+-libbgplugin_la_LDFLAGS = 
++libbgplugin_la_LDFLAGS = -avoid-version -module
+ libbgplugin_la_DEPENDENCIES =  \
+ $(top_builddir)/libbackground/libbackground.la
+ libbgplugin_la_OBJECTS =  background-plugin.lo config-io.lo \
diff --git a/misc/metatheme2/files/patch-ad b/misc/metatheme2/files/patch-ad
index 015bddfcccf5..a2ebce72d5c2 100644
--- a/misc/metatheme2/files/patch-ad
+++ b/misc/metatheme2/files/patch-ad
@@ -1,11 +1,11 @@
---- plugins/sawfish/Makefile.in	2000/11/26 21:12:29	1.1
-+++ plugins/sawfish/Makefile.in	2000/11/26 21:13:06
-@@ -148,7 +148,7 @@
+--- plugins/sawfish/Makefile.in.orig	Sun May 19 16:30:59 2002
++++ plugins/sawfish/Makefile.in	Sun May 19 16:31:06 2002
+@@ -134,7 +134,7 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
 -libsawfish_la_LDFLAGS = 
-+libsawfish_la_LDFLAGS = -module -avoid-version
++libsawfish_la_LDFLAGS = -avoid-version -module
  libsawfish_la_LIBADD = 
- libsawfish_la_OBJECTS =  sawfish-plugin.lo
+ libsawfish_la_OBJECTS =  sawfish-plugin.lo sawfish-config-gui.lo
  CFLAGS = @CFLAGS@
diff --git a/misc/metatheme2/files/patch-af b/misc/metatheme2/files/patch-af
deleted file mode 100644
index 572e38b524b2..000000000000
--- a/misc/metatheme2/files/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
---- plugins/gtk/gtk-plugin.c	2000/11/26 21:25:12	1.1
-+++ plugins/gtk/gtk-plugin.c	2000/11/26 21:27:39
-@@ -375,15 +375,15 @@
- 	
- 	/* This should be more robust.
- 	 * Perhaps we could make this user-configurable somehow. */
--	pipe = popen ("gtk-config --prefix", "r"); 
-+	pipe = popen ("%%GTK_CONFIG%% --prefix", "r"); 
- 	if (pipe == NULL)
--		return g_strdup ("/usr");
-+		return g_strdup ("%%X11BASE%%");
- 
- 	fgets (prefix, 1000, pipe);
- 	pclose (pipe);
- 	
- 	if (prefix == NULL)
--		return g_strdup ("/usr");
-+		return g_strdup ("%%X11BASE%%");
- 	
- 	return g_strchomp (g_strdup (prefix));
- }
diff --git a/misc/metatheme2/files/patch-ag b/misc/metatheme2/files/patch-ag
index 7e22f7655ec9..594f08020637 100644
--- a/misc/metatheme2/files/patch-ag
+++ b/misc/metatheme2/files/patch-ag
@@ -1,8 +1,8 @@
---- plugins/background/background-plugin.c	2000/11/26 21:31:41	1.1
-+++ plugins/background/background-plugin.c	2000/11/26 21:33:54
-@@ -227,9 +227,9 @@
- bg_plugin_find_theme (MtmExtHandler *handler, gchar *name,
- 	gboolean is_root)
+--- plugins/background/background-plugin.c.orig	Sun May 19 04:01:16 2002
++++ plugins/background/background-plugin.c	Sun May 19 04:02:12 2002
+@@ -101,9 +101,9 @@
+ static gchar *
+ bg_plugin_theme_find (MtmExtHandler *handler, const gchar *name, gboolean is_root)
  {
 -	gchar *root_prefixes[] = {"/usr/share/pixmaps/backgrounds",
 -		"/usr/share/pixmaps/backgrounds/tiles",
diff --git a/misc/metatheme2/files/patch-ah b/misc/metatheme2/files/patch-ah
index bf60fc5a820b..a2ec5f3690cd 100644
--- a/misc/metatheme2/files/patch-ah
+++ b/misc/metatheme2/files/patch-ah
@@ -1,9 +1,6 @@
-
-$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 @@
+--- plugins/sawfish/sawfish-plugin.c.orig	Sun May 19 04:04:04 2002
++++ plugins/sawfish/sawfish-plugin.c	Sun May 19 04:04:57 2002
+@@ -192,7 +192,7 @@
  sawfish_plugin_theme_find (MtmExtHandler *handler, const gchar *name,gboolean is_root) 
  {
  	gchar *root_prefixes[] = {"share/sawfish/themes", NULL, NULL};
diff --git a/misc/metatheme2/files/patch-capplet::mtm-selector.c b/misc/metatheme2/files/patch-capplet::mtm-selector.c
index dea390992adf..6f5e7d060bbc 100644
--- a/misc/metatheme2/files/patch-capplet::mtm-selector.c
+++ b/misc/metatheme2/files/patch-capplet::mtm-selector.c
@@ -1,9 +1,6 @@
-
-$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 @@
+--- capplet/mtm-selector.c.orig	Sun May 19 17:05:01 2002
++++ capplet/mtm-selector.c	Sun May 19 17:05:11 2002
+@@ -209,7 +209,7 @@
  
  	g_return_if_fail (MTM_IS_SELECTOR (selector));
  				   
diff --git a/misc/metatheme2/files/patch-configure b/misc/metatheme2/files/patch-configure
new file mode 100644
index 000000000000..b99a522a30eb
--- /dev/null
+++ b/misc/metatheme2/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sun May 19 04:17:29 2002
++++ configure	Sun May 19 04:17:53 2002
+@@ -7255,6 +7255,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/misc/metatheme2/files/patch-libbackground_Makefile.in b/misc/metatheme2/files/patch-libbackground_Makefile.in
new file mode 100644
index 000000000000..4324d7fd257e
--- /dev/null
+++ b/misc/metatheme2/files/patch-libbackground_Makefile.in
@@ -0,0 +1,11 @@
+--- libbackground/Makefile.in.orig	Sun May 19 04:08:14 2002
++++ libbackground/Makefile.in	Sun May 19 04:08:41 2002
+@@ -118,7 +118,7 @@
+ 
+ EXTRA_DIST = ChangeLog
+ 
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 				-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 				-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
+ 
+ 
+ noinst_LTLIBRARIES = libbackground.la
diff --git a/misc/metatheme2/files/patch-metatheme-edit::Makefile.in b/misc/metatheme2/files/patch-metatheme-edit::Makefile.in
index a1a1130487c6..2a0623fa9b71 100644
--- a/misc/metatheme2/files/patch-metatheme-edit::Makefile.in
+++ b/misc/metatheme2/files/patch-metatheme-edit::Makefile.in
@@ -1,23 +1,11 @@
-
-$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 @@
+--- metatheme-edit/Makefile.in.orig	Sun May 19 04:10:50 2002
++++ metatheme-edit/Makefile.in	Sun May 19 04:11:07 2002
+@@ -141,7 +141,7 @@
  gladedir = $(SHAREDIR)
  glade_DATA = metatheme-edit.glade
  
 -pixmapsdir = $(prefix)/share/pixmaps
-+pixmapsdir = $(prefix)/share/gnome/pixmaps
++pixmapsdir = $(datadir)/pixmaps
  pixmaps_DATA = 32_butteflylogo.png settings.png
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
diff --git a/misc/metatheme2/files/patch-plugins_gtk-2_Makefile.in b/misc/metatheme2/files/patch-plugins_gtk-2_Makefile.in
new file mode 100644
index 000000000000..e7691be2ff30
--- /dev/null
+++ b/misc/metatheme2/files/patch-plugins_gtk-2_Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/gtk-2/Makefile.in.orig	Sun May 19 16:29:10 2002
++++ plugins/gtk-2/Makefile.in	Sun May 19 16:29:22 2002
+@@ -136,7 +136,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libgtkplugin2_la_LDFLAGS = 
++libgtkplugin2_la_LDFLAGS = -avoid-version -module
+ libgtkplugin2_la_LIBADD = 
+ libgtkplugin2_la_OBJECTS =  gtk-plugin.lo gtk-config-gui.lo
+ CFLAGS = @CFLAGS@
diff --git a/misc/metatheme2/files/patch-plugins_gtk-2_gtk-config-gui.c b/misc/metatheme2/files/patch-plugins_gtk-2_gtk-config-gui.c
new file mode 100644
index 000000000000..5d6a4f5d75d6
--- /dev/null
+++ b/misc/metatheme2/files/patch-plugins_gtk-2_gtk-config-gui.c
@@ -0,0 +1,11 @@
+--- plugins/gtk-2/gtk-config-gui.c.orig	Sun May 19 03:58:52 2002
++++ plugins/gtk-2/gtk-config-gui.c	Sun May 19 03:59:16 2002
+@@ -48,7 +48,7 @@
+ 	GArray *files;
+ 	gchar **ret;
+ 	/* FIXME */
+-	gchar *dirnames[] = { "/usr/share/themes", "/.themes", NULL};
++	gchar *dirnames[] = { "%%X11BASE%%/share/themes", "/.themes", NULL};
+ 	int i;
+ 
+ 	dirnames[1] = g_strconcat (g_get_home_dir (), dirnames[1], NULL);
diff --git a/misc/metatheme2/files/patch-plugins_nautilus_Makefile.in b/misc/metatheme2/files/patch-plugins_nautilus_Makefile.in
new file mode 100644
index 000000000000..8ca1504f5053
--- /dev/null
+++ b/misc/metatheme2/files/patch-plugins_nautilus_Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/nautilus/Makefile.in.orig	Sun May 19 16:30:14 2002
++++ plugins/nautilus/Makefile.in	Sun May 19 16:30:25 2002
+@@ -134,7 +134,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libnautilus_la_LDFLAGS = 
++libnautilus_la_LDFLAGS = -avoid-version -module
+ libnautilus_la_LIBADD = 
+ libnautilus_la_OBJECTS =  nautilus-plugin.lo nautilus-config-gui.lo
+ CFLAGS = @CFLAGS@
diff --git a/misc/metatheme2/files/patch-plugins_sawfish_sawfish-config-gui.c b/misc/metatheme2/files/patch-plugins_sawfish_sawfish-config-gui.c
new file mode 100644
index 000000000000..301ebd08438c
--- /dev/null
+++ b/misc/metatheme2/files/patch-plugins_sawfish_sawfish-config-gui.c
@@ -0,0 +1,11 @@
+--- plugins/sawfish/sawfish-config-gui.c.orig	Sun May 19 04:05:50 2002
++++ plugins/sawfish/sawfish-config-gui.c	Sun May 19 04:06:00 2002
+@@ -35,7 +35,7 @@
+ 	GArray *files;
+ 	gchar **ret;
+ 	/* FIXME */
+-	gchar *dirnames[] = { "/usr/share/sawfish/themes", "/.sawfish/themes", NULL};
++	gchar *dirnames[] = { "%%X11BASE%%/share/sawfish/themes", "/.sawfish/themes", NULL};
+ 	int i;
+ 
+ 	dirnames[1] = g_strconcat (g_get_home_dir (), dirnames[1], NULL);
diff --git a/misc/metatheme2/files/patch-plugins_xmms_Makefile.in b/misc/metatheme2/files/patch-plugins_xmms_Makefile.in
new file mode 100644
index 000000000000..35fe69060007
--- /dev/null
+++ b/misc/metatheme2/files/patch-plugins_xmms_Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/xmms/Makefile.in.orig	Sun May 19 16:31:37 2002
++++ plugins/xmms/Makefile.in	Sun May 19 16:31:47 2002
+@@ -136,7 +136,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libmtmxmms_la_LDFLAGS = 
++libmtmxmms_la_LDFLAGS = -avoid-version -module
+ libmtmxmms_la_DEPENDENCIES = 
+ libmtmxmms_la_OBJECTS =  xmms-plugin.lo xmms-config-gui.lo
+ CFLAGS = @CFLAGS@
diff --git a/misc/metatheme2/pkg-plist b/misc/metatheme2/pkg-plist
index 26c3cb541b88..0057257074ae 100644
--- a/misc/metatheme2/pkg-plist
+++ b/misc/metatheme2/pkg-plist
@@ -15,18 +15,17 @@ include/mtm/mtm.h
 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/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
+lib/metatheme/plugins/%%VERSION%%/libbgplugin.so
+lib/metatheme/plugins/%%VERSION%%/libgtkplugin1.so
+lib/metatheme/plugins/%%VERSION%%/libgtkplugin2.so
+lib/metatheme/plugins/%%VERSION%%/libnautilus.so
+lib/metatheme/plugins/%%VERSION%%/libsawfish.so
+share/gnome/applications/metatheme-edit.desktop
+share/gnome/control-center-2.0/capplets/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.keys
 share/gnome/mime-info/metatheme.mime
@@ -35,18 +34,31 @@ 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/es/LC_MESSAGES/metatheme.mo
+share/locale/et/LC_MESSAGES/metatheme.mo
+share/locale/eu/LC_MESSAGES/metatheme.mo
 share/locale/fr/LC_MESSAGES/metatheme.mo
+share/locale/gl/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/lv/LC_MESSAGES/metatheme.mo
+share/locale/ms/LC_MESSAGES/metatheme.mo
 share/locale/no/LC_MESSAGES/metatheme.mo
+share/locale/pl/LC_MESSAGES/metatheme.mo
+share/locale/pt/LC_MESSAGES/metatheme.mo
 share/locale/pt_BR/LC_MESSAGES/metatheme.mo
 share/locale/ru/LC_MESSAGES/metatheme.mo
+share/locale/sk/LC_MESSAGES/metatheme.mo
+share/locale/sl/LC_MESSAGES/metatheme.mo
 share/locale/sv/LC_MESSAGES/metatheme.mo
 share/locale/tr/LC_MESSAGES/metatheme.mo
-@dirrm share/gnome/metathemes
+share/locale/uk/LC_MESSAGES/metatheme.mo
+share/locale/vi/LC_MESSAGES/metatheme.mo
+share/locale/zh_CN/LC_MESSAGES/metatheme.mo
+share/locale/zh_TW/LC_MESSAGES/metatheme.mo
 @dirrm share/gnome/metatheme-glade
-@dirrm lib/metatheme/plugins/gtk
+@dirrm lib/metatheme/plugins/%%VERSION%%
 @dirrm lib/metatheme/plugins
 @dirrm lib/metatheme
 @dirrm include/mtm