xfrisk fails to properly display the action list, when using the standard

Xaw library, so change this to use Xaw3d. While here don't use X11BASE
as PREFIX for installation.

Patch provided by Soren Jacobsen PR pkg/21668, with some changes by me.
Bump pkgrevision to 1.

3 files changed, 42 insertions, 23 deletions

diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index 200edec7f3e..a77a8083e63 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/30 08:26:51 xtraeme Exp $
 #
 
 DISTNAME=	xfrisk-1.2
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/XFrisk
 CATEGORIES=	games
 MASTER_SITES=	http://morphy.iki.fi/xfrisk/files/
@@ -10,6 +11,7 @@ MAINTAINER=	sketch@rd.bbc.co.uk
 HOMEPAGE=	http://morphy.iki.fi/xfrisk/
 COMMENT=	X11 version of the classic Risk board game
 
+USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
 USE_X11=	yes
 
@@ -23,4 +25,12 @@ NO_BIN_ON_CDROM=${RESTRICTED}
 MAKE_ENV+=      LIBS="-lsocket -lnsl"
 .endif
 
+# xfrisk doesn't work with standard Xaw.
+XAW_TYPE?=	3d
+
+.if ${XAW_TYPE} == standard
+XAW_TYPE=3d
+.endif
+
+.include "../../mk/xaw.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xfrisk/distinfo b/games/xfrisk/distinfo
index ec9b2881ecb..f90a69ba09d 100644
--- a/games/xfrisk/distinfo
+++ b/games/xfrisk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/02/28 17:23:13 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/09/30 08:26:51 xtraeme Exp $
 
 SHA1 (xfrisk-1.2.tar.gz) = 2a82c4be95e151fd34f816aaa125f3eb237c28be
 Size (xfrisk-1.2.tar.gz) = 228943 bytes
-SHA1 (patch-aa) = a0dc10df6b8857066addb4b0094507e048433c89
+SHA1 (patch-aa) = 1516178346e7c7913512945a877da23ce29e7a64
diff --git a/games/xfrisk/patches/patch-aa b/games/xfrisk/patches/patch-aa
index fd8226bf420..64eea411c5a 100644
--- a/games/xfrisk/patches/patch-aa
+++ b/games/xfrisk/patches/patch-aa
@@ -1,38 +1,47 @@
-$NetBSD: patch-aa,v 1.2 2002/02/28 17:23:14 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2003/09/30 08:26:51 xtraeme Exp $
 
---- Makefile.orig	Sun Feb 24 21:34:38 2002
-+++ Makefile	Sun Feb 24 22:01:06 2002
-@@ -77,11 +77,11 @@
+--- Makefile.orig	2003-09-30 10:18:48.000000000 +0200
++++ Makefile	2003-09-30 10:20:04.000000000 +0200
+@@ -55,9 +55,9 @@
+ ####################
+ # C compiler options
+ # GNU gcc is recommended.
+-CC=gcc
++#CC=gcc
+ # Use these with gcc
+-CFLAGS=-g -Wall -W -fno-common -pedantic
++#CFLAGS+= -Wall -W -fno-common -pedantic
+ 
+ # If you don't have gcc, don't use -Wall -W -fno-common
+ #CFLAGS=-g
+@@ -77,25 +77,25 @@
  #CFLAGS+=-DTEST_GAME
  
  ## Initial linker options
 -LDFLAGS=
-+LDFLAGS=-Wl,-R/usr/X11R6/lib
++#LDFLAGS=
  
  ## Installation prefix
  # Adjust to taste. Stuff gets installed here.
 -PREFIX=/usr/local
-+#PREFIX=${X11BASE}
++#PREFIX=/usr/local
  #PREFIX=/usr/local/X11
  
  ## X11 location and options
-@@ -92,8 +92,8 @@
+ # for X11R6
+ # Point this at your X tree.
+-XDIR=/usr/X11R6
++XDIR=${X11BASE}
+ #XDIR=/usr/local/X11
  #XDIR=/usr/openwin
  
  # try Xaw if you don't have Xaw3d
--#XAW=Xaw
+ #XAW=Xaw
 -XAW=Xaw3d
-+XAW=Xaw
-+#XAW=Xaw3d
- 
- XLIBS=-L$(XDIR)/lib -l$(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11
++XAW=${LIBXAW}
  
-@@ -106,7 +106,7 @@
- # System V (Solaris, Irix, etc.) will probably want -lsocket -lnsl.
- #LIBS=-lsocket -lnsl
- # on other systems leave LIBS blank for now
--LIBS=
-+#LIBS=
+-XLIBS=-L$(XDIR)/lib -l$(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11
++XLIBS=-L$(XDIR)/lib $(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11
  
- # On some systems -DNARROWPROTO is needed for working Xaw scrollbars
- # This includes FreeBSD 3.x and recent Linux
+ XINC=-I$(XDIR)/include
+ CFLAGS+=$(XINC)