From 5114e2637e2224ea9b0e0ea4b315bc38370ccf04 Mon Sep 17 00:00:00 2001 From: Satoshi Asami 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. --- editors/mule-common/Makefile | 6 +++--- editors/mule/Makefile | 6 +++--- editors/thoteditor/Makefile | 4 ++-- editors/wordperfect/Makefile | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'editors') diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile index 51d07146a87f..160d605236b9 100644 --- a/editors/mule-common/Makefile +++ b/editors/mule-common/Makefile @@ -3,7 +3,7 @@ # Date created: 7 July 1997 # Whom: Satoshi Taoka # -# $Id: Makefile,v 1.35 1998/12/02 07:57:11 asami Exp $ +# $Id: Makefile,v 1.36 1999/01/23 14:28:27 simokawa Exp $ # DISTNAME= mule-2.3 @@ -84,10 +84,10 @@ ELC_DIR= ../lisp # MEW_ORG_PATCH: apply mew's patches to original mule (http://www.mew.org) # MEW_PATCH: apply mew's patch after apply Mr. Katayama's patches post-extract: - ${EXTRACT_CMD} -C ${WRKDIR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR} ${CP} ${FILESDIR}/unexfreebsd.c ${WRKSRC}/src .if !defined(ORIGINAL) && !defined(MEW_ORG_PATCH) - ${EXTRACT_CMD} -C ${WRKDIR} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR} ${MKDIR} ${WRKSRC}/lisp/its ${CP} ${WRKDIR}/lisp/its/* ${WRKSRC}/lisp/its/ .endif diff --git a/editors/mule/Makefile b/editors/mule/Makefile index 555dd3db75bc..eaafb5ec72bd 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -3,7 +3,7 @@ # Date created: 6 July 1997 # Whom: Satoshi Taoka # -# $Id: Makefile,v 1.34 1998/12/02 08:40:00 asami Exp $ +# $Id: Makefile,v 1.35 1999/01/23 14:28:25 simokawa Exp $ # DISTNAME= mule-2.3 @@ -90,10 +90,10 @@ SITE_START=${PREFIX}/share/${EMACS_PREFIX}/19.34/site-lisp/site-start.el # MEW_ORG_PATCH: apply mew's patches to original mule (http://www.mew.org) # MEW_PATCH: apply mew's patch after apply Mr. Katayama's patches post-extract: - ${EXTRACT_CMD} -C ${WRKDIR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mule-2.3-19.34.patch-981002.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR} ${CP} ${FILESDIR}/unexfreebsd.c ${WRKSRC}/src .if !defined(ORIGINAL) && !defined(MEW_ORG_PATCH) - ${EXTRACT_CMD} -C ${WRKDIR} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-19.34.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR} ${MKDIR} ${WRKSRC}/lisp/its ${CP} ${WRKDIR}/lisp/its/* ${WRKSRC}/lisp/its/ .endif diff --git a/editors/thoteditor/Makefile b/editors/thoteditor/Makefile index cf92975c2906..665914387219 100644 --- a/editors/thoteditor/Makefile +++ b/editors/thoteditor/Makefile @@ -3,7 +3,7 @@ # Date created: 1 Aug 1997 # Whom: Pedro Giffuni (orig) # -# $Id: Makefile,v 1.4 1998/12/21 21:08:12 jseger Exp $ +# $Id: Makefile,v 1.5 1999/01/30 01:48:43 fenner Exp $ # DISTNAME= Thot @@ -26,7 +26,7 @@ USE_GMAKE= yes ALL_TARGET= all schemas post-extract: - ($(EXTRACT_CMD) $(EXTRACT_BEFORE_ARGS) $(DISTDIR)/thoteditor-src-2.1b.tar.gz -C $(WRKSRC)) + ($(EXTRACT_CMD) $(EXTRACT_BEFORE_ARGS) $(DISTDIR)/thoteditor-src-2.1b.tar.gz ${EXTRACT_AFTER_ARGS} -C $(WRKSRC)) post-install: ${MKDIR} ${PREFIX}/share/thot/doc diff --git a/editors/wordperfect/Makefile b/editors/wordperfect/Makefile index 09b291a21a10..18fdf8abd7db 100644 --- a/editors/wordperfect/Makefile +++ b/editors/wordperfect/Makefile @@ -5,7 +5,7 @@ # msmith@freebsd.org # Relevant URLs: http://www.corel.com/ # -# $Id: Makefile,v 1.2 1999/01/04 16:00:06 obrien Exp $ +# $Id: Makefile,v 1.3 1999/01/07 02:31:39 simokawa Exp $ DISTNAME= GUILG00 PKGNAME= wordperfect-8.0 @@ -32,7 +32,7 @@ IGNORE='The source to this port may not be automatically fetched due to licensin .endif post-extract: - @(cd ${WRKDIR} ; for file in b* g* ; do ${EXTRACT_CMD} -xf $$file ; done) + @(cd ${WRKDIR} ; for file in b* g* ; do ${TAR} -xf $$file ; done) post-patch: @${CP} ${WRKDIR}/shared/wpdata ${WRKDIR}/shared/wpdata.old -- cgit v1.2.3