* Update to 0.5

* ${PERL} --> ${REINPLACE_CMD}

5 files changed, 35 insertions, 8 deletions

diff --git a/x11-wm/metacity-setup/Makefile b/x11-wm/metacity-setup/Makefile
index e3b60a5085e..9769f571658 100644
--- a/x11-wm/metacity-setup/Makefile
+++ b/x11-wm/metacity-setup/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	metacity-setup
-PORTVERSION=	0.4.1
+PORTVERSION=	0.5
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://plastercast.tzo.com/~plastercast/Projects/ \
 		http://www.marcuscom.com/downloads/ \
@@ -27,14 +27,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 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'
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
+		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 post-patch:
-	@${PERL} -pi -e 's|\%\%X11BASE\%\%|${X11BASE}|g' \
+	@${REINPLACE_CMD} -e 's|[%][%]X11BASE[%][%]|${X11BASE}|g' \
 		${WRKSRC}/src/callbacks.c
 
 .include <bsd.port.mk>
diff --git a/x11-wm/metacity-setup/distinfo b/x11-wm/metacity-setup/distinfo
index 3cf53ee8b97..442f30aed32 100644
--- a/x11-wm/metacity-setup/distinfo
+++ b/x11-wm/metacity-setup/distinfo
@@ -1 +1 @@
-MD5 (metacity-setup-0.4.1.tar.gz) = 577848e12a7e06bc6eedbc0350726a47
+MD5 (metacity-setup-0.5.tar.gz) = cba131bfa64ed66e478611e59e4da5df
diff --git a/x11-wm/metacity-setup/files/patch-Makefile.in b/x11-wm/metacity-setup/files/patch-Makefile.in
new file mode 100644
index 00000000000..5a5149947f5
--- /dev/null
+++ b/x11-wm/metacity-setup/files/patch-Makefile.in
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	Sun Jun 16 23:05:24 2002
++++ Makefile.in	Sun Jun 16 23:06:31 2002
+@@ -398,10 +398,10 @@
+ install-data-local:
+ 	@$(NORMAL_INSTALL)
+ 	if test -d $(srcdir)/pixmaps; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
++	  $(mkinstalldirs) $(pixmapdir); \
+ 	  for pixmap in $(srcdir)/pixmaps/*; do \
+ 	    if test -f $$pixmap; then \
+-	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(prefix)share/pixmaps; \
++	      $(INSTALL_DATA) $$pixmap $(pixmapdir); \
+ 	    fi \
+ 	  done \
+ 	fi
diff --git a/x11-wm/metacity-setup/files/patch-src_main.c b/x11-wm/metacity-setup/files/patch-src_main.c
new file mode 100644
index 00000000000..5c6ff5032fc
--- /dev/null
+++ b/x11-wm/metacity-setup/files/patch-src_main.c
@@ -0,0 +1,11 @@
+--- src/main.c.orig	Sun Jun 16 23:17:13 2002
++++ src/main.c	Sun Jun 16 23:17:22 2002
+@@ -26,7 +26,7 @@
+   gtk_set_locale ();
+   gtk_init (&argc, &argv);
+ 
+-  add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
++  add_pixmap_directory (PACKAGE_DATA_DIR "/pixmaps");
+ 
+   /*
+    * The following code was added by Glade to create one of each component
diff --git a/x11-wm/metacity-setup/pkg-plist b/x11-wm/metacity-setup/pkg-plist
index 0e36b45c1b4..9895a7b8ad6 100644
--- a/x11-wm/metacity-setup/pkg-plist
+++ b/x11-wm/metacity-setup/pkg-plist
@@ -1,2 +1,3 @@
 bin/metacity-setup
-share/gnome/metacity-setup/pixmaps/Metacity-Setup-Icon2.png
+share/gnome/control-center-2.0/capplets/metacity-setup.desktop
+share/gnome/pixmaps/metacity-setup-icon.png