Tue Sep 12 02:32:17 2017 UTC ()
Fix packaging when pgp5 is no installed etc.

* Add pgp5 or gpg configure args explicitly
* Conditional PLIST

Reported by pgoyette@. Thank you.


(ryoon)
diff -r1.1.1.1 -r1.2 pkgsrc/security/pinepgp/PLIST
diff -r1.1 -r1.2 pkgsrc/security/pinepgp/options.mk
cvs diff -r1.1.1.1 -r1.2 pkgsrc/security/pinepgp/PLIST (expand / switch to unified diff)

--- pkgsrc/security/pinepgp/PLIST 2003/12/08 17:44:49 1.1.1.1
+++ pkgsrc/security/pinepgp/PLIST 2017/09/12 02:32:17 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/08 17:44:49 jschauma Exp $ 1@comment $NetBSD: PLIST,v 1.2 2017/09/12 02:32:17 ryoon Exp $
2bin/gpg-check 2${PLIST.gpg}bin/gpg-check
3bin/gpg-encrypt 3${PLIST.gpg}bin/gpg-encrypt
4bin/gpg-sign 4${PLIST.gpg}bin/gpg-sign
5bin/gpg-sign+encrypt 5${PLIST.gpg}bin/gpg-sign+encrypt
6bin/pinegpg 6${PLIST.gpg}bin/pinegpg
7bin/pinegpg-install 7${PLIST.gpg}bin/pinegpg-install
8bin/pinepgp5x 8${PLIST.pgp5}bin/pinepgp5x
9bin/pinepgp5x-install 9${PLIST.pgp5}bin/pinepgp5x-install
10bin/pinepgpgpg-install 10bin/pinepgpgpg-install
11bin/pgp5x-check 11${PLIST.pgp5}bin/pgp5x-check
12bin/pgp5x-encrypt 12${PLIST.pgp5}bin/pgp5x-encrypt
13bin/pgp5x-sign 13${PLIST.pgp5}bin/pgp5x-sign
14bin/pgp5x-sign+encrypt 14${PLIST.pgp5}bin/pgp5x-sign+encrypt
cvs diff -r1.1 -r1.2 pkgsrc/security/pinepgp/options.mk (expand / switch to unified diff)

--- pkgsrc/security/pinepgp/options.mk 2017/09/09 11:43:08 1.1
+++ pkgsrc/security/pinepgp/options.mk 2017/09/12 02:32:17 1.2
@@ -1,17 +1,25 @@ @@ -1,17 +1,25 @@
1# $NetBSD: options.mk,v 1.1 2017/09/09 11:43:08 ryoon Exp $ 1# $NetBSD: options.mk,v 1.2 2017/09/12 02:32:17 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.pinepgp 3PKG_OPTIONS_VAR= PKG_OPTIONS.pinepgp
4 4
5PKG_SUPPORTED_OPTIONS= gpg pgp5 5PKG_SUPPORTED_OPTIONS= gpg pgp5
6PKG_SUGGESTED_OPTIONS= gpg 6PKG_SUGGESTED_OPTIONS= gpg
7PLIST_VARS= gpg pgp5 7PLIST_VARS= gpg pgp5
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11.if !empty(PKG_OPTIONS:Mgpg) 11.if !empty(PKG_OPTIONS:Mgpg)
12DEPENDS+= gnupg>=1.2.3:../../security/gnupg 12DEPENDS+= gnupg>=1.2.3:../../security/gnupg
 13CONFIGURE_ARGS+= --with-gpg
 14PLIST.gpg=yes
 15.else
 16CONFIGURE_ARGS+= --without-gpg
13.endif 17.endif
14 18
15.if !empty(PKG_OPTIONS:Mpgp5) 19.if !empty(PKG_OPTIONS:Mpgp5)
16DEPENDS+= pgp5>=5.0:../../security/pgp5 20DEPENDS+= pgp5>=5.0:../../security/pgp5
 21CONFIGURE_ARGS+= --with-pgp5
 22PLIST.pgp5=yes
 23.else
 24CONFIGURE_ARGS+= --without-pgp5
17.endif 25.endif