From 5114e2637e2224ea9b0e0ea4b315bc38370ccf04 Mon Sep 17 00:00:00 2001 From: Satoshi Asami Date: Wed, 3 Feb 1999 11:12:01 +0000 Subject: Adjust port Makefiles to new EXTRACT_* variable defaults. See log of bsd.port.mk rev. 1.304 for details on the change. The fix here is one of the following. (1) Define USE_BZIP2 instead of BUILD_DEPENDS on bzip2 and redefining EXTRACT_* commands. (2) Change ${EXTRACT_CMD} to ${TAR} when the command is obviously calling the "tar" command (i.e., arguments like "-xzf" are spelled out). (3) If ${EXTRACT_CMD} is called directly with ${EXTRACT_BEFORE_ARGS}, add ${EXTRACT_AFTER_ARGS} to the command line as well. (4) If any of EXTRACT_CMD, EXTRACT_BEFORE_ARGS or EXTRACT_AFTER_ARGS is set, define the other two too. --- math/bihar/Makefile | 4 +++- math/calc/Makefile | 4 +++- math/eispack/Makefile | 5 +++-- math/eval/Makefile | 6 ++++-- math/fftpack/Makefile | 4 +++- math/kcalc/Makefile | 8 ++------ math/linpack/Makefile | 5 +++-- 7 files changed, 21 insertions(+), 15 deletions(-) (limited to 'math') diff --git a/math/bihar/Makefile b/math/bihar/Makefile index 6fa72e4a63bf..72965c0ab6be 100644 --- a/math/bihar/Makefile +++ b/math/bihar/Makefile @@ -3,7 +3,7 @@ # Date created: 31 October 1996 # Whom: Pedro Giffuni S. # -# $Id: Makefile,v 1.7 1998/10/09 03:36:39 asami Exp $ +# $Id: Makefile,v 1.8 1998/11/14 09:43:22 asami Exp $ # DISTNAME= bihar @@ -16,7 +16,9 @@ MAINTAINER= giffunip@asme.org # ${DISTFILES} is automatically created from the directory contents IGNOREFILES= ${DISTFILES} +EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= -xf +EXTRACT_AFTER_ARGS= # empty .include diff --git a/math/calc/Makefile b/math/calc/Makefile index 5d21eb261932..fbf7daff99e5 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -3,7 +3,7 @@ # Date created: 3 October 1994 # Whom: jmz # -# $Id: Makefile,v 1.10 1997/08/25 00:09:35 asami Exp $ +# $Id: Makefile,v 1.11 1998/06/04 17:13:49 smace Exp $ # DISTNAME= calc-2.9.3t6 @@ -14,7 +14,9 @@ EXTRACT_SUFX= .tar MAINTAINER= jmz@FreeBSD.org +EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= -xf +EXTRACT_AFTER_ARGS= # empty MAN1= calc.1 IGNOREFILES= ${DISTFILES} # "on-the-fly" creation of tarball diff --git a/math/eispack/Makefile b/math/eispack/Makefile index 420fc1b513d6..52d86c9562ff 100644 --- a/math/eispack/Makefile +++ b/math/eispack/Makefile @@ -3,7 +3,7 @@ # Date created: 31 October 1994 # Whom: ljo # -# $Id: Makefile,v 1.18 1998/11/14 09:43:20 asami Exp $ +# $Id: Makefile,v 1.19 1998/12/01 09:30:25 asami Exp $ # DISTNAME= eispack @@ -19,7 +19,8 @@ LIB_DEPENDS= blas.1:${PORTSDIR}/math/blas EXTRACT_CMD= ${SH} ${SCRIPTDIR}/uncomp EXTRACT_SUFX= .gz -EXTRACT_ARGS= ${WRKDIR} +EXTRACT_BEFORE_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= # empty NO_WRKSUBDIR= yes diff --git a/math/eval/Makefile b/math/eval/Makefile index c7aae0c6f8eb..1dea64f03495 100644 --- a/math/eval/Makefile +++ b/math/eval/Makefile @@ -3,7 +3,7 @@ # Date created: 24 Sep 1997 # Whom: eserte # -# $Id: Makefile,v 1.1.1.1 1998/04/26 03:25:09 mph Exp $ +# $Id: Makefile,v 1.2 1998/07/07 18:55:41 scrappy Exp $ # DISTNAME= Eval113 @@ -17,7 +17,9 @@ MAINTAINER= eserte@cs.tu-berlin.de BUILD_DEPENDS= lha:${PORTSDIR}/archivers/lha -EXTRACT_CMD= lha +EXTRACT_CMD= ${CAT} +EXTRACT_BEFORE_ARGS= # empty +EXTRACT_AFTER_ARGS= | lha x - WRKSRC= ${WRKDIR}/Eval/source diff --git a/math/fftpack/Makefile b/math/fftpack/Makefile index 6fa72e4a63bf..72965c0ab6be 100644 --- a/math/fftpack/Makefile +++ b/math/fftpack/Makefile @@ -3,7 +3,7 @@ # Date created: 31 October 1996 # Whom: Pedro Giffuni S. # -# $Id: Makefile,v 1.7 1998/10/09 03:36:39 asami Exp $ +# $Id: Makefile,v 1.8 1998/11/14 09:43:22 asami Exp $ # DISTNAME= bihar @@ -16,7 +16,9 @@ MAINTAINER= giffunip@asme.org # ${DISTFILES} is automatically created from the directory contents IGNOREFILES= ${DISTFILES} +EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= -xf +EXTRACT_AFTER_ARGS= # empty .include diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile index 1f62668bfa0c..d4a56406d055 100644 --- a/math/kcalc/Makefile +++ b/math/kcalc/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer # -# $Id: Makefile,v 1.23 1999/01/07 00:51:50 se Exp $ +# $Id: Makefile,v 1.24 1999/01/08 09:54:20 asami Exp $ # DISTNAME= kdeutils @@ -15,15 +15,11 @@ EXTRACT_SUFX= -1.1-alpha1.src.tar.bz2 MAINTAINER= se@freebsd.org -BUILD_DEPENDS= bzip2:${PORTSDIR}/archivers/bzip2 LIB_DEPENDS= gif.3:${PORTSDIR}/graphics/giflib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ kdecore.2:${PORTSDIR}/x11/kdelibs11 -EXTRACT_CMD= bzip2 -EXTRACT_BEFORE_ARGS= -cd -EXTRACT_AFTER_ARGS= | tar xf - - +USE_BZIP2= yes USE_QT= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=$(PREFIX)" \ diff --git a/math/linpack/Makefile b/math/linpack/Makefile index 3c2f3c48afeb..dba6f8fd1a6d 100644 --- a/math/linpack/Makefile +++ b/math/linpack/Makefile @@ -3,7 +3,7 @@ # Date created: 31 October 1994 # Whom: ljo # -# $Id: Makefile,v 1.17 1998/11/14 09:43:24 asami Exp $ +# $Id: Makefile,v 1.18 1998/12/01 09:55:09 asami Exp $ # DISTNAME= linpack @@ -19,7 +19,8 @@ LIB_DEPENDS= blas.1:${PORTSDIR}/math/blas EXTRACT_CMD= ${SH} ${SCRIPTDIR}/uncomp EXTRACT_SUFX= .gz -EXTRACT_ARGS= ${WRKDIR} +EXTRACT_BEFORE_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= # empty NO_WRKSUBDIR= yes -- cgit v1.2.3