summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>1999-02-03 11:12:01 +0000
committerSatoshi Asami <asami@FreeBSD.org>1999-02-03 11:12:01 +0000
commit5114e2637e2224ea9b0e0ea4b315bc38370ccf04 (patch)
tree414dd9b31f0192eb7d0054b2463c2eed8afd25b4 /net
parent(1) ${MASTER_SITE_SUBDIR} is now a list, and ${MASTER_SITE_*} macros (diff)
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.
Notes
Notes: svn path=/head/; revision=16518
Diffstat (limited to 'net')
-rw-r--r--net/binkd/Makefile5
-rw-r--r--net/kdenetwork11/Makefile9
-rw-r--r--net/kdenetwork2/Makefile9
-rw-r--r--net/kdenetwork3/Makefile9
-rw-r--r--net/kdenetwork4/Makefile9
-rw-r--r--net/tac_plus4/Makefile6
6 files changed, 19 insertions, 28 deletions
diff --git a/net/binkd/Makefile b/net/binkd/Makefile
index fd7e74a4dfd9..705a1d9b07f6 100644
--- a/net/binkd/Makefile
+++ b/net/binkd/Makefile
@@ -3,7 +3,7 @@
# Date created: 19 August 1998
# Whom: Andrey Zakhvatov
#
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/12/24 06:55:54 steve Exp $
#
DISTNAME= binkd092
@@ -19,7 +19,8 @@ BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
WRKSRC= ${WRKDIR}/${PKGNAME}
EXTRACT_CMD= unzip
-EXTRACT_BEFORE_ARGS=
+EXTRACT_BEFORE_ARGS= # empty
+EXTRACT_AFTER_ARGS= # empty
GNU_CONFIGURE= yes
MAN8= binkd.8
diff --git a/net/kdenetwork11/Makefile b/net/kdenetwork11/Makefile
index 1dfeaed3c28e..9af97da9c645 100644
--- a/net/kdenetwork11/Makefile
+++ b/net/kdenetwork11/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.24 1999/01/07 00:51:55 se Exp $
+# $Id: Makefile,v 1.25 1999/01/08 09:54:20 asami Exp $
#
DISTNAME= kdenetwork
@@ -15,8 +15,7 @@ EXTRACT_SUFX= -1.1-alpha1.src.tar.bz2
MAINTAINER= se@freebsd.org
-BUILD_DEPENDS= bzip2:${PORTSDIR}/archivers/bzip2 \
- ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
LIB_DEPENDS= gif.3:${PORTSDIR}/graphics/giflib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
uu.1:${PORTSDIR}/converters/uulib \
@@ -25,10 +24,8 @@ LIB_DEPENDS= gif.3:${PORTSDIR}/graphics/giflib \
js.2:${PORTSDIR}/converters/kdesupport11 \
mimelib.1:${PORTSDIR}/converters/kdesupport11 \
rdb.55:${PORTSDIR}/converters/kdesupport11
-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/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index 1dfeaed3c28e..9af97da9c645 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.24 1999/01/07 00:51:55 se Exp $
+# $Id: Makefile,v 1.25 1999/01/08 09:54:20 asami Exp $
#
DISTNAME= kdenetwork
@@ -15,8 +15,7 @@ EXTRACT_SUFX= -1.1-alpha1.src.tar.bz2
MAINTAINER= se@freebsd.org
-BUILD_DEPENDS= bzip2:${PORTSDIR}/archivers/bzip2 \
- ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
LIB_DEPENDS= gif.3:${PORTSDIR}/graphics/giflib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
uu.1:${PORTSDIR}/converters/uulib \
@@ -25,10 +24,8 @@ LIB_DEPENDS= gif.3:${PORTSDIR}/graphics/giflib \
js.2:${PORTSDIR}/converters/kdesupport11 \
mimelib.1:${PORTSDIR}/converters/kdesupport11 \
rdb.55:${PORTSDIR}/converters/kdesupport11
-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/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 1dfeaed3c28e..9af97da9c645 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.24 1999/01/07 00:51:55 se Exp $
+# $Id: Makefile,v 1.25 1999/01/08 09:54:20 asami Exp $
#
DISTNAME= kdenetwork
@@ -15,8 +15,7 @@ EXTRACT_SUFX= -1.1-alpha1.src.tar.bz2
MAINTAINER= se@freebsd.org
-BUILD_DEPENDS= bzip2:${PORTSDIR}/archivers/bzip2 \
- ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
LIB_DEPENDS= gif.3:${PORTSDIR}/graphics/giflib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
uu.1:${PORTSDIR}/converters/uulib \
@@ -25,10 +24,8 @@ LIB_DEPENDS= gif.3:${PORTSDIR}/graphics/giflib \
js.2:${PORTSDIR}/converters/kdesupport11 \
mimelib.1:${PORTSDIR}/converters/kdesupport11 \
rdb.55:${PORTSDIR}/converters/kdesupport11
-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/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 1dfeaed3c28e..9af97da9c645 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.24 1999/01/07 00:51:55 se Exp $
+# $Id: Makefile,v 1.25 1999/01/08 09:54:20 asami Exp $
#
DISTNAME= kdenetwork
@@ -15,8 +15,7 @@ EXTRACT_SUFX= -1.1-alpha1.src.tar.bz2
MAINTAINER= se@freebsd.org
-BUILD_DEPENDS= bzip2:${PORTSDIR}/archivers/bzip2 \
- ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
LIB_DEPENDS= gif.3:${PORTSDIR}/graphics/giflib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
uu.1:${PORTSDIR}/converters/uulib \
@@ -25,10 +24,8 @@ LIB_DEPENDS= gif.3:${PORTSDIR}/graphics/giflib \
js.2:${PORTSDIR}/converters/kdesupport11 \
mimelib.1:${PORTSDIR}/converters/kdesupport11 \
rdb.55:${PORTSDIR}/converters/kdesupport11
-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/net/tac_plus4/Makefile b/net/tac_plus4/Makefile
index a29dfcc88e32..8a602a60e43c 100644
--- a/net/tac_plus4/Makefile
+++ b/net/tac_plus4/Makefile
@@ -3,7 +3,7 @@
# Date created: 4 Mar 1997
# Whom: Igor Vinokurov <igor@zynaps.ru>
#
-# $Id: Makefile,v 1.2 1997/09/17 04:51:30 max Exp $
+# $Id: Makefile,v 1.3 1998/01/16 04:06:17 jseger Exp $
#
DISTNAME= tac_plus.2.1
@@ -14,7 +14,9 @@ EXTRACT_SUFX= .tar
MAINTAINER= igor@zynaps.ru
-EXTRACT_BEFORE_ARGS= -C ${WRKDIR} -xf
+EXTRACT_CMD= ${TAR}
+EXTRACT_BEFORE_ARGS= -xf
+EXTRACT_AFTER_ARGS= # empty
ALL_TARGET= tac_plus
MAN8= tac_plus.8
EXTRA_PATCH= patch-ba