head	1.2;
access;
symbols
	RELENG_8_4:1.2.0.2
	RELENG_9_1_0_RELEASE:1.1.20.1.4.2
	RELENG_9_1:1.1.20.1.0.4
	RELENG_9_1_BP:1.1.20.1
	RELENG_8_3_0_RELEASE:1.1.14.1.8.1
	RELENG_8_3:1.1.14.1.0.8
	RELENG_8_3_BP:1.1.14.1
	RELENG_9_0_0_RELEASE:1.1.20.1.2.1
	RELENG_9_0:1.1.20.1.0.2
	RELENG_9_0_BP:1.1.20.1
	RELENG_9:1.1.0.20
	RELENG_9_BP:1.1
	RELENG_7_4_0_RELEASE:1.1.18.1
	RELENG_8_2_0_RELEASE:1.1.14.1.6.1
	RELENG_7_4:1.1.0.18
	RELENG_7_4_BP:1.1
	RELENG_8_2:1.1.14.1.0.6
	RELENG_8_2_BP:1.1.14.1
	RELENG_8_1_0_RELEASE:1.1.14.1.4.1
	RELENG_8_1:1.1.14.1.0.4
	RELENG_8_1_BP:1.1.14.1
	RELENG_7_3_0_RELEASE:1.1.16.1
	RELENG_7_3:1.1.0.16
	RELENG_7_3_BP:1.1
	RELENG_8_0_0_RELEASE:1.1.14.1.2.1
	RELENG_8_0:1.1.14.1.0.2
	RELENG_8_0_BP:1.1.14.1
	RELENG_8:1.1.0.14
	RELENG_8_BP:1.1
	RELENG_7_2_0_RELEASE:1.1.12.1
	RELENG_7_2:1.1.0.12
	RELENG_7_2_BP:1.1
	RELENG_7_1_0_RELEASE:1.1.10.1
	RELENG_6_4_0_RELEASE:1.1.2.1.10.1
	RELENG_7_1:1.1.0.10
	RELENG_7_1_BP:1.1
	RELENG_6_4:1.1.2.1.0.10
	RELENG_6_4_BP:1.1.2.1
	RELENG_7_0_0_RELEASE:1.1
	RELENG_6_3_0_RELEASE:1.1.2.1
	RELENG_7_0:1.1.0.8
	RELENG_7_0_BP:1.1
	RELENG_6_3:1.1.2.1.0.8
	RELENG_6_3_BP:1.1.2.1
	RELENG_7:1.1.0.6
	RELENG_7_BP:1.1
	RELENG_6_2_0_RELEASE:1.1.2.1
	RELENG_6_2:1.1.2.1.0.6
	RELENG_6_2_BP:1.1.2.1
	RELENG_5_5_0_RELEASE:1.1.4.1
	RELENG_5_5:1.1.4.1.0.2
	RELENG_5_5_BP:1.1.4.1
	RELENG_6_1_0_RELEASE:1.1.2.1
	RELENG_6_1:1.1.2.1.0.4
	RELENG_6_1_BP:1.1.2.1
	RELENG_5:1.1.0.4
	RELENG_6_0_0_RELEASE:1.1.2.1
	RELENG_6_0:1.1.2.1.0.2
	RELENG_6_0_BP:1.1.2.1
	RELENG_6:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2012.11.17.01.54.14;	author svnexp;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2005.08.06.01.59.06;	author cperciva;	state Exp;
branches
	1.1.2.1
	1.1.4.1
	1.1.6.1
	1.1.10.1
	1.1.12.1
	1.1.14.1
	1.1.16.1
	1.1.18.1
	1.1.20.1;
next	;

1.2.2.1
date	2012.11.17.01.54.14;	author svnexp;	state dead;
branches;
next	1.2.2.2;

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

1.1.2.1
date	2005.08.15.18.34.21;	author cperciva;	state Exp;
branches
	1.1.2.1.10.1;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.07.45.34;	author svnexp;	state Exp;
branches;
next	;

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

1.1.4.1
date	2005.11.13.06.58.36;	author cperciva;	state Exp;
branches;
next	;

1.1.6.1
date	2012.11.17.08.08.20;	author svnexp;	state Exp;
branches;
next	;

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

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

1.1.14.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.1.14.1.2.1
	1.1.14.1.4.1
	1.1.14.1.6.1
	1.1.14.1.8.1;
