pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mail/courier-imap courier-imap: Fix pkglint warning ab...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ecf7057782fe
branches:  trunk
changeset: 373736:ecf7057782fe
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Jan 10 00:19:48 2018 +0000

description:
courier-imap: Fix pkglint warning about foreign variables in SUBST block

diffstat:

 mail/courier-imap/options.mk |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r 9a76a79e2543 -r ecf7057782fe mail/courier-imap/options.mk
--- a/mail/courier-imap/options.mk      Wed Jan 10 00:06:26 2018 +0000
+++ b/mail/courier-imap/options.mk      Wed Jan 10 00:19:48 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/02/21 15:50:29 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2018/01/10 00:19:48 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.courier-imap
 PKG_SUPPORTED_OPTIONS=         courier-gnutls fam
@@ -10,17 +10,20 @@
 ### Support using the GNU TLS tools for creating certificates; otherwise
 ### default to using OpenSSL.
 ###
+COURIER_CERTTOOL=      ${PREFIX}/bin/certtool
+.if !empty(PKG_OPTIONS:Mcourier-gnutls)
+COURIER_OPENSSL=       ${PREFIX}/bin/openssl
+.else
+USE_TOOLS+=            openssl:run
+COURIER_OPENSSL=       ${TOOLS_OPENSSL}
+.endif
+
 SUBST_CLASSES+=                tls
 SUBST_FILES.tls=       imap/mkimapdcert.in imap/mkpop3dcert.in
 SUBST_STAGE.tls=       pre-configure
-COURIER_CERTTOOL=      ${PREFIX}/bin/certtool
-COURIER_OPENSSL=       ${PREFIX}/bin/openssl
-
 .if !empty(PKG_OPTIONS:Mcourier-gnutls)
 SUBST_SED.tls=         -e "s|@ssllib@|gnutls|g"
 .else
-USE_TOOLS+=            openssl:run
-COURIER_OPENSSL=       ${TOOLS_OPENSSL}
 SUBST_SED.tls=         -e "s|@ssllib@|openssl|g"
 .endif
 



Home | Main Index | Thread Index | Old Index