summaryrefslogtreecommitdiff
path: root/x11
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 /x11
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 'x11')
-rw-r--r--x11/fbsd-icons/Makefile4
-rw-r--r--x11/kde4-baseapps/Makefile8
-rw-r--r--x11/kde4-runtime/Makefile8
-rw-r--r--x11/kde4-workspace/Makefile8
-rw-r--r--x11/kdebase11/Makefile8
-rw-r--r--x11/kdebase2/Makefile8
-rw-r--r--x11/kdebase3/Makefile8
-rw-r--r--x11/kdebase4-runtime/Makefile8
-rw-r--r--x11/kdebase4-workspace/Makefile8
-rw-r--r--x11/kdebase4/Makefile8
-rw-r--r--x11/kdelibs11/Makefile8
-rw-r--r--x11/kdelibs2/Makefile8
-rw-r--r--x11/kdelibs3/Makefile8
-rw-r--r--x11/kdelibs4/Makefile8
14 files changed, 28 insertions, 80 deletions
diff --git a/x11/fbsd-icons/Makefile b/x11/fbsd-icons/Makefile
index ff9dfa75221c..707dea1bdc15 100644
--- a/x11/fbsd-icons/Makefile
+++ b/x11/fbsd-icons/Makefile
@@ -3,7 +3,7 @@
# Date created: Sat Jun 14 09:43:24 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
-# $Id: Makefile,v 1.3 1998/06/27 05:19:51 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/05 09:31:42 asami Exp $
#
DISTNAME= fbsd-icons
@@ -19,6 +19,6 @@ NO_WRKSUBDIR= yes
do-install:
${MKDIR} ${X11BASE}/icons
- ( cd ${X11BASE}/icons; ${EXTRACT_CMD} xzf ${DISTDIR}/fbsd-icons.tar.gz )
+ ( cd ${X11BASE}/icons; ${TAR} -xzf ${DISTDIR}/fbsd-icons.tar.gz )
.include <bsd.port.mk>
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
#
DISTNAME= kdebase
@@ -15,16 +15,12 @@ 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 \
Xpm.4:${PORTSDIR}/graphics/xpm
-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/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
#
DISTNAME= kdebase
@@ -15,16 +15,12 @@ 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 \
Xpm.4:${PORTSDIR}/graphics/xpm
-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/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
#
DISTNAME= kdebase
@@ -15,16 +15,12 @@ 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 \
Xpm.4:${PORTSDIR}/graphics/xpm
-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/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
#
DISTNAME= kdebase
@@ -15,16 +15,12 @@ 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 \
Xpm.4:${PORTSDIR}/graphics/xpm
-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/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
#
DISTNAME= kdebase
@@ -15,16 +15,12 @@ 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 \
Xpm.4:${PORTSDIR}/graphics/xpm
-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/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
#
DISTNAME= kdebase
@@ -15,16 +15,12 @@ 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 \
Xpm.4:${PORTSDIR}/graphics/xpm
-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/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
#
DISTNAME= kdebase
@@ -15,16 +15,12 @@ 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 \
Xpm.4:${PORTSDIR}/graphics/xpm
-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/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
#
DISTNAME= kdebase
@@ -15,16 +15,12 @@ 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 \
Xpm.4:${PORTSDIR}/graphics/xpm
-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/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 90cab6162e4f..40e9178e58f4 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.25 1999/01/08 09:54:21 asami Exp $
+# $Id: Makefile,v 1.26 1999/01/21 08:15:38 asami Exp $
#
DISTNAME= kdebase
@@ -15,16 +15,12 @@ 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 \
Xpm.4:${PORTSDIR}/graphics/xpm
-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/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 28ccce5e3da6..284289e073d8 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.22 1998/11/14 09:43:39 asami Exp $
+# $Id: Makefile,v 1.24 1999/01/07 00:52:03 se Exp $
#
DISTNAME= kdelibs
@@ -15,14 +15,10 @@ 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
-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/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 28ccce5e3da6..284289e073d8 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.22 1998/11/14 09:43:39 asami Exp $
+# $Id: Makefile,v 1.24 1999/01/07 00:52:03 se Exp $
#
DISTNAME= kdelibs
@@ -15,14 +15,10 @@ 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
-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/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 28ccce5e3da6..284289e073d8 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.22 1998/11/14 09:43:39 asami Exp $
+# $Id: Makefile,v 1.24 1999/01/07 00:52:03 se Exp $
#
DISTNAME= kdelibs
@@ -15,14 +15,10 @@ 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
-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/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 28ccce5e3da6..284289e073d8 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
-# $Id: Makefile,v 1.22 1998/11/14 09:43:39 asami Exp $
+# $Id: Makefile,v 1.24 1999/01/07 00:52:03 se Exp $
#
DISTNAME= kdelibs
@@ -15,14 +15,10 @@ 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
-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)" \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 10:22:23 +0000