From aa52cd921c82a10ec33065084fe0edb5cf8bebbc Mon Sep 17 00:00:00 2001
From: asami <asami@FreeBSD.org>
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.
---
 security/pgp/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'security/pgp')

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
-- 
cgit