diff options
| author | atatat <atatat> | 2003-04-30 03:05:06 +0000 |
|---|---|---|
| committer | atatat <atatat> | 2003-04-30 03:05:06 +0000 |
| commit | 57f0029c2917d477058cf4b4ebc1f5262414fcfe (patch) | |
| tree | 03a7f3775721e0dcf4023d19a936057b9fdc16cb /mk | |
| parent | cf9fd6a25dce6fcda0f8fef2fb3d903e782dfd17 (diff) | |
| download | pkgsrc-57f0029c2917d477058cf4b4ebc1f5262414fcfe.tar.gz | |
Move MESA_REQD from bsd.pkg.defaults.mk to bsd.pkg.mk, since the
latter appears to be a much better place to put something like that.
Also, remove a ) from the awk expression in the check-vulnerable
target, since it is extraneous and only causes awk to die.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 7 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 9a675758e6a..47c60b44e48 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.141 2003/04/25 20:05:19 jmmv Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.142 2003/04/30 03:05:06 atatat Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -1068,11 +1068,6 @@ MAJORDOMO_USER?= majordom # Possible: any # Default: majordom -MESA_REQD?= 5.0 -# Used by packages depending on an OpenGL implementation -# Possible: any numerical value -# Default: 5.0 - MOZILLA_USE_XFT?= NO # Used by mozilla packages to enable Xft support where available. # Possible: YES, NO diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 72ca23ea6b9..b30bd498d72 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1175 2003/04/29 20:31:52 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1176 2003/04/30 03:05:06 atatat Exp $ # # This file is in the public domain. # @@ -123,6 +123,9 @@ RESTRICTED?= uses Kerberos encryption code BUILD_DEFS+= KERBEROS .endif +# Used by packages depending on an OpenGL implementation +MESA_REQD?= 5.0 + PERL5_REQD?= 5.0 PERL5_PKGSRCDIR?= ../../lang/perl5 @@ -1412,7 +1415,7 @@ check-vulnerable: PKGBASE="${PKGBASE}" \ ${AWK} '/^$$/ { next } \ /^#.*/ { next } \ - $$1 !~ ENVIRON["PKGBASE"]) { next } \ + $$1 !~ ENVIRON["PKGBASE"] { next } \ { s = sprintf("${PKG_ADMIN} pmatch \"%s\" %s && ${ECHO} \"*** WARNING - %s vulnerability in %s - see %s for more information ***\"", $$1, ENVIRON["PKGNAME"], $$2, ENVIRON["PKGNAME"], $$3); system(s); }' < ${PKGVULNDIR}/vulnerabilities || ${FALSE}; \ fi |