From owner-svn-ports-head@FreeBSD.ORG Mon Apr 22 16:24:12 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 45365CC4; Mon, 22 Apr 2013 16:24:12 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1D76614E5; Mon, 22 Apr 2013 16:24:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3MGOCbZ013360; Mon, 22 Apr 2013 16:24:12 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3MGOBjB013357; Mon, 22 Apr 2013 16:24:11 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201304221624.r3MGOBjB013357@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 22 Apr 2013 16:24:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316247 - in head: Mk emulators/linux_base-c6 emulators/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.14 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: Mon, 22 Apr 2013 16:24:12 -0000 Author: bapt Date: Mon Apr 22 16:24:11 2013 New Revision: 316247 URL: http://svnweb.freebsd.org/changeset/ports/316247 Log: On all supported version of FreeBSD tar do support rpm as an archive format. So directly use tar to extract linux* distfiles instead of rpm2cpio. Modified: head/Mk/bsd.linux-rpm.mk head/emulators/linux_base-c6/Makefile head/emulators/linux_base-f10/Makefile Modified: head/Mk/bsd.linux-rpm.mk ============================================================================== --- head/Mk/bsd.linux-rpm.mk Mon Apr 22 16:16:46 2013 (r316246) +++ head/Mk/bsd.linux-rpm.mk Mon Apr 22 16:24:11 2013 (r316247) @@ -33,8 +33,6 @@ Linux_RPM_Include_MAINTAINER= emulation@FreeBSD.org Linux_RPM_Pre_Include= bsd.linux-rpm.mk -RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio - EXTRACT_SUFX?= .${LINUX_RPM_ARCH}.rpm SRC_SUFX?= .src.rpm @@ -133,11 +131,9 @@ MASTER_SITE_SUBDIR+= ${MASTER_SITE_SRC_S ALWAYS_KEEP_DISTFILES= yes . endif -EXTRACT_DEPENDS+= ${RPM2CPIO}:${PORTSDIR}/archivers/rpm - -EXTRACT_CMD?= ${RPM2CPIO} -EXTRACT_BEFORE_ARGS?= -EXTRACT_AFTER_ARGS?= | ${CPIO} -id --quiet +EXTRACT_CMD?= ${TAR} +EXTRACT_BEFORE_ARGS?= -xf +EXTRACT_AFTER_ARGS?= DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} Modified: head/emulators/linux_base-c6/Makefile ============================================================================== --- head/emulators/linux_base-c6/Makefile Mon Apr 22 16:16:46 2013 (r316246) +++ head/emulators/linux_base-c6/Makefile Mon Apr 22 16:24:11 2013 (r316247) @@ -114,14 +114,10 @@ PLIST_SUB= GLIBCVER="2.12" # - research what are the important differences between 2.6.16 and 2.6.18, and # if we need to add something to the linuxulator -RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio - -EXTRACT_DEPENDS+= ${RPM2CPIO}:${PORTSDIR}/archivers/rpm - EXTRACT_ONLY= ${BIN_DISTFILES} -EXTRACT_CMD?= ${RPM2CPIO} -EXTRACT_BEFORE_ARGS?= -EXTRACT_AFTER_ARGS?= | ${CPIO} -id --quiet +EXTRACT_CMD?= ${TAR} +EXTRACT_BEFORE_ARGS?= -xf +EXTRACT_AFTER_ARGS?= .include Modified: head/emulators/linux_base-f10/Makefile ============================================================================== --- head/emulators/linux_base-f10/Makefile Mon Apr 22 16:16:46 2013 (r316246) +++ head/emulators/linux_base-f10/Makefile Mon Apr 22 16:24:11 2013 (r316247) @@ -110,14 +110,10 @@ NO_WRKSUBDIR= yes DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} PLIST_SUB= GLIBCVER="2.9" -RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio - -EXTRACT_DEPENDS+= ${RPM2CPIO}:${PORTSDIR}/archivers/rpm - EXTRACT_ONLY= ${BIN_DISTFILES} -EXTRACT_CMD?= ${RPM2CPIO} -EXTRACT_BEFORE_ARGS?= -EXTRACT_AFTER_ARGS?= | ${CPIO} -id --quiet +EXTRACT_CMD?= ${TAR} +EXTRACT_BEFORE_ARGS?= -xf +EXTRACT_AFTER_ARGS?= .include