diff options
| author | dougb <dougb@FreeBSD.org> | 2007-12-06 03:57:49 +0800 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2007-12-06 03:57:49 +0800 |
| commit | f7c610eb55ed2cfa46ca0a032ef30ddb08951fe5 (patch) | |
| tree | 6cb46f7f2ff77d979b9195755fdc1c1bf4e6f10a /mail | |
| parent | 5326cc352aa901b133aacf2923da7420a4f2093c (diff) | |
| download | freebsd-ports-graphics-f7c610eb55ed2cfa46ca0a032ef30ddb08951fe5.tar.gz freebsd-ports-graphics-f7c610eb55ed2cfa46ca0a032ef30ddb08951fe5.tar.zst freebsd-ports-graphics-f7c610eb55ed2cfa46ca0a032ef30ddb08951fe5.zip | |
Un-break packaging by making the GnuPG dependency explicit. My original
goal was to have this port be gpg-version-agnostic, but since there is
no gpg installed on the package builders, and the new configure script
in version 1.5 fails if it can't find one, package building was failing.
The solution is twofold, in the port test if gpg2 is already present,
and record a dependency on it if so. If not, depend on gpg 1.x, and
record that dependency. [1] Second, rev the configure script to look
for gpg2 first, and use that if its found. That will allow those that
install the port (or the software without the port) to prefer gpg2.
Other than the fix in the configure script there are no other changes
from version 1.5 to 1.6.
Submitted by: pav [1]
Approved by: portmgr (pav)
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/pine-pgp-filters/Makefile | 14 | ||||
| -rw-r--r-- | mail/pine-pgp-filters/distinfo | 12 |
2 files changed, 18 insertions, 8 deletions
diff --git a/mail/pine-pgp-filters/Makefile b/mail/pine-pgp-filters/Makefile index f1ca5f6357f..761c2f2f2b2 100644 --- a/mail/pine-pgp-filters/Makefile +++ b/mail/pine-pgp-filters/Makefile @@ -6,7 +6,7 @@ # PORTNAME= pine-pgp-filters -PORTVERSION= 1.5 +PORTVERSION= 1.6 CATEGORIES= mail security MASTER_SITES= http://dougbarton.us/PGP/scripts/ppf/ \ ${MASTER_SITE_LOCAL} @@ -19,6 +19,16 @@ COMMENT= Simple /bin/sh-based filters to use GnuPG with Pine or Alpine RUN_DEPENDS= pine:${PORTSDIR}/mail/pine4 +.include <bsd.port.pre.mk> + +# We want to be version-agnostic here, but also record the right dependency +# if the user installs the package and already has one or the other installed. +.if exists(${LOCALBASE}/bin/gpg2) +RUN_DEPENDS+= gpg2:${PORTSDIR}/security/gnupg +.else +RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg1 +.endif + verify: checksum gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc @@ -34,4 +44,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/mail/pine-pgp-filters/distinfo b/mail/pine-pgp-filters/distinfo index 3f38f0cba2b..642e0181536 100644 --- a/mail/pine-pgp-filters/distinfo +++ b/mail/pine-pgp-filters/distinfo @@ -1,6 +1,6 @@ -MD5 (pine-pgp-filters-1.5.tar.gz) = 611b6fdd06196a9851ae7fc74da2e8e2 -SHA256 (pine-pgp-filters-1.5.tar.gz) = afac5c8e34ddd7283225351f4bbcbc01c329e9142a945aa392fc91bb67fac11d -SIZE (pine-pgp-filters-1.5.tar.gz) = 9948 -MD5 (pine-pgp-filters-1.5.tar.gz.asc) = ed7a28ecda8f16aa751db1dfaca2cbc5 -SHA256 (pine-pgp-filters-1.5.tar.gz.asc) = 664c4645ec3c516041016fcbc4b2e5ba8340a40134d900969b340b305ba71007 -SIZE (pine-pgp-filters-1.5.tar.gz.asc) = 187 +MD5 (pine-pgp-filters-1.6.tar.gz) = d1aff26af1fdfb2269ae8a5064df2e82 +SHA256 (pine-pgp-filters-1.6.tar.gz) = 563f6a480c2177b216c1aa88c27fbd095b37b515b83748ae600c7d1e649c216d +SIZE (pine-pgp-filters-1.6.tar.gz) = 10034 +MD5 (pine-pgp-filters-1.6.tar.gz.asc) = 7cec8bdb9bf68a6973aa7232b3d7156e +SHA256 (pine-pgp-filters-1.6.tar.gz.asc) = dd6c5740fa68191d6a69de802887bc76df90c21830c58aa1c961998d95693ef3 +SIZE (pine-pgp-filters-1.6.tar.gz.asc) = 187 |