Introduce a USE_XAW definition, which is used in package Makefiles, to

denote that the package uses libXaw.

Introduce an XAW_TYPE definition, which is defined in /etc/mk.conf by
the user, to denote the type of libXaw to use. Possible values are:
standard, 3d and xpm.

Define USE_XAW in relevant Makefiles.

Set default XAW_TYPE in Makefiles which previously did a DEPENDS+= Xaw3d...

This means that package builds should not fail because of conflicting
Xaw packages being installed on machines.

10 files changed, 63 insertions, 23 deletions

diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 2efddd269eb..4865c6a022c 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/08/23 08:09:45 tron Exp $
+# $NetBSD: Makefile,v 1.12 1999/08/25 13:37:35 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp
 
 DISTNAME=	xemacs-21.1.6
@@ -13,7 +13,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.xemacs.org/
 
-DEPENDS+=	Xaw3d-1.5:../../x11/Xaw3d
+USE_XAW=	yes
+
 DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
 DEPENDS+=	png-1.0.3:../../graphics/png
 DEPENDS+=	tiff-3.4:../../graphics/tiff
@@ -29,6 +30,8 @@ BUILD_DEFS+=	USE_XFACE
 
 .include "../../mk/bsd.prefs.mk"
 
+XAW_TYPE?=	3d
+
 WITH_DIALOGS=	--with-dialogs=athena3d
 
 .if defined(USE_XFACE) && ${USE_XFACE} == YES
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 620da566eb1..e9c2a33ed1e 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/04/15 20:39:43 tron Exp $
+# $NetBSD: Makefile,v 1.19 1999/08/25 13:37:35 agc Exp $
 #
 
 DISTNAME=		xfig.3.2.2
@@ -13,9 +13,13 @@ HOMEPAGE=		http://epb1.lbl.gov/BVSmith/xfig/
 DEPENDS+=		transfig-3.2.1:../../print/transfig
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		Xaw3d-1.5:../../x11/Xaw3d
 
 USE_IMAKE=		yes
+USE_XAW=		yes
+
+.include "../../mk/bsd.prefs.mk"
+
+XAW_TYPE?=		3d
 
 post-install:
 	@${MKDIR} ${X11BASE}/share/examples/xfig
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index 6e7d3c77a78..43d8f458413 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/07/13 17:52:41 mjl Exp $
+# $NetBSD: Makefile,v 1.9 1999/08/25 13:37:36 agc Exp $
 
 DISTNAME=       siag-3.1.20
 CATEGORIES=     misc textproc math
@@ -7,7 +7,6 @@ MASTER_SITES=   ftp://ftp.edu.stockholm.se/pub/siag/
 MAINTAINER=     packages@netbsd.org
 HOMEPAGE=       http://www.edu.stockholm.se/siag/
 
-DEPENDS+=	Xaw3d-1.5:../../x11/Xaw3d
 DEPENDS+=	gv-3.5.8:../../print/gv
 DEPENDS+=	gnuplot-3.7:../../graphics/gnuplot
 DEPENDS+=	guile-1.3:../../lang/guile
@@ -17,11 +16,16 @@ CONFIGURE_ARGS=	--with-x --with-guile --includedir=${PREFIX}/include
 GNU_CONFIGURE=  yes
 USE_GMAKE=	yes
 USE_X11=	yes
+USE_XAW=	yes
 
 CFLAGS+=	-Dunix
 LDFLAGS+=	-Wl,-R${X11BASE}/lib
 STRIPFLAG=
 
+.include "../../mk/bsd.prefs.mk"
+
+XAW_TYPE?=	3d
+
 post-install:
 	${MV} ${PREFIX}/doc/siag ${PREFIX}/share/doc/siag
 	${RMDIR} ${PREFIX}/doc
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 733f0e0255b..e76459dad05 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.323 1999/08/24 19:03:08 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.324 1999/08/25 13:37:34 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -124,6 +124,15 @@ CONFIGURE_ENV+=		LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 MAKE_ENV+=		LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 .endif
 
+.if defined(USE_XAW)
+XAW_TYPE?=		standard
+.if ${XAW_TYPE} == "xpm"
+DEPENDS+=		Xaw-Xpm-1.1:${PKGSRCDIR}/x11/Xaw-Xpm
+.elif ${XAW_TYPE} == "3d"
+DEPENDS+=		Xaw3d-1.5:${PKGSRCDIR}/x11/Xaw3d
+.endif
+.endif
+
 # Don't change these!!!  These names are built into the _TARGET_USE macro,
 # there is no way to refer to them cleanly from within the macro AFAIK.
 EXTRACT_COOKIE=		${WRKDIR}/.extract_done
diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index b2830c7164a..91f028475be 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.69 1999/08/25 10:04:46 agc Exp $
+# $NetBSD: mk.conf.example,v 1.70 1999/08/25 13:37:34 agc Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -375,6 +375,11 @@ PAPERSIZE=	A4		# Default paper size for packages.
                                 # Possible: see http://wm.themes.org/
                                 # Default: FreeBSD-theme
 
