svn commit: r347964 - in head: . Mk Mk/Uses

[Baptiste Daroussin]

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 at 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 at 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 at 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