head	1.10;
access;
symbols
	RELENG_8_4:1.10.0.2
	RELENG_9_1_0_RELEASE:1.8.36.1.4.2
	RELENG_9_1:1.8.36.1.0.4
	RELENG_9_1_BP:1.8.36.1
	RELENG_8_3_0_RELEASE:1.8.30.1.8.1
	RELENG_8_3:1.8.30.1.0.8
	RELENG_8_3_BP:1.8.30.1
	RELENG_9_0_0_RELEASE:1.8.36.1.2.1
	RELENG_9_0:1.8.36.1.0.2
	RELENG_9_0_BP:1.8.36.1
	RELENG_9:1.8.0.36
	RELENG_9_BP:1.8
	RELENG_7_4_0_RELEASE:1.8.34.1
	RELENG_8_2_0_RELEASE:1.8.30.1.6.1
	RELENG_7_4:1.8.0.34
	RELENG_7_4_BP:1.8
	RELENG_8_2:1.8.30.1.0.6
	RELENG_8_2_BP:1.8.30.1
	RELENG_8_1_0_RELEASE:1.8.30.1.4.1
	RELENG_8_1:1.8.30.1.0.4
	RELENG_8_1_BP:1.8.30.1
	RELENG_7_3_0_RELEASE:1.8.32.1
	RELENG_7_3:1.8.0.32
	RELENG_7_3_BP:1.8
	RELENG_8_0_0_RELEASE:1.8.30.1.2.1
	RELENG_8_0:1.8.30.1.0.2
	RELENG_8_0_BP:1.8.30.1
	RELENG_8:1.8.0.30
	RELENG_8_BP:1.8
	RELENG_7_2_0_RELEASE:1.8.28.1
	RELENG_7_2:1.8.0.28
	RELENG_7_2_BP:1.8
	RELENG_7_1_0_RELEASE:1.8.26.1
	RELENG_6_4_0_RELEASE:1.8.24.1
	RELENG_7_1:1.8.0.26
	RELENG_7_1_BP:1.8
	RELENG_6_4:1.8.0.24
	RELENG_6_4_BP:1.8
	RELENG_7_0_0_RELEASE:1.8
	RELENG_6_3_0_RELEASE:1.8
	RELENG_7_0:1.8.0.22
	RELENG_7_0_BP:1.8
	RELENG_6_3:1.8.0.20
	RELENG_6_3_BP:1.8
	RELENG_7:1.8.0.18
	RELENG_7_BP:1.8
	RELENG_6_2_0_RELEASE:1.8
	RELENG_6_2:1.8.0.16
	RELENG_6_2_BP:1.8
	RELENG_5_5_0_RELEASE:1.8
	RELENG_5_5:1.8.0.14
	RELENG_5_5_BP:1.8
	RELENG_6_1_0_RELEASE:1.8
	RELENG_6_1:1.8.0.12
	RELENG_6_1_BP:1.8
	RELENG_6_0_0_RELEASE:1.8
	RELENG_6_0:1.8.0.10
	RELENG_6_0_BP:1.8
	RELENG_6:1.8.0.8
	RELENG_6_BP:1.8
	RELENG_5_4_0_RELEASE:1.8
	RELENG_5_4:1.8.0.6
	RELENG_5_4_BP:1.8
	RELENG_4_11_0_RELEASE:1.6.6.1
	RELENG_4_11:1.6.6.1.0.16
	RELENG_4_11_BP:1.6.6.1
	RELENG_5_3_0_RELEASE:1.8
	RELENG_5_3:1.8.0.4
	RELENG_5_3_BP:1.8
	RELENG_5:1.8.0.2
	RELENG_5_BP:1.8
	RELENG_4_10_0_RELEASE:1.6.6.1
	RELENG_4_10:1.6.6.1.0.14
	RELENG_4_10_BP:1.6.6.1
	RELENG_5_2_1_RELEASE:1.7
	RELENG_5_2_0_RELEASE:1.7
	RELENG_5_2:1.7.0.6
	RELENG_5_2_BP:1.7
	RELENG_4_9_0_RELEASE:1.6.6.1
	RELENG_4_9:1.6.6.1.0.12
	RELENG_4_9_BP:1.6.6.1
	RELENG_5_1_0_RELEASE:1.7
	RELENG_5_1:1.7.0.4
	RELENG_5_1_BP:1.7
	RELENG_4_8_0_RELEASE:1.6.6.1
	RELENG_4_8:1.6.6.1.0.10
	RELENG_4_8_BP:1.6.6.1
	RELENG_5_0_0_RELEASE:1.7
	RELENG_5_0:1.7.0.2
	RELENG_5_0_BP:1.7
	RELENG_4_7_0_RELEASE:1.6.6.1
	RELENG_4_7:1.6.6.1.0.8
	RELENG_4_7_BP:1.6.6.1
	RELENG_4_6_2_RELEASE:1.6.6.1
	RELENG_4_6_1_RELEASE:1.6.6.1
	RELENG_4_6_0_RELEASE:1.6.6.1
	RELENG_4_6:1.6.6.1.0.6
	RELENG_4_6_BP:1.6.6.1
	RELENG_4_5_0_RELEASE:1.6.6.1
	RELENG_4_5:1.6.6.1.0.4
	RELENG_4_5_BP:1.6.6.1
	RELENG_4_4_0_RELEASE:1.6.6.1
	RELENG_4_4:1.6.6.1.0.2
	RELENG_4_4_BP:1.6.6.1
	RELENG_4_3_0_RELEASE:1.6
	RELENG_4_3:1.6.0.8
	RELENG_4_3_BP:1.6
	RELENG_4_2_0_RELEASE:1.6
	RELENG_4_1_1_RELEASE:1.6
	PRE_SMPNG:1.6
	RELENG_4_1_0_RELEASE:1.6
	RELENG_3_5_0_RELEASE:1.6
	RELENG_4_0_0_RELEASE:1.6
	RELENG_4:1.6.0.6
	RELENG_4_BP:1.6
	RELENG_3_4_0_RELEASE:1.6
	RELENG_3_3_0_RELEASE:1.6
	RELENG_3_2_PAO:1.6.0.4
	RELENG_3_2_PAO_BP:1.6
	RELENG_3_2_0_RELEASE:1.6
	RELENG_3_1_0_RELEASE:1.6
	RELENG_3:1.6.0.2
	RELENG_3_BP:1.6
	RELENG_2_2_8_RELEASE:1.2
	RELENG_3_0_0_RELEASE:1.6
	RELENG_2_2_7_RELEASE:1.2
	RELENG_2_2_6_RELEASE:1.2
	RELENG_2_2_5_RELEASE:1.2
	RELENG_2_2_2_RELEASE:1.2
	RELENG_2_2_1_RELEASE:1.2
	RELENG_2_2_0_RELEASE:1.2
	RELENG_2_1_7_RELEASE:1.2
	RELENG_2_1_6_1_RELEASE:1.2
	RELENG_2_1_6_RELEASE:1.2
	RELENG_2_2:1.2.0.6
	RELENG_2_2_BP:1.2
	RELENG_2_1_5_RELEASE:1.2
	RELENG_2_1_0_RELEASE:1.2
	RELENG_2_1_0:1.2.0.4
	RELENG_2_1_0_BP:1.2
	RELENG_2_0_5_RELEASE:1.2
	RELENG_2_0_5:1.2.0.2
	RELENG_2_0_5_BP:1.2
	RELENG_2_0_5_ALPHA:1.1.1.1
	RELEASE_2_0:1.1.1.1
	BETA_2_0:1.1.1.1
	ALPHA_2_0:1.1.1.1.0.4
	MOVED_NEWCVS:1.1.1.1
	FINAL_1_1_5:1.1.1.1
	ALPHA_1_1_5:1.1.1.1
	FINAL_1_1:1.1.1.1
	GAMMA_1_1:1.1.1.1
	BETA_1_1:1.1.1.1.0.2
	BP_BETA_1_1:1.1.1.1
	FINAL_1_0:1.1.1.1
	EPSILON_1_0:1.1.1.1
	GAMMA_1_0:1.1.1.1
	BETA_1_0:1.1.1.1
	ALPHA_1_0:1.1.1.1
	V2_10:1.1.1.1;
locks; strict;
comment	@# @;


1.10
date	2013.01.30.00.27.06;	author svnexp;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2012.11.17.01.49.12;	author svnexp;	state Exp;
branches;
next	1.8;

1.8
date	2004.02.17.01.24.45;	author ache;	state Exp;
branches
	1.8.8.1
	1.8.18.1
	1.8.24.1
	1.8.26.1
	1.8.28.1
	1.8.30.1
	1.8.32.1
	1.8.34.1
	1.8.36.1;
next	1.7;

1.7
date	2001.03.27.14.59.03;	author ru;	state Exp;
branches;
next	1.6;

1.6
date	98.01.21.14.37.13;	author ache;	state Exp;
branches
	1.6.6.1;
next	1.5;

1.5
date	98.01.04.21.41.13;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	97.03.17.01.44.38;	author jmg;	state Exp;
branches;
next	1.3;

1.3
date	97.02.13.21.10.37;	author jmg;	state Exp;
branches;
next	1.2;

1.2
date	95.05.30.05.02.28;	author rgrimes;	state Exp;
branches;
next	1.1;

1.1
date	93.06.19.14.21.50;	author paul;	state Exp;
branches
	1.1.1.1;
next	;

1.10.2.1
date	2013.01.30.00.27.06;	author svnexp;	state dead;
branches;
next	1.10.2.2;

1.10.2.2
date	2013.03.28.13.02.52;	author svnexp;	state Exp;
branches;
next	;

1.8.8.1
date	2012.11.17.07.39.22;	author svnexp;	state Exp;
branches;
next	;

1.8.18.1
date	2012.11.17.08.01.36;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.8.30.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.8.30.1.2.1
	1.8.30.1.4.1
	1.8.30.1.6.1
	1.8.30.1.8.1;
next	1.8.30.2;

1.8.30.2
date	2012.11.17.10.35.59;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.8.30.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.8.30.1.8.2;

1.8.30.1.8.2
date	2012.11.17.08.24.40;	author svnexp;	state Exp;
branches;
next	;

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

1.8.34.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.8.34.2;

1.8.34.2
date	2012.11.17.08.16.39;	author svnexp;	state Exp;
branches;
next	;

1.8.36.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.8.36.1.2.1
	1.8.36.1.4.1;
next	1.8.36.2;

1.8.36.2
date	2012.11.17.11.36.14;	author svnexp;	state Exp;
branches;
next	;

1.8.36.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.8.36.1.2.2;

1.8.36.1.2.2
date	2012.11.17.08.36.14;	author svnexp;	state Exp;
branches;
next	;

1.8.36.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.8.36.1.4.2;

1.8.36.1.4.2
date	2012.11.17.08.47.04;	author svnexp;	state Exp;
branches;
next	;

1.6.6.1
date	2001.04.25.12.03.54;	author ru;	state Exp;
branches;
next	1.6.6.2;

1.6.6.2
date	2012.11.17.07.23.07;	author svnexp;	state Exp;
branches;
next	;

1.1.1.1
date	93.06.19.14.21.51;	author paul;	state Exp;
branches;
next	;


desc
@@


1.10
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/246074
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/gnu/usr.bin/patch/Makefile 246074 2013-01-29 17:03:18Z gabor $

.include <bsd.own.mk>

.if ${MK_BSD_PATCH} == "yes"
PROG=	gnupatch
CLEANFILES+= gnupatch.1

gnupatch.1: patch.1
	cp ${.ALLSRC} ${.TARGET}
.else
PROG=	patch
.endif

SRCS=   backupfile.c inp.c patch.c pch.c util.c version.c
CFLAGS+=-DHAVE_CONFIG_H

.include <bsd.prog.mk>
@


1.10.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:02:52 +0000
@
text
@d1 18
@


1.10.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 7
# $FreeBSD: releng/8.4/gnu/usr.bin/patch/Makefile 125910 2004-02-17 01:34:53Z ache $

PROG= 	patch
SRCS=   backupfile.c inp.c patch.c pch.c util.c version.c
CFLAGS+=-DHAVE_CONFIG_H

.include <bsd.prog.mk>
@


1.9
log
@Switching exporter and resync
@
text
@d1 13
a13 1
# $FreeBSD: head/gnu/usr.bin/patch/Makefile 125910 2004-02-17 01:34:53Z ache $
a14 1
PROG= 	patch
@


1.8
log
@Remove getopt*.c, we already have compatible getopt_long() in libc
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.8.18.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/gnu/usr.bin/patch/Makefile 125910 2004-02-17 01:34:53Z ache $
@


1.8.8.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/gnu/usr.bin/patch/Makefile 125910 2004-02-17 01:34:53Z ache $
@


1.8.36.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.8.36.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/gnu/usr.bin/patch/Makefile 125910 2004-02-17 01:34:53Z ache $
@


1.8.36.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.8.36.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/gnu/usr.bin/patch/Makefile 125910 2004-02-17 01:34:53Z ache $
@


1.8.36.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.8.36.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/gnu/usr.bin/patch/Makefile 125910 2004-02-17 01:34:53Z ache $
@


1.8.34.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.8.34.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/gnu/usr.bin/patch/Makefile 125910 2004-02-17 01:34:53Z ache $
@


1.8.32.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.8.30.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.8.30.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/gnu/usr.bin/patch/Makefile 125910 2004-02-17 01:34:53Z ache $
@


1.8.30.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.8.30.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/gnu/usr.bin/patch/Makefile 125910 2004-02-17 01:34:53Z ache $
@


1.8.30.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.8.30.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.8.30.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.8.28.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.8.26.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.8.24.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.7
log
@MAN[1-9] -> MAN.
@
text
@d4 1
a4 2
SRCS=	backupfile.c getopt.c getopt1.c inp.c patch.c pch.c util.c \
	version.c
@


1.6
log
@Resurrect patch 2.1 without FreeBSD Index: hack
@
text
@d1 2
d4 1
a4 1
SRCS = backupfile.c getopt.c getopt1.c inp.c patch.c pch.c util.c \
d6 2
a7 2
CFLAGS += -DHAVE_CONFIG_H
MAN=	patch.1
@


1.6.6.1
log
@MFC: MAN[1-9] -> MAN.
@
text
@a0 2
# $FreeBSD$

d2 1
a2 1
SRCS=	backupfile.c getopt.c getopt1.c inp.c patch.c pch.c util.c \
d4 2
a5 2
CFLAGS+=-DHAVE_CONFIG_H

@


1.6.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/gnu/usr.bin/patch/Makefile 75959 2001-04-25 12:03:56Z ru $
@


1.5
log
@Upgrade to 2.5 (contrib version)
@
text
@a0 4
# $Id: Makefile,v 1.9 1997/10/29 17:35:54 ache Exp $

.PATH:  ${.CURDIR}/../../../contrib/patch

d2 4
a5 10

LIBSRCS = getopt.c getopt1.c
SRCS = addext.c argmatch.c backupfile.c basename.c inp.c maketime.c \
	partime.c patch.c pch.c quotearg.c util.c version.c $(LIBSRCS)

CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/../../../contrib/patch
CFLAGS+= -DHAVE_CONFIG_H
CFLAGS+= -Ded_PROGRAM=\"/bin/ed\"

@


1.4
log
@fix compilation warnings in patch... (with slight modification)

also remove -Wall that I acidentally committed last time I was here...

Submitted-by: Philippe Charnier

Closes PR#2998
@
text
@d1 4
d6 10
a15 4
SRCS = backupfile.c getopt.c getopt1.c inp.c patch.c pch.c util.c \
	version.c
CFLAGS += -DHAVE_CONFIG_H
MAN=	patch.1
@


1.3
log
@Fix a problem with patch in that is will always default, even when the
controlling terminal is closed.  Now the function ask() will return 1 when th
input is known to come from a file or terminal, or it will return 0 when ther
was a read error.

Modified the question "Skip patch?" so that on an error from ask it will skip
the patch instead of looping.

Closes PR#777

2.2 candidate
@
text
@d4 1
a4 1
CFLAGS += -DHAVE_CONFIG_H -Wall
@


1.2
log
@Remove trailing whitespace.
@
text
@d4 1
a4 1
CFLAGS += -DHAVE_CONFIG_H
@


1.1
log
@Initial revision
@
text
@d3 1
a3 1
	version.c  
@


1.1.1.1
log
@b-maked patch-2.10
@
text
@@
