ports/154186: Fix Mk infrastructure to allow using linux 2.4 emulation with FreeBSD > 8.0

[Alex Dupre]

>Number:         154186
>Category:       ports
>Synopsis:       Fix Mk infrastructure to allow using linux 2.4 emulation with FreeBSD > 8.0
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 21 08:30:15 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 8.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 8.1-STABLE FreeBSD 8.1-STABLE #2 r215627: Sun Nov 21 13:36:51 UTC 2010 simon at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386


	
>Description:
Currently (8.x-RELEASE) it's not possible to use Fedora Core 4 ports with
linux emulation. Fix this issue, by selecting correct ports if
compat.linux.osrelease is 2.4.2. As a side effect this will fix using
linux sun jdks with FreeBSD.
	
>How-To-Repeat:
	
>Fix:

	

--- linux.diff begins here ---
Index: ports/Mk/bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.666
diff -u -r1.666 bsd.port.mk
--- ports/Mk/bsd.port.mk	29 Dec 2010 07:14:56 -0000	1.666
+++ ports/Mk/bsd.port.mk	21 Jan 2011 08:20:13 -0000
@@ -1953,7 +1953,7 @@
 LINUX_BASE_PORT=	${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}
 .	else
 .		if ${USE_LINUX:L} == "yes"
-.			if ${OSVERSION} < 800076
+.			if ${OSVERSION} < 800076 || ${LINUX_OSRELEASE} == "2.4.2"
 LINUX_BASE_PORT=	${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-fc4
 .			else
 LINUX_BASE_PORT=	${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10
Index: ports/Mk/bsd.linux-apps.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.linux-apps.mk,v
retrieving revision 1.34
diff -u -r1.34 bsd.linux-apps.mk
--- ports/Mk/bsd.linux-apps.mk	19 Aug 2010 20:09:05 -0000	1.34
+++ ports/Mk/bsd.linux-apps.mk	21 Jan 2011 08:20:13 -0000
@@ -48,7 +48,7 @@
 .    else
 IGNORE=		valid values for OVERRIDE_LINUX_NONBASE_PORTS are \"f8\", \"f10\"
 .    endif
-.  elif ${OSVERSION} < 800076
+.  elif ${OSVERSION} < 800076 || ${LINUX_OSRELEASE} == "2.4.2"
 # default for OSVERSION < 800076
 LINUX_DIST_SUFFIX=
 .  else
Index: ports/Mk/bsd.linux-rpm.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.linux-rpm.mk,v
retrieving revision 1.24
diff -u -r1.24 bsd.linux-rpm.mk
--- ports/Mk/bsd.linux-rpm.mk	28 Oct 2010 21:00:06 -0000	1.24
+++ ports/Mk/bsd.linux-rpm.mk	21 Jan 2011 08:20:13 -0000
@@ -63,7 +63,7 @@
 Linux_RPM_Post_Include=	bsd.linux-rpm.mk
 
 LINUX_DIST?=		fedora
-. if ${OSVERSION} < 800076
+. if ${OSVERSION} < 800076 || ${LINUX_OSRELEASE} == "2.4.2"
 LINUX_DIST_VER?=	4
 . else
 LINUX_DIST_VER?=	10
--- linux.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: