Thu Apr 27 13:56:47 2017 UTC ()
Fix to use PKG_SYSCONFDIR.  Bump PKGREVISION for all packages using the
shared Makefile.common.


(jperkin)
diff -r1.9 -r1.10 pkgsrc/security/cy2-anonymous/Makefile
diff -r1.9 -r1.10 pkgsrc/security/cy2-crammd5/Makefile
diff -r1.19 -r1.20 pkgsrc/security/cy2-digestmd5/Makefile
diff -r1.25 -r1.26 pkgsrc/security/cy2-gssapi/Makefile
diff -r1.11 -r1.12 pkgsrc/security/cy2-ldapdb/Makefile
diff -r1.16 -r1.17 pkgsrc/security/cy2-login/Makefile
diff -r1.27 -r1.28 pkgsrc/security/cy2-ntlm/Makefile
diff -r1.20 -r1.21 pkgsrc/security/cy2-otp/Makefile
diff -r1.9 -r1.10 pkgsrc/security/cy2-plain/Makefile
diff -r1.7 -r1.8 pkgsrc/security/cy2-scram/Makefile
diff -r1.33 -r1.34 pkgsrc/security/cy2-sql/Makefile
diff -r1.71 -r1.72 pkgsrc/security/cyrus-sasl/Makefile
diff -r1.25 -r1.26 pkgsrc/security/cyrus-sasl/Makefile.common
diff -r1.51 -r1.52 pkgsrc/security/cyrus-saslauthd/Makefile
cvs diff -r1.9 -r1.10 pkgsrc/security/cy2-anonymous/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-anonymous/Makefile 2013/04/06 15:46:38 1.9
+++ pkgsrc/security/cy2-anonymous/Makefile 2017/04/27 13:56:46 1.10
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2013/04/06 15:46:38 rodent Exp $ 1# $NetBSD: Makefile,v 1.10 2017/04/27 13:56:46 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-anonymous/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-anonymous/}
 4PKGREVISION= 1
4COMMENT= Cyrus SASL ANONYMOUS authentication plugin 5COMMENT= Cyrus SASL ANONYMOUS authentication plugin
5SASL_PLUGIN= yes 6SASL_PLUGIN= yes
6 7
7CONFLICTS= cyrus-sasl<=2.1.19nb1 8CONFLICTS= cyrus-sasl<=2.1.19nb1
8 9
9.include "../../security/cyrus-sasl/Makefile.common" 10.include "../../security/cyrus-sasl/Makefile.common"
10 11
11CONFIGURE_ARGS+= --enable-anonymous 12CONFIGURE_ARGS+= --enable-anonymous
12 13
13BUILD_DIRS= plugins 14BUILD_DIRS= plugins
14BUILD_TARGET= libanonymous.la 15BUILD_TARGET= libanonymous.la
15 16
16do-install: 17do-install:
cvs diff -r1.9 -r1.10 pkgsrc/security/cy2-crammd5/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-crammd5/Makefile 2013/04/06 15:46:38 1.9
+++ pkgsrc/security/cy2-crammd5/Makefile 2017/04/27 13:56:46 1.10
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2013/04/06 15:46:38 rodent Exp $ 1# $NetBSD: Makefile,v 1.10 2017/04/27 13:56:46 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-crammd5/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-crammd5/}
 4PKGREVISION= 1
