svn commit: r374415 - in head/emulators: linux_base-c6 linux_base-f10

[Johannes Jost Meixner]

Author: xmj
Date: Tue Dec  9 17:47:32 2014
New Revision: 374415
URL: https://svnweb.freebsd.org/changeset/ports/374415
QAT: https://qat.redports.org/buildarchive/r374415/

Log:
  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)

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

Modified: head/emulators/linux_base-c6/Makefile
==============================================================================
--- head/emulators/linux_base-c6/Makefile	Tue Dec  9 17:44:30 2014	(r374414)
+++ head/emulators/linux_base-c6/Makefile	Tue Dec  9 17:47:32 2014	(r374415)
@@ -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.

Modified: head/emulators/linux_base-c6/pkg-plist
==============================================================================
--- head/emulators/linux_base-c6/pkg-plist	Tue Dec  9 17:44:30 2014	(r374414)
+++ head/emulators/linux_base-c6/pkg-plist	Tue Dec  9 17:47:32 2014	(r374415)
@@ -2340,8 +2340,7 @@ usr/tmp
 var/mail
 @sample etc/krb5.conf.sample
 @sample etc/yp.conf.sample
- at dir /compat/linux
- at dir /compat
+ at dir %%LINUXBASE%%
 @dir etc/X11/applnk
 @dir etc/X11/fontpath.d
 @dir etc/ld.so.conf.d

Modified: head/emulators/linux_base-f10/Makefile
==============================================================================
--- head/emulators/linux_base-f10/Makefile	Tue Dec  9 17:44:30 2014	(r374414)
+++ head/emulators/linux_base-f10/Makefile	Tue Dec  9 17:47:32 2014	(r374415)
@@ -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}
 

Modified: head/emulators/linux_base-f10/pkg-plist
==============================================================================
--- head/emulators/linux_base-f10/pkg-plist	Tue Dec  9 17:44:30 2014	(r374414)
+++ head/emulators/linux_base-f10/pkg-plist	Tue Dec  9 17:47:32 2014	(r374415)
@@ -2011,6 +2011,7 @@ usr/share/man/man8/setserial.8.gz
 usr/share/man/man8/tune2fs.8.gz
 usr/tmp
 var/mail
+ at dir %%LINUXBASE%%
 @rmtry var/cache/ldconfig/aux-cache
 @comment empty directory listing
 @dir var/yp