Fix the build on -current (patch-aa)

Compile all targets in the do-build phase, fix install with XFree86-4, honor
CFLAGS

games/xmris/Makefile

@@ -6,6 +6,7 @@
 
 PORTNAME=	xmris
 PORTVERSION=	4.04
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
@@ -14,11 +15,16 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jmz@FreeBSD.org
 
-USE_GMAKE=	yes
 USE_IMAKE=	yes
 MAKE_FLAGS=	XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
-ALL_TARGET=	xmris
+ALL_TARGET=	xmris xmred
 MAN6=		xmred.6 xmris.6 xmsit.6
+USE_REINPLACE=  yes
+
+post-configure:
+	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/MANSUFFIX = 1/MANSUFFIX = 6/' \
+	  -e 's/OWNER = -o games/OWNER = -g games/' \
+	  -e 's/^INSTMRISFLAGS.*/INSTMRISFLAGS = \$(OWNER) -m 2555/' Makefile
 
 post-install:
 	@${CHMOD} g+w ${X11BASE}/lib/X11/xmris

games/xmris/files/patch-aa

@@ -1,14 +1,13 @@
-*** all.c.orig	Fri Dec 22 04:05:56 1995
---- all.c	Thu Dec  5 14:08:46 1996
-***************
-*** 638,644 ****
---- 638,646 ----
-   */
-  {
-    extern int sys_nerr;
-+ #ifndef __FreeBSD__
-    extern char *sys_errlist[];
-+ #endif
-    
-    int   error;
-    
+--- all.c.orig	Fri Dec 22 13:05:56 1995
++++ all.c	Sat Oct 19 22:49:11 2002
+@@ -637,8 +637,10 @@
+  * returns the error string, or NULL
+  */
+ {
++#ifndef __FreeBSD__
+   extern int sys_nerr;
+   extern char *sys_errlist[];
++#endif
+   
+   int   error;
+   

games/xmris/scripts/pre-configure

@@ -7,9 +7,4 @@ echo "LOCAL=$PREFIX" >${WRKSRC}/Imakefile || exit 1;
 # remove extra space after \ in continuation lines
 sed -e 's/\\ $/\\/' <${WRKSRC}/Imakefile.orig >>${WRKSRC}/Imakefile || exit 1
 
-echo "CDEBUGFLAGS=-O2" >>${WRKSRC}/Imakefile  || exit 1
-echo "MANSUFFIX=6" >>${WRKSRC}/Imakefile  || exit 1
-echo "OWNER = -g games" >>${WRKSRC}/Imakefile  || exit 1
-echo "INSTMRISFLAGS = \$(OWNER) -m 2555" >>${WRKSRC}/Imakefile  || exit 1
-
 exit 0