CVS commit: pkgsrc/mail/courier-imap

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Wed Jan 10 00:19:48 UTC 2018

Modified Files:
        pkgsrc/mail/courier-imap: options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/courier-imap/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/mail/courier-imap/options.mk
diff -u pkgsrc/mail/courier-imap/options.mk:1.2 pkgsrc/mail/courier-imap/options.mk:1.3
--- pkgsrc/mail/courier-imap/options.mk:1.2     Thu Feb 21 15:50:29 2008
+++ pkgsrc/mail/courier-imap/options.mk Wed Jan 10 00:19:48 2018
@@ -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 @@ PKG_SUGGESTED_OPTIONS=              # empty
 ### Support using the GNU TLS tools for creating certificates; otherwise
 ### default to using OpenSSL.
 ###
-SUBST_CLASSES+=                tls
-SUBST_FILES.tls=       imap/mkimapdcert.in imap/mkpop3dcert.in
-SUBST_STAGE.tls=       pre-configure
 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
 .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