From 86aced3a9d904e13488ad6ea62c1d4320f9f6bb9 Mon Sep 17 00:00:00 2001 From: agc Date: Wed, 25 Aug 1999 13:37:34 +0000 Subject: 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. --- x11/kterm/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'x11/kterm/Makefile') 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 -- cgit v1.2.3