diff options
author | asami <asami@FreeBSD.org> | 1999-02-03 19:12:01 +0800 |
---|---|---|
committer | asami <asami@FreeBSD.org> | 1999-02-03 19:12:01 +0800 |
commit | aa52cd921c82a10ec33065084fe0edb5cf8bebbc (patch) | |
tree | b70284a297d2e3c06462e3a3a86166c4371477f9 /graphics | |
parent | dd1603cad7e60d10dd91a2f1f918e24ed859ed24 (diff) | |
download | freebsd-ports-gnome-aa52cd921c82a10ec33065084fe0edb5cf8bebbc.tar.gz freebsd-ports-gnome-aa52cd921c82a10ec33065084fe0edb5cf8bebbc.tar.zst freebsd-ports-gnome-aa52cd921c82a10ec33065084fe0edb5cf8bebbc.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.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/dore/Makefile | 6 | ||||
-rw-r--r-- | graphics/gifmerge/Makefile | 4 | ||||
-rw-r--r-- | graphics/gimp-manual-html/Makefile | 9 | ||||
-rw-r--r-- | graphics/kdegraphics11/Makefile | 8 | ||||
-rw-r--r-- | graphics/kdegraphics2/Makefile | 8 | ||||
-rw-r--r-- | graphics/kdegraphics3/Makefile | 8 | ||||
-rw-r--r-- | graphics/kdegraphics4/Makefile | 8 | ||||
-rw-r--r-- | graphics/opengl-man/Makefile | 10 | ||||
-rw-r--r-- | graphics/urt/Makefile | 6 | ||||
-rw-r--r-- | graphics/xmandel/Makefile | 5 |
10 files changed, 25 insertions, 47 deletions
diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile index 9d4e7315b0c7..dfeccc6a73c2 100644 --- a/graphics/dore/Makefile +++ b/graphics/dore/Makefile @@ -3,7 +3,7 @@ # Date created: 10 February 1995 # Whom: jkh # -# $Id: Makefile,v 1.6 1997/04/30 03:18:01 asami Exp $ +# $Id: Makefile,v 1.7 1998/08/05 09:31:07 asami Exp $ # DISTNAME= pdore-6.0 @@ -14,7 +14,9 @@ EXTRACT_SUFX= .tar.Z USE_GMAKE= yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/dore -EXTRACT_CMD= mkdir -p dore; cd dore; tar +EXTRACT_CMD= mkdir -p dore; cd dore; ${GZIP_CMD} +EXTRACT_BEFORE_ARGS= -dc +EXTRACT_AFTER_ARGS= | ${TAR} -xf - MAKEFILE= mk.stdx MAKE_FLAGS= DORE_LOC=${WRKDIR} CFLAGS=-O2 MAKEFLAGS=m -f ALL_TARGET= diff --git a/graphics/gifmerge/Makefile b/graphics/gifmerge/Makefile index 9dceb2c7d9a1..b56978051249 100644 --- a/graphics/gifmerge/Makefile +++ b/graphics/gifmerge/Makefile @@ -3,7 +3,7 @@ # Date created: 20 Oct 1996 # Whom: Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp> # -# $Id: Makefile,v 1.2 1997/04/30 03:18:02 asami Exp $ +# $Id: Makefile,v 1.3 1999/01/12 16:50:29 vanilla Exp $ # DISTNAME= gifmerge @@ -16,7 +16,9 @@ MAINTAINER= nacai@iname.com ALL_TARGET= gifmerge NO_WRKSUBDIR= yes +EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= -xf +EXTRACT_AFTER_ARGS= # empty do-install: @${INSTALL_PROGRAM} ${WRKSRC}/gifmerge ${PREFIX}/bin/gifmerge diff --git a/graphics/gimp-manual-html/Makefile b/graphics/gimp-manual-html/Makefile index 4ef3cbbfd37b..91590db3ce7d 100644 --- a/graphics/gimp-manual-html/Makefile +++ b/graphics/gimp-manual-html/Makefile @@ -3,7 +3,7 @@ # Date created: 5 June 1998 # Whom: Brett Taylor # -# $Id: Makefile,v 1.7 1998/12/04 22:10:57 billf Exp $ +# $Id: Makefile,v 1.8 1998/12/07 19:26:02 billf Exp $ # DISTNAME= GimpUserManual-1.0.0 @@ -37,15 +37,10 @@ pre-fetch: EXTRACT_SUFX= -html.tar.bz2 WRKSRC= ${WRKDIR}/GimpUserManaul_v1.0.0 -BUILD_DEPENDS= bzip2:${PORTSDIR}/archivers/bzip2 - +USE_BZIP2= yes USE_X_PREFIX= yes NO_BUILD= yes -EXTRACT_CMD= bzip2 -EXTRACT_BEFORE_ARGS= -cd -EXTRACT_AFTER_ARGS= | tar -xf - - do-install: @${MKDIR} ${PREFIX}/share/doc/gimp @${CP} ${WRKSRC}/* ${PREFIX}/share/doc/gimp diff --git a/graphics/kdegraphics11/Makefile b/graphics/kdegraphics11/Makefile index a12c3d427e77..486b41b93599 100644 --- a/graphics/kdegraphics11/Makefile +++ b/graphics/kdegraphics11/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id: Makefile,v 1.18 1999/01/08 09:54:19 asami Exp $ +# $Id: Makefile,v 1.19 1999/01/11 02:13:24 asami Exp $ # DISTNAME= kdegraphics @@ -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/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile index a12c3d427e77..486b41b93599 100644 --- a/graphics/kdegraphics2/Makefile +++ b/graphics/kdegraphics2/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id: Makefile,v 1.18 1999/01/08 09:54:19 asami Exp $ +# $Id: Makefile,v 1.19 1999/01/11 02:13:24 asami Exp $ # DISTNAME= kdegraphics @@ -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/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index a12c3d427e77..486b41b93599 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id: Makefile,v 1.18 1999/01/08 09:54:19 asami Exp $ +# $Id: Makefile,v 1.19 1999/01/11 02:13:24 asami Exp $ # DISTNAME= kdegraphics @@ -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/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index a12c3d427e77..486b41b93599 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id: Makefile,v 1.18 1999/01/08 09:54:19 asami Exp $ +# $Id: Makefile,v 1.19 1999/01/11 02:13:24 asami Exp $ # DISTNAME= kdegraphics @@ -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/graphics/opengl-man/Makefile b/graphics/opengl-man/Makefile index 6779f6901d6d..d827ebdcc1f2 100644 --- a/graphics/opengl-man/Makefile +++ b/graphics/opengl-man/Makefile @@ -3,28 +3,22 @@ # Date created: 19990120 # Whom: cracauer@cons.org "Martin Cracauer" # -# $Id: Makefile,v 1.3 1998/12/08 08:13:31 obrien Exp $ +# $Id: Makefile,v 1.1.1.1 1999/01/20 16:43:22 cracauer Exp $ # DISTNAME= opengl-man-657 CATEGORIES= graphics MASTER_SITES= http://www2.cons.org:8000/freebsd-distfiles/ \ http://www.freebsd.org/~cracauer/freebsd-distfiles/ -EXTRACT_SUFX= .tar.bz2 MAINTAINER= cracauer@cons.org -BUILD_DEPENDS= bzip2:${PORTSDIR}/archivers/bzip2 - +USE_BZIP2= yes NO_BUILD= yes NO_WRKSUBDIR= yes .include <bsd.port.pre.mk> -EXTRACT_CMD= bzip2 -EXTRACT_BEFORE_ARGS= -dc -EXTRACT_AFTER_ARGS= | tar -xf - - MAN3= glDisable.3 glDisableClientState.3 glEdgeFlag.3 \ glEdgeFlagPointer.3 glEdgeFlagv.3 glEnable.3 \ glEnableClientState.3 glEndList.3 glEvalCoord1d.3 \ diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile index dbfa03676709..081f7234fa39 100644 --- a/graphics/urt/Makefile +++ b/graphics/urt/Makefile @@ -3,7 +3,7 @@ # Date created: Jan 5 1997 # Whom: cfs@ing.puc.cl (original) # -# $Id: Makefile,v 1.11 1998/11/25 09:01:20 asami Exp $ +# $Id: Makefile,v 1.12 1999/01/10 18:11:45 steve Exp $ # DISTNAME= urt @@ -61,13 +61,13 @@ post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/urt ${PREFIX}/share/examples/urt cd ${PREFIX}/share/doc/urt; \ - ${EXTRACT_CMD} xf $(DISTDIR)/urt-doc.tar; \ + ${TAR} xf $(DISTDIR)/urt-doc.tar; \ cd doc; \ find -d . | cpio -dump ..; \ cd ..; \ ${RM} -rf doc; \ cd ${PREFIX}/share/examples/urt; \ - ${EXTRACT_CMD} xf $(DISTDIR)/urt-img.tar; \ + ${TAR} xf $(DISTDIR)/urt-img.tar; \ chown -R root:wheel . ; \ find . -type d -exec chmod 775 '{}' \; ; \ find . -type f -exec chmod 664 '{}' \; diff --git a/graphics/xmandel/Makefile b/graphics/xmandel/Makefile index 70e74f8d289a..0de32367743a 100644 --- a/graphics/xmandel/Makefile +++ b/graphics/xmandel/Makefile @@ -3,7 +3,7 @@ # Date created: 18 October 1996 # Whom: andreas@marvin.robin.de # -# $Id: Makefile,v 1.1.1.1 1996/11/15 10:22:03 asami Exp $ +# $Id: Makefile,v 1.2 1998/08/25 20:21:17 asami Exp $ # DISTNAME= xmandel @@ -15,7 +15,8 @@ EXTRACT_SUFX= .shar # but this has changed apparently. EXTRACT_CMD= sh -EXTRACT_BEFORE_ARGS= +EXTRACT_BEFORE_ARGS= # empty +EXTRACT_AFTER_ARGS= # empty USE_IMAKE= yes NO_WRKSUBDIR= yes MAN1= xmandel.1 |