From owner-svn-ports-all@FreeBSD.ORG Wed Mar 12 09:17:07 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4A0FF33F; Wed, 12 Mar 2014 09:17:07 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 373EBF65; Wed, 12 Mar 2014 09:17:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2C9H7Mi088617; Wed, 12 Mar 2014 09:17:07 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2C9H6RL088610; Wed, 12 Mar 2014 09:17:06 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403120917.s2C9H6RL088610@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 12 Mar 2014 09:17:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347964 - in head: . Mk Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Mar 2014 09:17:07 -0000 Author: bapt Date: Wed Mar 12 09:17:06 2014 New Revision: 347964 URL: http://svnweb.freebsd.org/changeset/ports/347964 QAT: https://qat.redports.org/buildarchive/r347964/ Log: Two new USES added to finish handling distfiles formats a consistent way: USES=tar[:[xz|bzip2|Z|tgz]] handles distributions files in format: - plain tar - tar.xz - tar.bz2 - tar.Z - tgz USES=lha handles distributions files info LHA format Added: head/Mk/Uses/lha.mk (contents, props changed) head/Mk/Uses/tar.mk (contents, props changed) Modified: head/CHANGES head/Mk/bsd.sanity.mk Modified: head/CHANGES ============================================================================== --- head/CHANGES Wed Mar 12 08:01:20 2014 (r347963) +++ head/CHANGES Wed Mar 12 09:17:06 2014 (r347964) @@ -10,6 +10,20 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20140312: +AUTHOR: bapt@FreeBSD.org + + Two new USES were added to finish handling distfiles formats a consistent way: + + USES=tar[:[xz|bzip2|Z|tgz]] handles distributions files in format: + - plain tar + - tar.xz + - tar.bz2 + - tar.Z + - tgz + + USES=lha handles distributions files info LHA format + 20140307: AUTHOR: rene@FreeBSD.org Added: head/Mk/Uses/lha.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/lha.mk Wed Mar 12 09:17:06 2014 (r347964) @@ -0,0 +1,22 @@ +# $FreeBSD$ +# +# handle lha archives +# +# Feature: lha +# Usage: USES=lha +# +.if !defined(_INCLUDE_USES_LHA_Mk) +_INCLUDE_USES_LHA_MK= yes + +EXTRACT_SUFX?= .lzh + +.if defined(lha_ARGS) +IGNORE= Incorrect 'USES+=lha:${lha_ARGS}' expecting 'USES+=lha' +.endif + +EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha +EXTRACT_CMD?= ${LHA_CMD} +EXTRACT_BEFORE_ARGS?= xfpw=${WRKDIR} +EXTRACT_AFTER_ARGS?= + +.endif Added: head/Mk/Uses/tar.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/tar.mk Wed Mar 12 09:17:06 2014 (r347964) @@ -0,0 +1,28 @@ +# $FreeBSD$ +# +# handle tar archives +# +# MAINTAINER: portmgr@FreeBSD.org +# +# Feature: tar +# Usage: USES=tar[:[xz|Z|bzip2|tgz]] +# +.if !defined(_INCLUDE_USES_TAR_Mk) +_INCLUDE_USES_TAR_MK= yes + +tar_ARGS?= none + +.if ${tar_ARGS} == xz +EXTRACT_SUFX?= .tar.xz +.elif ${tar_ARGS} == bzip2 +EXTRACT_SUFX?= .tar.bz2 +.elif ${tar_ARGS} == tgz +EXTRACT_SUFX?= .tgz +.elif ${tar_ARGS} == Z +EXTRACT_SUFX?= .tar.Z +.elif ${tar_ARGS} == none +EXTRACT_SUFX?= .tar +.else +IGNORE= Incorrect 'USES+=tar:${tar_ARGS}' +.endif +.endif Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Wed Mar 12 08:01:20 2014 (r347963) +++ head/Mk/bsd.sanity.mk Wed Mar 12 09:17:06 2014 (r347964) @@ -175,3 +175,15 @@ DEV_ERROR+= "USE_MAKESELF is unsupported .if defined(USE_ZIP) DEV_ERROR+= 'USE_ZIP is unsupported, please use USES=zip' .endif + +.if defined(USE_LHA) +DEV_WARNING+= 'USE_LHA is deprecated, please use USES=lha' +.endif + +.if defined(USE_XZ) +DEV_WARNING+= 'USE_XZ is deprecated, please use USES=tar:xz' +.endif + +.if defined(USE_BZIP2) +DEV_WARNING+= 'USE_XZ is deprecated, please use USES=tar:bzip2' +.endif