On Thu, Aug 25, 2016 at 01:54:11PM +0200, Joerg Sonnenberger wrote:
> On Thu, Aug 25, 2016 at 11:46:03AM +0200, Andreas Kusalananda Kähäri wrote:
> > Since gnupg2 and gnupg21 doesn't co-exist easily on one system, I added
> > a flavor of the port that replaces the dependency on gnupg2 with a
> > dependency on gnupg21:
>
> No option needed, just make it an either-or pattern, e.g.
>
> DEPENDS+= {gnupg2>=2.0.26,gnupg21>=2.1}:../../security/gnupg2
>
> Joerg
>
Yes, that's a better way to do it.
That means that the patch becomes simply:
Index: Makefile
===================================================================
RCS file: /Users/kk/NetBSD-CVS/pkgsrc/security/password-store/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 15 Feb 2015 18:58:40 -0000 1.4
+++ Makefile 25 Aug 2016 15:06:30 -0000
@@ -5,6 +5,8 @@
MASTER_SITES= http://git.zx2c4.com/password-store/snapshot/
EXTRACT_SUFX= .tar.xz
+PKGREVISION= 1
+
MAINTAINER= imil%NetBSD.org@localhost
HOMEPAGE= http://www.passwordstore.org/
COMMENT= Standard UNIX password manager
@@ -15,7 +17,7 @@
USE_TOOLS+= gmake pax bash:run
DEPENDS+= getopt>=1.1.6:../../misc/getopt
-DEPENDS+= gnupg2>=2.0.26:../../security/gnupg2
+DEPENDS+= {gnupg2>=2.0.26,gnupg21>=2.1}:../../security/gnupg2
DEPENDS+= pwgen>=2.06:../../sysutils/pwgen
DEPENDS+= tree>=1.7.0:../../sysutils/tree
Attachment:
signature.asc
Description: PGP signature