diff options
| author | nia <nia@pkgsrc.org> | 2020-05-14 14:31:16 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-05-14 14:31:16 +0000 |
| commit | d16cdaeda964000f308bde004b8ec72be0c23391 (patch) | |
| tree | 69c6835909183f47e86c2519ad6f97c718fd11c3 /security | |
| parent | 9ae6e683a5fc10e1c81c538381efe4607e6c6525 (diff) | |
| download | pkgsrc-d16cdaeda964000f308bde004b8ec72be0c23391.tar.gz | |
cyrus-sasl: Resolve some pkglint warnings
Diffstat (limited to 'security')
| -rw-r--r-- | security/cyrus-sasl/Makefile | 6 | ||||
| -rw-r--r-- | security/cyrus-sasl/Makefile.common | 6 | ||||
| -rw-r--r-- | security/cyrus-sasl/options.mk | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index f7c03b047c1..d2a82c2100a 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -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 diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common index 8f12639b912..5da1db4a684 100644 --- a/security/cyrus-sasl/Makefile.common +++ b/security/cyrus-sasl/Makefile.common @@ -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 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 diff --git a/security/cyrus-sasl/options.mk b/security/cyrus-sasl/options.mk index 8fb3f383e59..a5d93d5ee50 100644 --- a/security/cyrus-sasl/options.mk +++ b/security/cyrus-sasl/options.mk @@ -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 |