summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2017-05-01 09:36:48 +0000
committerbsiegert <bsiegert@pkgsrc.org>2017-05-01 09:36:48 +0000
commitefa046ad981f2a1f82de9c6d44cbb7b6fced9c06 (patch)
tree21c59e0d6e93ac28a526d170354fe6e5840151e4
parentced2053298d06af6cd589aed19585a85ad9a290d (diff)
downloadpkgsrc-efa046ad981f2a1f82de9c6d44cbb7b6fced9c06.tar.gz
Pullup ticket #5381 - requested by sevan
security/cyrus-sasl: build fix Revisions pulled up: - security/cy2-anonymous/Makefile 1.10 - security/cy2-crammd5/Makefile 1.10 - security/cy2-digestmd5/Makefile 1.20 - security/cy2-gssapi/Makefile 1.26 - security/cy2-ldapdb/Makefile 1.12 - security/cy2-login/Makefile 1.17 - security/cy2-ntlm/Makefile 1.28 - security/cy2-otp/Makefile 1.21 - security/cy2-plain/Makefile 1.10 - security/cy2-scram/Makefile 1.8 - security/cy2-sql/Makefile 1.34 - security/cyrus-sasl/Makefile 1.72 - security/cyrus-sasl/Makefile.common 1.26 - security/cyrus-saslauthd/Makefile 1.52 --- Module Name: pkgsrc Committed By: jperkin Date: Thu Apr 27 13:56:47 UTC 2017 Modified Files: pkgsrc/security/cy2-anonymous: Makefile pkgsrc/security/cy2-crammd5: Makefile pkgsrc/security/cy2-digestmd5: Makefile pkgsrc/security/cy2-gssapi: Makefile pkgsrc/security/cy2-ldapdb: Makefile pkgsrc/security/cy2-login: Makefile pkgsrc/security/cy2-ntlm: Makefile pkgsrc/security/cy2-otp: Makefile pkgsrc/security/cy2-plain: Makefile pkgsrc/security/cy2-scram: Makefile pkgsrc/security/cy2-sql: Makefile pkgsrc/security/cyrus-sasl: Makefile Makefile.common pkgsrc/security/cyrus-saslauthd: Makefile Log Message: Fix to use PKG_SYSCONFDIR. Bump PKGREVISION for all packages using the shared Makefile.common.
Diffstat
-rw-r--r--security/cy2-anonymous/Makefile3
-rw-r--r--security/cy2-crammd5/Makefile3
-rw-r--r--security/cy2-digestmd5/Makefile4
-rw-r--r--security/cy2-gssapi/Makefile4
-rw-r--r--security/cy2-ldapdb/Makefile4
-rw-r--r--security/cy2-login/Makefile3
-rw-r--r--security/cy2-ntlm/Makefile4
-rw-r--r--security/cy2-otp/Makefile4
-rw-r--r--security/cy2-plain/Makefile3
-rw-r--r--security/cy2-scram/Makefile4
-rw-r--r--security/cy2-sql/Makefile4
-rw-r--r--security/cyrus-sasl/Makefile4
-rw-r--r--security/cyrus-sasl/Makefile.common5
-rw-r--r--security/cyrus-saslauthd/Makefile4
14 files changed, 30 insertions, 23 deletions
diff --git a/security/cy2-anonymous/Makefile b/security/cy2-anonymous/Makefile
index 345b86f39ab..ab2d0abfc2a 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.9.32.1 2017/05/01 09:36:48 bsiegert 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..a7f1e3875b2 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.9.32.1 2017/05/01 09:36:48 bsiegert 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..b8b50dfcc46 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.19.10.1 2017/05/01 09:36:48 bsiegert 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..7c0fd81aa9c 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.25.4.1 2017/05/01 09:36:48 bsiegert 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..43effa3ba73 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.11.10.1 2017/05/01 09:36:49 bsiegert 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..4f09b4010fa 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.16.32.1 2017/05/01 09:36:49 bsiegert 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..b698f3b1405 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.27.10.1 2017/05/01 09:36:49 bsiegert 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..ca44b38a0cb 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.20.10.1 2017/05/01 09:36:49 bsiegert 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..1634da87986 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.9.32.1 2017/05/01 09:36:49 bsiegert 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..85d387a01c0 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.7.10.1 2017/05/01 09:36:49 bsiegert 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 247aaf5eee8..470971682e7 100644
--- a/security/cy2-sql/Makefile
+++ b/security/cy2-sql/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2016/12/04 05:17:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.32.4.1 2017/05/01 09:36:49 bsiegert Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/}
-PKGREVISION= 10
+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..41b50dc5733 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.71.6.1 2017/05/01 09:36:49 bsiegert 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..0844ac1a55a 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.25.2.1 2017/05/01 09:36:49 bsiegert 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..51a1de7e7e2 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.51.4.1 2017/05/01 09:36:49 bsiegert Exp $
PKGNAME= ${DISTNAME:S/sasl/saslauthd/}
-PKGREVISION= 6
+PKGREVISION= 7
CONFLICTS+= cyrus-sasl<2.1.15nb2
.include "../../security/cyrus-sasl/Makefile.common"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 07:56:51 +0000