svn commit: r378639 - head/emulators/linux_base-c6
Tijl Coosemans
tijl at FreeBSD.org
Sun Feb 8 10:34:15 UTC 2015
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 <svyatoslav.lempert at 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 at 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
More information about the svn-ports-all
mailing list