Switch from x11/Xaw3d to newer x11/libXaw3d.

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

11 files changed, 22 insertions, 21 deletions

diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile
index e67d7e45d8d..d13082d79fe 100644
--- a/editors/emacs-snapshot/Makefile
+++ b/editors/emacs-snapshot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2015/10/10 01:58:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2015/10/14 20:17:24 wiz Exp $
 
 #PKGREVISION= 1
-PKGREVISION= 3
+PKGREVISION= 4
 .include "../../editors/emacs-snapshot/Makefile.common"
 
 .include "options.mk"
diff --git a/editors/emacs-snapshot/options.mk b/editors/emacs-snapshot/options.mk
index c371db0a9b6..a95d4b800d2 100644
--- a/editors/emacs-snapshot/options.mk
+++ b/editors/emacs-snapshot/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2015/06/14 15:46:22 mef Exp $
+# $NetBSD: options.mk,v 1.11 2015/10/14 20:17:24 wiz Exp $
 #
 
 ### Set options
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=	--without-gconf
 ### Support Xaw3d (This is only valid with Lucid Toolkit)
 ###
 .  if !empty(PKG_OPTIONS:Mxaw3d)
-.include "../../x11/Xaw3d/buildlink3.mk"
+.include "../../x11/libXaw3d/buildlink3.mk"
 .  else
 CONFIGURE_ARGS+=	--without-xaw3d
 .  endif
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 809a79fdd0e..6caebdd0fee 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2015/01/01 09:54:25 dholland Exp $
+# $NetBSD: Makefile,v 1.52 2015/10/14 20:17:24 wiz Exp $
 
 DISTNAME=	emacs-20.7
 PKGNAME=	${DISTNAME:S/emacs/emacs20/}
-PKGREVISION=	17
+PKGREVISION=	18
 CATEGORIES=	editors
 MASTER_SITES=	http://ftp.gnu.org/pub/old-gnu/emacs/	\
 		ftp://ftp.gnu.org/pub/old-gnu/emacs
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index ee059d7b84b..9c2866a3736 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2015/06/12 10:50:01 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2015/10/14 20:17:24 wiz Exp $
 
-PKGREVISION=	33
+PKGREVISION=	34
 CATEGORIES=	editors
 
 CONFLICTS+=	emacs21-nox11-[0-9]*
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index f3e0546c1c8..179c738a81d 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2015/06/12 10:50:01 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2015/10/14 20:17:25 wiz Exp $
 
-PKGREVISION=	40
+PKGREVISION=	41
 
 CONFLICTS+=	emacs22-nox11-[0-9]*
 
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index fb6ddc7d1dc..d809b546f74 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2015/10/10 01:58:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.23 2015/10/14 20:17:25 wiz Exp $
 
 CONFLICTS+=	emacs23-nox11-[0-9]*
 
 .include "../../editors/emacs23/Makefile.common"
-PKGREVISION=	33
+PKGREVISION=	34
 
 .include "options.mk"
 
diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile
index dfad654d659..967a817a1bf 100644
--- a/editors/emacs24/Makefile
+++ b/editors/emacs24/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2015/10/10 01:58:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2015/10/14 20:17:25 wiz Exp $
 
 CONFLICTS+=	emacs24-nox11-[0-9]*
 
-PKGREVISION= 5
+PKGREVISION= 6
 .include "../../editors/emacs24/Makefile.common"
 
 .include "options.mk"
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 7bad3a8c493..f72980358d4 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2013/01/15 16:21:34 morr Exp $
+# $NetBSD: Makefile,v 1.57 2015/10/14 20:17:25 wiz Exp $
 
 PKGNAME=		vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION=		1
 COMMENT=		Vim editor (vi clone) with X11 Athena GUI
 
 .include		"../../editors/vim-share/Makefile.common"
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 15bdb087deb..8c729c48ae3 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2015/09/29 11:23:28 hauke Exp $
+# $NetBSD: Makefile,v 1.88 2015/10/14 20:17:25 wiz Exp $
 
 PKGNAME?=	${DISTNAME}
 COMMENT?=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV}
@@ -6,7 +6,7 @@ COMMENT?=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV}
 DISTNAME=	xemacs-21.5.27
 EMACSVERSION=	21.5-b27
 EMACS_DISTNAME=	xemacs-${EMACSVERSION}
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 77bad26998d..b540a90c0a0 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.113 2015/02/15 13:13:24 hauke Exp $
+# $NetBSD: Makefile,v 1.114 2015/10/14 20:17:25 wiz Exp $
 
 PKGNAME?=	${DISTNAME}
 COMMENT?=	XEmacs text editor version 21
 
 DISTNAME=	xemacs-21.4.23
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 38091c1d97c..949c150fd72 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2015/06/12 10:50:03 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2015/10/14 20:17:25 wiz Exp $
 
 DISTNAME=		vile-9.8
 PKGNAME=		x${DISTNAME}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		editors
 MASTER_SITES=		ftp://invisible-island.net/vile/
 EXTRACT_SUFX=		.tgz