Update to 0.3.1.

svn path=/head/; revision=60203

x11-wm/metacity-setup/Makefile

@@ -6,29 +6,25 @@
 #
 
 PORTNAME=	metacity-setup
-PORTVERSION=	0.2
+PORTVERSION=	0.3.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://plastercast.tzo.com/~plastercast/Projects/ \
 		http://www.marcuscom.com/downloads/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	marcus
-DISTNAME=	Metacity-setup-${PORTVERSION}
 
 MAINTAINER=	marcus@FreeBSD.org
 
 LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
 
-WRKSRC=	${WRKDIR}/Metacity-setup
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
-AUTOMAKE_ARGS=	--add-missing
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
@@ -37,8 +33,8 @@ pre-patch:
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
-pre-configure:
-	${RM} -f ${WRKSRC}/install-sh ${WRKSRC}/COPYING ${WRKSRC}/INSTALL \
-		${WRKSRC}/mkinstalldirs ${WRKSRC}/missing
+post-patch:
+	@${PERL} -pi -e 's|\%\%X11BASE\%\%|${X11BASE}|g' \
+		${WRKSRC}/src/callbacks.c
 
 .include <bsd.port.mk>

x11-wm/metacity-setup/distinfo

@@ -1 +1 @@
-MD5 (Metacity-setup-0.2.tar.gz) = 44b376156595a0ef2ffd86372bc46041
+MD5 (metacity-setup-0.3.1.tar.gz) = 5d023fa26f7e0e92739ae53e1e614047

x11-wm/metacity-setup/files/patch-src_callbacks.c

@@ -0,0 +1,13 @@
+--- src/callbacks.c.orig	Tue May 28 11:52:13 2002
++++ src/callbacks.c	Tue May 28 11:53:24 2002
+@@ -30,9 +30,7 @@
+ 	gchar *possibleThemeDirs[4] =
+ 		{ g_build_filename (g_get_home_dir (), ".metacity", "themes",
+ 				    NULL),
+-		"/gnome/head/INSTALL/share/metacity/themes",
+-		"/usr/share/metacity/themes",
+-		"/usr/local/share/metacity/themes"
++		"%%X11BASE%%/share/gnome/metacity/themes"
+ 	};
+ 	for (i = 0; i < 4; i++)
+ 	{