aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2015-10-02 18:41:09 +0800
committermat <mat@FreeBSD.org>2015-10-02 18:41:09 +0800
commit88c08205e5cc47183711d643e64a2aba13b485ce (patch)
tree73f21d557cf51be9ab78d5f572de1bd2b9c5e70a
parent3e2071ccd19807f46d113360c01e9b09124836a7 (diff)
downloadfreebsd-ports-gnome-88c08205e5cc47183711d643e64a2aba13b485ce.tar.gz
freebsd-ports-gnome-88c08205e5cc47183711d643e64a2aba13b485ce.tar.zst
freebsd-ports-gnome-88c08205e5cc47183711d643e64a2aba13b485ce.zip
Backout r398328 and r398370, they break packages depending on them.
With hat: portmgr MFH: 2015Q4 Sponsored by: Absolight, The FreeBSD Foundation
-rw-r--r--security/cyrus-sasl2-gssapi/Makefile6
-rw-r--r--security/cyrus-sasl2-ldapdb/Makefile6
-rw-r--r--security/cyrus-sasl2-saslauthd/Makefile6
-rw-r--r--security/cyrus-sasl2/Makefile7
4 files changed, 13 insertions, 12 deletions
diff --git a/security/cyrus-sasl2-gssapi/Makefile b/security/cyrus-sasl2-gssapi/Makefile
index 1c7b9a46a084..c6d4bb3b6c7e 100644
--- a/security/cyrus-sasl2-gssapi/Makefile
+++ b/security/cyrus-sasl2-gssapi/Makefile
@@ -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
diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile
index b8b129d9235b..6111aa8c1f05 100644
--- a/security/cyrus-sasl2-ldapdb/Makefile
+++ b/security/cyrus-sasl2-ldapdb/Makefile
@@ -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
diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index a744cc1e48a1..5528a0cb9fbb 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -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
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 1fad68b2a26f..b521e4e85e6c 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -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}/etc \
--disable-krb4
MAKE_ENV+= INSTALL_STRIP_FLAG=${STRIP}
+DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}2
+
CPE_VENDOR= cmu
NO_OPTIONS_SORT= yes