Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 May 2014 15:12:55 +0000 (UTC)
From:      Hajimu UMEMOTO <ume@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r353315 - in head/security: cyrus-sasl2 cyrus-sasl2-gssapi cyrus-sasl2-ldapdb cyrus-sasl2-saslauthd
Message-ID:  <201405081512.s48FCtvg065054@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ume
Date: Thu May  8 15:12:55 2014
New Revision: 353315
URL: http://svnweb.freebsd.org/changeset/ports/353315
QAT: https://qat.redports.org/buildarchive/r353315/

Log:
  - Use USES=libtool
  - Add one more MASTER_SITE
  - Add DOCS to OPTIONS_DEFINE

Modified:
  head/security/cyrus-sasl2-gssapi/Makefile
  head/security/cyrus-sasl2-ldapdb/Makefile
  head/security/cyrus-sasl2-saslauthd/Makefile
  head/security/cyrus-sasl2/Makefile
  head/security/cyrus-sasl2/pkg-plist

Modified: head/security/cyrus-sasl2-gssapi/Makefile
==============================================================================
--- head/security/cyrus-sasl2-gssapi/Makefile	Thu May  8 15:01:19 2014	(r353314)
+++ head/security/cyrus-sasl2-gssapi/Makefile	Thu May  8 15:12:55 2014	(r353315)
@@ -2,9 +2,10 @@
 
 PORTNAME=	gssapi
 PORTVERSION=	2.1.26
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	security ipv6
-MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/
+MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
+		http://cyrusimap.org/releases/
 PKGNAMEPREFIX=	cyrus-sasl-
 DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
@@ -21,8 +22,8 @@ DISTINFO_FILE=	${CYRUS_SASL2_DIR}/distin
 PATCHDIR=	${CYRUS_SASL2_DIR}/files
 INSTALL_WRKSRC=	${WRKSRC}/plugins
 
