From owner-svn-ports-all@FreeBSD.ORG  Tue Apr 16 20:38:07 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 87525A89;
 Tue, 16 Apr 2013 20:38:07 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 617E01651;
 Tue, 16 Apr 2013 20:38:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3GKc7C8097316;
 Tue, 16 Apr 2013 20:38:07 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3GKc7Ps097314;
 Tue, 16 Apr 2013 20:38:07 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201304162038.r3GKc7Ps097314@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 16 Apr 2013 20:38:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r315899 - head/emulators/linux_base-f10
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Apr 2013 20:38:07 -0000

Author: tijl
Date: Tue Apr 16 20:38:06 2013
New Revision: 315899
URL: http://svnweb.freebsd.org/changeset/ports/315899

Log:
  Add some symlinks to linux_base-f10 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.
  
  No objection from:	-emulation
  PR:		ports/176819
  Feature safe:	yes

Modified:
  head/emulators/linux_base-f10/Makefile
  head/emulators/linux_base-f10/pkg-plist

Modified: head/emulators/linux_base-f10/Makefile
==============================================================================
--- head/emulators/linux_base-f10/Makefile	Tue Apr 16 20:27:58 2013	(r315898)
+++ head/emulators/linux_base-f10/Makefile	Tue Apr 16 20:38:06 2013	(r315899)
@@ -3,7 +3,7 @@
 
 PORTNAME=		f10
 PORTVERSION=		10
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		emulators linux
 MASTER_SITES=		CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${PORTVERSION}
 PKGNAMEPREFIX=		linux_base-
@@ -210,6 +210,10 @@ do-install:
 		| ${CPIO} -pm -R root:wheel ${PREFIX}
 
 	@${LN} -sf /var/tmp ${PREFIX}/usr/tmp
+	@${LN} -sf ../usr/bin/[ ${PREFIX}/bin/[
+	@${LN} -sf ../usr/bin/expr ${PREFIX}/bin/expr
+	@${LN} -sf ../usr/bin/test ${PREFIX}/bin/test
+	@${LN} -sf ../usr/bin/uuidgen ${PREFIX}/bin/uuidgen
 	@${CHOWN} root:wheel ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 	@${CHMOD} 755 ${PREFIX}/var/lock ${PREFIX}/var/spool/mail
 #

Modified: head/emulators/linux_base-f10/pkg-plist
==============================================================================
--- head/emulators/linux_base-f10/pkg-plist	Tue Apr 16 20:27:58 2013	(r315898)
+++ head/emulators/linux_base-f10/pkg-plist	Tue Apr 16 20:38:06 2013	(r315899)
@@ -1,4 +1,5 @@
 @comment file listing
+bin/[
 bin/arch
 bin/basename
 bin/bash
@@ -13,6 +14,7 @@ bin/dd
 bin/echo
 bin/egrep
 bin/env
+bin/expr
 bin/false
 bin/fgrep
 bin/grep
@@ -33,10 +35,12 @@ bin/sleep
 bin/sort
 bin/stty
 bin/sync
+bin/test
 bin/touch
 bin/true
 bin/uname
 bin/unlink
+bin/uuidgen
 etc/DIR_COLORS
 etc/DIR_COLORS.256color
 etc/DIR_COLORS.xterm