next	1.1.14.2;

1.1.14.2
date	2012.11.17.10.37.15;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.1.14.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.1.14.1.8.2;

1.1.14.1.8.2
date	2012.11.17.08.25.49;	author svnexp;	state Exp;
branches;
next	;

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

1.1.18.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.1.18.2;

1.1.18.2
date	2012.11.17.08.17.41;	author svnexp;	state Exp;
branches;
next	;

1.1.20.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.1.20.1.2.1
	1.1.20.1.4.1;
next	1.1.20.2;

1.1.20.2
date	2012.11.17.11.37.37;	author svnexp;	state Exp;
branches;
next	;

1.1.20.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.1.20.1.2.2;

1.1.20.1.2.2
date	2012.11.17.08.37.33;	author svnexp;	state Exp;
branches;
next	;

1.1.20.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.1.20.1.4.2;

1.1.20.1.4.2
date	2012.11.17.08.48.25;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/usr.bin/bsdiff/bspatch/Makefile 148771 2005-08-06 01:59:06Z cperciva $

PROG=	bspatch

DPADD=	${LIBBZ2}
LDADD=	-lbz2

.include <bsd.prog.mk>
@


1.2.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:00 +0000
@
text
@d1 8
@


1.2.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 8
# $FreeBSD: releng/8.4/usr.bin/bsdiff/bspatch/Makefile 148771 2005-08-06 01:59:06Z cperciva $

PROG=	bspatch

DPADD=	${LIBBZ2}
LDADD=	-lbz2

.include <bsd.prog.mk>
@


1.1
log
@Add bsdiff and bspatch to the base system.  These are tools for
constructing and applying binary patches; in particular, they perform
well (in the sense of constructing small patches) for executable code.
Both portsnap (coming to the base system Real Soon Now) and FreeBSD
Update (coming to the base system a bit later) use bspatch.

This is the same code as the bsdiff-4.2 which has been in the ports
tree (misc/bsdiff) for the past year, with the following exceptions:
1. The license is now the traditional 2-clause BSD;
2. Instead of forking and execing bzip2, the code now uses libbz2; and
3. Some minor changes have been made to fit this code into the base
system (adding $FreeBSD$ tags, putting bsdiff and bspatch into separate
directories, etc.)

This code is rather ugly and has lots of style bugs (mostly because I
wrote it before I had ever heard of style(9)).  Some day I'll come
back and clean it up.

Discussed on:	freebsd-arch
MFC before:	5.5-RELEASE
Tested by:	Several million users (earlier version).
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.1.6.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.bin/bsdiff/bspatch/Makefile 148771 2005-08-06 01:59:06Z cperciva $
@


1.1.20.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.1.20.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
@d1 1
a1 1
# $FreeBSD: stable/9/usr.bin/bsdiff/bspatch/Makefile 148771 2005-08-06 01:59:06Z cperciva $
@


1.1.20.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.1.20.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.bin/bsdiff/bspatch/Makefile 148771 2005-08-06 01:59:06Z cperciva $
@


1.1.20.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.1.20.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.bin/bsdiff/bspatch/Makefile 148771 2005-08-06 01:59:06Z cperciva $
@


1.1.18.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.1.18.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.bin/bsdiff/bspatch/Makefile 148771 2005-08-06 01:59:06Z cperciva $
@


1.1.16.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.1.14.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.1.14.2
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
@d1 1
a1 1
# $FreeBSD: stable/8/usr.bin/bsdiff/bspatch/Makefile 148771 2005-08-06 01:59:06Z cperciva $
@


1.1.14.1.8.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.1.14.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.bin/bsdiff/bspatch/Makefile 148771 2005-08-06 01:59:06Z cperciva $
@


1.1.14.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.1.14.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.1.14.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.1.12.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.1.10.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.1.4.1
log
@MFC bsdiff/bspatch to RELENG_5.  This should be identical to the version
in HEAD and RELENG_6.
@
text
@@


1.1.2.1
log
@MFC addition of bsdiff and bspatch to the base system, in order to
allow them to be used by portsnap(8) in 6.0-RELEASE.

Approved by:	re (kensmith)
@
text
@@


1.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.bin/bsdiff/bspatch/Makefile 149102 2005-08-15 18:34:21Z cperciva $
@


1.1.2.1.10.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
@@


