CVS commit: pkgsrc/security/cyrus-sasl

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May 14 14:31:16 UTC 2020

Modified Files:
        pkgsrc/security/cyrus-sasl: Makefile Makefile.common options.mk

Log Message:
cyrus-sasl: Resolve some pkglint warnings


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/security/cyrus-sasl/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/security/cyrus-sasl/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/cyrus-sasl/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/cyrus-sasl/Makefile
diff -u pkgsrc/security/cyrus-sasl/Makefile:1.77 pkgsrc/security/cyrus-sasl/Makefile:1.78
--- pkgsrc/security/cyrus-sasl/Makefile:1.77    Thu May 14 14:27:31 2020
+++ pkgsrc/security/cyrus-sasl/Makefile Thu May 14 14:31:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2020/05/14 14:27:31 nia Exp $
+# $NetBSD: Makefile,v 1.78 2020/05/14 14:31:16 nia Exp $
 
 PKGREVISION=   1
 COMMENT=       Simple Authentication and Security Layer
@@ -52,8 +52,8 @@ CONFIGURE_ARGS+=      --enable-sample=no
 #
 CYRUS_USER?=           cyrus
 CYRUS_GROUP?=          mail
-FILES_SUBST+=          CYRUS_USER=${CYRUS_USER:Q}
-FILES_SUBST+=          ROOT_USER=${ROOT_USER:Q}
+FILES_SUBST+=          CYRUS_USER=${CYRUS_USER}
+FILES_SUBST+=          ROOT_USER=${ROOT_USER}
 PKG_GROUPS_VARS+=      CYRUS_GROUP
 PKG_USERS_VARS+=       CYRUS_USER
 

Index: pkgsrc/security/cyrus-sasl/Makefile.common
diff -u pkgsrc/security/cyrus-sasl/Makefile.common:1.32 pkgsrc/security/cyrus-sasl/Makefile.common:1.33
--- pkgsrc/security/cyrus-sasl/Makefile.common:1.32     Wed May 13 04:35:55 2020
+++ pkgsrc/security/cyrus-sasl/Makefile.common  Thu May 14 14:31:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2020/05/13 04:35:55 rillig Exp $
+# $NetBSD: Makefile.common,v 1.33 2020/05/14 14:31:16 nia Exp $
 #
 # used by security/cyrus-sasl/Makefile
 # used by security/cy2-anonymous/Makefile
@@ -32,8 +32,8 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.cyrusimap.org/sasl/
 LICENSE=       original-bsd # CMU version
 
-DISTINFO_FILE=         ${.CURDIR}/../cyrus-sasl/distinfo
-PATCHDIR=              ${.CURDIR}/../cyrus-sasl/patches
+DISTINFO_FILE=         ${.CURDIR}/../../security/cyrus-sasl/distinfo
+PATCHDIR=              ${.CURDIR}/../../security/cyrus-sasl/patches
 
 PKG_SYSCONFSUBDIR=     sasl2
 

Index: pkgsrc/security/cyrus-sasl/options.mk
diff -u pkgsrc/security/cyrus-sasl/options.mk:1.3 pkgsrc/security/cyrus-sasl/options.mk:1.4
--- pkgsrc/security/cyrus-sasl/options.mk:1.3   Mon Nov  4 21:12:52 2019
+++ pkgsrc/security/cyrus-sasl/options.mk       Thu May 14 14:31:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/11/04 21:12:52 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2020/05/14 14:31:16 nia Exp $
 #
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.cyrus-sasl
@@ -6,13 +6,13 @@ PKG_OPTIONS_REQUIRED_GROUPS=  database
 PKG_OPTIONS_GROUP.database=    ndbm bdb gdbm
 
 .if defined(SASL_DBTYPE)
-PKG_OPTIONS_DEPRECATED_WARNINGS+=      "Deprecated SASL_DBTYPE variable used, use ${PKG_OPTIONS_VAR:Q} instead (${PKG_OPTIONS_GROUP.database:ts,:Q})."
+PKG_OPTIONS_DEPRECATED_WARNINGS+=      "Deprecated SASL_DBTYPE variable used, use ${PKG_OPTIONS_VAR} instead (${PKG_OPTIONS_GROUP.database:ts,})."
 .  if !empty(SASL_DBTYPE:Mndbm)
 PKG_SUGGESTED_OPTIONS+=        ndbm
 .  elif !empty(SASL_DBTYPE:Mberkeley)
 PKG_SUGGESTED_OPTIONS+=        bdb
 .  else
-PKG_FAIL_REASON+=      "Unknown SASL_DBTYPE: ${SASL_DBTYPE:Q}"
+PKG_FAIL_REASON+=      "Unknown SASL_DBTYPE: ${SASL_DBTYPE}"
 .  endif
 .elif exists(/usr/include/ndbm.h) && ${OPSYS} != "Linux"
 PKG_SUGGESTED_OPTIONS+=        ndbm