diff options
| author | jlam <jlam> | 2003-08-29 00:53:05 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-29 00:53:05 +0000 |
| commit | 3bc65c81f5d2447baaaab8650a356891be426245 (patch) | |
| tree | cc70c52fba14a84092731dca851c34e9a3390367 | |
| parent | 4e977e34b82cf4cd83fe6624e435ac0de626e8c5 (diff) | |
| download | pkgsrc-3bc65c81f5d2447baaaab8650a356891be426245.tar.gz | |
buildlink2 no longer uses BUILDLINK_X11PKG_DIR, so reap it.
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 2088d0c7878..ea544dd30a2 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1216.2.42 2003/08/28 19:12:51 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1216.2.43 2003/08/29 00:53:05 jlam Exp $ # # This file is in the public domain. # @@ -126,12 +126,11 @@ PKG_FAIL_REASON+= "Please undefine USE_BUILDLINK2 or USE_BUILDLINK3." .if !empty(USE_BUILDLINK3:M[nN][oO]) # -# Set the default BUILDLINK_DIR, BUILDLINK_X11PKG_DIR, BUILDLINK_X11_DIR so -# that if no buildlink2.mk files are included, then they still point to -# where headers and libraries for installed packages and X11R6 may be found. +# Set the default BUILDLINK_DIR, BUILDLINK_X11_DIR so that if no +# buildlink2.mk files are included, then they still point to where headers +# and libraries for installed packages and X11R6 may be found. # BUILDLINK_DIR?= ${LOCALBASE} -BUILDLINK_X11PKG_DIR?= ${X11BASE} BUILDLINK_X11_DIR?= ${X11BASE} .endif @@ -164,7 +163,6 @@ _OPSYS_NEEDS_XPKGWEDGE?= no . if defined(USE_X11BASE) . if !empty(_OPSYS_NEEDS_XPKGWEDGE:M[yY][eE][sS]) BUILD_DEPENDS+= xpkgwedge>=1.5:../../pkgtools/xpkgwedge -BUILDLINK_X11PKG_DIR= ${LOCALBASE} . endif PREFIX= ${X11PREFIX} . elif defined(USE_CROSSBASE) |