4COMMENT= Cyrus SASL CRAM-MD5 authentication plugin 5COMMENT= Cyrus SASL CRAM-MD5 authentication plugin
5SASL_PLUGIN= yes 6SASL_PLUGIN= yes
6 7
7CONFLICTS= cyrus-sasl<=2.1.19nb1 8CONFLICTS= cyrus-sasl<=2.1.19nb1
8 9
9.include "../../security/cyrus-sasl/Makefile.common" 10.include "../../security/cyrus-sasl/Makefile.common"
10 11
11CONFIGURE_ARGS+= --enable-cram 12CONFIGURE_ARGS+= --enable-cram
12 13
13BUILD_DIRS= plugins 14BUILD_DIRS= plugins
14BUILD_TARGET= libcrammd5.la 15BUILD_TARGET= libcrammd5.la
15 16
16do-install: 17do-install:
cvs diff -r1.19 -r1.20 pkgsrc/security/cy2-digestmd5/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-digestmd5/Makefile 2016/03/05 11:29:19 1.19
+++ pkgsrc/security/cy2-digestmd5/Makefile 2017/04/27 13:56:47 1.20
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.19 2016/03/05 11:29:19 jperkin Exp $ 1# $NetBSD: Makefile,v 1.20 2017/04/27 13:56:47 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/}
4PKGREVISION= 3 4PKGREVISION= 4
5COMMENT= Cyrus SASL DIGEST-MD5 authentication plugin 5COMMENT= Cyrus SASL DIGEST-MD5 authentication plugin
6SASL_PLUGIN= yes 6SASL_PLUGIN= yes
7 7
8CONFLICTS= cyrus-sasl<=2.1.19nb1 8CONFLICTS= cyrus-sasl<=2.1.19nb1
9 9
10.include "../../security/cyrus-sasl/Makefile.common" 10.include "../../security/cyrus-sasl/Makefile.common"
11 11
12CONFIGURE_ARGS+= --enable-digest 12CONFIGURE_ARGS+= --enable-digest
13CONFIGURE_ARGS+= --with-rc4 13CONFIGURE_ARGS+= --with-rc4
14CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 14CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
15 15
16BUILD_DIRS= plugins 16BUILD_DIRS= plugins
17BUILD_TARGET= libdigestmd5.la 17BUILD_TARGET= libdigestmd5.la
cvs diff -r1.25 -r1.26 pkgsrc/security/cy2-gssapi/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-gssapi/Makefile 2016/12/12 14:22:03 1.25
+++ pkgsrc/security/cy2-gssapi/Makefile 2017/04/27 13:56:47 1.26
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.25 2016/12/12 14:22:03 wiz Exp $ 1# $NetBSD: Makefile,v 1.26 2017/04/27 13:56:47 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-gssapi/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-gssapi/}
4PKGREVISION= 3 4PKGREVISION= 4
5COMMENT= Cyrus SASL GSSAPI authentication plugin 5COMMENT= Cyrus SASL GSSAPI authentication plugin
6SASL_PLUGIN= yes 6SASL_PLUGIN= yes
7 7
8CONFLICTS= cyrus-sasl<=2.1.19nb1 8CONFLICTS= cyrus-sasl<=2.1.19nb1
9 9
10.include "../../security/cyrus-sasl/Makefile.common" 10.include "../../security/cyrus-sasl/Makefile.common"
11 11
12CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 12CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
13CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q} 13CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q}
14CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} 14CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
15GSSIMPL.heimdal= heimdal 15GSSIMPL.heimdal= heimdal
16GSSIMPL.mit-krb5= mit 16GSSIMPL.mit-krb5= mit
17 17
cvs diff -r1.11 -r1.12 pkgsrc/security/cy2-ldapdb/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-ldapdb/Makefile 2016/03/05 11:29:19 1.11
+++ pkgsrc/security/cy2-ldapdb/Makefile 2017/04/27 13:56:47 1.12
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.11 2016/03/05 11:29:19 jperkin Exp $ 1# $NetBSD: Makefile,v 1.12 2017/04/27 13:56:47 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ldapdb/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ldapdb/}
4PKGREVISION= 3 4PKGREVISION= 4
5COMMENT= Cyrus SASL LDAPDB authentication plugin 5COMMENT= Cyrus SASL LDAPDB authentication plugin
6SASL_PLUGIN= yes 6SASL_PLUGIN= yes
7 7
8.include "../../security/cyrus-sasl/Makefile.common" 8.include "../../security/cyrus-sasl/Makefile.common"
9 9
10CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap} 10CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap}
11CONFIGURE_ARGS+= --enable-ldapdb 11CONFIGURE_ARGS+= --enable-ldapdb
12 12
13BUILD_DIRS= plugins 13BUILD_DIRS= plugins
14BUILD_TARGET= libldapdb.la 14BUILD_TARGET= libldapdb.la
15 15
16.include "../../databases/openldap-client/buildlink3.mk" 16.include "../../databases/openldap-client/buildlink3.mk"
17 17
cvs diff -r1.16 -r1.17 pkgsrc/security/cy2-login/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-login/Makefile 2013/04/06 15:46:39 1.16
+++ pkgsrc/security/cy2-login/Makefile 2017/04/27 13:56:47 1.17
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.16 2013/04/06 15:46:39 rodent Exp $ 1# $NetBSD: Makefile,v 1.17 2017/04/27 13:56:47 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-login/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-login/}
 4PKGREVISION= 1
