diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-11-25 12:58:02 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-11-25 12:58:02 +0000 |
| commit | a11a77bec17fecebef359089d653762abe27296d (patch) | |
| tree | 57e106310a50f17f725b2c9734f78f204f8e950d /security/gpgme | |
| parent | dd9b059aed8be7b6979127439c2494c374a4f149 (diff) | |
| download | pkgsrc-a11a77bec17fecebef359089d653762abe27296d.tar.gz | |
Remove mk/find-prefix.mk usage from the security category.
The find-prefix infrastructure was required in a pkgviews world where
packages installed from pkgsrc could have different installation
prefixes, and this was a way for a dependency prefix to be determined.
Now that pkgviews has been removed there is no longer any need for the
overhead of this infrastructure. Instead we use BUILDLINK_PREFIX.pkg
for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the
dependency is coming from pkgsrc.
Provides a reasonable performance win due to the reduction of `pkg_info
-qp` calls, some of which were redundant anyway as they were duplicating
the same information provided by BUILDLINK_PREFIX.pkg.
Diffstat (limited to 'security/gpgme')
| -rw-r--r-- | security/gpgme/options.mk | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/security/gpgme/options.mk b/security/gpgme/options.mk index b30d11e87a1..f3c61f199c2 100644 --- a/security/gpgme/options.mk +++ b/security/gpgme/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2015/10/22 19:18:34 tnn Exp $ +# $NetBSD: options.mk,v 1.4 2015/11/25 12:58:02 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gpgme PKG_OPTIONS_REQUIRED_GROUPS= gnupg @@ -9,17 +9,13 @@ PKG_SUGGESTED_OPTIONS= gnupg2 .if !empty(PKG_OPTIONS:Mgnupg21) DEPENDS+= gnupg21>=2.1:../../security/gnupg21 -FIND_PREFIX:= GPG2DIR=gnupg21 -.include "../../mk/find-prefix.mk" -CONFIGURE_ARGS+= --with-gpgsm=${GPG2DIR}/bin/gpgsm -CONFIGURE_ARGS+= --with-gpg=${GPG2DIR}/bin/gpg2 +CONFIGURE_ARGS+= --with-gpgsm=${LOCALBASE}/bin/gpgsm +CONFIGURE_ARGS+= --with-gpg=${LOCALBASE}/bin/gpg2 REPLACE_SH+= tests/gpg/pinentry .elif !empty(PKG_OPTIONS:Mgnupg2) DEPENDS+= gnupg2>=2.0<2.1:../../security/gnupg2 -FIND_PREFIX:= GPG2DIR=gnupg2 -.include "../../mk/find-prefix.mk" -CONFIGURE_ARGS+= --with-gpgsm=${GPG2DIR}/bin/gpgsm -CONFIGURE_ARGS+= --with-gpg=${GPG2DIR}/bin/gpg2 +CONFIGURE_ARGS+= --with-gpgsm=${LOCALBASE}/bin/gpgsm +CONFIGURE_ARGS+= --with-gpg=${LOCALBASE}/bin/gpg2 REPLACE_SH+= tests/gpg/pinentry .else DEPENDS+= gnupg>=1.4.2:../../security/gnupg |