+#XAW_TYPE=standard              # Used in various packages to specify that
+                                # libXaw is used.
+                                # Possible: standard, 3d, xpm
+                                # Default: standard
+
 #ZIP_ENCRYPTION=		# Add encryption code to zip, zip1, and unzip
                                 # Possible: defined, not defined
                                 # Default: not defined
diff --git a/print/gv/Makefile b/print/gv/Makefile
index e54127dc38b..6f12cc423ec 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/04/13 15:31:07 agc Exp $
+# $NetBSD: Makefile,v 1.18 1999/08/25 13:37:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
 #
 
@@ -9,10 +9,14 @@ MASTER_SITES=	ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://wwwthep.physik.uni-mainz.de/~plass/gv/
 
-DEPENDS+=	Xaw3d-1.5:../../x11/Xaw3d
 DEPENDS+=	ghostscript-5.50:../../print/ghostscript5
 
 USE_IMAKE=	yes
+USE_XAW=	yes
+
+.include "../../mk/bsd.prefs.mk"
+
+XAW_TYPE?=	3d
 
 post-extract:
 	${MV} ${WRKSRC}/doc/gv.man ${WRKSRC}/source/
diff --git a/x11/emiclock/Makefile b/x11/emiclock/Makefile
index bbba4993800..9a069ba99d1 100644
--- a/x11/emiclock/Makefile
+++ b/x11/emiclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/06/10 15:29:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1999/08/25 13:37:36 agc Exp $
 #
 
 DISTNAME=	emiclock-1.0.4
@@ -7,10 +7,13 @@ MASTER_SITES=	ftp://ftp.plaza.hitachi-sk.co.jp/pub/EmiClock/X11/
 
 MAINTAINER=	minoura@netbsd.org
 
-DEPENDS=	Xaw3d-1.5:../../x11/Xaw3d
+USE_X11BASE=	yes
+USE_IMAKE=	yes
+USE_XAW=	yes
 
-USE_X11BASE=	YES
-USE_IMAKE=	YES
+.include "../../mk/bsd.prefs.mk"
+
+XAW_TYPE?=	3d
 
 post-install:
 	$(MKDIR) $(PREFIX)/lib/X11/ja_JP.eucJP/app-defaults
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 6e15e4f4d23..2138f29e215 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/06/09 11:34:01 sakamoto Exp $
+# $NetBSD: Makefile,v 1.2 1999/08/25 13:37:36 agc Exp $
 
 DISTNAME=	kterm-6.2.0
 CATEGORIES=	x11
@@ -13,10 +13,11 @@ PATCH_DIST_STRIP= -p1
 MAINTAINER=	sakamoto@netbsd.org
 
 USE_IMAKE=	yes
+USE_XAW=	yes
 
-.if defined(USE_XAW3DLIB) && ${USE_XAW3DLIB} == YES
-DEPENDS+=	Xaw3d-1.5:../../x11/Xaw3d
-.endif
+.include "../../mk/bsd.prefs.mk"
+
+XAW_TYPE?=	3d
 
 .if defined(USE_WALLPAPER) && ${USE_WALLPAPER} == YES
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 4c6fcfb57a4..0e635df93b1 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:49 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/08/25 13:37:37 agc Exp $
 #
 
 DISTNAME=	xcolorsel-1.1a-src
@@ -8,9 +8,12 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 
 MAINTAINER=	perry@netbsd.org
 
-DEPENDS+=	Xaw3d-1.5:../../x11/Xaw3d
-
 WRKSRC=		${WRKDIR}/xcolorsel
 USE_IMAKE=	yes
+USE_XAW=	yes
+
+.include "../../mk/bsd.prefs.mk"
+
+XAW_TYPE?=	3d
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 8323eeceb8f..77b2c257610 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 1999/07/23 16:01:27 frueauf Exp $
+# $NetBSD: Makefile,v 1.29 1999/08/25 13:37:37 agc Exp $
 #
 
 DISTNAME=	xscreensaver-3.17
@@ -9,7 +9,6 @@ MAINTAINER=	frueauf@netbsd.org
 HOMEPAGE=	http://www.jwz.org/xscreensaver/
 
 DEPENDS=	xpm-3.4k:../../graphics/xpm	\
-		Xaw3d-1.5:../../x11/Xaw3d	\
 		Mesa-3.0:../../graphics/Mesa	\
 		gtk+-1.2.2:../../x11/gtk
 
@@ -21,5 +20,10 @@ CONFIGURE_ENV+=	INSTALL=/usr/bin/install
 USE_X11BASE=	yes
 USE_MOTIF=	yes
 USE_PERL5=	yes
+USE_XAW=	yes
+
+.include "../../mk/bsd.prefs.mk"
+
+XAW_TYPE?=	3d
 
 .include "../../mk/bsd.pkg.mk"