diff options
| author | jlam <jlam@pkgsrc.org> | 2003-07-11 20:22:11 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-07-11 20:22:11 +0000 |
| commit | b36d20c1c7696083adf759f3542d8e26e1b660d4 (patch) | |
| tree | 97efd2851d2c6534b61c155f5702529b78c5bef4 | |
| parent | 4f85ec8991975675d0e8fd7cc5890bc4d0f7a031 (diff) | |
| download | pkgsrc-b36d20c1c7696083adf759f3542d8e26e1b660d4.tar.gz | |
Use new _OPSYS_NEEDS_XPKGWEDGE to simplify the check for whether we need a
build dependency on xpkgwedge.
| -rw-r--r-- | mk/bsd.pkg.mk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 86837970dc2..a8a41a15cb2 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1210 2003/07/11 15:40:18 jschauma Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1211 2003/07/11 20:22:11 jlam Exp $ # # This file is in the public domain. # @@ -79,12 +79,18 @@ PLIST_SUBST+= IMAKE_MAN_SOURCE_PATH=${IMAKE_MAN_SOURCE_PATH} \ USE_X11?= implied .endif -# IRIX *always* needs xpkgwedge +# If xpkgwedge.def is found, then we need to require xpkgwedge as +# a build dependency for X11 packages. +# +.if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ + exists(${X11BASE}/lib/X11/config/xpkgwedge.def) +_OPSYS_NEEDS_XPKGWEDGE?= yes +.else +_OPSYS_NEEDS_XPKGWEDGE?= no +.endif + .if defined(USE_X11BASE) -. if ( defined(_OPSYS_NEEDS_XPKGWEDGE) && \ - !empty(_OPSYS_NEEDS_XPKGWEDGE:M[yY][eE][sS]) ) || - exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ - exists(${X11BASE}/lib/X11/config/xpkgwedge.def) +. if !empty(_OPSYS_NEEDS_XPKGWEDGE:M[yY][eE][sS]) BUILD_DEPENDS+= xpkgwedge>=1.5:../../pkgtools/xpkgwedge BUILDLINK_X11PKG_DIR= ${LOCALBASE} . endif |