Date: Tue, 2 Feb 1999 21:22:23 -0800 (PST) From: asami@FreeBSD.ORG (Satoshi Asami) To: se@FreeBSD.ORG Cc: garbanzo@hooked.net, sada@FreeBSD.ORG, cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, se@FreeBSD.ORG Subject: Re: cvs commit: ports/x11/kdelibs11/patches patch-aa Message-ID: <199902030522.VAA16232@silvia.hip.berkeley.edu> In-Reply-To: <19990203000656.B432@dialup124.mi.uni-koeln.de> (message from Stefan Esser on Wed, 3 Feb 1999 00:06:56 %2B0100)
next in thread | previous in thread | raw e-mail | index | archive | help
* I fetched all of 1.1pre2 immediately when it was announced,
* but have not yet completed the port. As soon as I have the
* first packages complete, I'll do the commits. To my surprise
Cool. Please try it with this patch so you can get rid of most of the
bzip2 cruft. It will be committed later tonight after I'm sure I have
the entire tree under control.
With this patch, you can just define USE_BZIP2 instead of
BUILD_DEPENDS on bzip2 and the EXTRACT_* macros.
Satoshi
-------
Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.303
diff -u -r1.303 bsd.port.mk
--- bsd.port.mk 1999/01/26 03:58:58 1.303
+++ bsd.port.mk 1999/02/02 05:54:26
@@ -52,8 +52,9 @@
# DISTFILES - Name(s) of archive file(s) containing distribution
# (default: ${DISTNAME}${EXTRACT_SUFX}). Set this to
# an empty string if the port doesn't require it.
-# EXTRACT_SUFX - Suffix for archive names (default: .tar.gz). You
-# never have to set both DISTFILES and EXTRACT_SUFX.
+# EXTRACT_SUFX - Suffix for archive names (default: .tar.bz2 if USE_BZIP2
+# is set, .tar.gz otherwise). You never have to set both
+# DISTFILES and EXTRACT_SUFX.
# MASTER_SITES - Primary location(s) for distribution files if not found
# locally.
# PATCHFILES - Name(s) of additional files that contain distribution
@@ -111,6 +112,8 @@
#
# Use these if your port uses some of the common software packages.
#
+# USE_BZIP2 - Says that the port tarballs use bzip2, not gzip, for
+# compression.
# USE_GMAKE - Says that the port uses gmake.
# GMAKE - Set to path of GNU make if not in $PATH (default: gmake).
# USE_AUTOCONF - Says that the port uses autoconf. Implies GNU_CONFIGURE.
@@ -311,13 +314,14 @@
#
# For extract:
#
-# EXTRACT_CMD - Command for extracting archive (default: tar).
+# EXTRACT_CMD - Command for extracting archive (default: "bzip2" if
+# USE_BZIP2 is set, "gzip" if not).
# EXTRACT_BEFORE_ARGS -
# Arguments to ${EXTRACT_CMD} before filename
-# (default: -xzf).
+# (default: "-dc").
# EXTRACT_AFTER_ARGS -
# Arguments to ${EXTRACT_CMD} following filename
-# (default: none).
+# (default: "| tar -xf -").
#
# For configure:
#
@@ -456,7 +460,11 @@
X11BASE?= ${DESTDIR}/usr/X11R6
DISTDIR?= ${PORTSDIR}/distfiles
_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
-EXTRACT_SUFX?= .tar.gz
+.if defined(USE_BZIP2)
+EXTRACT_SUFX?= .tar.bz2
+.else
+EXTRACT_SUFX?= .tar.gz
+.endif
PACKAGES?= ${PORTSDIR}/packages
TEMPLATES?= ${PORTSDIR}/Templates
@@ -547,6 +555,9 @@
MANCOMPRESSED?= no
.endif
+.if defined(USE_BZIP2)
+BUILD_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
+.endif
.if defined(USE_GMAKE)
BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
.endif
@@ -661,15 +672,18 @@
.endif
.if exists(/bin/tar)
-EXTRACT_CMD?= /bin/tar
+TAR?= /bin/tar
.else
-EXTRACT_CMD?= /usr/bin/tar
+TAR?= /usr/bin/tar
.endif
-# Backwards compatability.
-.if defined(EXTRACT_ARGS)
-EXTRACT_BEFORE_ARGS?= ${EXTRACT_ARGS}
+
+# EXTRACT_SUFX is defined in .pre.mk section
+EXTRACT_BEFORE_ARGS?= -dc
+EXTRACT_AFTER_ARGS?= | ${TAR} -xf -
+.if defined(USE_BZIP2)
+EXTRACT_CMD?= bzip2
.else
-EXTRACT_BEFORE_ARGS?= -xzf
+EXTRACT_CMD?= ${GZIP_CMD}
.endif
# Figure out where the local mtree file is
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199902030522.VAA16232>