Update CentOS base to 6.5, add userland ports

The Fedora 10 infrastructure ports have been in use since June 2009 and, while
having served a great deed, have become unsupported upstream and hence affected
by unfixed security vulnerabilities. In addition to that, many recent Linux
binaries need newer libc / stdlibc++ versions.

This commit adds the linux-c6- userland as drop-in replacement for the -f10
infrastructure, as well as upgrading the linux_base-c6 port to CentOS 6.5.

If you want to switch to linux-c6 ports, please define at /etc/make.conf:

    OVERRIDE_LINUX_BASE_PORT=c6
    OVERRIDE_LINUX_NONBASE_PORTS=c6

Additionally, please add the following line to /etc/sysctl.conf:

    compat.linux.osrelease=2.6.18

Upgrading procedures are shown in /usr/ports/UPDATING.

This work has been inspired by Artyom Mirgorodskiy's post to emulation@ in
November 2013, using and extending mav@'s work. It has been tested extensively
and most reported issues were already fixed. Please report any additional bug
or "features" to the emulation mailing list.

Many thanks to: mav@, rene@, allanjude@, netchild@, antoine@, everyone who's
filed Issues and Pull requests on GitHub,

PR:		186820
Differential Revision:	https://reviews.freebsd.org/D793
Reviewed by:	allanjude, antoine, bapt, rene
Approved by:	portmgr (antoine, bapt)
Approved by:	koobs (mentor)
Sponsored by:	Perceivon Hosting Inc.

4 files changed, 240 insertions, 70 deletions

diff --git a/Mk/bsd.linux-apps.mk b/Mk/bsd.linux-apps.mk
index 50fb489ebe0d..d5d313a51c86 100644
--- a/Mk/bsd.linux-apps.mk
+++ b/Mk/bsd.linux-apps.mk
@@ -10,7 +10,7 @@
 # 
 # Ports can use this as follows:
 #
-# USE_LINUX_APPS=    esound xorglibs
+# USE_LINUX_APPS=	esound xorglibs
 #
 # .include <bsd.port.mk>
 #
@@ -39,32 +39,38 @@ Linux_APPS_Pre_Include=			bsd.linux-apps.mk
 
 Linux_APPS_Post_Include=	bsd.linux-apps.mk
 
-# OVERRIDE_LINUX_NONBASE_PORTS may be used only with LINUX_OSRELEASE=2.6.16
-.  if (${LINUX_OSRELEASE} == "2.6.16") && defined(OVERRIDE_LINUX_NONBASE_PORTS)
-.    if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10"
-LINUX_DIST_SUFFIX=	-f10
-.    else
-IGNORE=		valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"f10\"
-.    endif
+#new
+. if defined(OVERRIDE_LINUX_NONBASE_PORTS)
+.        if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6"
+LINUX_DIST_SUFFIX=      -${OVERRIDE_LINUX_NONBASE_PORTS}
+.        else
+IGNORE=         valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"f10\" and \"c6\"
+.        endif
+. elif defined(USE_LINUX)
+.        if ${USE_LINUX} == "f10" || ${USE_LINUX} == "c6"
+LINUX_DIST_SUFFIX=      -${USE_LINUX}
+.        endif
 .  else
-# default for OSVERSION >= 800076
-LINUX_DIST_SUFFIX=	-f10
+# default
+LINUX_DIST_SUFFIX=      -f10 # temporary default, set to -c6 soon
 .  endif
 
 WEB_AUTH=			nvu
 
 # Non-version specific components
-_LINUX_APPS_ALL=	allegro alsalib arts aspell atk cairo cups-libs curl dri esound expat fontconfig \
-					freealut gdkpixbuf gnutls gtk2 hicontheme imlib jpeg libaudiofile \
-					libg2c libgcrypt libglade2 libglu libgpg-error libmng libogg \
-					libsigcpp20 libtasn1 libtheora libvorbis libxml2 mikmod naslibs \
-					ncurses-base openal openmotif openssl pango png scimgtk \
-					scimlibs sdl12 sdlimage sdlmixer tiff xorglibs ucl ungif upx webauth
+_LINUX_APPS_ALL=	allegro alsalib alsa-plugins-oss alsa-plugins-pulseaudio \
+					arts aspell atk cairo cups-libs curl dri devtools esound expat \
+					flac fontconfig freealut gdkpixbuf gnutls gtk2 hicontheme imlib jpeg libaudiofile \
+					libasyncns libg2c libgcrypt libglade2 libglu libgpg-error libmng libogg \
+					libpciaccess libsigcpp20 libsndfile libtasn1 libtheora libvorbis libxml2 mikmod \
+					naslibs ncurses-base openal openmotif openssl openssl-compat pango png \
+					pulseaudio-libs scimgtk scimlibs sdl12 sdlimage sdlmixer sdlttf tiff \
+					tcp_wrappers-libs xorglibs ucl ungif upx webauth
 
 # 2.6.16 components
-_LINUX_26_APPS=		alsa-plugins-oss blt cyrus-sasl2 dbusglib dbuslibs \
-			libasyncns libidn libssh2 libv4l nspr nss openal-soft \
-			openldap pulseaudio-libs qt45 sqlite3 tcl84 tk84
+_LINUX_26_APPS=		 blt cyrus-sasl2 dbusglib dbuslibs \
+			libidn libssh2 libv4l nspr nss openal-soft \
+			openldap  qt45 sqlite3 tcl85 tk85 qt47 qt47-x11 qt47-webkit
 
 _LINUX_APPS_ALL+=	${_LINUX_26_APPS}
 
@@ -79,85 +85,113 @@ _LINUX_APPS_ALL+=	${_LINUX_26_APPS}
 # component_DEPENDS	- A list of components the current component depends on.
 
 allegro_f10_FILE=	${LINUXBASE}/usr/lib/liballeg-4.2.2.so
+#FIXME: locate weird location for allegro c6 libs
 allegro_DETECT=		${allegro${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 allegro_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-allegro
 allegro_DEPENDS=	xorglibs
 
 alsa-plugins-oss_f10_FILE=	${LINUXBASE}/usr/lib/alsa-lib/libasound_module_pcm_oss.so
+alsa-plugins-oss_c6_FILE=	${LINUXBASE}/usr/lib/alsa-lib/libasound_module_pcm_oss.so
 alsa-plugins-oss_DETECT=	${alsa-plugins-oss${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 alsa-plugins-oss_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-plugins-oss
 alsa-plugins-oss_DEPENDS=	alsalib
 
+alsa-plugins-pulseaudio_c6_FILE=	${LINUXBASE}/usr/lib/alsa-lib/libasound_module_conf_pulse.so
+alsa-plugins-pulseaudio_DETECT=	${alsa-plugins-oss${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+alsa-plugins-pulseaudio_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-plugins-pulseaudio
+alsa-plugins-pulseaudio_DEPENDS=	alsalib
+
 alsalib_f10_FILE=	${LINUXBASE}/lib/libasound.so.2.0.0
+alsalib_c6_FILE=	${LINUXBASE}/lib/libasound.so.2.0.0
 alsalib_DETECT=		${alsalib${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 alsalib_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-lib
 
 arts_f10_FILE=		${LINUXBASE}/usr/lib/libartsc.so.0
+arts_c6_FILE=		${LINUXBASE}/usr/lib/libartsc.so.0
 arts_DETECT=		${arts${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 arts_PORT=			${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-arts
 
 aspell_f10_FILE=	${LINUXBASE}/usr/lib/libaspell.so.15.1.4
+aspell_c6_FILE=		${LINUXBASE}/usr/lib/libaspell.so.15.1.4
 aspell_DETECT=		${aspell${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 aspell_PORT=		${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-aspell
 
 atk_f10_FILE=		${LINUXBASE}/usr/lib/libatk-1.0.so.0.2409.1
+atk_c6_FILE=		${LINUXBASE}/usr/lib/libatk-1.0.so.0.3009.1
 atk_DETECT=			${atk${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 atk_PORT=			${PORTSDIR}/accessibility/linux${LINUX_DIST_SUFFIX}-atk
 
-blt_f10_FILE=		${LINUXBASE}/usr/lib/libBLT24.so
+blt_f10_FILE=		${LINUXBASE}/usr/lib/libBLT24.so # FIXME: deprecated, merged into tcl/tk85
 blt_DETECT=		${blt${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 blt_PORT=		${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-blt
-blt_DEPENDS=		tcl84 tk84 xorglibs
+blt_DEPENDS=		tcl85 tk85 xorglibs
 
 cairo_f10_FILE=		${LINUXBASE}/usr/lib/libcairo.so.2.10800.0
+cairo_c6_FILE=		${LINUXBASE}/usr/lib/libcairo.so.2.10800.8
 cairo_DETECT=		${cairo${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 cairo_PORT=			${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-cairo
 cairo_DEPENDS=		fontconfig png xorglibs
 
 cups-libs_f10_FILE=	${LINUXBASE}/usr/lib/libcups.so.2
+cups-libs_c6_FILE=	${LINUXBASE}/usr/lib/libcups.so.2
 cups-libs_DETECT=	${cups-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 cups-libs_PORT=		${PORTSDIR}/print/linux${LINUX_DIST_SUFFIX}-cups-libs
 cups-libs_DEPENDS=	gnutls
 
 curl_f10_FILE=		${LINUXBASE}/usr/lib/libcurl.so.4.1.1
+curl_c6_FILE=		${LINUXBASE}/usr/lib/libcurl.so.4.1.1
 curl_DETECT=		${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 curl_PORT=		${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl
-.  if ${LINUX_DIST_SUFFIX} == "-f10"
 curl_DEPENDS=		cyrus-sasl2 openldap
-.  endif
 
 cyrus-sasl2_f10_FILE=	${LINUXBASE}/usr/lib/libsasl2.so.2.0.22
+cyrus-sasl2_c6_FILE=	${LINUXBASE}/usr/lib/libsasl2.so.2.0.23
 cyrus-sasl2_DETECT=	${cyrus-sasl2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 cyrus-sasl2_PORT=	${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-cyrus-sasl2
 
 dbusglib_f10_FILE=	${LINUXBASE}/usr/lib/libdbus-glib-1.so.2
+dbusglib_c6_FILE=	${LINUXBASE}/usr/lib/libdbus-glib-1.so.2
 dbusglib_DETECT=	${dbusglib${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 dbusglib_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-dbus-glib
 dbusglib_DEPENDS=	dbuslibs expat
 
 dbuslibs_f10_FILE=	${LINUXBASE}/lib/libdbus-1.so.3
+dbuslibs_c6_FILE=	${LINUXBASE}/lib/libdbus-1.so.3
 dbuslibs_DETECT=	${dbuslibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 dbuslibs_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-dbus-libs
 
 dri_f10_FILE=		${LINUXBASE}/usr/lib/libGL.so.1.2
-dri_DETECT=		${dri${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-dri_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-dri
+dri_c6_FILE=		${LINUXBASE}/usr/lib/libGL.so.1.2.0
+dri_DETECT=			${dri${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+dri_PORT=			${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-dri
 dri_DEPENDS=		xorglibs
 
+devtools_f10_FILE=	${LINUXBASE}/usr/bin/i386-redhat-linux-gcc
+devtools_c6_FILE=	${LINUXBASE}/usr/bin/gcc
+devtools_DETECT=	${devtools${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+devtools_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-devtools
+
 esound_f10_FILE=	${LINUXBASE}/usr/lib/libesd.so.0.2.39
+esound_c6_FILE=		${LINUXBASE}/usr/lib/libesd.so.0.2.39
 esound_DETECT=		${esound${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 esound_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-esound
 esound_DEPENDS=		libaudiofile
 
 expat_f10_FILE=		${LINUXBASE}/lib/libexpat.so.1
+expat_c6_FILE=		${LINUXBASE}/lib/libexpat.so.1
 expat_DETECT=		${expat${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 expat_PORT=			${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-expat
 
 fontconfig_f10_FILE=	${LINUXBASE}/usr/lib/libfontconfig.so.1.3.0
+fontconfig_c6_FILE=	${LINUXBASE}/usr/lib/libfontconfig.so.1.4.4
 fontconfig_DETECT=	${fontconfig${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 fontconfig_PORT=	${PORTSDIR}/x11-fonts/linux${LINUX_DIST_SUFFIX}-fontconfig
 fontconfig_DEPENDS=	expat
 
+flac_c6_FILE=		${LINUXBASE}/usr/lib/libFLAC.so.8.2.0
+flac_DETECT=		${flac${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+flac_PORT=			${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-flac
+
 freealut_f10_FILE=	${LINUXBASE}/usr/lib/libalut.so.0.1.0
 freealut_DETECT=	${freealut${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 freealut_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-freealut
@@ -168,16 +202,19 @@ gdkpixbuf_DETECT=	${gdkpixbuf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 gdkpixbuf_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf
 
 gnutls_f10_FILE=	${LINUXBASE}/usr/lib/libgnutls.so.26.4.6
+gnutls_c6_FILE=		${LINUXBASE}/usr/lib/libgnutls.so.26.14.12
 gnutls_DETECT=		${gnutls${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 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_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
 
 hicontheme_f10_FILE=	${LINUXBASE}/usr/share/icons/hicolor
+hicontheme_c6_FILE=	${LINUXBASE}/usr/share/icons/hicolor
 hicontheme_DETECT=	${hicontheme${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 hicontheme_PORT=	${PORTSDIR}/x11-themes/linux${LINUX_DIST_SUFFIX}-hicolor-icon-theme
 
@@ -186,14 +223,17 @@ imlib_DETECT=		${imlib${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 imlib_PORT=			${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-imlib
 
 jpeg_f10_FILE=		${LINUXBASE}/usr/lib/libjpeg.so.62.0.0
+jpeg_c6_FILE=		${LINUXBASE}/usr/lib/libjpeg.so.62.0.0
 jpeg_DETECT=		${jpeg${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 jpeg_PORT=			${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-jpeg
 
 libasyncns_f10_FILE=	${LINUXBASE}/usr/lib/libasyncns.so.0.3.1
+libasyncns_c6_FILE=	${LINUXBASE}/usr/lib/libasyncns.so.0.3.1
 libasyncns_DETECT=	${libasyncns${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libasyncns_PORT=	${PORTSDIR}/dns/linux${LINUX_DIST_SUFFIX}-libasyncns
 
 libaudiofile_f10_FILE=	${LINUXBASE}/usr/lib/libaudiofile.so.0.0.2
+libaudiofile_c6_FILE=	${LINUXBASE}/usr/lib/libaudiofile.so.0.0.2
 libaudiofile_DETECT=	${libaudiofile${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libaudiofile_PORT=	${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libaudiofile
 
@@ -202,10 +242,12 @@ libg2c_DETECT=		${libg2c${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libg2c_PORT=		${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-libg2c
 
 libgcrypt_f10_FILE=	${LINUXBASE}/lib/libgcrypt.so.11.5.2
+libgcrypt_c6_FILE=	${LINUXBASE}/lib/libgcrypt.so.11.5.3
 libgcrypt_DETECT=	${libgcrypt${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libgcrypt_PORT=		${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libgcrypt
 
 libglade2_f10_FILE=	${LINUXBASE}/usr/lib/libglade-2.0.so.0.0.7
+libglade2_c6_FILE=	${LINUXBASE}/usr/lib/libglade-2.0.so.0.0.7
 libglade2_DETECT=	${libglade2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libglade2_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libglade2
 
@@ -214,6 +256,7 @@ libglu_DETECT=		${libglu${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libglu_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-libGLU
 
 libgpg-error_f10_FILE=	${LINUXBASE}/lib/libgpg-error.so.0.4.0
+libgpg-error_c6_FILE=	${LINUXBASE}/lib/libgpg-error.so.0.5.0
 libgpg-error_DETECT=	${libgpg-error${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libgpg-error_PORT=	${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libgpg-error
 
@@ -227,66 +270,88 @@ libmng_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-libmng
 libmng_DEPENDS=		jpeg
 
 libogg_f10_FILE=	${LINUXBASE}/usr/lib/libogg.so.0.5.3
+libogg_c6_FILE=		${LINUXBASE}/usr/lib/libogg.so.0.6.0
 libogg_DETECT=		${libogg${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libogg_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libogg
 
+libpciaccess_c6_FILE=		${LINUXBASE}/usr/lib/libpciaccess.so.0.11.1
+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_DETECT=	${libsigcpp20${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libsigcpp20_PORT=	${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libsigc++20
 
+libsndfile_c6_FILE=	${LINUXBASE}/usr/lib/libsndfile.so.1.0.20
+libsndfile_DETECT=	${libsndfile${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+libsndfile_PORT=	${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libsndfile
+
 libssh2_f10_FILE=	${LINUXBASE}/usr/lib/libssh2.so.1
+libssh2_c6_FILE=	${LINUXBASE}/usr/lib/libssh2.so.1.0.1
 libssh2_DETECT=		${libssh2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libssh2_PORT=		${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libssh2
 libssh2_DEPENDS=	openssl
 
 libv4l_f10_FILE=	${LINUXBASE}/usr/lib/libv4l1.so.0
+libv4l_c6_FILE=	${LINUXBASE}/usr/lib/libv4l1.so.0
 libv4l_DETECT=		${libv4l${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libv4l_PORT=		${PORTSDIR}/multimedia/linux${LINUX_DIST_SUFFIX}-libv4l
 
 libtasn1_f10_FILE=	${LINUXBASE}/usr/lib/libtasn1.so.3.0.16
+libtasn1_c6_FILE=	${LINUXBASE}/usr/lib/libtasn1.so.3.1.6
 libtasn1_DETECT=	${libtasn1${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libtasn1_PORT=		${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libtasn1
 
 libtheora_f10_FILE=	${LINUXBASE}/usr/lib/libtheora.so.0.3.3
+libtheora_c6_FILE=	${LINUXBASE}/usr/lib/libtheora.so.0.3.9
 libtheora_DETECT=	${libtheora${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libtheora_PORT=		${PORTSDIR}/multimedia/linux${LINUX_DIST_SUFFIX}-libtheora
 
 libvorbis_f10_FILE=	${LINUXBASE}/usr/lib/libvorbis.so.0.4.0
+libvorbis_c6_FILE=	${LINUXBASE}/usr/lib/libvorbis.so.0.4.3
 libvorbis_DETECT=	${libvorbis${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libvorbis_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libvorbis
 libvorbis_DEPENDS=	libogg
 
 libxml2_f10_FILE=	${LINUXBASE}/usr/lib/libxml2.so.2.7.3
+libxml2_c6_FILE=	${LINUXBASE}/usr/lib/libxml2.so.2.7.6
 libxml2_DETECT=		${libxml2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 libxml2_PORT=		${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-libxml2
 
 mikmod_f10_FILE=	${LINUXBASE}/usr/lib/libmikmod.so.3.0.0
+mikmod_c6_FILE=	${LINUXBASE}/usr/lib/libmikmod.so.3.0.0
 mikmod_DETECT=		${mikmod${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 mikmod_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-mikmod
 
 naslibs_f10_FILE=	${LINUXBASE}/usr/lib/libaudio.so.2
+naslibs_c6_FILE=	${LINUXBASE}/usr/lib/libaudio.so.2
 naslibs_DETECT=		${naslibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 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_DETECT=	${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 openldap_PORT=		${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-openldap
 
 openmotif_f10_FILE=	${LINUXBASE}/usr/lib/libXm.so.4
+openmotif_c6_FILE=	${LINUXBASE}/usr/lib/libXm.so.4.0.3
 openmotif_DETECT=	${openmotif${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 openmotif_PORT=		${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-openmotif
 openmotif_DEPENDS=	xorglibs
 
 ncurses-base_f10_FILE=	${LINUXBASE}/lib/terminfo/a/ansi
+ncurses-base_c6_FILE=	${LINUXBASE}/lib/terminfo/a/ansi
 ncurses-base_DETECT=	${ncurses-base${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 ncurses-base_PORT=	${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-ncurses-base
 
 nspr_f10_FILE=		${LINUXBASE}/lib/libnspr4.so
+nspr_c6_FILE=		${LINUXBASE}/lib/libnspr4.so
 nspr_DETECT=		${nspr${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 nspr_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-nspr
 
 nss_f10_FILE=		${LINUXBASE}/lib/libnss3.so
+nss_c6_FILE=		${LINUXBASE}/usr/lib/libnss3.so
 nss_DETECT=		${nss${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 nss_PORT=		${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-nss
 nss_DEPENDS=		nspr sqlite3
@@ -297,24 +362,33 @@ openal_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-openal
 openal_DEPENDS=		alsalib arts esound libaudiofile libvorbis sdl12
 
 openal-soft_f10_FILE=	${LINUXBASE}/usr/lib/libopenal.so.1.8.466
+openal-soft_c6_FILE=	${LINUXBASE}/usr/lib/libopenal.so.1.12.854
 openal-soft_DETECT=	${openal-soft${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 openal-soft_PORT=	${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-openal-soft
 openal-soft_DEPENDS=	alsalib arts esound
 
 openssl_f10_FILE=	${LINUXBASE}/lib/libssl.so.0.9.8g
+openssl_c6_FILE=	${LINUXBASE}/usr/lib/libssl.so.10
 openssl_DETECT=		${openssl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 openssl_PORT=		${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-openssl
 
+openssl-compat_c6_FILE=	${LINUXBASE}/usr/lib/libssl.so.0.9.8e
+openssl-compat_DETECT=		${openssl-compat${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+openssl-compat_PORT=		${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-openssl-compat
+
 pango_f10_FILE=		${LINUXBASE}/usr/lib/libpango-1.0.so.0.2800.3
+pango_c6_FILE=		${LINUXBASE}/usr/lib/libpango-1.0.so.0.2800.1
 pango_DETECT=		${pango${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 pango_PORT=			${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-pango
 pango_DEPENDS=		cairo expat fontconfig xorglibs
 
 png_f10_FILE=		${LINUXBASE}/usr/lib/libpng.so.3.37.0
+png_c6_FILE=		${LINUXBASE}/usr/lib/libpng.so.3.49.0
 png_DETECT=			${png${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 png_PORT=			${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-png
 
 pulseaudio-libs_f10_FILE=	${LINUXBASE}/usr/lib/libpulse.so.0
+pulseaudio-libs_c6_FILE=	${LINUXBASE}/usr/lib/libpulse.so.0.12.2
 pulseaudio-libs_DETECT=		${pulseaudio-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 pulseaudio-libs_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-pulseaudio-libs
 
@@ -323,20 +397,29 @@ qt45_DETECT=		${qt45${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 qt45_DEPENDS=		fontconfig libmng png
 
 sdl12_f10_FILE=		${LINUXBASE}/usr/lib/libSDL-1.2.so.0.11.2
+sdl12_c6_FILE=		${LINUXBASE}/usr/lib/libSDL-1.2.so.0.11.3
 sdl12_DETECT=		${sdl12${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 sdl12_PORT=			${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-sdl12
 sdl12_DEPENDS=		xorglibs
 
 sdlimage_f10_FILE=	${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.1.5
+sdlimage_c6_FILE=	${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.8.2
 sdlimage_DETECT=	${sdlimage${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 sdlimage_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-sdl_image
 sdlimage_DEPENDS=	jpeg png sdl12 tiff
 
 sdlmixer_f10_FILE=	${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.2.6
+sdlmixer_c6_FILE=	${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.10.1
 sdlmixer_DETECT=	${sdlmixer${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 sdlmixer_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-sdl_mixer
 sdlmixer_DEPENDS=	sdl12
 
+sdlttf_f10_FILE=	${LINUXBASE}/usr/lib/libSDL_ttf-2.0.so.0.6.2
+sdlttf_c6_FILE=	${LINUXBASE}/usr/lib/libSDL_ttf-2.0.so.0.6.3
+sdlttf_DETECT=		${sdlttf${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+sdlttf_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-sdl_ttf
+sdlttf_DEPENDS=	sdl12
+
 scimgtk_f10_FILE=	${LINUXBASE}/usr/lib/gtk-2.0/immodules/im-scim.so
 scimgtk_DETECT=		${scimgtk${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 scimgtk_PORT=		${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-scim-gtk
@@ -348,26 +431,33 @@ scimlibs_PORT=		${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-scim-libs
 scimlibs_DEPENDS=	gtk2
 
 sqlite3_f10_FILE=	${LINUXBASE}/usr/lib/libsqlite3.so.0
+sqlite3_c6_FILE=	${LINUXBASE}/usr/lib/libsqlite3.so.0
 sqlite3_DETECT=		${sqlite3${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 sqlite3_PORT=		${PORTSDIR}/databases/linux${LINUX_DIST_SUFFIX}-sqlite3
 
-# XXX: tcl85!!!
-tcl84_f10_FILE=		${LINUXBASE}/usr/lib/libtcl8.5.so
-tcl84_DETECT=		${tcl84${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-tcl84_PORT=		${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-tcl85
+tcl85_f10_FILE=		${LINUXBASE}/usr/lib/libtcl8.5.so
+tcl85_c6_FILE=		${LINUXBASE}/usr/lib/libtcl8.5.so
+tcl85_DETECT=		${tcl85${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+tcl85_PORT=		${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-tcl85
+
+tcp_wrappers-libs_c6_FILE=	${LINUXBASE}/lib/libwrap.so.0
+tcp_wrappers-libs_DETECT=	${tcp_wrappers-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+tcp_wrappers-libs_PORT=	${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-tcp_wrappers-libs
 
 tiff_f10_FILE=		${LINUXBASE}/usr/lib/libtiff.so.3.8.2
+tiff_c6_FILE=		${LINUXBASE}/usr/lib/libtiff.so.3.9.4
 tiff_DETECT=		${tiff${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 tiff_PORT=			${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-tiff
 tiff_DEPENDS=		jpeg
 
-# XXX: tk85!!!
-tk84_f10_FILE=		${LINUXBASE}/usr/lib/libtk8.5.so
-tk84_DETECT=		${tk84${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-tk84_PORT=		${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-tk85
-tk84_DEPENDS=		xorglibs
+tk85_f10_FILE=		${LINUXBASE}/usr/lib/libtk8.5.so
+tk85_c6_FILE=		${LINUXBASE}/usr/lib/libtk8.5.so
+tk85_DETECT=		${tk85${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+tk85_PORT=		${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-tk85
+tk85_DEPENDS=		xorglibs
 
 xorglibs_f10_FILE=	${LINUXBASE}/usr/lib/libXrandr.so.2.1.0
+xorglibs_c6_FILE=	${LINUXBASE}/usr/lib/libXrandr.so.2.2.0
 xorglibs_DETECT=	${xorglibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 xorglibs_PORT=		${PORTSDIR}/x11/linux${LINUX_DIST_SUFFIX}-xorg-libs
 xorglibs_DEPENDS=	fontconfig
@@ -390,6 +480,18 @@ webauth_DETECT=		${webauth${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
 webauth_PORT=		${PORTSDIR}/www/linux-${WEB_AUTH}
 webauth_DEPENDS=	gtk2 atk pango fontconfig
 
+qt47_c6_FILE=		${LINUXBASE}/usr/lib/qt47/libQtCore.so.4.7.2
+qt47_DETECT=		${qt47${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+qt47_PORT=		${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-qt47
+
+qt47-x11_c6_FILE=		${LINUXBASE}/usr/lib/qt47/libQtGui.so.4.7.2
+qt47-x11_DETECT=		${qt47-x11${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+qt47-x11_PORT=		${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-qt47-x11
+
+qt47-webkit_c6_FILE=		${LINUXBASE}/usr/lib/qt47/libQtWebKit.so.4.7.2
+qt47-webkit_DETECT=		${qt47-webkit${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+qt47-webkit_PORT=		${PORTSDIR}/www/linux${LINUX_DIST_SUFFIX}-qt47-webkit
+
 # End component definition section
 
 # Let's check if components from USE_LINUX_APPS exist at _LINUX_APPS_ALL
diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk
index 3c86773594bb..f4d84a26a5a4 100644
--- a/Mk/bsd.linux-rpm.mk
+++ b/Mk/bsd.linux-rpm.mk
@@ -42,68 +42,110 @@ USE_LINUX_PREFIX=	yes
 NO_WRKSUBDIR=		yes
 NO_BUILD=			yes
 
-.  if ${ARCH} == "amd64"
+.	if ${ARCH} == "amd64" || ${ARCH} == "i386"
+.		if ${USE_LINUX} == "c6"
+# Do not build CentOS 6.5 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.
+.			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
+# Do not build Fedora 10 ports unless specifically overridden.
+#.			if ! defined(OVERRIDE_LINUX_NONBASE_PORTS) || ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10"
+#IGNORE=		This port requires Fedora 10, yet Fedora 10 is heavily outdated and contains many vulnerable ports. If you really need it, add OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf.
+#.			endif
 LINUX_RPM_ARCH?=	i386	# the linuxulator does not yet support amd64 code
-.  elif ${ARCH} == "powerpc"
-LINUX_RPM_ARCH?=	ppc
-.  else
+.		else
 LINUX_RPM_ARCH?=	${ARCH}
-.  endif
+. 		endif
 
+.	elif ${ARCH} == "powerpc"
+LINUX_RPM_ARCH?=	ppc
+.	endif
 .endif
 
 .if defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Post_Include)
 
 Linux_RPM_Post_Include=	bsd.linux-rpm.mk
 
-LINUX_DIST?=		fedora
-LINUX_DIST_VER?=	10
-.   if  !defined(OVERRIDE_LINUX_NONBASE_PORTS) && \
-        ${LINUX_DIST_VER} != 10
-IGNORE=		bsd.linux-rpm.mk test failed: package building defaults to linux-f10 ports, please define OVERRIDE_LINUX_NONBASE_PORTS to build other linux infrastructure ports
-.   endif
+.if ${USE_LINUX} == "f10" || ${USE_LINUX} == "yes" # temporary default, remove or clause soon
+USE_LINUX?=	"f10"
+LINUX_DIST=	fedora
+LINUX_DIST_VER=	10
+.else
+LINUX_DIST=	centos
+LINUX_DIST_VER=	6.5
+.endif
 
-.  if defined(LINUX_DIST)
+.	if defined(LINUX_DIST)
 DIST_SUBDIR?=	rpm/${LINUX_RPM_ARCH}/${LINUX_DIST}/${LINUX_DIST_VER}
 
-.    if ${LINUX_DIST} == "fedora"
+.		if ${LINUX_DIST} == "fedora"
 # we do not want to define MASTER_SITES and MASTER_SITE_* if they are already defined
 # ex.: MASTER_SITES=file:///...
-.      ifndef MASTER_SITES
+.			ifndef MASTER_SITES
 MASTER_SITES=			${MASTER_SITE_FEDORA_LINUX}
-.        if ${LINUX_DIST_VER} == 10
+.				if ${LINUX_DIST_VER} == 10
 MASTER_SITE_SUBDIR?=	../releases/${LINUX_DIST_VER}/Everything/${LINUX_RPM_ARCH}/os/Packages \
 			../updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
 MASTER_SITE_SRC_SUBDIR?=	../releases/${LINUX_DIST_VER}/Everything/source/SRPMS \
 				../updates/${LINUX_DIST_VER}/SRPMS
-.        else
+.				else
 MASTER_SITE_SUBDIR?=	${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
 			updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}
 MASTER_SITE_SRC_SUBDIR?=	${LINUX_DIST_VER}/SRPMS \
 				updates/${LINUX_DIST_VER}/SRPMS
-.        endif
-.      endif
-.    else
-IGNORE=	unknown LINUX_DIST in port Makefile
-.    endif
-.  endif
-PKGNAMEPREFIX?=			linux-
+.				endif
+.			endif
+.		elif ${LINUX_DIST} == "centos"
+MASTER_SITES_SUBDIR=	/centos/6/os/i386/Packages/
+.			if ${LINUX_DIST_VER} == "5" #needed for Qt...
+LINUX_RPM_ARCH=	i386
+MASTER_SITES_SUBDIR=	/centos/5/os/i386/Packages/
+.			endif
+
+.			ifndef MASTER_SITES
+MASTER_SITES=	${MASTER_SITE_CENTOS_LINUX}
+.				if ${LINUX_DIST_VER} == "6.5"
+.					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/
+.					endif
+
+.				else
+MASTER_SITES=	http://vault.centos.org/${LINUX_DIST_VER}/os/i386/Packages/
+.				endif
+.			endif
+
+.		endif
+.	endif
+
+
+#.if ${USE_LINUX:L} == "yes" #redundant with bsd.port.mk fu
+#USE_LINUX=	c6
+#.endif
+PKGNAMEPREFIX?=			linux-${USE_LINUX}-
 
 # DISTFILES and SRC_DISTFILES assume that there is only one bindist
 # and one src file.
-# Please, define them n the Makefile of the port in case this assumption
+# Please, define them in the Makefile of the port in case this assumption
 # is not true.
 
+DISTVERSION=	${PORTVERSION}-${RPMVERSION}
+DISTNAME?=		${PORTNAME}-${DISTVERSION}
 DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
 BIN_DISTFILES:=		${DISTFILES}
 SRC_DISTFILES?=		${DISTNAME}${SRC_SUFX}
 EXTRACT_ONLY?=		${BIN_DISTFILES:C/:[^:]+$//}
 
-.  if defined(PACKAGE_BUILDING)
+.	if defined(PACKAGE_BUILDING)
 DISTFILES+=		${SRC_DISTFILES}
 MASTER_SITE_SUBDIR+=	${MASTER_SITE_SRC_SUBDIR}
 ALWAYS_KEEP_DISTFILES=	yes
-.  endif
+.	endif
 
 EXTRACT_CMD?=			${TAR}
 EXTRACT_BEFORE_ARGS?=	-xf
@@ -119,36 +161,39 @@ BRANDELF_FILES?=
 .  if defined(PORTDOCS) && defined(NOPORTDOCS)
 pre-patch: linux-rpm-clean-portdocs
 
-.    if !target(linux-rpm-clean-portdocs)
+.		if !target(linux-rpm-clean-portdocs)
 linux-rpm-clean-portdocs:
-.      for x in ${PORTDOCS}
+.			for x in ${PORTDOCS}
 	@${RM} -f ${WRKDIR}/${DOCSDIR_REL}/${x}
-.      endfor
+.			endfor
 	@${RMDIR} ${WRKDIR}/${DOCSDIR_REL}
-.    endif
+.		endif
 .  endif
 
 .  if defined(AUTOMATIC_PLIST)
 
-.    if ${USE_LINUX} == "f10" || ${USE_LINUX:tl} == "yes"
+.	if ${USE_LINUX} == "f10" || ${USE_LINUX} == "yes"
 _LINUX_BASE_SUFFIX=		f10
-.    else
+.	elif ${USE_LINUX} == "c6"
+USE_LINUX=	c6
+_LINUX_BASE_SUFFIX=		c6
+.	else
 # other linux_base ports do not provide a pkg-plist file
-IGNORE=					uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\" and \"f10\"
-.    endif
+IGNORE=					uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"f10\" and \"c6\"
+.  endif
 
 PLIST?=					${WRKDIR}/.PLIST.linux-rpm
 
 pre-install: linux-rpm-generate-plist
 
-.    if !target(linux-rpm-generate-plist)
+.  if !target(linux-rpm-generate-plist)
 linux-rpm-generate-plist:
 	cd ${WRKSRC} && \
 	${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST} && \
 	${FIND} * ! -path "stage*" -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs
 	@${GREP} '^@dirrm' ${PORTSDIR}/emulators/linux_base-${_LINUX_BASE_SUFFIX}/pkg-plist | ${SED} 's:^@dirrmtry:@dirrm:g' | ${SORT} > ${PLIST}.shared-dirs
 	@${COMM} -1 -3 ${PLIST}.shared-dirs ${PLIST}.dirs | ${SORT} -r >> ${PLIST}
-.    endif
+.	endif
 .  endif
 
 .  if !target(do-install)
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 5917fad832b1..6d6f84ce3d83 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1749,7 +1749,9 @@ USE_LINUX=	${OVERRIDE_LINUX_BASE_PORT}
 LINUX_BASE_PORT=	${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}
 .	else
 .		if ${USE_LINUX:tl} == "yes"
+USE_LINUX=	f10		# temporary default, set to c6 soon
 LINUX_BASE_PORT=	${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10
+#LINUX_BASE_PORT=	${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-c6
 .		else
 IGNORE=		cannot be built: there is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT
 .		endif
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 0badc8ab7474..acd8ea1aab46 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -250,6 +250,27 @@ MASTER_SITE_EXIM+= \
 	http://ftp.exim.llorien.org/exim/%SUBDIR%
 .endif
 
+.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://mirror.centos.org/%SUBDIR%/ \
+	http://vault.centos.org/%SUBDIR%/
+
+.endif
+
+.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/
+.endif
+
+.if !defined(IGNORE_MASTER_SITE_EPEL)
+MASTER_SITE_EPEL+= \
+	http://dl.fedoraproject.org/pub/epel/6/i386/ \
+	http://dl.fedoraproject.org/pub/epel/6/SRPMS/
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_FEDORA_LINUX)
 MASTER_SITE_FEDORA_LINUX+= \
 	http://archives.fedoraproject.org/pub/archive/fedora/linux/core/%SUBDIR%/ \