diff options
| author | jlam <jlam@pkgsrc.org> | 2001-06-20 19:36:03 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-06-20 19:36:03 +0000 |
| commit | c459aefcea0f6f1c0c8dd01c0c3423a7c5a56e6c (patch) | |
| tree | 075645831faeed4d2a65ab6e6c6fff1b921ae737 /mk | |
| parent | 7732303bf39a104713289c374f8a738bac1764fb (diff) | |
| download | pkgsrc-c459aefcea0f6f1c0c8dd01c0c3423a7c5a56e6c.tar.gz | |
Move default setting of XAW_TYPE to bsd.prefs.mk.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 3 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 20114f2482f..75c2f4380d4 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.763 2001/06/19 11:54:56 assar Exp $ +# $NetBSD: bsd.pkg.mk,v 1.764 2001/06/20 19:36:03 jlam Exp $ # # This file is in the public domain. # @@ -271,7 +271,6 @@ BUILD_DEFS+= SSLBASE .endif .if defined(USE_XAW) -XAW_TYPE?= standard .if ${XAW_TYPE} == "xpm" DEPENDS+= Xaw-Xpm-1.1:../../x11/Xaw-Xpm .elif ${XAW_TYPE} == "3d" diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 64b3fda8173..1d08979e3a3 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.43 2001/06/16 08:45:41 veego Exp $ +# $NetBSD: bsd.prefs.mk,v 1.44 2001/06/20 19:36:03 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -132,6 +132,11 @@ USE_INET6?= NO .include "${.CURDIR}/mk/defs.NetBSD.mk" .endif +# Set default type of libXaw used during package builds. +.if defined(USE_XAW) +XAW_TYPE?= standard +.endif + # Check if we got Mesa distributed with XFree86 4.x or if we need to # depend on the Mesa package. # XFree86 starting with 4.1.0 contains now a libGLU, so also check for it. |