4COMMENT= Cyrus SASL LOGIN authentication plugin 5COMMENT= Cyrus SASL LOGIN authentication plugin
5SASL_PLUGIN= yes 6SASL_PLUGIN= yes
6 7
7.include "../../security/cyrus-sasl/Makefile.common" 8.include "../../security/cyrus-sasl/Makefile.common"
8 9
9# We need to configure the PLAIN plugin as well since some of the important 10# We need to configure the PLAIN plugin as well since some of the important
10# build variables for the LOGIN plugin are only set if PLAIN is configured. 11# build variables for the LOGIN plugin are only set if PLAIN is configured.
11# 12#
12CONFIGURE_ARGS+= --enable-login 13CONFIGURE_ARGS+= --enable-login
13CONFIGURE_ARGS+= --enable-plain 14CONFIGURE_ARGS+= --enable-plain
14 15
15BUILD_DIRS= plugins 16BUILD_DIRS= plugins
16BUILD_TARGET= liblogin.la 17BUILD_TARGET= liblogin.la
cvs diff -r1.27 -r1.28 pkgsrc/security/cy2-ntlm/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-ntlm/Makefile 2016/03/05 11:29:19 1.27
+++ pkgsrc/security/cy2-ntlm/Makefile 2017/04/27 13:56:47 1.28
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.27 2016/03/05 11:29:19 jperkin Exp $ 1# $NetBSD: Makefile,v 1.28 2017/04/27 13:56:47 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ntlm/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
4PKGREVISION= 3 4PKGREVISION= 4
5COMMENT= Cyrus SASL NTLM authentication plugin 5COMMENT= Cyrus SASL NTLM authentication plugin
6SASL_PLUGIN= yes 6SASL_PLUGIN= yes
7 7
8.include "../../security/cyrus-sasl/Makefile.common" 8.include "../../security/cyrus-sasl/Makefile.common"
9 9
10CONFIGURE_ARGS+= --enable-ntlm 10CONFIGURE_ARGS+= --enable-ntlm
11CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 11CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
12 12
13BUILD_DIRS= plugins 13BUILD_DIRS= plugins
14BUILD_TARGET= libntlm.la 14BUILD_TARGET= libntlm.la
15 15
16.include "../../security/openssl/buildlink3.mk" 16.include "../../security/openssl/buildlink3.mk"
17 17
cvs diff -r1.20 -r1.21 pkgsrc/security/cy2-otp/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-otp/Makefile 2016/03/05 11:29:19 1.20
+++ pkgsrc/security/cy2-otp/Makefile 2017/04/27 13:56:47 1.21
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.20 2016/03/05 11:29:19 jperkin Exp $ 1# $NetBSD: Makefile,v 1.21 2017/04/27 13:56:47 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-otp/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-otp/}
4PKGREVISION= 4 4PKGREVISION= 5
5COMMENT= Cyrus SASL OTP authentication plugin 5COMMENT= Cyrus SASL OTP authentication plugin
6SASL_PLUGIN= yes 6SASL_PLUGIN= yes
7 7
8CONFLICTS= cyrus-sasl<=2.1.19nb1 8CONFLICTS= cyrus-sasl<=2.1.19nb1
9 9
10.include "../../security/cyrus-sasl/Makefile.common" 10.include "../../security/cyrus-sasl/Makefile.common"
11 11
12CONFIGURE_ARGS+= --enable-otp 12CONFIGURE_ARGS+= --enable-otp
13CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 13CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
14 14
15BUILD_DIRS= plugins 15BUILD_DIRS= plugins
16BUILD_TARGET= libotp.la 16BUILD_TARGET= libotp.la
17 17
cvs diff -r1.9 -r1.10 pkgsrc/security/cy2-plain/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-plain/Makefile 2013/04/06 15:46:39 1.9
+++ pkgsrc/security/cy2-plain/Makefile 2017/04/27 13:56:47 1.10
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2013/04/06 15:46:39 rodent Exp $ 1# $NetBSD: Makefile,v 1.10 2017/04/27 13:56:47 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-plain/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-plain/}
 4PKGREVISION= 1
