head	1.6;
access;
symbols
	RELENG_8_4:1.6.0.2
	RELENG_9_1_0_RELEASE:1.4.2.1.4.2
	RELENG_9_1:1.4.2.1.0.4
	RELENG_9_1_BP:1.4.2.1
	RELENG_8_3_0_RELEASE:1.2.12.2.2.1
	RELENG_8_3:1.2.12.2.0.2
	RELENG_8_3_BP:1.2.12.2
	RELENG_9_0_0_RELEASE:1.4.2.1.2.1
	RELENG_9_0:1.4.2.1.0.2
	RELENG_9_0_BP:1.4.2.1
	RELENG_9:1.4.0.2
	RELENG_9_BP:1.4
	RELENG_7_4_0_RELEASE:1.2.16.1
	RELENG_8_2_0_RELEASE:1.2.12.1.6.1
	RELENG_7_4:1.2.0.16
	RELENG_7_4_BP:1.2
	RELENG_8_2:1.2.12.1.0.6
	RELENG_8_2_BP:1.2.12.1
	RELENG_8_1_0_RELEASE:1.2.12.1.4.1
	RELENG_8_1:1.2.12.1.0.4
	RELENG_8_1_BP:1.2.12.1
	RELENG_7_3_0_RELEASE:1.2.14.1
	RELENG_7_3:1.2.0.14
	RELENG_7_3_BP:1.2
	RELENG_8_0_0_RELEASE:1.2.12.1.2.1
	RELENG_8_0:1.2.12.1.0.2
	RELENG_8_0_BP:1.2.12.1
	RELENG_8:1.2.0.12
	RELENG_8_BP:1.2
	RELENG_7_2_0_RELEASE:1.2.10.1
	RELENG_7_2:1.2.0.10
	RELENG_7_2_BP:1.2
	RELENG_7_1_0_RELEASE:1.2.8.1
	RELENG_6_4_0_RELEASE:1.2.2.1.4.1
	RELENG_7_1:1.2.0.8
	RELENG_7_1_BP:1.2
	RELENG_6_4:1.2.2.1.0.4
	RELENG_6_4_BP:1.2.2.1
	RELENG_7_0_0_RELEASE:1.2
	RELENG_6_3_0_RELEASE:1.2.2.1
	RELENG_7_0:1.2.0.6
	RELENG_7_0_BP:1.2
	RELENG_6_3:1.2.2.1.0.2
	RELENG_6_3_BP:1.2.2.1
	RELENG_7:1.2.0.4
	RELENG_7_BP:1.2
	RELENG_6:1.2.0.2;
locks; strict;
comment	@# @;


1.6
date	2012.11.17.01.54.21;	author svnexp;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2011.10.10.06.37.32;	author delphij;	state Exp;
branches;
next	1.4;

1.4
date	2011.05.23.09.02.44;	author delphij;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2010.01.02.10.27.05;	author ed;	state Exp;
branches;
next	1.2;

1.2
date	2007.02.10.13.49.39;	author simon;	state Exp;
branches
	1.2.2.1
	1.2.4.1
	1.2.8.1
	1.2.10.1
	1.2.12.1
	1.2.14.1
	1.2.16.1;
next	1.1;

1.1
date	2007.01.26.10.19.07;	author delphij;	state Exp;
branches;
next	;

1.6.2.1
date	2012.11.17.01.54.21;	author svnexp;	state dead;
branches;
next	1.6.2.2;

1.6.2.2
date	2013.03.28.13.06.04;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.4.2.1.2.1
	1.4.2.1.4.1;
next	1.4.2.2;

1.4.2.2
date	2012.11.17.11.37.38;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.4.2.1.2.2;

1.4.2.1.2.2
date	2012.11.17.08.37.35;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.4.2.1.4.2;

1.4.2.1.4.2
date	2012.11.17.08.48.26;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2007.02.20.08.33.31;	author delphij;	state Exp;
branches
	1.2.2.1.4.1;
next	1.2.2.2;

1.2.2.2
date	2012.11.17.07.45.41;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.4.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.2.4.1
date	2011.06.06.05.48.25;	author delphij;	state Exp;
branches;
next	1.2.4.2;

1.2.4.2
date	2012.11.17.08.08.28;	author svnexp;	state Exp;
branches;
next	;

1.2.8.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.2.10.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.2.12.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.2.12.1.2.1
	1.2.12.1.4.1
	1.2.12.1.6.1;
next	1.2.12.2;

1.2.12.2
date	2011.06.06.05.40.52;	author delphij;	state Exp;
branches
	1.2.12.2.2.1;
next	1.2.12.3;

1.2.12.3
date	2012.11.17.10.37.16;	author svnexp;	state Exp;
branches;
next	;

1.2.12.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.2.12.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.2.12.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.2.12.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.12.2.2.2;

1.2.12.2.2.2
date	2012.11.17.08.25.50;	author svnexp;	state Exp;
branches;
next	;

1.2.14.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.2.16.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.2.16.2;

1.2.16.2
date	2012.11.17.08.17.42;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.6
log
@Switching exporter and resync
@
text
@#	$NetBSD: Makefile,v 1.16 2011/06/21 13:25:45 joerg Exp $
# $FreeBSD: head/usr.bin/gzip/Makefile 226184 2011-10-10 06:37:32Z delphij $

.include <bsd.own.mk>

PROG=		gzip
MAN=		gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1

DPADD=		${LIBZ} ${LIBLZMA}
LDADD=		-lz -llzma

.if ${MK_BZIP2_SUPPORT} != "no"
DPADD+=		${LIBBZ2}
LDADD+=		-lbz2
.else
CFLAGS+=	-DNO_BZIP2_SUPPORT
.endif

SCRIPTS=	gzexe zdiff zforce zmore znew

MLINKS+=	gzip.1 gunzip.1 \
		gzip.1 gzcat.1 \
		gzip.1 zcat.1 \
		zdiff.1 zcmp.1

LINKS+=		${BINDIR}/gzip ${BINDIR}/gunzip \
		${BINDIR}/gzip ${BINDIR}/gzcat \
		${BINDIR}/gzip ${BINDIR}/zcat \
		${BINDIR}/zdiff ${BINDIR}/zcmp

.include <bsd.prog.mk>
@


1.6.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:04 +0000
@
text
@d1 31
@


1.6.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 32
#	$NetBSD: Makefile,v 1.13 2009/04/14 22:15:20 lukem Exp $
# $FreeBSD: releng/8.4/usr.bin/gzip/Makefile 222735 2011-06-06 05:40:52Z delphij $

.include <bsd.own.mk>

PROG=		gzip
MAN=		gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1

DPADD=		${LIBZ}
LDADD=		-lz
WARNS?=		6

.if ${MK_BZIP2_SUPPORT} != "no"
DPADD+=		${LIBBZ2}
LDADD+=		-lbz2
.else
CFLAGS+=	-DNO_BZIP2_SUPPORT
.endif

SCRIPTS=	gzexe zdiff zforce zmore znew

MLINKS+=	gzip.1 gunzip.1 \
		gzip.1 gzcat.1 \
		gzip.1 zcat.1 \
		zdiff.1 zcmp.1

LINKS+=		${BINDIR}/gzip ${BINDIR}/gunzip \
		${BINDIR}/gzip ${BINDIR}/gzcat \
		${BINDIR}/gzip ${BINDIR}/zcat \
		${BINDIR}/zdiff ${BINDIR}/zcmp

.include <bsd.prog.mk>
@


1.5
log
@SVN rev 226184 on 2011-10-10 06:37:32Z by delphij

Incorporate recent changes from NetBSD.  Most notable change is the addition
of support of decompressing xz files.

Obtained from:	NetBSD
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.4
log
@SVN rev 222210 on 2011-05-23 09:02:44Z by delphij

Diff reduction against NetBSD.  The most notable change is to zdiff(1) to
handle more file formats including bzip2 and xz.

MFC after:	2 weeks
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2009/04/14 22:15:20 lukem Exp $
d9 2
a10 2
DPADD=		${LIBZ}
LDADD=		-lz
@


1.4.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.4.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/usr.bin/gzip/Makefile 222210 2011-05-23 09:02:44Z delphij $
@


1.4.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.4.2.1.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/usr.bin/gzip/Makefile 222210 2011-05-23 09:02:44Z delphij $
@


