Upgrade CentOS to 6.6

- Upgrade all things linux-c6- to CentOS 6.6
- Add ports:
  devel/linux-c6-libsigc++20
  graphics/linux-c6-gdk-pixbuf [1]
  graphics/linux-c6-glx-utils
- Add pkg-plists for net/linux-c6-openldap
  and security/linux-c6-cyrus-sasl2
- Misc. cleanups

Differential Revision:	https://reviews.freebsd.org/D1108
Submitted by:	kmoore [1]
Reviewed by:	rene (emulation)
Approved by:	portmgr (swills)
Approved by:	swills (mentor)
Sponsored by:	Perceivon Hosting Inc.

3 files changed, 37 insertions, 10 deletions

diff --git a/security/linux-c6-cyrus-sasl2/Makefile b/security/linux-c6-cyrus-sasl2/Makefile
index 7d8b6b4e82db..ed4099f86fe7 100644
--- a/security/linux-c6-cyrus-sasl2/Makefile
+++ b/security/linux-c6-cyrus-sasl2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cyrus-sasl2
 PORTVERSION=	2.1.23
+PORTREVISION=	1
 CATEGORIES=	security linux
 DISTNAME=	cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
 
@@ -13,20 +14,16 @@ COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS
 
 ONLY_FOR_ARCHS=	i386 amd64
 .if defined(PACKAGE_BUILDING)
-SRC_DISTFILES=	cyrus-sasl-2.1.23-13.el6_3.1.src.rpm
+SRC_DISTFILES=	cyrus-sasl-${PORTVERSION}-${RPMVERSION}.src.rpm
 .endif
 
 USE_LINUX=	c6
 USE_LINUX_RPM=	yes
-RPMVERSION=	13.el6_3.1
+RPMVERSION=	15.el6
 USE_LDCONFIG=	yes
 BRANDELF_FILES=	usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
 DESCR=	${.CURDIR}/../cyrus-sasl2/pkg-descr
 
-PLIST_DIRS=	etc/sasl2 usr/lib/sasl2
-PLIST_FILES=	usr/lib/libsasl2.so.2 usr/lib/libsasl2.so.2.0.23 usr/lib/sasl2/libanonymous.so usr/lib/sasl2/libanonymous.so.2 usr/lib/sasl2/libanonymous.so.2.0.23 usr/lib/sasl2/libsasldb.so usr/lib/sasl2/libsasldb.so.2 usr/lib/sasl2/libsasldb.so.2.0.23 usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
-PLIST_FILES+=	"@exec mkdir -p %D/etc/sasl2"
 DOCSDIR=	usr/share/doc/cyrus-sasl-lib-${PORTVERSION}
-PORTDOCS=	AUTHORS COPYING NEWS README advanced.html appconvert.html components.html gssapi.html index.html install.html macosx.html mechanisms.html options.html plugprog.html programming.html readme.html sysadmin.html upgrading.html windows.html
 
 .include <bsd.port.mk>
diff --git a/security/linux-c6-cyrus-sasl2/distinfo.i686 b/security/linux-c6-cyrus-sasl2/distinfo.i686
index 5401cf7f31a2..ce14dc912bad 100644
--- a/security/linux-c6-cyrus-sasl2/distinfo.i686
+++ b/security/linux-c6-cyrus-sasl2/distinfo.i686
@@ -1,4 +1,4 @@
-SHA256 (rpm/i686/centos/6.5/cyrus-sasl-lib-2.1.23-13.el6_3.1.i686.rpm) = 268cac2b4d8edf1491c5a2d8ae9d76ee20f73d3d8000ada1d1081c77b5ba98ff
-SIZE (rpm/i686/centos/6.5/cyrus-sasl-lib-2.1.23-13.el6_3.1.i686.rpm) = 138808
-SHA256 (rpm/i686/centos/6.5/cyrus-sasl-2.1.23-13.el6_3.1.src.rpm) = 49ff5360a67b62fe95a841f54c5fcf6c9d6ae7c2f651721aefebb98f649e698b
-SIZE (rpm/i686/centos/6.5/cyrus-sasl-2.1.23-13.el6_3.1.src.rpm) = 1666942
+SHA256 (rpm/i686/centos/6.6/cyrus-sasl-lib-2.1.23-15.el6.i686.rpm) = dc5ae32a8cf710da51961da3664f78e18a5e12388c6a9ac679e79b12c0496960
+SIZE (rpm/i686/centos/6.6/cyrus-sasl-lib-2.1.23-15.el6.i686.rpm) = 139000
+SHA256 (rpm/i686/centos/6.6/cyrus-sasl-2.1.23-15.el6.src.rpm) = a1192a223c6c116d090c72bfcb217c08065619ec976bf0fff11424896669d5a7
+SIZE (rpm/i686/centos/6.6/cyrus-sasl-2.1.23-15.el6.src.rpm) = 1669908
diff --git a/security/linux-c6-cyrus-sasl2/pkg-plist b/security/linux-c6-cyrus-sasl2/pkg-plist
new file mode 100644
index 000000000000..339989fec8b7
--- /dev/null
+++ b/security/linux-c6-cyrus-sasl2/pkg-plist
@@ -0,0 +1,30 @@
+usr/lib/libsasl2.so.2
+usr/lib/libsasl2.so.2.0.23
+usr/lib/sasl2/libanonymous.so
+usr/lib/sasl2/libanonymous.so.2
+usr/lib/sasl2/libanonymous.so.2.0.23
+usr/lib/sasl2/libsasldb.so
+usr/lib/sasl2/libsasldb.so.2
+usr/lib/sasl2/libsasldb.so.2.0.23
+usr/sbin/sasldblistusers2
+usr/sbin/saslpasswd2
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/appconvert.html
+%%PORTDOCS%%%%DOCSDIR%%/components.html
+%%PORTDOCS%%%%DOCSDIR%%/gssapi.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/macosx.html
+%%PORTDOCS%%%%DOCSDIR%%/mechanisms.html
+%%PORTDOCS%%%%DOCSDIR%%/options.html
+%%PORTDOCS%%%%DOCSDIR%%/plugprog.html
+%%PORTDOCS%%%%DOCSDIR%%/programming.html
+%%PORTDOCS%%%%DOCSDIR%%/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/sysadmin.html
+%%PORTDOCS%%%%DOCSDIR%%/upgrading.html
+%%PORTDOCS%%%%DOCSDIR%%/windows.html
+@dir etc/sasl2