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. --- misc/siag/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'misc') 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 -- cgit v1.2.3