>Number:         21668
>Category:       pkg
>Synopsis:       games/xfrisk needs !standard Xaw
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun May 25 05:39:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Soren Jacobsen
>Release:        NetBSD 1.6.1
>Organization:
>Environment:
pkgsrc as of 05/24/2003.
>Description:
xfrisk, when linked against the standard Xaw library, fails to properly
display the Action list. Changing to Xaw3d, as the developer seems to have had
in mind, fixes it. neXtaw also works, but I've not tested others.
>How-To-Repeat:
friskserver&
xfrisk localhost

Note the empty column under Action. There should be Place, Attack, Do or die,
and move.
>Fix:
This has a couple other minor build fixes as well.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/xfrisk/Makefile,v
retrieving revision 1.3
diff -b -u -r1.3 Makefile
--- Makefile	2003/03/29 12:41:11	1.3
+++ Makefile	2003/05/25 05:31:56
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=	xfrisk-1.2
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/XFrisk
 CATEGORIES=	games
 MASTER_SITES=	http://morphy.iki.fi/xfrisk/files/
@@ -12,6 +13,7 @@
 
 USE_GMAKE=	yes
 USE_X11=	yes
+USE_BUILDLINK2=	YES
 
 RESTRICTED=	"Possible trademark infringement"
 NO_SRC_ON_CDROM=${RESTRICTED}
@@ -23,4 +25,12 @@
 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"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/games/xfrisk/distinfo,v
retrieving revision 1.2
diff -b -u -r1.2 distinfo
--- distinfo	2002/02/28 17:23:13	1.2
+++ distinfo	2003/05/25 05:31:56
@@ -2,4 +2,4 @@
 
 SHA1 (xfrisk-1.2.tar.gz) = 2a82c4be95e151fd34f816aaa125f3eb237c28be
 Size (xfrisk-1.2.tar.gz) = 228943 bytes
-SHA1 (patch-aa) = a0dc10df6b8857066addb4b0094507e048433c89
+SHA1 (patch-aa) = 4eb657e70cbbae0056fdf32d6076f37f26214fbb
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/games/xfrisk/patches/patch-aa,v
retrieving revision 1.2
diff -b -u -r1.2 patch-aa
--- patches/patch-aa	2002/02/28 17:23:14	1.2
+++ patches/patch-aa	2003/05/25 05:31:56
@@ -1,13 +1,12 @@
 $NetBSD: patch-aa,v 1.2 2002/02/28 17:23:14 wiz Exp $
 
---- Makefile.orig	Sun Feb 24 21:34:38 2002
-+++ Makefile	Sun Feb 24 22:01:06 2002
-@@ -77,11 +77,11 @@
+--- Makefile.orig	Sun Jan 23 11:01:55 2000
++++ Makefile	Thu May  8 20:15:42 2003
+@@ -77,25 +77,24 @@
  #CFLAGS+=-DTEST_GAME
  
  ## Initial linker options
 -LDFLAGS=
-+LDFLAGS=-Wl,-R/usr/X11R6/lib
  
  ## Installation prefix
  # Adjust to taste. Stuff gets installed here.
@@ -16,18 +15,24 @@
  #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
++XAW=${LIBXAW}
  
- XLIBS=-L$(XDIR)/lib -l$(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11
+-XLIBS=-L$(XDIR)/lib -l$(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11
++XLIBS=-L$(XDIR)/lib $(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11
  
-@@ -106,7 +106,7 @@
+ XINC=-I$(XDIR)/include
+ CFLAGS+=$(XINC)
+@@ -106,7 +105,7 @@
  # System V (Solaris, Irix, etc.) will probably want -lsocket -lnsl.
  #LIBS=-lsocket -lnsl
  # on other systems leave LIBS blank for now
>Release-Note:
>Audit-Trail:
>Unformatted: