[patch] switch to default linux-f10 ports at -current

[Boris Samorodov]

Hello List,

here is a patch to switch 8-CURRENT to linux-f10 ports.
The switch is intended to be soft for those who define
OVERRIDE_LINUX_BASE_PORT and OVERRIDE_LINUX_NONBASE_PORTS
(i.e. nothing will change at that case). Otherwise linux
base port and infrastructure ports will change.

The OSVERSION is fragile and is a subject to discuss.
Your opinions are welcome. I've tested it at my tinderbox,
so far so good. But sure I may missed something. Thanks!

-----
Index: Mk/bsd.linux-apps.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.linux-apps.mk,v
retrieving revision 1.19
diff -u -r1.19 bsd.linux-apps.mk
--- Mk/bsd.linux-apps.mk	1 Jun 2009 17:26:07 -0000	1.19
+++ Mk/bsd.linux-apps.mk	2 Jun 2009 16:08:18 -0000
@@ -48,8 +48,12 @@
 .    else
 IGNORE=		valid values for OVERRIDE_LINUX_NONBASE_PORTS are \"f8\", \"f10\"
 .    endif
-.  else
+.  elif ${OSVERSION} < 800076
+# default for OSVERSION < 800076
 LINUX_DIST_SUFFIX=
+.  else
+# default for OSVERSION >= 800076
+LINUX_DIST_SUFFIX=	-f10
 .  endif
 
 # I'm not sure if kompozer is better for linux-f8 ports, so use nvu
Index: Mk/bsd.linux-rpm.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.linux-rpm.mk,v
retrieving revision 1.19
diff -u -r1.19 bsd.linux-rpm.mk
--- Mk/bsd.linux-rpm.mk	1 Jun 2009 17:26:07 -0000	1.19
+++ Mk/bsd.linux-rpm.mk	2 Jun 2009 16:08:18 -0000
@@ -63,7 +63,11 @@
 Linux_RPM_Post_Include=	bsd.linux-rpm.mk
 
 LINUX_DIST?=		fedora
-LINUX_DIST_VER?=	3
+. if ${OSVERSION} < 800076
+LINUX_DIST_VER?=	4
+. else
+LINUX_DIST_VER?=	10
+. endif
 
 # linux Fedora 8 infrastructure ports should be used with compat.linux.osrelease=2.6.16,
 # linux_base-f8 (or greater) port
@@ -72,14 +76,19 @@
 .    if (${LINUX_OSRELEASE} != "2.6.16")
 IGNORE=		bsd.linux-rpm.mk test failed: the port should be used with compat.linux.osrelease=2.6.16, which is supported at 8-CURRENT and has a limitted support at 7-STABLE
 .    endif
+# the default for OSVERSION < 800076
+.    if ${OSVERSION} < 800076
 # let's check if an apropriate linux base port is used
-.    if ${USE_LINUX} != f8 && ${USE_LINUX} != f9 && ${USE_LINUX} != f10
+.      if ${USE_LINUX} != f8 && ${USE_LINUX} != f9 && ${USE_LINUX} != f10
 IGNORE=		bsd.linux-rpm.mk test failed: the port should be used with at least linux_base-f8, please read /usr/ports/UPDATING
-.    endif
+.      endif
 # let's check if OVERRIDE_LINUX_NONBASE_PORTS is defined
-.    ifndef(OVERRIDE_LINUX_NONBASE_PORTS)
+.      ifndef(OVERRIDE_LINUX_NONBASE_PORTS)
 IGNORE=		bsd.linux-rpm.mk test failed: the port should be used with defined OVERRIDE_LINUX_NONBASE_PORTS, please read /usr/ports/UPDATING
-.    endif
+.      endif
+# the default for OSVERSION >= 800076
+#.      else
+.    endif # ${OSVERSION} < 800076
 .  endif
 
 .  if defined(LINUX_DIST)
Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.619
diff -u -r1.619 bsd.port.mk
--- Mk/bsd.port.mk	22 May 2009 21:57:33 -0000	1.619
+++ Mk/bsd.port.mk	2 Jun 2009 16:08:20 -0000
@@ -1837,7 +1837,11 @@
 LINUX_BASE_PORT=	${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}
 .	else
 .		if ${USE_LINUX:L} == "yes"
+.			if ${OSVERSION} < 800076
 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
+.			endif
 .		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
-----

WBR
-- 
Boris Samorodov (bsam)
Research Engineer, http://www.ipt.ru Telephone & Internet SP
FreeBSD Committer, http://www.FreeBSD.org The Power To Serve