4COMMENT= Cyrus SASL PLAIN authentication plugin 5COMMENT= Cyrus SASL PLAIN authentication plugin
5SASL_PLUGIN= yes 6SASL_PLUGIN= yes
6 7
7CONFLICTS= cyrus-sasl<=2.1.19nb1 8CONFLICTS= cyrus-sasl<=2.1.19nb1
8 9
9.include "../../security/cyrus-sasl/Makefile.common" 10.include "../../security/cyrus-sasl/Makefile.common"
10 11
11CONFIGURE_ARGS+= --enable-plain 12CONFIGURE_ARGS+= --enable-plain
12 13
13BUILD_DIRS= plugins 14BUILD_DIRS= plugins
14BUILD_TARGET= libplain.la 15BUILD_TARGET= libplain.la
15 16
16do-install: 17do-install:
cvs diff -r1.7 -r1.8 pkgsrc/security/cy2-scram/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-scram/Makefile 2016/03/05 11:29:19 1.7
+++ pkgsrc/security/cy2-scram/Makefile 2017/04/27 13:56:47 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.7 2016/03/05 11:29:19 jperkin Exp $ 1# $NetBSD: Makefile,v 1.8 2017/04/27 13:56:47 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-scram/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-scram/}
4PKGREVISION= 3 4PKGREVISION= 4
5COMMENT= Cyrus SASL SCRAM authentication plugin 5COMMENT= Cyrus SASL SCRAM authentication plugin
6SASL_PLUGIN= yes 6SASL_PLUGIN= yes
7 7
8.include "../../security/cyrus-sasl/Makefile.common" 8.include "../../security/cyrus-sasl/Makefile.common"
9 9
10CONFIGURE_ARGS+= --enable-scram 10CONFIGURE_ARGS+= --enable-scram
11CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 11CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
12 12
13BUILD_DIRS= plugins 13BUILD_DIRS= plugins
14BUILD_TARGET= libscram.la 14BUILD_TARGET= libscram.la
15 15
16.include "../../security/openssl/buildlink3.mk" 16.include "../../security/openssl/buildlink3.mk"
17 17
cvs diff -r1.33 -r1.34 pkgsrc/security/cy2-sql/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cy2-sql/Makefile 2017/04/22 21:03:55 1.33
+++ pkgsrc/security/cy2-sql/Makefile 2017/04/27 13:56:47 1.34
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.33 2017/04/22 21:03:55 adam Exp $ 1# $NetBSD: Makefile,v 1.34 2017/04/27 13:56:47 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/} 3PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/}
4PKGREVISION= 11 4PKGREVISION= 12
5COMMENT= Cyrus SASL SQL authentication plugin 5COMMENT= Cyrus SASL SQL authentication plugin
6SASL_PLUGIN= yes 6SASL_PLUGIN= yes
7 7
8.include "../../security/cyrus-sasl/Makefile.common" 8.include "../../security/cyrus-sasl/Makefile.common"
9 9
10PKG_OPTIONS_VAR= PKG_OPTIONS.cy2-sql 10PKG_OPTIONS_VAR= PKG_OPTIONS.cy2-sql
11PKG_SUPPORTED_OPTIONS= mysql pgsql sqlite sqlite3 11PKG_SUPPORTED_OPTIONS= mysql pgsql sqlite sqlite3
12PKG_SUGGESTED_OPTIONS= mysql 12PKG_SUGGESTED_OPTIONS= mysql
13 13
14.include "../../mk/bsd.options.mk" 14.include "../../mk/bsd.options.mk"
15 15
16.if !empty(PKG_OPTIONS:Mmysql) 16.if !empty(PKG_OPTIONS:Mmysql)
17. include "../../mk/mysql.buildlink3.mk" 17. include "../../mk/mysql.buildlink3.mk"
cvs diff -r1.71 -r1.72 pkgsrc/security/cyrus-sasl/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cyrus-sasl/Makefile 2016/09/11 06:11:15 1.71
+++ pkgsrc/security/cyrus-sasl/Makefile 2017/04/27 13:56:47 1.72
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.71 2016/09/11 06:11:15 richard Exp $ 1# $NetBSD: Makefile,v 1.72 2017/04/27 13:56:47 jperkin Exp $
2 2
3PKGREVISION= 5 3PKGREVISION= 6
4COMMENT= Simple Authentication and Security Layer 4COMMENT= Simple Authentication and Security Layer
5 5
6.include "Makefile.common" 6.include "Makefile.common"
7 7
8CPPFLAGS+= -DPIC -fPIC 8CPPFLAGS+= -DPIC -fPIC
9 9
10.include "options.mk" 10.include "options.mk"
11 11
12BUILD_DEFS+= VARBASE 12BUILD_DEFS+= VARBASE
13 13
14# Support using Cyrus saslauthd (security/cyrus-saslauthd) for plaintext 14# Support using Cyrus saslauthd (security/cyrus-saslauthd) for plaintext
15# password authentication. 15# password authentication.
16# 16#
cvs diff -r1.25 -r1.26 pkgsrc/security/cyrus-sasl/Makefile.common (expand / switch to unified diff)

