Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Oct 2015 10:42:39 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r398429 - in branches/2015Q4/security: cyrus-sasl2 cyrus-sasl2-gssapi cyrus-sasl2-ldapdb cyrus-sasl2-saslauthd
Message-ID:  <201510021042.t92AgdiX036840@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Fri Oct  2 10:42:39 2015
New Revision: 398429
URL: https://svnweb.freebsd.org/changeset/ports/398429

Log:
  MFH: r398428
  
  Backout r398328 and r398370, they break packages depending on them.
  
  With hat:	portmgr
  Sponsored by:	Absolight, The FreeBSD Foundation

Modified:
  branches/2015Q4/security/cyrus-sasl2-gssapi/Makefile
  branches/2015Q4/security/cyrus-sasl2-ldapdb/Makefile
  branches/2015Q4/security/cyrus-sasl2-saslauthd/Makefile
  branches/2015Q4/security/cyrus-sasl2/Makefile
Directory Properties:
  branches/2015Q4/   (props changed)

Modified: branches/2015Q4/security/cyrus-sasl2-gssapi/Makefile
==============================================================================
--- branches/2015Q4/security/cyrus-sasl2-gssapi/Makefile	Fri Oct  2 10:41:09 2015	(r398428)
+++ branches/2015Q4/security/cyrus-sasl2-gssapi/Makefile	Fri Oct  2 10:42:39 2015	(r398429)
@@ -2,12 +2,12 @@
 
 PORTNAME=	gssapi
 PORTVERSION=	2.1.26
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
-PKGNAMEPREFIX=	cyrus-sasl2-
-DISTNAME=	cyrus-sasl-${PORTVERSION}
+PKGNAMEPREFIX=	cyrus-sasl-
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	SASL GSSAPI authentication plugin

Modified: branches/2015Q4/security/cyrus-sasl2-ldapdb/Makefile
==============================================================================
--- branches/2015Q4/security/cyrus-sasl2-ldapdb/Makefile	Fri Oct  2 10:41:09 2015	(r398428)
+++ branches/2015Q4/security/cyrus-sasl2-ldapdb/Makefile	Fri Oct  2 10:42:39 2015	(r398429)
@@ -2,12 +2,12 @@
 
 PORTNAME=	ldapdb
 PORTVERSION=	2.1.26
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
-PKGNAMEPREFIX=	cyrus-sasl2-
-DISTNAME=	cyrus-sasl-${PORTVERSION}
+PKGNAMEPREFIX=	cyrus-sasl-
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	SASL LDAPDB auxprop plugin

Modified: branches/2015Q4/security/cyrus-sasl2-saslauthd/Makefile
==============================================================================
--- branches/2015Q4/security/cyrus-sasl2-saslauthd/Makefile	Fri Oct  2 10:41:09 2015	(r398428)
+++ branches/2015Q4/security/cyrus-sasl2-saslauthd/Makefile	Fri Oct  2 10:42:39 2015	(r398429)
@@ -2,12 +2,12 @@
 
 PORTNAME=	saslauthd
 PORTVERSION=	2.1.26
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
-PKGNAMEPREFIX=	cyrus-sasl2-
-DISTNAME=	cyrus-sasl-${PORTVERSION}
+PKGNAMEPREFIX=	cyrus-sasl-
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	SASL authentication server for cyrus-sasl2

Modified: branches/2015Q4/security/cyrus-sasl2/Makefile
==============================================================================
--- branches/2015Q4/security/cyrus-sasl2/Makefile	Fri Oct  2 10:41:09 2015	(r398428)
+++ branches/2015Q4/security/cyrus-sasl2/Makefile	Fri Oct  2 10:42:39 2015	(r398429)
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
-PORTNAME=	cyrus-sasl2
+PORTNAME=	cyrus-sasl
 PORTVERSION=	2.1.26
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
-DISTNAME=	cyrus-sasl-${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
@@ -35,6 +34,8 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/e
 		--disable-krb4
 MAKE_ENV+=	INSTALL_STRIP_FLAG=${STRIP}
 
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}2
+
 CPE_VENDOR=	cmu
 
 NO_OPTIONS_SORT=	yes



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