Latest changes from Jean-Marc

Submitted by:	Jean-Marc Zucconi

4 files changed, 8 insertions, 5 deletions

diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index 188a2b2f4d3b..4f4abcab7457 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -1,5 +1,6 @@
 DISTNAME=	xmris.4.02
 USE_IMAKE=	yes
+USE_GMAKE=	yes
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 
 pre-install:
diff --git a/games/xmris/pkg-comment b/games/xmris/pkg-comment
index ea7921ffe7f6..6f544cbe8fc9 100644
--- a/games/xmris/pkg-comment
+++ b/games/xmris/pkg-comment
@@ -1 +1 @@
-Xmris: a version of a popular video arcade game for the X Window System.
+Xmris: a version of the Mr Do video arcade game for the X Window System.
diff --git a/games/xmris/pkg-plist b/games/xmris/pkg-plist
index f2054858d79d..ae604bcaca73 100644
--- a/games/xmris/pkg-plist
+++ b/games/xmris/pkg-plist
@@ -1,7 +1,6 @@
 @cd /usr/local
-@owner bin
 @group bin
-@mode a+r
+@mode 444
 man/man6/xmris.6
 man/man6/xmsit.6
 man/man6/xmred.6
@@ -11,8 +10,11 @@ bin/xmris
 bin/xmsit
 @mode 755
 bin/xmred
+@exec mkdir -p %D/lib/xmris
+@exec chmod  775 %D/lib/xmris
+@unexec rm -rf %D/lib/xmris
 @cd /usr/X386
-@mode a+r
+@mode 444
 lib/X11/app-defaults/Xmris
 lib/X11/app-defaults/xmris/alphabet.gdn
 lib/X11/app-defaults/xmris/digits.gdn
diff --git a/games/xmris/scripts/pre-configure b/games/xmris/scripts/pre-configure
index 6c01b92f1e8c..8214f8999e32 100644
--- a/games/xmris/scripts/pre-configure
+++ b/games/xmris/scripts/pre-configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # X must be running when the scram program creates the bitmaps
-xwd -root >/dev/null
+xwd -root >/dev/null 2>&1 
 if [ $? != 0 ]; then
   echo "X needs to be started to build xmris"
   exit 1