--- pkgsrc/security/cyrus-sasl/Makefile.common 2017/01/19 18:52:23 1.25
+++ pkgsrc/security/cyrus-sasl/Makefile.common 2017/04/27 13:56:47 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.25 2017/01/19 18:52:23 agc Exp $ 1# $NetBSD: Makefile.common,v 1.26 2017/04/27 13:56:47 jperkin Exp $
2# 2#
3# used by security/cyrus-sasl/Makefile 3# used by security/cyrus-sasl/Makefile
4# used by security/cy2-anonymous/Makefile 4# used by security/cy2-anonymous/Makefile
5# used by security/cy2-crammd5/Makefile 5# used by security/cy2-crammd5/Makefile
6# used by security/cy2-digestmd5/Makefile 6# used by security/cy2-digestmd5/Makefile
7# used by security/cy2-gssapi/Makefile 7# used by security/cy2-gssapi/Makefile
8# used by security/cy2-ldapdb/Makefile 8# used by security/cy2-ldapdb/Makefile
9# used by security/cy2-login/Makefile 9# used by security/cy2-login/Makefile
10# used by security/cy2-ntlm/Makefile 10# used by security/cy2-ntlm/Makefile
11# used by security/cy2-otp/Makefile 11# used by security/cy2-otp/Makefile
12# used by security/cy2-plain/Makefile 12# used by security/cy2-plain/Makefile
13# used by security/cy2-scram/Makefile 13# used by security/cy2-scram/Makefile
14# used by security/cy2-sql/Makefile 14# used by security/cy2-sql/Makefile
@@ -23,44 +23,47 @@ MASTER_SITES= ftp://ftp.cyrusimap.org/cy @@ -23,44 +23,47 @@ MASTER_SITES= ftp://ftp.cyrusimap.org/cy
23MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/ 23MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/
24PATCHFILES+= cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2 24PATCHFILES+= cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2
25SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \ 25SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \
26 -https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d 26 -https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d
27PATCH_DIST_STRIP= -p1 27PATCH_DIST_STRIP= -p1
28 28
29MAINTAINER= pkgsrc-users@NetBSD.org 29MAINTAINER= pkgsrc-users@NetBSD.org
30HOMEPAGE= http://www.cyrussasl.org/ 30HOMEPAGE= http://www.cyrussasl.org/
31LICENSE= original-bsd # CMU version 31LICENSE= original-bsd # CMU version
32 32
33DISTINFO_FILE= ${.CURDIR}/../cyrus-sasl/distinfo 33DISTINFO_FILE= ${.CURDIR}/../cyrus-sasl/distinfo
34PATCHDIR= ${.CURDIR}/../cyrus-sasl/patches 34PATCHDIR= ${.CURDIR}/../cyrus-sasl/patches
35 35
 36PKG_SYSCONFSUBDIR= sasl2
 37