1.4.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.4.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/usr.bin/gzip/Makefile 222210 2011-05-23 09:02:44Z delphij $
@


1.3
log
@SVN rev 201386 on 2010-01-02 10:27:05Z by ed

Build usr.bin/ with WARNS=6 by default.

Also add some missing $FreeBSD$ to keep svn happy.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2006/05/12 02:01:15 mrg Exp $
@


1.2
log
@Do not install zgrep, or links to zgrep, since zgrep is provided by
src/gnu/usr.bin/grep.

Reviewed by:	delphij
@
text
@a10 1
WARNS?=		6
@


1.2.4.1
log
@SVN rev 222736 on 2011-06-06 05:48:25Z by delphij

MFC r222210, 222211, 222287:

 - Diff reduction against NetBSD.  The most notable change is to zdiff(1)
   to handle more file formats including bzip2 and xz.
 - Match symbolic link handling behavior with GNU gzip, bzip2 and xz:
   When we are operating on a symbolic link pointing to an existing
   file, bail out by default, but go ahead if -f is specified.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2009/04/14 22:15:20 lukem Exp $
@


1.2.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/7/usr.bin/gzip/Makefile 222736 2011-06-06 05:48:25Z delphij $
@


1.2.16.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.2.16.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/7.4/usr.bin/gzip/Makefile 166621 2007-02-10 13:49:39Z simon $
@


1.2.14.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.2.12.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.2.12.2
log
@SVN rev 222735 on 2011-06-06 05:40:52Z by delphij

MFC r222210, 222211, 222287:

 - Diff reduction against NetBSD.  The most notable change is to zdiff(1)
   to handle more file formats including bzip2 and xz.
 - Match symbolic link handling behavior with GNU gzip, bzip2 and xz:
   When we are operating on a symbolic link pointing to an existing
   file, bail out by default, but go ahead if -f is specified.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2009/04/14 22:15:20 lukem Exp $
@


1.2.12.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/usr.bin/gzip/Makefile 222735 2011-06-06 05:40:52Z delphij $
@


1.2.12.2.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.12.2.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/usr.bin/gzip/Makefile 222735 2011-06-06 05:40:52Z delphij $
@


1.2.12.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.2.12.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.2.12.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.2.10.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.2.8.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.2.2.1
log
@MFC: Replace gzip(1) with the BSD licensed version found in -HEAD.

Discussed with:	re, so, portmgr (kris)

All bugs are mine.
@
text
@d13 1
a13 1
.if !defined(MK_BZIP2_SUPPORT) || ${MK_BZIP2_SUPPORT} != "no"
@


1.2.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/6/usr.bin/gzip/Makefile 166840 2007-02-20 08:33:32Z delphij $
@


1.2.2.1.4.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.1
log
@Replace the GNU gzip with a slightly modified NetBSD gzip.  The
NetBSD version is a feature-to-feature re-implementation of GNU
gzip using the freely-redistributable zlib and this version is
expected to be mostly bug-to-bug compatible with the GNU
implementation.

 - Because this is a piece of mature code and we want to make
   changes so it is added directly rather than importing to
   src/contrib.
 - Connect newly added code to src/usr.bin/ and rescue/rescue
   build.
 - Disconnect the GNU gzip code from build for now, they will
   be eventually removed completely.
 - Provide two new src.conf(5) knobs, WITHOUT_BZIP2_SUPPORT and
   WITHOUT_BZIP2.

Tested by:	kris (full exp-7 pointyhat build)
Approved by:	core (importing a 4-clause BSD licensed file)
Approved by:	re (adding new utility during -HEAD code slush)
@
text
@d7 1
a7 1
MAN=		gzip.1 gzexe.1 zdiff.1 zforce.1 zgrep.1 zmore.1 znew.1
d20 1
a20 1
SCRIPTS=	gzexe zdiff zforce zgrep zmore znew
d25 1
a25 3
		zdiff.1 zcmp.1 \
		zgrep.1 zegrep.1 \
		zgrep.1 zfgrep.1
d30 1
a30 3
		${BINDIR}/zdiff ${BINDIR}/zcmp \
		${BINDIR}/zgrep ${BINDIR}/zegrep \
		${BINDIR}/zgrep ${BINDIR}/zfgrep
@

