diff options
| author | agc <agc@pkgsrc.org> | 1999-08-25 13:37:34 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1999-08-25 13:37:34 +0000 |
| commit | 86aced3a9d904e13488ad6ea62c1d4320f9f6bb9 (patch) | |
| tree | 4e6397ac799b96e60809f2cb1c097771c079275a /x11 | |
| parent | 7d907c661a12f906c64159810469ac7e488e11ea (diff) | |
| download | pkgsrc-86aced3a9d904e13488ad6ea62c1d4320f9f6bb9.tar.gz | |
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.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/emiclock/Makefile | 11 | ||||
| -rw-r--r-- | x11/kterm/Makefile | 9 | ||||
| -rw-r--r-- | x11/xcolorsel/Makefile | 9 | ||||
| -rw-r--r-- | x11/xscreensaver/Makefile | 8 |
4 files changed, 24 insertions, 13 deletions
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" |