From owner-svn-ports-head@FreeBSD.ORG Tue Dec 9 17:47:34 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 061F7B7B; Tue, 9 Dec 2014 17:47:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB7C189A; Tue, 9 Dec 2014 17:47:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB9HlXeq096210; Tue, 9 Dec 2014 17:47:33 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB9HlW7Y096203; Tue, 9 Dec 2014 17:47:32 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201412091747.sB9HlW7Y096203@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Tue, 9 Dec 2014 17:47:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374415 - in head/emulators: linux_base-c6 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2014 17:47:34 -0000 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 -@dir /compat/linux -@dir /compat +@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 +@dir %%LINUXBASE%% @rmtry var/cache/ldconfig/aux-cache @comment empty directory listing @dir var/yp