[pkgsrc/trunk]: pkgsrc/security Fix to use PKG_SYSCONFDIR. Bump PKGREVISION ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/82bdb1635c19
branches:  trunk
changeset: 361862:82bdb1635c19
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Apr 27 13:56:46 2017 +0000

description:
Fix to use PKG_SYSCONFDIR.  Bump PKGREVISION for all packages using the
shared Makefile.common.

diffstat:

 security/cy2-anonymous/Makefile     |  3 ++-
 security/cy2-crammd5/Makefile       |  3 ++-
 security/cy2-digestmd5/Makefile     |  4 ++--
 security/cy2-gssapi/Makefile        |  4 ++--
 security/cy2-ldapdb/Makefile        |  4 ++--
 security/cy2-login/Makefile         |  3 ++-
 security/cy2-ntlm/Makefile          |  4 ++--
 security/cy2-otp/Makefile           |  4 ++--
 security/cy2-plain/Makefile         |  3 ++-
 security/cy2-scram/Makefile         |  4 ++--
 security/cy2-sql/Makefile           |  4 ++--
 security/cyrus-sasl/Makefile        |  4 ++--
 security/cyrus-sasl/Makefile.common |  5 ++++-
 security/cyrus-saslauthd/Makefile   |  4 ++--
 14 files changed, 30 insertions(+), 23 deletions(-)

diffs (190 lines):

diff -r 6400c62156d9 -r 82bdb1635c19 security/cy2-anonymous/Makefile
--- a/security/cy2-anonymous/Makefile   Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cy2-anonymous/Makefile   Thu Apr 27 13:56:46 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2013/04/06 15:46:38 rodent Exp $
+# $NetBSD: Makefile,v 1.10 2017/04/27 13:56:46 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-anonymous/}
+PKGREVISION=   1
 COMMENT=       Cyrus SASL ANONYMOUS authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 6400c62156d9 -r 82bdb1635c19 security/cy2-crammd5/Makefile
--- a/security/cy2-crammd5/Makefile     Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cy2-crammd5/Makefile     Thu Apr 27 13:56:46 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2013/04/06 15:46:38 rodent Exp $
+# $NetBSD: Makefile,v 1.10 2017/04/27 13:56:46 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-crammd5/}
+PKGREVISION=   1
 COMMENT=       Cyrus SASL CRAM-MD5 authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 6400c62156d9 -r 82bdb1635c19 security/cy2-digestmd5/Makefile
--- a/security/cy2-digestmd5/Makefile   Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cy2-digestmd5/Makefile   Thu Apr 27 13:56:46 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2016/03/05 11:29:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2017/04/27 13:56:47 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Cyrus SASL DIGEST-MD5 authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 6400c62156d9 -r 82bdb1635c19 security/cy2-gssapi/Makefile
--- a/security/cy2-gssapi/Makefile      Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cy2-gssapi/Makefile      Thu Apr 27 13:56:46 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2016/12/12 14:22:03 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2017/04/27 13:56:47 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-gssapi/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Cyrus SASL GSSAPI authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 6400c62156d9 -r 82bdb1635c19 security/cy2-ldapdb/Makefile
--- a/security/cy2-ldapdb/Makefile      Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cy2-ldapdb/Makefile      Thu Apr 27 13:56:46 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2016/03/05 11:29:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2017/04/27 13:56:47 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-ldapdb/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Cyrus SASL LDAPDB authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 6400c62156d9 -r 82bdb1635c19 security/cy2-login/Makefile
--- a/security/cy2-login/Makefile       Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cy2-login/Makefile       Thu Apr 27 13:56:46 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2013/04/06 15:46:39 rodent Exp $
+# $NetBSD: Makefile,v 1.17 2017/04/27 13:56:47 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-login/}
+PKGREVISION=   1
 COMMENT=       Cyrus SASL LOGIN authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 6400c62156d9 -r 82bdb1635c19 security/cy2-ntlm/Makefile
