mail/pine-pgp-filters: use gnupg only, fix MASTER_SITES

When dougb released the port, he also reset the MASTER_SITES.  It has
been pulling off the cache ever since.  If the cache gets cleared, this
port would break.  I've moved the distfiles to my LOCAL site so this
never happens.

The other big change is to remove this hacky dependency logic.  Someone
tried to select between gnupg and gnupg1 depending on what was already
installed.  For the standard packages builders, this meant the port always
used the old gnupg1 because gnupg was never installed in the clean jail.

As both gnupg packages are range between 1.0M and 1.5M in size and can
coexist, the savings of resources in miniscule assuming they weren't both
installed anyway.  Let's just pick the new gnupg as the unconditional
dependency and remove the hack.  Inspired by discussion on PR which
was trying to fix a bug in the hack.

PR:		195426
Submitted by:	Trond Endrestol
This commit is contained in:
John Marino 2015-02-06 22:59:21 +00:00
parent b9640de8a0
commit 239cd9d9b3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=378568

View file

@ -2,14 +2,17 @@
PORTNAME= pine-pgp-filters PORTNAME= pine-pgp-filters
PORTVERSION= 1.8 PORTVERSION= 1.8
PORTREVISION= 1
CATEGORIES= mail security CATEGORIES= mail security
#MASTER_SITES= MASTER_SITES= LOCAL/marino
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Simple /bin/sh-based filters to use GnuPG with Alpine COMMENT= Simple /bin/sh-based filters to use GnuPG with Alpine
BUILD_DEPENDS= gpg2:${PORTSDIR}/security/gnupg
RUN_DEPENDS+= gpg2:${PORTSDIR}/security/gnupg
RUN_DEPENDS= alpine:${PORTSDIR}/mail/alpine RUN_DEPENDS= alpine:${PORTSDIR}/mail/alpine
PORTDOCS= BUGS CHANGES INSTALL LICENSE README PORTDOCS= BUGS CHANGES INSTALL LICENSE README
@ -17,16 +20,6 @@ PLIST_FILES= bin/ppf_mime bin/ppf_mime_decrypt \
libexec/ppf_decrypt libexec/ppf_encrypt libexec/ppf_mime \ libexec/ppf_decrypt libexec/ppf_encrypt libexec/ppf_mime \
libexec/ppf_mime_decrypt libexec/ppf_sign libexec/ppf_verify libexec/ppf_mime_decrypt libexec/ppf_sign libexec/ppf_verify
# 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)
BUILD_DEPENDS= gpg2:${PORTSDIR}/security/gnupg
RUN_DEPENDS+= gpg2:${PORTSDIR}/security/gnupg
.else
BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg1
RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg1
.endif
verify: checksum verify: checksum
gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc