Attachment 112724 Details for Bug 154186 – linux.diff

[patch] linux.diff

linux.diff (text/plain), 1.83 KB, created by Alex Dupre on 2011-01-21 08:30:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Dupre

Created: 2011-01-21 08:30:15 UTC

Size: 1.83 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 154186: 112724