From owner-svn-ports-all@FreeBSD.ORG Fri Feb 6 22:59:22 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 348AA866; Fri, 6 Feb 2015 22:59:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0813ABA9; Fri, 6 Feb 2015 22:59:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16MxLBH087686; Fri, 6 Feb 2015 22:59:21 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16MxLwC087685; Fri, 6 Feb 2015 22:59:21 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201502062259.t16MxLwC087685@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 6 Feb 2015 22:59:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378568 - head/mail/pine-pgp-filters X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2015 22:59:22 -0000 Author: marino Date: Fri Feb 6 22:59:21 2015 New Revision: 378568 URL: https://svnweb.freebsd.org/changeset/ports/378568 QAT: https://qat.redports.org/buildarchive/r378568/ Log: 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 Modified: head/mail/pine-pgp-filters/Makefile Modified: head/mail/pine-pgp-filters/Makefile ============================================================================== --- head/mail/pine-pgp-filters/Makefile Fri Feb 6 22:48:14 2015 (r378567) +++ head/mail/pine-pgp-filters/Makefile Fri Feb 6 22:59:21 2015 (r378568) @@ -2,14 +2,17 @@ PORTNAME= pine-pgp-filters PORTVERSION= 1.8 +PORTREVISION= 1 CATEGORIES= mail security -#MASTER_SITES= +MASTER_SITES= LOCAL/marino DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org 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 PORTDOCS= BUGS CHANGES INSTALL LICENSE README @@ -17,16 +20,6 @@ PLIST_FILES= bin/ppf_mime bin/ppf_mime_d libexec/ppf_decrypt libexec/ppf_encrypt libexec/ppf_mime \ 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 gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc