Attachment #147553 for bug #187786

Lines 52-58 Link Here

(-)Mk/bsd.linux-apps.mk (-1 / +1 lines)
52	. endif	52	. endif
53	. else	53	. else
54	# default	54	# default
55	LINUX_DIST_SUFFIX= -f10 # temporary default, set to -c6 soon	55	LINUX_DIST_SUFFIX= -c6 # new default.
56	. endif	56	. endif
57		57
58	WEB_AUTH= nvu	58	WEB_AUTH= nvu




NO_BUILD=			yes

.	if ${ARCH} == "amd64" || ${ARCH} == "i386"
.		if ${USE_LINUX} == "c6" || ${USE_LINUX} == "yes"
# 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" 
# 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.


Linux_RPM_Post_Include=	bsd.linux-rpm.mk

.if ${USE_LINUX} == "f10"
USE_LINUX?=	"f10"
LINUX_DIST=	fedora
LINUX_DIST_VER=	10
.else				# Default to CentOS 6.5 32-bit (for now)
LINUX_DIST=	centos
LINUX_DIST_VER=	6.5
.endif

Lines 1749-1755 Link Here

(-)Mk/bsd.port.mk (-1 / +1 lines)
1749	LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}	1749	LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}
1750	. else	1750	. else
1751	. if ${USE_LINUX:tl} == "yes"	1751	. if ${USE_LINUX:tl} == "yes"
1752	USE_LINUX= f10 # temporary default, set to c6 soon	1752	USE_LINUX= c6 # New default linux base.
1753	LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10	1753	LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10
1754	#LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-c6	1754	#LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-c6
1755	. else	1755	. else

Return to bug 187786

Lines 43-55 Link Here

(-)Mk/bsd.linux-rpm.mk (-4 / +4 lines)
43	NO_BUILD= yes	43	NO_BUILD= yes
44		44
45	. if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"	45	. if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"
46	. if ${USE_LINUX} == "c6"	46	. if ${USE_LINUX} == "c6" \|\| ${USE_LINUX} == "yes"
47	# Do not build CentOS 6.5 ports if overridden by f10	47	# Do not build CentOS 6.5 ports if overridden by f10
48	. if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10"	48	. if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10"
49	IGNORE= This port requires CentOS 6.5. Please remove OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf.	49	IGNORE= This port requires CentOS 6.5. Please remove OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf.
50	. endif	50	. endif
51	LINUX_RPM_ARCH?= i686 # ?= because of nasty c5 qt ports	51	LINUX_RPM_ARCH?= i686 # ?= because of nasty c5 qt ports
52	. elif ${USE_LINUX} == "f10" \|\| ${USE_LINUX} == "yes" # temporary default, move or clause to line 46	52	. elif ${USE_LINUX} == "f10"
53	# Do not build Fedora 10 ports unless specifically overridden.	53	# Do not build Fedora 10 ports unless specifically overridden.
54	#. if ! defined(OVERRIDE_LINUX_NONBASE_PORTS) \|\| ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10"	54	#. if ! defined(OVERRIDE_LINUX_NONBASE_PORTS) \|\| ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10"
55	#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.	55	#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.
Lines 68-78 Link Here
68		68
69	Linux_RPM_Post_Include= bsd.linux-rpm.mk	69	Linux_RPM_Post_Include= bsd.linux-rpm.mk
70		70
71	.if ${USE_LINUX} == "f10" \|\| ${USE_LINUX} == "yes" # temporary default, remove or clause soon	71	.if ${USE_LINUX} == "f10"
72	USE_LINUX?= "f10"	72	USE_LINUX?= "f10"
73	LINUX_DIST= fedora	73	LINUX_DIST= fedora
74	LINUX_DIST_VER= 10	74	LINUX_DIST_VER= 10
75	.else	75	.else # Default to CentOS 6.5 32-bit (for now)
76	LINUX_DIST= centos	76	LINUX_DIST= centos
77	LINUX_DIST_VER= 6.5	77	LINUX_DIST_VER= 6.5
78	.endif	78	.endif