Fix to use PKG_SYSCONFDIR. Bump PKGREVISION for all packages using the

shared Makefile.common.

14 files changed, 30 insertions, 23 deletions

diff --git a/security/cy2-anonymous/Makefile b/security/cy2-anonymous/Makefile
index 345b86f39ab..f7286c2e273 100644
--- a/security/cy2-anonymous/Makefile
+++ b/security/cy2-anonymous/Makefile
@@ -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 --git a/security/cy2-crammd5/Makefile b/security/cy2-crammd5/Makefile
index 676059a2ea9..0bc90257668 100644
--- a/security/cy2-crammd5/Makefile
+++ b/security/cy2-crammd5/Makefile
@@ -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 --git a/security/cy2-digestmd5/Makefile b/security/cy2-digestmd5/Makefile
index 34d75a5f137..57488a8a7a9 100644
--- a/security/cy2-digestmd5/Makefile
+++ b/security/cy2-digestmd5/Makefile
@@ -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 --git a/security/cy2-gssapi/Makefile b/security/cy2-gssapi/Makefile
index b2b4b52dff0..207c0aca5f2 100644
--- a/security/cy2-gssapi/Makefile
+++ b/security/cy2-gssapi/Makefile
@@ -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 --git a/security/cy2-ldapdb/Makefile b/security/cy2-ldapdb/Makefile
index afb36aa56d6..aeb0f258fd9 100644
--- a/security/cy2-ldapdb/Makefile
+++ b/security/cy2-ldapdb/Makefile
@@ -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 --git a/security/cy2-login/Makefile b/security/cy2-login/Makefile
index 40533227ded..3093008c17f 100644
--- a/security/cy2-login/Makefile
+++ b/security/cy2-login/Makefile
@@ -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 --git a/security/cy2-ntlm/Makefile b/security/cy2-ntlm/Makefile
index 09a236940cb..a8282638b87 100644
--- a/security/cy2-ntlm/Makefile
+++ b/security/cy2-ntlm/Makefile
@@ -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 --git a/security/cy2-otp/Makefile b/security/cy2-otp/Makefile
index 4034c512448..54644aa829d 100644
--- a/security/cy2-otp/Makefile
+++ b/security/cy2-otp/Makefile
@@ -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 --git a/security/cy2-plain/Makefile b/security/cy2-plain/Makefile
index 4cc1b7f415e..30627292d07 100644
--- a/security/cy2-plain/Makefile
+++ b/security/cy2-plain/Makefile
@@ -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 --git a/security/cy2-scram/Makefile b/security/cy2-scram/Makefile
index 8516f3fb0e8..30ffa87076f 100644
--- a/security/cy2-scram/Makefile
+++ b/security/cy2-scram/Makefile
@@ -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 --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile
index 69b4053bb14..2c8ad3b6724 100644
--- a/security/cy2-sql/Makefile
+++ b/security/cy2-sql/Makefile
@@ -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 --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index ede78c1cb7c..d480d6de812 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -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 --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common
index d7693e97221..047c37d2d8f 100644
--- a/security/cyrus-sasl/Makefile.common
+++ b/security/cyrus-sasl/Makefile.common
@@ -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 @@ LICENSE=	original-bsd # CMU version
 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 @@ USE_LIBTOOL=		yes
 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 --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index a836fc9d16f..03f857717cf 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -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"