From tijl@coosemans.org  Sun Mar 10 20:04:02 2013
Return-Path: <tijl@coosemans.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 06209E71
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Mar 2013 20:04:02 +0000 (UTC)
	(envelope-from tijl@coosemans.org)
Received: from mailrelay007.isp.belgacom.be (mailrelay007.isp.belgacom.be [195.238.6.173])
	by mx1.freebsd.org (Postfix) with ESMTP id 99A71DCE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Mar 2013 20:04:01 +0000 (UTC)
Received: from 193.66-129-109.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([109.129.66.193])
  by relay.skynet.be with ESMTP; 10 Mar 2013 21:03:53 +0100
Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1])
	by kalimero.tijl.coosemans.org (8.14.6/8.14.6) with ESMTP id r2AK3qWL011760
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Mar 2013 21:03:53 +0100 (CET)
	(envelope-from tijl@kalimero.tijl.coosemans.org)
Received: (from tijl@localhost)
	by kalimero.tijl.coosemans.org (8.14.6/8.14.6/Submit) id r2AK3qbK011759;
	Sun, 10 Mar 2013 21:03:52 +0100 (CET)
	(envelope-from tijl)
Message-Id: <201303102003.r2AK3qbK011759@kalimero.tijl.coosemans.org>
Date: Sun, 10 Mar 2013 21:03:52 +0100 (CET)
From: Tijl Coosemans <tijl@coosemans.org>
Reply-To: Tijl Coosemans <tijl@coosemans.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] emulators/linux_base-f10: add symlinks for matlab
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         176819
>Category:       ports
>Synopsis:       [patch] emulators/linux_base-f10: add symlinks for matlab
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tijl
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 10 20:10:01 UTC 2013
>Closed-Date:    Tue Apr 16 22:51:45 CEST 2013
>Last-Modified:  Tue Apr 16 22:51:45 CEST 2013
>Originator:     Tijl Coosemans
>Release:        FreeBSD 10.0-CURRENT i386
>Organization:
>Environment:
>Description:
Some programs are installed under /usr/bin on Linux, but /bin on
FreeBSD. Because PATH usually lists /bin before /usr/bin this
means Linux shell scripts run the FreeBSD program and fail.

The attached patch fixes the problem by creating symlinks in
/compat/linux/bin.
>How-To-Repeat:
>Fix:

--- linux_base-f10.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 313342)
+++ Makefile	(working copy)
@@ -7,7 +7,7 @@
 
 PORTNAME=		f10
 PORTVERSION=		10
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		emulators linux
 MASTER_SITES=		CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${PORTVERSION}
 PKGNAMEPREFIX=		linux_base-
@@ -214,6 +214,10 @@
 		| ${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
 #
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 313342)
+++ pkg-plist	(working copy)
@@ -1,4 +1,5 @@
 @comment file listing
+bin/[
 bin/arch
 bin/basename
 bin/bash
@@ -13,6 +14,7 @@
 bin/echo
 bin/egrep
 bin/env
+bin/expr
 bin/false
 bin/fgrep
 bin/grep
@@ -33,10 +35,12 @@
 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
--- linux_base-f10.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->emulation 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Mar 10 20:10:10 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176819 
Responsible-Changed-From-To: emulation->freebsd-emulation 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Mar 12 06:54:49 UTC 2013 
Responsible-Changed-Why:  
Canonicalize assignment. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176819 

From: Tijl Coosemans <tijl@coosemans.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176819: [patch] emulators/linux_base-f10: add symlinks
 for matlab
Date: Wed, 27 Mar 2013 10:33:41 +0100

 Are there any objections to this patch? It is required to get at
 least Maple and Matlab working. It would be nice to have it
 committed before the freeze. 
Responsible-Changed-From-To: freebsd-emulation->tijl 
Responsible-Changed-By: tijl 
Responsible-Changed-When: Mon Apr 15 19:09:05 CEST 2013 
Responsible-Changed-Why:  
Take to get reminders. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176819 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176819: commit references a PR
Date: Tue, 16 Apr 2013 20:38:18 +0000 (UTC)

 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: tijl 
State-Changed-When: Tue Apr 16 22:51:10 CEST 2013 
State-Changed-Why:  
Committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176819 
>Unformatted:
