Clean up libXaw handling. [1/2]

- remove LIBXAW variable. It is handled by buildlink3.mk now
- simplify patches and Makefile in packages using libXaw
- in some cases force use of Xaw3d (won't build with Xaw)
- replace some directly included of x11/Xaw3d with mk/xaw.buildlink3.mk

In next part:
- replace more includes with mk/xaw.buildlink3.mk

3 files changed, 16 insertions, 22 deletions

diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index 1556fe9d7d4..7a8db5e4b47 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2012/10/06 11:55:00 asau Exp $
+# $NetBSD: Makefile,v 1.29 2013/01/15 16:21:34 morr Exp $
 #
 
 DISTNAME=	xfrisk-1.2
@@ -29,11 +29,7 @@ LIBS.SunOS=	-lsocket -lnsl
 MAKE_ENV+=	LIBS=${LIBS:Q}
 
 # xfrisk doesn't work with standard Xaw.
-XAW_TYPE?=	3d
-
-.if ${XAW_TYPE} == standard
-XAW_TYPE=3d
-.endif
+XAW_TYPE=	3d
 
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xfrisk/distinfo b/games/xfrisk/distinfo
index 92886fa2201..56cf5fe9ae4 100644
--- a/games/xfrisk/distinfo
+++ b/games/xfrisk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2012/02/05 00:02:47 dholland Exp $
+$NetBSD: distinfo,v 1.10 2013/01/15 16:21:34 morr Exp $
 
 SHA1 (xfrisk-1.2.tar.gz) = 2a82c4be95e151fd34f816aaa125f3eb237c28be
 RMD160 (xfrisk-1.2.tar.gz) = 7e55be2742bf9b2db40cc10156a6ff615bc37e7a
 Size (xfrisk-1.2.tar.gz) = 228943 bytes
-SHA1 (patch-aa) = bfaca880c2d88125628d0b724638eb54e27bf96d
+SHA1 (patch-aa) = eb7ec1f41c10582ece9dc65d858e5e03b2856049
 SHA1 (patch-ab) = 8c458f0fa7db8e2a032f592b857f4024769cb4f1
 SHA1 (patch-ac) = ed2194b764c3d78eedabceb9136814cffcb8f25f
 SHA1 (patch-ad) = abd57e121edccbf1f3f78d8f124fbc198722dfcd
diff --git a/games/xfrisk/patches/patch-aa b/games/xfrisk/patches/patch-aa
index 50f4271d90b..518392a3c03 100644
--- a/games/xfrisk/patches/patch-aa
+++ b/games/xfrisk/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.5 2009/05/23 15:14:21 dholland Exp $
+$NetBSD: patch-aa,v 1.6 2013/01/15 16:21:34 morr Exp $
 
 - take build configuration from inherited pkgsrc variables
 - install under $(DESTDIR)
 
---- Makefile.orig	2000-01-23 14:01:55.000000000 -0500
-+++ Makefile	2009-05-23 11:08:33.000000000 -0400
-@@ -55,9 +55,9 @@
+--- Makefile.orig	2000-01-23 19:01:55.000000000 +0000
++++ Makefile
+@@ -55,9 +55,9 @@ DROPALL=
  ####################
  # C compiler options
  # GNU gcc is recommended.
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.5 2009/05/23 15:14:21 dholland Exp $
  
  # If you don't have gcc, don't use -Wall -W -fno-common
  #CFLAGS=-g
-@@ -77,25 +77,25 @@
+@@ -77,23 +77,23 @@ CFLAGS=-g -Wall -W -fno-common -pedantic
  #CFLAGS+=-DTEST_GAME
  
  ## Initial linker options
@@ -39,16 +39,14 @@ $NetBSD: patch-aa,v 1.5 2009/05/23 15:14:21 dholland Exp $
  #XDIR=/usr/openwin
  
  # try Xaw if you don't have Xaw3d
- #XAW=Xaw
+-#XAW=Xaw
 -XAW=Xaw3d
-+XAW=${LIBXAW}
++XAW=Xaw
++#XAW=Xaw3d
  
--XLIBS=-L$(XDIR)/lib -l$(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11
-+XLIBS=-L$(XDIR)/lib $(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11
+ XLIBS=-L$(XDIR)/lib -l$(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11
  
- XINC=-I$(XDIR)/include
- CFLAGS+=$(XINC)
-@@ -106,7 +106,6 @@
+@@ -106,7 +106,6 @@ CFLAGS+=$(XINC)
  # System V (Solaris, Irix, etc.) will probably want -lsocket -lnsl.
  #LIBS=-lsocket -lnsl
  # on other systems leave LIBS blank for now
@@ -56,7 +54,7 @@ $NetBSD: patch-aa,v 1.5 2009/05/23 15:14:21 dholland Exp $
  
  # On some systems -DNARROWPROTO is needed for working Xaw scrollbars
  # This includes FreeBSD 3.x and recent Linux
-@@ -208,16 +207,16 @@
+@@ -208,16 +207,16 @@ libfriskAI.a: network.o aiDice.o game.o 
  	$(RANLIB) $@
  
  install: all
@@ -83,7 +81,7 @@ $NetBSD: patch-aa,v 1.5 2009/05/23 15:14:21 dholland Exp $
  
  
  # Other targets
-@@ -225,13 +224,13 @@
+@@ -225,13 +224,13 @@ Countries.risk World.risk: World.ppm bui
  	./buildmap World.ppm World.risk Countries.risk
  
  uninstall: