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, 11 insertions, 9 deletions

diff --git a/Mk/bsd.linux-apps.mk b/Mk/bsd.linux-apps.mk
index f51419ce715a..5a3f603f4828 100644
--- a/Mk/bsd.linux-apps.mk
+++ b/Mk/bsd.linux-apps.mk
@@ -202,6 +202,7 @@ freealut_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-freealut
 freealut_DEPENDS=	openal
 
 gdkpixbuf_f10_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf.so.2
+gdkpixbuf_c6_FILE=	${LINUXBASE}/usr/lib/libgdk_pixbuf-2.0.so.0
 gdkpixbuf_DETECT=	${gdkpixbuf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 gdkpixbuf_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf
 
@@ -212,7 +213,7 @@ gnutls_PORT=		${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-gnutls
 gnutls_DEPENDS=		libtasn1 libgcrypt libgpg-error
 
 gtk2_f10_FILE=		${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.1400.7
-gtk2_c6_FILE=		${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.2000.1
+gtk2_c6_FILE=		${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.2400.23
 gtk2_DETECT=		${gtk2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 gtk2_PORT=			${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2
 gtk2_DEPENDS=		atk jpeg png pango tiff xorglibs
@@ -284,6 +285,7 @@ libpciaccess_DETECT=		${libogg${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libpciaccess_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libpciaccess
 
 libsigcpp20_f10_FILE=	${LINUXBASE}/usr/lib/libsigc-2.0.so.0
+libsigcpp20_c6_FILE=	${LINUXBASE}/usr/lib/libsigc-2.0.so.0
 libsigcpp20_DETECT=	${libsigcpp20${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libsigcpp20_PORT=	${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libsigc++20
 
@@ -335,7 +337,7 @@ naslibs_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-nas-libs
 naslibs_DEPENDS=	xorglibs
 
 openldap_f10_FILE=	${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0
-openldap_c6_FILE=	${LINUXBASE}/lib/libldap-2.4.so.2.5.6
+openldap_c6_FILE=	${LINUXBASE}/lib/libldap-2.4.so.2.10.2
 openldap_DETECT=	${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 openldap_PORT=		${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-openldap
 
diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk
index 8ee50e5a93ce..7d1989077e6e 100644
--- a/Mk/bsd.linux-rpm.mk
+++ b/Mk/bsd.linux-rpm.mk
@@ -44,9 +44,9 @@ NO_BUILD=			yes
 
 .	if ${ARCH} == "amd64" || ${ARCH} == "i386"
 .		if ${USE_LINUX} == "c6"
-# Do not build CentOS 6.5 ports if overridden by f10
+# Do not build CentOS 6.6 ports if overridden by f10
 .			if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10"
-IGNORE=		This port requires CentOS 6.5. Please remove OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf.
+IGNORE=		This port requires CentOS ${LINUX_DIST_VER}. Please remove OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf.
 .			endif
 LINUX_RPM_ARCH?=	i686	# ?= because of nasty c5 qt ports
 .		elif ${USE_LINUX} == "f10" || ${USE_LINUX} == "yes" # temporary default, move or clause to line 46
@@ -74,7 +74,7 @@ LINUX_DIST=	fedora
 LINUX_DIST_VER=	10
 .else
 LINUX_DIST=	centos
-LINUX_DIST_VER=	6.5
+LINUX_DIST_VER=	6.6
 .endif
 
 .	if defined(LINUX_DIST)
@@ -106,13 +106,13 @@ MASTER_SITES_SUBDIR=	/centos/5/os/i386/Packages/
 
 .			ifndef MASTER_SITES
 MASTER_SITES=	${MASTER_SITE_CENTOS_LINUX}
-.				if ${LINUX_DIST_VER} == "6.5"
+.				if ${LINUX_DIST_VER} == "6.6"
 .					if ! defined(PACKAGE_BUILDING)
 MASTER_SITES=	http://mirror.centos.org/centos/6/os/i386/Packages/
 MASTER_SITES_SUBDIR=	/centos/6/os/i386/Packages/
 .					else
 MASTER_SITES?=  http://vault.centos.org/%SUBDIR%/
-MASTER_SITES_SUBDIR=	/6.5/os/Source/SPackages/
+MASTER_SITES_SUBDIR=	/${LINUX_DIST_VER}/os/Source/SPackages/
 .					endif
 
 .				else
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 8292dd3226e1..50816e7c158d 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -253,7 +253,7 @@ MASTER_SITE_EXIM+= \
 .if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX)
 MASTER_SITE_CENTOS_LINUX+= \
 	http://mirror.centos.org/centos/6/os/i386/Packages/ \
-	http://vault.centos.org/6.5/os/Source/SPackages/ \
+	http://vault.centos.org/6.6/os/Source/SPackages/ \
 	http://mirror.centos.org/%SUBDIR%/ \
 	http://vault.centos.org/%SUBDIR%/
 
@@ -262,7 +262,7 @@ MASTER_SITE_CENTOS_LINUX+= \
 .if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX)
 MASTER_SITE_CENTOS_LINUX_UPDATES+= \
 	http://mirror.centos.org/centos/6/updates/i386/Packages/ \
-	http://vault.centos.org/6.5/updates/Source/SPackages/
+	http://vault.centos.org/${LINUX_DIST_VER}/updates/Source/SPackages/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_EPEL)