aboutsummaryrefslogtreecommitdiff
path: root/security
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 /security
parentfd5131ad95770d2ae6bee7059204950dfa6402d1 (diff)
downloadports-5114e2637e2224ea9b0e0ea4b315bc38370ccf04.tar.gz
ports-5114e2637e2224ea9b0e0ea4b315bc38370ccf04.zip
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 'security')
-rw-r--r--security/kgpg-kde4/Makefile8
-rw-r--r--security/kwallet/Makefile8
-rw-r--r--security/pgp/Makefile8
3 files changed, 9 insertions, 15 deletions
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/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/security/kwallet/Makefile b/security/kwallet/Makefile
index 1f62668bfa0c..d4a56406d055 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/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/security/pgp/Makefile b/security/pgp/Makefile
index 3390e2c9c289..70a49a884442 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -5,7 +5,7 @@
# Date created: 8 Jul 1995
# Whom: ache
#
-# $Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp $
+# $Id: Makefile,v 1.21 1998/09/25 10:20:21 asami Exp $
#
# Pick an initial default, else it doesn't get set in the INDEX.
@@ -56,12 +56,14 @@ BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS+= rsaref.2:${PORTSDIR}/security/rsaref
EXTRACT_CMD= unzip
-EXTRACT_ARGS= -q
+EXTRACT_BEFORE_ARGS= -q
+EXTRACT_AFTER_ARGS= # empty
FILESDIR= ${.CURDIR}/files.usa
PATCHDIR= ${.CURDIR}/patches.usa
post-extract:
- cd ${WRKDIR}; $(EXTRACT_CMD) $(EXTRACT_ARGS) -aa $(DISTNAME)i
+ cd ${WRKDIR}; $(EXTRACT_CMD) $(EXTRACT_BEFORE_ARGS) -aa $(DISTNAME)i \
+ $(EXTRACT_AFTER_ARGS)
cd ${WRKDIR}; rm -f *.zip
.else