pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/pinepgp Fix packaging when pgp5 is no install...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a0b7da5dbf76
branches:  trunk
changeset: 368204:a0b7da5dbf76
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Tue Sep 12 02:32:17 2017 +0000

description:
Fix packaging when pgp5 is no installed etc.

* Add pgp5 or gpg configure args explicitly
* Conditional PLIST

Reported by pgoyette@. Thank you.

diffstat:

 security/pinepgp/PLIST      |  26 +++++++++++++-------------
 security/pinepgp/options.mk |  10 +++++++++-
 2 files changed, 22 insertions(+), 14 deletions(-)

diffs (57 lines):

diff -r 3cedd52e479b -r a0b7da5dbf76 security/pinepgp/PLIST
--- a/security/pinepgp/PLIST    Mon Sep 11 21:30:13 2017 +0000
+++ b/security/pinepgp/PLIST    Tue Sep 12 02:32:17 2017 +0000
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/08 17:44:49 jschauma Exp $
-bin/gpg-check
-bin/gpg-encrypt
-bin/gpg-sign
-bin/gpg-sign+encrypt
-bin/pinegpg
-bin/pinegpg-install
-bin/pinepgp5x
-bin/pinepgp5x-install
+@comment $NetBSD: PLIST,v 1.2 2017/09/12 02:32:17 ryoon Exp $
+${PLIST.gpg}bin/gpg-check
+${PLIST.gpg}bin/gpg-encrypt
+${PLIST.gpg}bin/gpg-sign
+${PLIST.gpg}bin/gpg-sign+encrypt
+${PLIST.gpg}bin/pinegpg
+${PLIST.gpg}bin/pinegpg-install
+${PLIST.pgp5}bin/pinepgp5x
+${PLIST.pgp5}bin/pinepgp5x-install
 bin/pinepgpgpg-install
-bin/pgp5x-check
-bin/pgp5x-encrypt
-bin/pgp5x-sign
-bin/pgp5x-sign+encrypt
+${PLIST.pgp5}bin/pgp5x-check
+${PLIST.pgp5}bin/pgp5x-encrypt
+${PLIST.pgp5}bin/pgp5x-sign
+${PLIST.pgp5}bin/pgp5x-sign+encrypt
diff -r 3cedd52e479b -r a0b7da5dbf76 security/pinepgp/options.mk
--- a/security/pinepgp/options.mk       Mon Sep 11 21:30:13 2017 +0000
+++ b/security/pinepgp/options.mk       Tue Sep 12 02:32:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2017/09/09 11:43:08 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2017/09/12 02:32:17 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pinepgp
 
@@ -10,8 +10,16 @@
 
 .if !empty(PKG_OPTIONS:Mgpg)
 DEPENDS+=      gnupg>=1.2.3:../../security/gnupg
+CONFIGURE_ARGS+=       --with-gpg
+PLIST.gpg=yes
+.else
+CONFIGURE_ARGS+=       --without-gpg
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgp5)
 DEPENDS+=      pgp5>=5.0:../../security/pgp5
+CONFIGURE_ARGS+=       --with-pgp5
+PLIST.pgp5=yes
+.else
+CONFIGURE_ARGS+=       --without-pgp5
 .endif



Home | Main Index | Thread Index | Old Index