diff options
| author | agc <agc> | 1999-08-25 13:37:34 +0000 |
|---|---|---|
| committer | agc <agc> | 1999-08-25 13:37:34 +0000 |
| commit | 180af65efcbfb9594cafbaf1302968edfdc791e0 (patch) | |
| tree | 4e6397ac799b96e60809f2cb1c097771c079275a /x11/xscreensaver | |
| parent | 60a78b505626e9b3ea90765f6fe799033a8f8d0f (diff) | |
| download | pkgsrc-180af65efcbfb9594cafbaf1302968edfdc791e0.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/xscreensaver')
| -rw-r--r-- | x11/xscreensaver/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
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" |