Switch from x11/Xaw3d to newer x11/libXaw3d.

Adapt some packages so they build with that.
Bump their PKGREVISIONs.

5 files changed, 23 insertions, 12 deletions

diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index f8327c3955d..1595aba04c7 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2015/10/10 01:58:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2015/10/14 20:17:25 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Freeciv client
 
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
diff --git a/games/freeciv-client/options.mk b/games/freeciv-client/options.mk
index 454bbd677e6..5255861a4a4 100644
--- a/games/freeciv-client/options.mk
+++ b/games/freeciv-client/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2015/04/26 19:19:42 spz Exp $
+# $NetBSD: options.mk,v 1.8 2015/10/14 20:17:25 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.freeciv-client
 PKG_OPTIONS_REQUIRED_GROUPS=	backend
@@ -51,7 +51,7 @@ PLIST_SRC=		${PKGDIR}/PLIST.xaw
 CONFIGURE_ARGS+=	--enable-client=xaw
 CONFIGURE_ARGS+=	--enable-fcmp=cli
 CONFIGURE_ARGS+=	--with-xaw3d
-.include "../../x11/Xaw3d/buildlink3.mk"
+.include "../../x11/libXaw3d/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 PLIST_SRC=		${PKGDIR}/PLIST.xaw
 .endif
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 37e8b78a15f..669cca81315 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2015/06/12 10:50:07 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2015/10/14 20:17:25 wiz Exp $
 
 DISTNAME=	xboard-4.6.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GNU:=xboard/}
 
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index e4df8354268..e1ca10877ce 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2014/05/11 02:19:04 dholland Exp $
-#
+# $NetBSD: Makefile,v 1.32 2015/10/14 20:17:25 wiz Exp $
 
 DISTNAME=	xfrisk-1.2
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	http://www.tuxick.net/xfrisk/files/
 
@@ -30,6 +29,13 @@ MAKE_ENV+=	LIBS=${LIBS:Q}
 
 # xfrisk doesn't work with standard Xaw.
 XAW_TYPE=	3d
+# does not directly support Xaw3d
+BUILDLINK_TRANSFORM+=   l:Xaw:Xaw3d
+.PHONY: buildlink-Xaw3d-inc-hack
+pre-configure: buildlink-Xaw3d-inc-hack
+
+buildlink-Xaw3d-inc-hack: buildlink-directories
+	cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw
 
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xgospel/Makefile b/games/xgospel/Makefile
index d974d0fecb9..e67555ecf87 100644
--- a/games/xgospel/Makefile
+++ b/games/xgospel/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2012/10/06 11:55:01 asau Exp $
-#
+# $NetBSD: Makefile,v 1.20 2015/10/14 20:17:26 wiz Exp $
 
 DISTNAME=	xgospel-1.12d
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	games x11
 MASTER_SITES=	http://gailly.net/
 
@@ -20,6 +19,12 @@ XAW_TYPE=		3d
 .if defined(XAW_TYPE)
 .  if (${XAW_TYPE} == "3d") || (${XAW_TYPE} == "xpm")
 CONFIGURE_ARGS+=	--with-xaw3d
+# does not directly support Xaw3d
+.PHONY: buildlink-Xaw3d-inc-hack
+pre-configure: buildlink-Xaw3d-inc-hack
+
+buildlink-Xaw3d-inc-hack: buildlink-directories
+	cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw
 .  endif
 .endif