Move per-package default XAW_TYPE setting above the inclusion of

bsd.prefs.mk so that it is actually used.  Where possible, include
xaw.buildlink.mk instead of setting USE_XAW, and use LIBXAW where needed.

6 files changed, 21 insertions, 21 deletions

diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 50fc6a6dbac..04681a0b0c0 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/08/06 17:44:45 pooka Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/23 04:26:52 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -10,7 +10,6 @@ DEPENDS+=		vim-share-${VIM_VERSION}:../vim-share
 CONFLICTS+=		vim-[0-9]* vim-gtk-*
 
 USE_X11=		yes
-USE_XAW=		yes
 USE_BUILDLINK_ONLY=	yes
 
 CONFIGURE_ARGS+=	--enable-gui=athena
@@ -21,11 +20,11 @@ INSTALL_TARGET=		installvimbin
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${XAW_TYPE} == "standard")
-MAKE_ENV+=		XAW_LIB=Xaw
+.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
+MAKE_ENV+=		XAW_LIB="Xaw3d" 
 .else
-.include "../../x11/Xaw3d/buildlink.mk"
-MAKE_ENV+=		XAW_LIB=Xaw3d
+XAW_TYPE=		standard
+MAKE_ENV+=		XAW_LIB="Xaw" 
 .endif
 
 post-install:
@@ -39,4 +38,5 @@ post-install:
 	done
 
 .include "../../devel/ncurses/buildlink.mk"
+.include "../../mk/xaw.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-xaw/distinfo b/editors/vim-xaw/distinfo
index d3a8fd62d06..12d29b4f045 100644
--- a/editors/vim-xaw/distinfo
+++ b/editors/vim-xaw/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/06/06 06:07:31 pooka Exp $
+$NetBSD: distinfo,v 1.5 2001/08/23 04:26:52 jlam Exp $
 
 SHA1 (vim-5.8-src.tar.gz) = 36d83481cc2faaae57e0a890c1db4701de32c047
 Size (vim-5.8-src.tar.gz) = 1112952 bytes
-SHA1 (patch-aa) = 64a3214cbede9da0e3fc7a7ae20f66d1f05b889c
-SHA1 (patch-ad) = 4bf0cc0a4df1bbd6cf1f9149dd22a8bdc727e03f
+SHA1 (patch-aa) = 6ee4b1538cf6771eadb1dc70930498c51513dcb1
+SHA1 (patch-ad) = b60f161c7d9365f107d33ae9d80d8e999c893492
 SHA1 (patch-zb) = 2069c60f506fcbcafdc013f0e2648b371185f20b
diff --git a/editors/vim-xaw/patches/patch-aa b/editors/vim-xaw/patches/patch-aa
index 914da39f71c..d3a7b7041dd 100644
--- a/editors/vim-xaw/patches/patch-aa
+++ b/editors/vim-xaw/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/06/06 06:07:31 pooka Exp $
+$NetBSD: patch-aa,v 1.4 2001/08/23 04:26:52 jlam Exp $
 
 --- configure.orig	Thu May 10 21:59:18 2001
 +++ configure	Wed Jun  6 08:36:44 2001
@@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/06 06:07:31 pooka Exp $
    # Look for the header file in a standard set of common directories.
  # Check X11 before X11Rn because it is often a symlink to the current release.
    for ac_dir in               \
-+    ${X11BASE}/include        \
++    ${BUILDLINK_X11_DIR}/include \
      /usr/X11/include          \
      /usr/X11R6/include        \
      /usr/X11R5/include        \
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/06 06:07:31 pooka Exp $
  # First see if replacing the include by lib works.
  # Check X11 before X11Rn because it is often a symlink to the current release.
  for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
-+    ${X11BASE}/lib        \
++    ${BUILDLINK_X11_DIR}/lib \
      /usr/X11/lib          \
      /usr/X11R6/lib        \
      /usr/X11R5/lib        \
diff --git a/editors/vim-xaw/patches/patch-ad b/editors/vim-xaw/patches/patch-ad
index de2866e728b..d65d3aa8ca2 100644
--- a/editors/vim-xaw/patches/patch-ad
+++ b/editors/vim-xaw/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2001/06/06 06:07:31 pooka Exp $
+$NetBSD: patch-ad,v 1.4 2001/08/23 04:26:53 jlam Exp $
 
 --- Makefile.orig	Thu May 31 16:03:57 2001
 +++ Makefile	Wed Jun  6 08:38:04 2001
@@ -32,7 +32,7 @@ $NetBSD: patch-ad,v 1.3 2001/06/06 06:07:31 pooka Exp $
  ATHENA_IPATH	= -I$(GUI_INC_LOC)
  ATHENA_LIBS_DIR = -L$(GUI_LIB_LOC)
 -ATHENA_LIBS1	= $(XAW_LIB)
-+ATHENA_LIBS1	= -l$(XAW_LIB)
++ATHENA_LIBS1	= ${LIBXAW}
  ATHENA_LIBS2	= -lXt
  ATHENA_TARGETS	= $(BINDIR)/$(GVIMTARGET) \
  			$(BINDIR)/$(GVIEWTARGET) \
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index f60a20fffa4..aaf7428f61c 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/05/22 09:32:19 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2001/08/23 04:26:53 jlam Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp
 
 DISTNAME=	xemacs-21.1.14
@@ -23,8 +23,9 @@ DEPENDS+=	jpeg-*:../../graphics/jpeg
 NOT_FOR_PLATFORM=	*-*-mips*	#fails purespace dumping
 
 HAS_CONFIGURE=	YES
-USE_XAW=	YES
 USE_XPM=	YES
+USE_XAW=	YES
+XAW_TYPE?=	3d
 
 BUILD_DEFS+=	USE_LDAP USE_XFACE
 DIST_SUBDIR=	xemacs
@@ -39,7 +40,6 @@ PLIST_SUBST+=	ELSUFX=.gz
 PLIST_SUBST+=	ELSUFX=
 .endif
 
-XAW_TYPE?=	3d
 .if (${XAW_TYPE} == "standard")
 WITH_DIALOGS=	--with-dialogs=athena
 .else
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 40d34182eef..3928565f704 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/06/11 06:34:32 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2001/08/23 04:26:53 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
 #
 
@@ -15,8 +15,6 @@ COMMENT=		VI Like Emacs, X11 version -- a fully "X aware" vi work-alike
 
 USE_PERL5=		# defined
 USE_X11BASE=		# defined
-USE_XAW=		# defined
-USE_XPM=		# defined
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-perl
@@ -36,7 +34,7 @@ EGDIR=			${PREFIX}/share/examples/xvile
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(XAW_TYPE) && ${XAW_TYPE} == "3d"
+.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
 CONFIGURE_ARGS+=	--with-screen=Xaw3d
 CONFIGURE_ARGS+=	--with-Xaw3d
 .else
@@ -54,4 +52,6 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/$$f ${EGDIR};		\
 	done
 
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/xaw.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"