CVS commit: pkgsrc/security/pinepgp

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Sep 12 02:32:17 UTC 2017

Modified Files:
        pkgsrc/security/pinepgp: PLIST options.mk

Log Message:
Fix packaging when pgp5 is no installed etc.

* Add pgp5 or gpg configure args explicitly
* Conditional PLIST

Reported by pgoyette@. Thank you.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/security/pinepgp/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/pinepgp/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/pinepgp/PLIST
diff -u pkgsrc/security/pinepgp/PLIST:1.1.1.1 pkgsrc/security/pinepgp/PLIST:1.2
--- pkgsrc/security/pinepgp/PLIST:1.1.1.1       Mon Dec  8 17:44:49 2003
+++ pkgsrc/security/pinepgp/PLIST       Tue Sep 12 02:32:17 2017
@@ -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

Index: pkgsrc/security/pinepgp/options.mk
diff -u pkgsrc/security/pinepgp/options.mk:1.1 pkgsrc/security/pinepgp/options.mk:1.2
--- pkgsrc/security/pinepgp/options.mk:1.1      Sat Sep  9 11:43:08 2017
+++ pkgsrc/security/pinepgp/options.mk  Tue Sep 12 02:32:17 2017
@@ -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 @@ PLIST_VARS=          gpg pgp5
 
 .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