Update to 0.7.1. With this update, metacity-setup now works with

metacity-2.4.0.

x11-wm/metacity-setup/Makefile

@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	metacity-setup
-PORTVERSION=	0.6
+PORTVERSION=	0.7.1
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://plastercast.tzo.com/~plastercast/Projects/ \
-		http://www.marcuscom.com/downloads/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	marcus
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	metacity-setup
 
 MAINTAINER=	marcus@FreeBSD.org
 
@@ -20,22 +18,17 @@ LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack
 USE_REINPLACE=	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:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|[%][%]X11BASE[%][%]|${X11BASE}|g' \
+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
 		${WRKSRC}/src/callbacks.c
 
 .include <bsd.port.mk>

x11-wm/metacity-setup/distinfo

@@ -1 +1 @@
-MD5 (metacity-setup-0.6.tar.gz) = 0dd8bfec3dd513f584218b5cbb022bfc
+MD5 (metacity-setup-0.7.1.tar.gz) = e898a13ea95d38dcc1f9dba5dd03581f

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

@@ -0,0 +1,30 @@
+--- src/callbacks.c.orig	Tue Aug 27 15:30:54 2002
++++ src/callbacks.c	Tue Aug 27 15:30:36 2002
+@@ -228,14 +228,25 @@
+ 
+ 			while ((filename =
+ 				g_dir_read_name (themeDirectory)) != NULL)
+-				if (g_file_test
++				if ((g_file_test
+ 				    (g_build_filename
+ 				     (possibleThemeDirs[i], filename, NULL),
+ 						G_FILE_TEST_IS_DIR) &&
+ 					(g_file_test
+ 						(g_build_filename
+ 							(possibleThemeDirs[i], filename, "metacity-theme-1.xml", NULL),
+-						G_FILE_TEST_IS_REGULAR)))
++						G_FILE_TEST_IS_REGULAR))) ||
++				   ((g_file_test
++				         (g_build_filename
++					  (possibleThemeDirs[i], filename, NULL),
++					  	G_FILE_TEST_IS_DIR) &&
++					    (g_file_test
++					            (g_build_filename
++						            (possibleThemeDirs[i], filename, "metacity-1", NULL), G_FILE_TEST_IS_DIR) &&
++							    (g_file_test
++							      (g_build_filename
++							        (possibleThemeDirs[i], filename, "metacity-1", "metacity-theme-1.xml", NULL), G_FILE_TEST_IS_REGULAR))))))
++
+ 					{
+ 						g_ptr_array_add (themeNameHolder,
+ 							 g_strdup (filename));