--- a/security/cy2-ntlm/Makefile        Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cy2-ntlm/Makefile        Thu Apr 27 13:56:46 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2016/03/05 11:29:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2017/04/27 13:56:47 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Cyrus SASL NTLM authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 6400c62156d9 -r 82bdb1635c19 security/cy2-otp/Makefile
--- a/security/cy2-otp/Makefile Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cy2-otp/Makefile Thu Apr 27 13:56:46 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2016/03/05 11:29:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2017/04/27 13:56:47 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-otp/}
-PKGREVISION=   4
+PKGREVISION=   5
 COMMENT=       Cyrus SASL OTP authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 6400c62156d9 -r 82bdb1635c19 security/cy2-plain/Makefile
--- a/security/cy2-plain/Makefile       Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cy2-plain/Makefile       Thu Apr 27 13:56:46 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2013/04/06 15:46:39 rodent Exp $
+# $NetBSD: Makefile,v 1.10 2017/04/27 13:56:47 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-plain/}
+PKGREVISION=   1
 COMMENT=       Cyrus SASL PLAIN authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 6400c62156d9 -r 82bdb1635c19 security/cy2-scram/Makefile
--- a/security/cy2-scram/Makefile       Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cy2-scram/Makefile       Thu Apr 27 13:56:46 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2016/03/05 11:29:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2017/04/27 13:56:47 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-scram/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Cyrus SASL SCRAM authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 6400c62156d9 -r 82bdb1635c19 security/cy2-sql/Makefile
--- a/security/cy2-sql/Makefile Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cy2-sql/Makefile Thu Apr 27 13:56:46 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2017/04/22 21:03:55 adam Exp $
+# $NetBSD: Makefile,v 1.34 2017/04/27 13:56:47 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-sql/}
-PKGREVISION=   11
+PKGREVISION=   12
 COMMENT=       Cyrus SASL SQL authentication plugin
 SASL_PLUGIN=   yes
 
diff -r 6400c62156d9 -r 82bdb1635c19 security/cyrus-sasl/Makefile
--- a/security/cyrus-sasl/Makefile      Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cyrus-sasl/Makefile      Thu Apr 27 13:56:46 2017 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2016/09/11 06:11:15 richard Exp $
+# $NetBSD: Makefile,v 1.72 2017/04/27 13:56:47 jperkin Exp $
 
-PKGREVISION=   5
+PKGREVISION=   6
 COMMENT=       Simple Authentication and Security Layer
 
 .include "Makefile.common"
diff -r 6400c62156d9 -r 82bdb1635c19 security/cyrus-sasl/Makefile.common
--- a/security/cyrus-sasl/Makefile.common       Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cyrus-sasl/Makefile.common       Thu Apr 27 13:56:46 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2017/01/19 18:52:23 agc Exp $
+# $NetBSD: Makefile.common,v 1.26 2017/04/27 13:56:47 jperkin Exp $
 #
 # used by security/cyrus-sasl/Makefile
 # used by security/cy2-anonymous/Makefile
@@ -33,6 +33,8 @@
 DISTINFO_FILE=         ${.CURDIR}/../cyrus-sasl/distinfo
 PATCHDIR=              ${.CURDIR}/../cyrus-sasl/patches
 
+PKG_SYSCONFSUBDIR=     sasl2
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS])
@@ -51,6 +53,7 @@
 DOCDIR=                        ${PREFIX}/share/doc/cyrus-sasl
 PLUGINDIR=             ${PREFIX}/lib/sasl2
 
+CONFIGURE_ARGS+=       --with-configdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-plugindir=${PLUGINDIR:Q}
 CONFIGURE_ARGS+=       --disable-java
 
diff -r 6400c62156d9 -r 82bdb1635c19 security/cyrus-saslauthd/Makefile
--- a/security/cyrus-saslauthd/Makefile Thu Apr 27 13:50:38 2017 +0000
+++ b/security/cyrus-saslauthd/Makefile Thu Apr 27 13:56:46 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2016/12/16 15:42:20 hans Exp $
+# $NetBSD: Makefile,v 1.52 2017/04/27 13:56:47 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/sasl/saslauthd/}
-PKGREVISION=   6
+PKGREVISION=   7
 CONFLICTS+=    cyrus-sasl<2.1.15nb2
 
 .include "../../security/cyrus-sasl/Makefile.common"