+USES=		libtool
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
@@ -62,9 +63,9 @@ MIT_LIB_DEPENDS=	libkrb5support.so:${POR
 MIT_LDFLAGS=		"-R${KRB5_HOME}/lib"
 
 PLIST_FILES=	lib/sasl2/libgssapiv2.a \
-		lib/sasl2/libgssapiv2.la \
 		lib/sasl2/libgssapiv2.so \
-		lib/sasl2/libgssapiv2.so.3
+		lib/sasl2/libgssapiv2.so.3 \
+		lib/sasl2/libgssapiv2.so.3.0.0
 
 .if !defined(HEIMDAL_HOME)
 HEIMDAL_HOME=	${PREFIX}
@@ -77,9 +78,9 @@ KRB5_HOME=	${PREFIX}
 
 .if ${PORT_OPTIONS:MHEIMDAL}
 PLIST_FILES+=	lib/sasl2/libgs2.a \
-		lib/sasl2/libgs2.la \
 		lib/sasl2/libgs2.so \
-		lib/sasl2/libgs2.so.3
+		lib/sasl2/libgs2.so.3 \
+		lib/sasl2/libgs2.so.3.0.0
 .endif
 
 .if ${OPENSSLBASE} == /usr

Modified: head/security/cyrus-sasl2-ldapdb/Makefile
==============================================================================
--- head/security/cyrus-sasl2-ldapdb/Makefile	Thu May  8 15:01:19 2014	(r353314)
+++ head/security/cyrus-sasl2-ldapdb/Makefile	Thu May  8 15:12:55 2014	(r353315)
@@ -2,9 +2,10 @@
 
 PORTNAME=	ldapdb
 PORTVERSION=	2.1.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security ipv6
-MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/
+MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
+		http://cyrusimap.org/releases/
 PKGNAMEPREFIX=	cyrus-sasl-
 DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
@@ -21,8 +22,8 @@ DISTINFO_FILE=	${CYRUS_SASL2_DIR}/distin
 PATCHDIR=	${CYRUS_SASL2_DIR}/files
 INSTALL_WRKSRC=	${WRKSRC}/plugins
 
+USES=		libtool
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
@@ -52,9 +53,9 @@ CONFIGURE_ARGS+=--enable-ldapdb --with-l
 MAKE_ENV+=	INSTALL_STRIP_FLAG=${STRIP}
 
 PLIST_FILES=	lib/sasl2/libldapdb.a \
-		lib/sasl2/libldapdb.la \
 		lib/sasl2/libldapdb.so \
-		lib/sasl2/libldapdb.so.3
+		lib/sasl2/libldapdb.so.3 \
+		lib/sasl2/libldapdb.so.3.0.0
 
 .include <bsd.port.pre.mk>
 

Modified: head/security/cyrus-sasl2-saslauthd/Makefile
==============================================================================
--- head/security/cyrus-sasl2-saslauthd/Makefile	Thu May  8 15:01:19 2014	(r353314)
+++ head/security/cyrus-sasl2-saslauthd/Makefile	Thu May  8 15:12:55 2014	(r353315)
@@ -4,7 +4,8 @@ PORTNAME=	saslauthd
 PORTVERSION=	2.1.26
 #PORTREVISION=	0
 CATEGORIES=	security ipv6
-MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/
+MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
+		http://cyrusimap.org/releases/
 PKGNAMEPREFIX=	cyrus-sasl-
 DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
@@ -43,7 +44,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/e
 		--disable-krb4
 CONFIGURE_ENV+=	andrew_cv_runpath_switch=none
 
-OPTIONS_DEFINE=		BDB OPENLDAP HTTPFORM
+OPTIONS_DEFINE=		BDB DOCS OPENLDAP HTTPFORM
 BDB_CONFIGURE_ON=	--with-dblib=berkeley \
 			--with-bdb-libdir=${BDB_LIB_DIR} \
 			--with-bdb-incdir=${BDB_INCLUDE_DIR} \

Modified: head/security/cyrus-sasl2/Makefile
==============================================================================
--- head/security/cyrus-sasl2/Makefile	Thu May  8 15:01:19 2014	(r353314)
+++ head/security/cyrus-sasl2/Makefile	Thu May  8 15:12:55 2014	(r353315)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-sasl
 PORTVERSION=	2.1.26
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
@@ -13,12 +13,11 @@ COMMENT=	RFC 2222 SASL (Simple Authentic
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		perl5
+USES=		libtool perl5
 USE_PERL5=	patch
-USE_AUTOTOOLS=	libtool
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-configdir=${PREFIX}/lib/sasl2:${PREFIX}/etc/sasl2 \
@@ -38,7 +37,7 @@ MAKE_ENV+=	INSTALL_STRIP_FLAG=${STRIP}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}2
 
 NO_OPTIONS_SORT=	yes
-OPTIONS_DEFINE=		ALWAYSTRUE AUTHDAEMOND KEEP_DB_OPEN \
+OPTIONS_DEFINE=		ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \
 			OBSOLETE_CRAM_ATTR BDB MYSQL PGSQL
 OPTIONS_RADIO=		SQLITE
 OPTIONS_RADIO_SQLITE=	SQLITE2 SQLITE3

Modified: head/security/cyrus-sasl2/pkg-plist
==============================================================================
--- head/security/cyrus-sasl2/pkg-plist	Thu May  8 15:01:19 2014	(r353314)
+++ head/security/cyrus-sasl2/pkg-plist	Thu May  8 15:12:55 2014	(r353315)
@@ -7,49 +7,49 @@ include/sasl/saslplug.h
 include/sasl/saslutil.h
 @dirrm include/sasl
 lib/libsasl2.a
-lib/libsasl2.la
 lib/libsasl2.so
 lib/libsasl2.so.3
+lib/libsasl2.so.3.0.0
 lib/sasl2/libanonymous.a
-lib/sasl2/libanonymous.la
 lib/sasl2/libanonymous.so
 lib/sasl2/libanonymous.so.3
+lib/sasl2/libanonymous.so.3.0.0
 %%CRAM%%lib/sasl2/libcrammd5.a
-%%CRAM%%lib/sasl2/libcrammd5.la
 %%CRAM%%lib/sasl2/libcrammd5.so
 %%CRAM%%lib/sasl2/libcrammd5.so.3
+%%CRAM%%lib/sasl2/libcrammd5.so.3.0.0
 %%DIGEST%%lib/sasl2/libdigestmd5.a
-%%DIGEST%%lib/sasl2/libdigestmd5.la
 %%DIGEST%%lib/sasl2/libdigestmd5.so
 %%DIGEST%%lib/sasl2/libdigestmd5.so.3
+%%DIGEST%%lib/sasl2/libdigestmd5.so.3.0.0
 %%LOGIN%%lib/sasl2/liblogin.a
-%%LOGIN%%lib/sasl2/liblogin.la
 %%LOGIN%%lib/sasl2/liblogin.so
 %%LOGIN%%lib/sasl2/liblogin.so.3
+%%LOGIN%%lib/sasl2/liblogin.so.3.0.0
 %%SCRAM%%lib/sasl2/libscram.a
-%%SCRAM%%lib/sasl2/libscram.la
 %%SCRAM%%lib/sasl2/libscram.so
 %%SCRAM%%lib/sasl2/libscram.so.3
+%%SCRAM%%lib/sasl2/libscram.so.3.0.0
 %%SQL%%lib/sasl2/libsql.a
-%%SQL%%lib/sasl2/libsql.la
 %%SQL%%lib/sasl2/libsql.so
 %%SQL%%lib/sasl2/libsql.so.3
+%%SQL%%lib/sasl2/libsql.so.3.0.0
 %%NTLM%%lib/sasl2/libntlm.a
-%%NTLM%%lib/sasl2/libntlm.la
 %%NTLM%%lib/sasl2/libntlm.so
 %%NTLM%%lib/sasl2/libntlm.so.3
+%%NTLM%%lib/sasl2/libntlm.so.3.0.0
 %%OTP%%lib/sasl2/libotp.a
-%%OTP%%lib/sasl2/libotp.la
 %%OTP%%lib/sasl2/libotp.so
 %%OTP%%lib/sasl2/libotp.so.3
+%%OTP%%lib/sasl2/libotp.so.3.0.0
 %%PLAIN%%lib/sasl2/libplain.a
-%%PLAIN%%lib/sasl2/libplain.la
 %%PLAIN%%lib/sasl2/libplain.so
 %%PLAIN%%lib/sasl2/libplain.so.3
+%%PLAIN%%lib/sasl2/libplain.so.3.0.0
 lib/sasl2/libsasldb.a
-lib/sasl2/libsasldb.la
 lib/sasl2/libsasldb.so
 lib/sasl2/libsasldb.so.3
+lib/sasl2/libsasldb.so.3.0.0
 libdata/pkgconfig/libsasl2.pc
 man/man3/sasl.3.gz
 man/man3/sasl_authorize_t.3.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405081512.s48FCtvg065054>