summaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1999-02-03 11:12:01 +0000
committerasami <asami@FreeBSD.org>1999-02-03 11:12:01 +0000
commitaa52cd921c82a10ec33065084fe0edb5cf8bebbc (patch)
treeb70284a297d2e3c06462e3a3a86166c4371477f9 /sysutils
parentdd1603cad7e60d10dd91a2f1f918e24ed859ed24 (diff)
downloadFreeBSD-ports-aa52cd921c82a10ec33065084fe0edb5cf8bebbc.zip
FreeBSD-ports-aa52cd921c82a10ec33065084fe0edb5cf8bebbc.tar.gz
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.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/asrpages/Makefile6
-rw-r--r--sysutils/kdf/Makefile8
-rw-r--r--sysutils/kfloppy/Makefile8
-rw-r--r--sysutils/sweeper/Makefile8
4 files changed, 10 insertions, 20 deletions
diff --git a/sysutils/asrpages/Makefile b/sysutils/asrpages/Makefile
index 17e1eea..8b8c57a 100644
--- a/sysutils/asrpages/Makefile
+++ b/sysutils/asrpages/Makefile
@@ -3,7 +3,7 @@
# Date created: 6 Nov 1997
# Whom: Sheldon Hearn <axl@iafrica.com>
#
-# $Id: Makefile,v 1.4 1998/08/17 20:54:47 asami Exp $
+# $Id: Makefile,v 1.5 1998/09/19 05:48:06 steve Exp $
#
DISTNAME= asrpages
@@ -14,7 +14,9 @@ DISTFILES= asr.pages.tar
MAINTAINER= axl@iafrica.com
-EXTRACT_ARGS= -xf
+EXTRACT_CMD= ${TAR}
+EXTRACT_BEFORE_ARGS= -xf
+EXTRACT_AFTER_ARGS= # empty
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 1f62668..d4a5640 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $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/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 1f62668..d4a5640 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $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/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 1f62668..d4a5640 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $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)" \
OpenPOWER on IntegriCloud