From c2209bab1d6989f4b5a85dd7e8769e78af9205db Mon Sep 17 00:00:00 2001
From: xmj <xmj@FreeBSD.org>
Date: Tue, 9 Dec 2014 17:47:32 +0000
Subject: Force PREFIX to LINUXBASE

Using pkg with linux packages will generate conflicts with non-linux ports if
PREFIX is set in make.conf. If USE_LINUX_PREFIX is defined, force PREFIX to
LINUXBASE, which can be overridden separately.

Differential Revision:	https://reviews.freebsd.org/D1265
Approved by:    koobs, swills (mentors)
---
 emulators/linux_base-c6/Makefile   | 2 +-
 emulators/linux_base-c6/pkg-plist  | 3 +--
 emulators/linux_base-f10/Makefile  | 2 +-
 emulators/linux_base-f10/pkg-plist | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'emulators')

diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index 27a8faafa546..48e6ed1dade9 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -131,7 +131,7 @@ LINUX_RPM_ARCH=		i686
 USE_LINUX_PREFIX=	yes
 NO_WRKSUBDIR=		yes
 DISTINFO_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
-PLIST_SUB=		GLIBCVER="2.12"
+PLIST_SUB=		GLIBCVER="2.12" LINUXBASE=${LINUXBASE}
 USES=	shebangfix
 SHEBANG_FILES=	bin/redhat_lsb_init sbin/mount.tmpfs
 # bash scripts need to work in chroot /compat/linux, so use env instead.
diff --git a/emulators/linux_base-c6/pkg-plist b/emulators/linux_base-c6/pkg-plist
index dc63de961a0d..7fc97ead6a05 100644
--- a/emulators/linux_base-c6/pkg-plist
+++ b/emulators/linux_base-c6/pkg-plist
@@ -2340,8 +2340,7 @@ usr/tmp
 var/mail
 @sample etc/krb5.conf.sample
 @sample etc/yp.conf.sample
-@dir /compat/linux
-@dir /compat
+@dir %%LINUXBASE%%
 @dir etc/X11/applnk
 @dir etc/X11/fontpath.d
 @dir etc/ld.so.conf.d
diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile
index b1675ee7c99b..bf50e186e87a 100644
--- a/emulators/linux_base-f10/Makefile
+++ b/emulators/linux_base-f10/Makefile
@@ -111,7 +111,7 @@ LINUX_RPM_ARCH=		i386
 USE_LINUX_PREFIX=	yes
 NO_WRKSUBDIR=		yes
 DISTINFO_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
-PLIST_SUB=		GLIBCVER="2.9"
+PLIST_SUB=		GLIBCVER="2.9" LINUXBASE=${LINUXBASE}
 
 EXTRACT_ONLY=		${BIN_DISTFILES}
 
diff --git a/emulators/linux_base-f10/pkg-plist b/emulators/linux_base-f10/pkg-plist
index 0fe011ce6c61..ea7f88e49648 100644
--- a/emulators/linux_base-f10/pkg-plist
+++ b/emulators/linux_base-f10/pkg-plist
@@ -2011,6 +2011,7 @@ usr/share/man/man8/setserial.8.gz
 usr/share/man/man8/tune2fs.8.gz
 usr/tmp
 var/mail
+@dir %%LINUXBASE%%
 @rmtry var/cache/ldconfig/aux-cache
 @comment empty directory listing
 @dir var/yp
-- 
cgit