36.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
37 39
38.if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS]) 40.if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS])
39BUILDLINK_ABI_DEPENDS.cyrus-sasl+= \ 41BUILDLINK_ABI_DEPENDS.cyrus-sasl+= \
40 cyrus-sasl>=${PKGVERSION_NOREV} 42 cyrus-sasl>=${PKGVERSION_NOREV}
41. include "../../security/cyrus-sasl/buildlink3.mk" 43. include "../../security/cyrus-sasl/buildlink3.mk"
42CPPFLAGS+= -I${BUILDLINK_PREFIX.cyrus-sasl}/include/sasl 44CPPFLAGS+= -I${BUILDLINK_PREFIX.cyrus-sasl}/include/sasl
43.endif 45.endif
44 46
45GNU_CONFIGURE= yes 47GNU_CONFIGURE= yes
46MAKE_JOBS_SAFE= no 48MAKE_JOBS_SAFE= no
47USE_TOOLS+= gmake 49USE_TOOLS+= gmake
48 50
49USE_LIBTOOL= yes 51USE_LIBTOOL= yes
50 52
51DOCDIR= ${PREFIX}/share/doc/cyrus-sasl 53DOCDIR= ${PREFIX}/share/doc/cyrus-sasl
52PLUGINDIR= ${PREFIX}/lib/sasl2 54PLUGINDIR= ${PREFIX}/lib/sasl2
53 55
 56CONFIGURE_ARGS+= --with-configdir=${PKG_SYSCONFDIR}
54CONFIGURE_ARGS+= --with-plugindir=${PLUGINDIR:Q} 57CONFIGURE_ARGS+= --with-plugindir=${PLUGINDIR:Q}
55CONFIGURE_ARGS+= --disable-java 58CONFIGURE_ARGS+= --disable-java
56 59
57CONFIGURE_ARGS.Darwin+= --disable-macos-framework 60CONFIGURE_ARGS.Darwin+= --disable-macos-framework
58 61
59.if ${OPSYS} == "SunOS" 62.if ${OPSYS} == "SunOS"
60CONFIGURE_ARGS+= --with-ipctype=doors 63CONFIGURE_ARGS+= --with-ipctype=doors
61.endif 64.endif
62 65
63# Authentication mechanisms 66# Authentication mechanisms
64CONFIGURE_ARGS+= --disable-anon # ANONYMOUS 67CONFIGURE_ARGS+= --disable-anon # ANONYMOUS
65CONFIGURE_ARGS+= --disable-checkapop # CHECKAPOP 68CONFIGURE_ARGS+= --disable-checkapop # CHECKAPOP
66CONFIGURE_ARGS+= --disable-cram # CRAM-MD5 69CONFIGURE_ARGS+= --disable-cram # CRAM-MD5
cvs diff -r1.51 -r1.52 pkgsrc/security/cyrus-saslauthd/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cyrus-saslauthd/Makefile 2016/12/16 15:42:20 1.51
+++ pkgsrc/security/cyrus-saslauthd/Makefile 2017/04/27 13:56:47 1.52
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.51 2016/12/16 15:42:20 hans Exp $ 1# $NetBSD: Makefile,v 1.52 2017/04/27 13:56:47 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/sasl/saslauthd/} 3PKGNAME= ${DISTNAME:S/sasl/saslauthd/}
4PKGREVISION= 6 4PKGREVISION= 7
5CONFLICTS+= cyrus-sasl<2.1.15nb2 5CONFLICTS+= cyrus-sasl<2.1.15nb2
6 6
7.include "../../security/cyrus-sasl/Makefile.common" 7.include "../../security/cyrus-sasl/Makefile.common"
8 8
9COMMENT= Cyrus SASL plaintext authentication daemon 9COMMENT= Cyrus SASL plaintext authentication daemon
10 10
11CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 11CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
12 12
13BUILD_TARGET= all saslcache 13BUILD_TARGET= all saslcache
14 14
15SASLSOCKETDIR?= ${VARBASE}/run/saslauthd 15SASLSOCKETDIR?= ${VARBASE}/run/saslauthd
16BUILD_DEFS+= SASLSOCKETDIR 16BUILD_DEFS+= SASLSOCKETDIR
17FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR:Q} 17FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR:Q}