From owner-svn-ports-all@freebsd.org Tue Jun 19 20:31:00 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CBB4C100CF17; Tue, 19 Jun 2018 20:31:00 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8250374A97; Tue, 19 Jun 2018 20:31:00 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 634ED1883C; Tue, 19 Jun 2018 20:31:00 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5JKV0i3005901; Tue, 19 Jun 2018 20:31:00 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5JKV0MH005895; Tue, 19 Jun 2018 20:31:00 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201806192031.w5JKV0MH005895@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 19 Jun 2018 20:31:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472820 - in head/emulators: linux_base-c6 linux_base-c7 X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/emulators: linux_base-c6 linux_base-c7 X-SVN-Commit-Revision: 472820 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jun 2018 20:31:01 -0000 Author: amdmi3 Date: Tue Jun 19 20:30:59 2018 New Revision: 472820 URL: https://svnweb.freebsd.org/changeset/ports/472820 Log: - Fix OSVERSION conditions Approved by: portmgr blanket Modified: head/emulators/linux_base-c6/Makefile head/emulators/linux_base-c7/Makefile Modified: head/emulators/linux_base-c6/Makefile ============================================================================== --- head/emulators/linux_base-c6/Makefile Tue Jun 19 20:25:10 2018 (r472819) +++ head/emulators/linux_base-c6/Makefile Tue Jun 19 20:30:59 2018 (r472820) @@ -3,7 +3,7 @@ PORTNAME= c6 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- BIN_DISTNAMES= bash-4.1.2-48.el6 \ @@ -121,7 +121,7 @@ REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/ .include -.if ${LINUX_ARCH} == x86_64 && ${OPSYS} == FreeBSD && ${OSVERSION} >= 11000105 +.if ${LINUX_ARCH} == x86_64 && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100105 SYSCTLMIB= kern.features.linux64 .else SYSCTLMIB= compat.linux.osrelease Modified: head/emulators/linux_base-c7/Makefile ============================================================================== --- head/emulators/linux_base-c7/Makefile Tue Jun 19 20:25:10 2018 (r472819) +++ head/emulators/linux_base-c7/Makefile Tue Jun 19 20:30:59 2018 (r472820) @@ -2,7 +2,7 @@ PORTNAME= c7 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- BIN_DISTNAMES= centos-release-7-4.1708.el7.centos \ @@ -125,7 +125,7 @@ REMOVE_FILES= bin/df bin/su etc/exports etc/group etc/ .include -.if ${LINUX_ARCH} == x86_64 && ${OPSYS} == FreeBSD && ${OSVERSION} >= 11000105 +.if ${LINUX_ARCH} == x86_64 && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100105 SYSCTLMIB= kern.features.linux64 .else SYSCTLMIB= compat.linux.osrelease