Attachment #112724 for bug #154186

View | Details | Raw Unified | Return to bug 154186
Collapse All | Expand All

Lines 1953-1959 Link Here

(-)ports/Mk/bsd.port.mk (-1 / +1 lines)
1953	LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}	1953	LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}
1954	. else	1954	. else
1955	. if ${USE_LINUX:L} == "yes"	1955	. if ${USE_LINUX:L} == "yes"
1956	. if ${OSVERSION} < 800076	1956	. if ${OSVERSION} < 800076 \|\| ${LINUX_OSRELEASE} == "2.4.2"
1957	LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-fc4	1957	LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-fc4
1958	. else	1958	. else
1959	LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10	1959	LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10

Lines 48-54 Link Here

(-)ports/Mk/bsd.linux-apps.mk (-1 / +1 lines)
48	. else	48	. else
49	IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are \"f8\", \"f10\"	49	IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are \"f8\", \"f10\"
50	. endif	50	. endif
51	. elif ${OSVERSION} < 800076	51	. elif ${OSVERSION} < 800076 \|\| ${LINUX_OSRELEASE} == "2.4.2"
52	# default for OSVERSION < 800076	52	# default for OSVERSION < 800076
53	LINUX_DIST_SUFFIX=	53	LINUX_DIST_SUFFIX=
54	. else	54	. else

Lines 63-69 Link Here

(-)ports/Mk/bsd.linux-rpm.mk (-1 / +1 lines)
63	Linux_RPM_Post_Include= bsd.linux-rpm.mk	63	Linux_RPM_Post_Include= bsd.linux-rpm.mk
64		64
65	LINUX_DIST?= fedora	65	LINUX_DIST?= fedora
66	. if ${OSVERSION} < 800076	66	. if ${OSVERSION} < 800076 \|\| ${LINUX_OSRELEASE} == "2.4.2"
67	LINUX_DIST_VER?= 4	67	LINUX_DIST_VER?= 4
68	. else	68	. else
69	LINUX_DIST_VER?= 10	69	LINUX_DIST_VER?= 10

Return to bug 154186