From owner-svn-ports-all@FreeBSD.ORG Sun Feb 8 10:34:15 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69F7B9FF; Sun, 8 Feb 2015 10:34:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3BEEA8F3; Sun, 8 Feb 2015 10:34:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18AYFsZ086336; Sun, 8 Feb 2015 10:34:15 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18AYEWN086332; Sun, 8 Feb 2015 10:34:14 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201502081034.t18AYEWN086332@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 8 Feb 2015 10:34:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378639 - head/emulators/linux_base-c6 X-SVN-Group: ports-head 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.18-1 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: Sun, 08 Feb 2015 10:34:15 -0000 Author: tijl Date: Sun Feb 8 10:34:14 2015 New Revision: 378639 URL: https://svnweb.freebsd.org/changeset/ports/378639 QAT: https://qat.redports.org/buildarchive/r378639/ Log: - White space fixes - Like r315899 did for linux_base-f10, add some symlinks to linux_base-c6 for executables that exist in /usr/bin on Linux but /bin on FreeBSD. This guarantees that Linux shell scripts run the Linux executables and not the FreeBSD ones. PR: 197406 Modified: head/emulators/linux_base-c6/Makefile head/emulators/linux_base-c6/pkg-plist Modified: head/emulators/linux_base-c6/Makefile ============================================================================== --- head/emulators/linux_base-c6/Makefile Sun Feb 8 10:31:13 2015 (r378638) +++ head/emulators/linux_base-c6/Makefile Sun Feb 8 10:34:14 2015 (r378639) @@ -1,15 +1,15 @@ # Created by: Svyatoslav Lempert # $FreeBSD$ -PORTNAME= c6 -PORTVERSION= 6.6 -PORTREVISION= 2 -CATEGORIES= emulators linux +PORTNAME= c6 +PORTVERSION= 6.6 +PORTREVISION= 3 +CATEGORIES= emulators linux MASTER_SITES= http://mirror.centos.org/centos/6/os/i386/Packages/ \ http://mirror.centos.org/centos/6/updates/i386/Packages/ -PKGNAMEPREFIX= linux_base- -DISTFILES= ${PRE_BIN_DISTFILES} ${BIN_DISTFILES} ${SRC_DISTFILES} -EXTRACT_ONLY= ${BIN_DISTFILES} +PKGNAMEPREFIX= linux_base- +DISTFILES= ${PRE_BIN_DISTFILES} ${BIN_DISTFILES} ${SRC_DISTFILES} +EXTRACT_ONLY= ${BIN_DISTFILES} MAINTAINER= emulation@FreeBSD.org COMMENT= Base set of packages needed in Linux mode for i386/amd64 (Linux CentOS 6) @@ -244,6 +244,10 @@ do-install: | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX} @${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp + @${LN} -sf ../usr/bin/[ ${STAGEDIR}${PREFIX}/bin/[ + @${LN} -sf ../usr/bin/expr ${STAGEDIR}${PREFIX}/bin/expr + @${LN} -sf ../usr/bin/test ${STAGEDIR}${PREFIX}/bin/test + @${LN} -sf ../usr/bin/uuidgen ${STAGEDIR}${PREFIX}/bin/uuidgen @${CHMOD} 755 ${STAGEDIR}${PREFIX}/var/lock ${STAGEDIR}${PREFIX}/var/spool/mail # # Let some linux applications (e.g. print/acroread8) print with default settings Modified: head/emulators/linux_base-c6/pkg-plist ============================================================================== --- head/emulators/linux_base-c6/pkg-plist Sun Feb 8 10:31:13 2015 (r378638) +++ head/emulators/linux_base-c6/pkg-plist Sun Feb 8 10:34:14 2015 (r378639) @@ -1,3 +1,4 @@ +bin/[ bin/arch bin/basename bin/bash @@ -12,6 +13,7 @@ bin/dd bin/echo bin/egrep bin/env +bin/expr bin/false bin/find bin/fgrep @@ -36,6 +38,7 @@ bin/sleep bin/sort bin/stty bin/sync +bin/test bin/touch bin/true bin/uname @@ -52,6 +55,7 @@ bin/raw bin/sed bin/taskset bin/umount +bin/uuidgen etc/DIR_COLORS etc/DIR_COLORS.256color etc/DIR_COLORS.lightbgcolor