Attachment 172405 Details for Bug 211030 – Need to fix two script accroding new FreeBSD branch. No version bump

Need to fix two script accroding new FreeBSD branch. No version bump

patch-cbsd.txt (text/plain), 1.44 KB, created by Oleg Ginzburg on 2016-07-12 10:22:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Ginzburg

Created: 2016-07-12 10:22:13 UTC

Size: 1.44 KB

patch

obsolete

>diff -ruN cbsd-o/files/patch-build.subr cbsd/files/patch-build.subr
>--- cbsd-o/files/patch-build.subr	1970-01-01 03:00:00.000000000 +0300
>+++ cbsd/files/patch-build.subr	2016-07-12 13:14:03.000000000 +0300
>@@ -0,0 +1,10 @@
>+--- build.subr.bak	2016-04-24 17:03:05.000000000 +0300
>++++ build.subr	2016-07-12 13:13:30.197771000 +0300
>+@@ -13,6 +13,6 @@
>+ 
>+ [ "${stable}" = "1" -a -z "${over}" ] && ver=${ver%%.*}
>+ [ -z "${rev}" ] && rev="head"
>+-[ "${ver}" = "head" ] && ver="11.0"
>++[ "${ver}" = "head" ] && ver="12.0"
>+ [ -z "${maxjobs}" ] && maxjobs=$( /sbin/sysctl -n hw.ncpu )
>+ [ -z "${clean}" ] && clean=0
>diff -ruN cbsd-o/files/patch-system-srcup cbsd/files/patch-system-srcup
>--- cbsd-o/files/patch-system-srcup	1970-01-01 03:00:00.000000000 +0300
>+++ cbsd/files/patch-system-srcup	2016-07-12 13:15:56.019869000 +0300
>@@ -0,0 +1,11 @@
>+--- system/srcup.bak	2016-04-24 17:03:05.000000000 +0300
>++++ system/srcup	2016-07-12 13:14:50.165156000 +0300
>+@@ -43,7 +43,7 @@
>+ 		SCM_URL="${scmbase}/releng/${ver}"
>+ 	fi
>+ 
>+-	[ "$ver" = "11.0" -o "${ver}" = "11" ] && SCM_URL="${scmbase}/head"
>++	[ "$ver" = "12.0" -o "${ver}" = "12" ] && SCM_URL="${scmbase}/head"
>+ 
>+ 	return 0
>+ }
>diff -ruN cbsd-o/Makefile cbsd/Makefile
>--- cbsd-o/Makefile	2016-06-12 13:05:13.318449000 +0300
>+++ cbsd/Makefile	2016-07-12 13:17:40.554147000 +0300
>@@ -3,6 +3,7 @@
> PORTNAME=	cbsd
> PORTVERSION=	10.3.2
> DISTVERSIONPREFIX=	v
>+PORTEPOCH=	1
> CATEGORIES=	sysutils
> 
> MAINTAINER=	olevole@olevole.ru

Actions: View

Attachments on bug 211030: 172405