From b024bf4540b707009350aaaacb497423ab8bc2d2 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Sun, 8 Feb 2015 10:34:14 +0000
Subject: [PATCH] - 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
---
 emulators/linux_base-c6/Makefile  | 18 +++++++++++-------
 emulators/linux_base-c6/pkg-plist |  4 ++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index eb0b8b9aa042..8bdf6abdc837 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -1,15 +1,15 @@
 # Created by: Svyatoslav Lempert <svyatoslav.lempert@gmail dot com>
 # $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
diff --git a/emulators/linux_base-c6/pkg-plist b/emulators/linux_base-c6/pkg-plist
index 7fc97ead6a05..14517465794f 100644
--- a/emulators/linux_base-c6/pkg-plist
+++ b/emulators/linux_base-c6/pkg-plist
@@ -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