head	1.24;
access;
symbols
	RELENG_8_4:1.21.0.2
	RELENG_9_1_0_RELEASE:1.19.2.1.4.2
	RELENG_9_1:1.19.2.1.0.4
	RELENG_9_1_BP:1.19.2.1
	RELENG_8_3_0_RELEASE:1.18.2.1.8.1
	RELENG_8_3:1.18.2.1.0.8
	RELENG_8_3_BP:1.18.2.1
	RELENG_9_0_0_RELEASE:1.19.2.1.2.1
	RELENG_9_0:1.19.2.1.0.2
	RELENG_9_0_BP:1.19.2.1
	RELENG_9:1.19.0.2
	RELENG_9_BP:1.19
	RELENG_7_4_0_RELEASE:1.17.2.1.8.1
	RELENG_8_2_0_RELEASE:1.18.2.1.6.1
	RELENG_7_4:1.17.2.1.0.8
	RELENG_7_4_BP:1.17.2.1
	RELENG_8_2:1.18.2.1.0.6
	RELENG_8_2_BP:1.18.2.1
	RELENG_8_1_0_RELEASE:1.18.2.1.4.1
	RELENG_8_1:1.18.2.1.0.4
	RELENG_8_1_BP:1.18.2.1
	RELENG_7_3_0_RELEASE:1.17.2.1.6.1
	RELENG_7_3:1.17.2.1.0.6
	RELENG_7_3_BP:1.17.2.1
	RELENG_8_0_0_RELEASE:1.18.2.1.2.1
	RELENG_8_0:1.18.2.1.0.2
	RELENG_8_0_BP:1.18.2.1
	RELENG_8:1.18.0.2
	RELENG_8_BP:1.18
	RELENG_7_2_0_RELEASE:1.17.2.1.4.1
	RELENG_7_2:1.17.2.1.0.4
	RELENG_7_2_BP:1.17.2.1
	RELENG_7_1_0_RELEASE:1.17.2.1.2.1
	RELENG_6_4_0_RELEASE:1.16.8.1.4.1
	RELENG_7_1:1.17.2.1.0.2
	RELENG_7_1_BP:1.17.2.1
	RELENG_6_4:1.16.8.1.0.4
	RELENG_6_4_BP:1.16.8.1
	RELENG_7_0_0_RELEASE:1.17
	RELENG_6_3_0_RELEASE:1.16.8.1
	RELENG_7_0:1.17.0.4
	RELENG_7_0_BP:1.17
	RELENG_6_3:1.16.8.1.0.2
	RELENG_6_3_BP:1.16.8.1
	RELENG_7:1.17.0.2
	RELENG_7_BP:1.17
	RELENG_6_2_0_RELEASE:1.16
	RELENG_6_2:1.16.0.16
	RELENG_6_2_BP:1.16
	RELENG_5_5_0_RELEASE:1.16
	RELENG_5_5:1.16.0.14
	RELENG_5_5_BP:1.16
	RELENG_6_1_0_RELEASE:1.16
	RELENG_6_1:1.16.0.12
	RELENG_6_1_BP:1.16
	RELENG_6_0_0_RELEASE:1.16
	RELENG_6_0:1.16.0.10
	RELENG_6_0_BP:1.16
	RELENG_6:1.16.0.8
	RELENG_6_BP:1.16
	RELENG_5_4_0_RELEASE:1.16
	RELENG_5_4:1.16.0.6
	RELENG_5_4_BP:1.16
	RELENG_4_11_0_RELEASE:1.13
	RELENG_4_11:1.13.0.26
	RELENG_4_11_BP:1.13
	RELENG_5_3_0_RELEASE:1.16
	RELENG_5_3:1.16.0.4
	RELENG_5_3_BP:1.16
	RELENG_5:1.16.0.2
	RELENG_5_BP:1.16
	RELENG_4_10_0_RELEASE:1.13
	RELENG_4_10:1.13.0.24
	RELENG_4_10_BP:1.13
	RELENG_5_2_1_RELEASE:1.13
	RELENG_5_2_0_RELEASE:1.13
	RELENG_5_2:1.13.0.22
	RELENG_5_2_BP:1.13
	RELENG_4_9_0_RELEASE:1.13
	RELENG_4_9:1.13.0.20
	RELENG_4_9_BP:1.13
	RELENG_5_1_0_RELEASE:1.13
	RELENG_5_1:1.13.0.18
	RELENG_5_1_BP:1.13
	RELENG_4_8_0_RELEASE:1.13
	RELENG_4_8:1.13.0.16
	RELENG_4_8_BP:1.13
	RELENG_5_0_0_RELEASE:1.13
	RELENG_5_0:1.13.0.14
	RELENG_5_0_BP:1.13
	RELENG_4_7_0_RELEASE:1.13
	RELENG_4_7:1.13.0.12
	RELENG_4_7_BP:1.13
	RELENG_4_6_2_RELEASE:1.13
	RELENG_4_6_1_RELEASE:1.13
	RELENG_4_6_0_RELEASE:1.13
	RELENG_4_6:1.13.0.10
	RELENG_4_6_BP:1.13
	RELENG_4_5_0_RELEASE:1.13
	RELENG_4_5:1.13.0.8
	RELENG_4_5_BP:1.13
	RELENG_4_4_0_RELEASE:1.13
	RELENG_4_4:1.13.0.6
	RELENG_4_4_BP:1.13
	RELENG_4_3_0_RELEASE:1.13
	RELENG_4_3:1.13.0.4
	RELENG_4_3_BP:1.13
	RELENG_4_2_0_RELEASE:1.13
	RELENG_4_1_1_RELEASE:1.13
	PRE_SMPNG:1.13
	RELENG_4_1_0_RELEASE:1.13
	RELENG_3_5_0_RELEASE:1.9.2.2
	RELENG_4_0_0_RELEASE:1.13
	RELENG_4:1.13.0.2
	RELENG_4_BP:1.13
	RELENG_3_4_0_RELEASE:1.9.2.2
	RELENG_3_3_0_RELEASE:1.9.2.1
	RELENG_3_2_PAO:1.9.0.4
	RELENG_3_2_PAO_BP:1.9
	RELENG_3_2_0_RELEASE:1.9
	RELENG_3_1_0_RELEASE:1.9
	RELENG_3:1.9.0.2
	RELENG_3_BP:1.9
	RELENG_2_2_8_RELEASE:1.5
	RELENG_3_0_0_RELEASE:1.9
	RELENG_2_2_7_RELEASE:1.5
	RELENG_2_2_6_RELEASE:1.5
	RELENG_2_2_5_RELEASE:1.5
	RELENG_2_2_2_RELEASE:1.5
	RELENG_2_2_1_RELEASE:1.5
	RELENG_2_2_0_RELEASE:1.5
	RELENG_2_1_7_RELEASE:1.4.4.1
	RELENG_2_1_6_1_RELEASE:1.4.4.1
	RELENG_2_1_6_RELEASE:1.4.4.1
	RELENG_2_2:1.5.0.2
	RELENG_2_2_BP:1.5
	RELENG_2_1_5_RELEASE:1.4.4.1
	RELENG_2_1_0_RELEASE:1.4
	RELENG_2_1_0:1.4.0.4
	RELENG_2_1_0_BP:1.4
	RELENG_2_0_5_RELEASE:1.4
	RELENG_2_0_5:1.4.0.2
	RELENG_2_0_5_BP:1.4
	RELENG_2_0_5_ALPHA:1.4
	RELEASE_2_0:1.3
	BETA_2_0:1.3
	ALPHA_2_0:1.3.0.4
	MOVED_NEWCVS:1.3
	FINAL_1_1_5:1.3
	ALPHA_1_1_5:1.3
	FINAL_1_1:1.3
	GAMMA_1_1:1.3
	BETA_1_1:1.3.0.2
	BP_BETA_1_1:1.3
	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
	DIFF_2_3:1.1.1.1
	GNU:1.1.1;
locks; strict;
comment	@# @;


1.24
date	2013.06.07.00.27.12;	author svnexp;	state Exp;
branches;
next	1.23;

1.23
date	2013.06.06.00.39.02;	author svnexp;	state Exp;
branches;
next	1.22;

1.22
date	2013.05.22.00.35.19;	author svnexp;	state Exp;
branches;
next	1.21;

1.21
date	2012.11.17.01.49.10;	author svnexp;	state Exp;
branches
	1.21.2.1;
next	1.20;

1.20
date	2012.08.17.18.20.38;	author obrien;	state Exp;
branches;
next	1.19;

1.19
date	2010.02.22.22.32.24;	author delphij;	state Exp;
branches
	1.19.2.1;
next	1.18;

1.18
date	2007.10.12.18.03.00;	author obrien;	state Exp;
branches
	1.18.2.1;
next	1.17;

1.17
date	2007.06.15.07.09.33;	author delphij;	state Exp;
branches
	1.17.2.1;
next	1.16;

1.16
date	2004.02.17.05.38.45;	author ache;	state Exp;
branches
	1.16.8.1;
next	1.15;

1.15
date	2004.02.16.22.56.36;	author ache;	state Exp;
branches;
next	1.14;

1.14
date	2004.02.05.22.44.22;	author ru;	state Exp;
branches;
next	1.13;

1.13
date	99.11.26.12.29.48;	author phk;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	99.11.26.03.06.33;	author obrien;	state Exp;
branches;
next	1.11;

1.11
date	99.11.26.02.51.43;	author obrien;	state Exp;
branches;
next	1.10;

1.10
date	99.08.27.23.35.33;	author peter;	state Exp;
branches;
next	1.9;

1.9
date	97.10.29.17.35.54;	author ache;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	97.10.29.16.36.33;	author ache;	state Exp;
branches;
next	1.7;

1.7
date	97.02.22.15.45.24;	author peter;	state Exp;
branches;
next	1.6;

1.6
date	97.01.14.05.57.11;	author jkh;	state Exp;
branches;
next	1.5;

1.5
date	95.10.29.09.08.32;	author peter;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	95.01.11.05.45.48;	author ache;	state Exp;
branches
	1.4.4.1;
next	1.3;

1.3
date	93.11.12.07.04.58;	author nate;	state Exp;
branches;
next	1.2;

1.2
date	93.11.08.01.33.29;	author nate;	state Exp;
branches;
next	1.1;

1.1
date	93.06.29.08.13.41;	author nate;	state Exp;
branches
	1.1.1.1;
next	;

1.21.2.1
date	2012.11.17.01.49.10;	author svnexp;	state dead;
branches;
next	1.21.2.2;

1.21.2.2
date	2013.03.28.13.02.49;	author svnexp;	state Exp;
branches;
next	;

1.19.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.19.2.1.2.1
	1.19.2.1.4.1;
next	1.19.2.2;

1.19.2.2
date	2012.11.17.11.36.13;	author svnexp;	state Exp;
branches;
next	;

1.19.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.19.2.1.2.2;

1.19.2.1.2.2
date	2012.11.17.08.36.13;	author svnexp;	state Exp;
branches;
next	;

1.19.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.19.2.1.4.2;

1.19.2.1.4.2
date	2012.11.17.08.47.03;	author svnexp;	state Exp;
branches;
next	;

1.18.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.18.2.1.2.1
	1.18.2.1.4.1
	1.18.2.1.6.1
	1.18.2.1.8.1;
next	1.18.2.2;

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

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

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

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

1.18.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.18.2.1.8.2;

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

1.17.2.1
date	2008.03.16.08.03.48;	author obrien;	state Exp;
branches
	1.17.2.1.2.1
	1.17.2.1.4.1
	1.17.2.1.6.1
	1.17.2.1.8.1;
next	1.17.2.2;

1.17.2.2
date	2012.11.17.08.01.31;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.17.2.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.17.2.1.8.2;

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

1.16.8.1
date	2007.07.15.01.24.45;	author delphij;	state Exp;
branches
	1.16.8.1.4.1;
next	1.16.8.2;

1.16.8.2
date	2012.11.17.07.39.18;	author svnexp;	state Exp;
branches;
next	;

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

1.13.2.1
date	2012.11.17.07.23.03;	author svnexp;	state Exp;
branches;
next	;

1.9.2.1
date	99.08.29.14.33.00;	author peter;	state Exp;
branches;
next	1.9.2.2;

1.9.2.2
date	99.12.08.15.48.30;	author obrien;	state Exp;
branches;
next	;

1.5.2.1
date	99.09.05.11.06.28;	author peter;	state Exp;
branches;
next	;

1.4.4.1
date	96.02.22.21.52.24;	author peter;	state Exp;
branches;
next	1.4.4.2;

1.4.4.2
date	99.09.05.11.10.58;	author peter;	state Exp;
branches;
next	;

1.1.1.1
date	93.06.29.08.13.42;	author nate;	state Exp;
branches;
next	;


desc
@@


1.24
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251468
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/gnu/usr.bin/diff/Makefile 251468 2013-06-06 11:59:38Z jkim $

DIFFSRC=${.CURDIR}/../../../contrib/diff/src
.PATH: ${DIFFSRC} \
       ${.CURDIR}/../../../contrib/diff/lib \
       ${.CURDIR}/../../../contrib/diff/man

PROG=	diff
SRCS=   analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \
	normal.c side.c util.c \
	xmalloc.c strtoumax.c cmpbuf.c exitfail.c error.c quotesys.c \
	strftime.c c-stack.c basename.c exclude.c hard-locale.c \
	file-type.c posixver.c prepargs.c version-etc.c

# Important for ctype macros!
CFLAGS+=-funsigned-char

CFLAGS+=-DHAVE_CONFIG_H
CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\"
CFLAGS+=-I${.CURDIR}/../../../contrib/diff
CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
CFLAGS+=-I${DESTDIR}/usr/include/gnu

SUBDIR+=doc

DPADD=	${LIBGNUREGEX}
LDADD=	-lgnuregex

.include <bsd.prog.mk>
@


1.23
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251438
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: head/gnu/usr.bin/diff/Makefile 251438 2013-06-05 21:31:06Z jkim $
a19 1
CFLAGS+=-D__USE_GNU
d23 1
a23 1
CFLAGS+=-I${.CURDIR}/../../../contrib/libgnuregex
@


1.22
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/250860
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: head/gnu/usr.bin/diff/Makefile 250860 2013-05-21 17:28:19Z marcel $
d20 1
d24 1
a24 1
CFLAGS+=-I${.CURDIR}/../../lib/libregex
@


1.21
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/gnu/usr.bin/diff/Makefile 239360 2012-08-17 18:20:38Z obrien $
a19 1
CFLAGS+=-I${DESTDIR}/usr/include/gnu
d23 1
@


1.21.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:02:49 +0000
@
text
@d1 30
@


1.21.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 36
# $FreeBSD: releng/8.4/gnu/usr.bin/diff/Makefile 172593 2007-10-12 18:03:00Z obrien $

DIFFSRC=${.CURDIR}/../../../contrib/diff/src
.PATH: ${DIFFSRC} \
       ${.CURDIR}/../../../contrib/diff/lib \
       ${.CURDIR}/../../../contrib/diff/man

PROG=	diff
SRCS=   analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \
	normal.c side.c util.c \
	xmalloc.c strtoumax.c cmpbuf.c exitfail.c error.c quotesys.c \
	strftime.c c-stack.c basename.c exclude.c hard-locale.c \
	file-type.c posixver.c prepargs.c version-etc.c

# Important for ctype macros!
CFLAGS+=-funsigned-char

CFLAGS+=-DHAVE_CONFIG_H
CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\"
CFLAGS+=-I${DESTDIR}/usr/include/gnu
CFLAGS+=-I${.CURDIR}/../../../contrib/diff
CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib

SUBDIR+=doc

DPADD=	${LIBGNUREGEX}
LDADD=	-lgnuregex

.for f in diff.c context.c
${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff
	patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
CLEANFILES+= ${f}
.endfor

.include <bsd.prog.mk>
@


1.20
log
@SVN rev 239360 on 2012-08-17 18:20:38Z by obrien

Catch up with the subversion conversion and apply these build-time patches.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.19
log
@SVN rev 204227 on 2010-02-22 22:32:24Z by delphij

POSIX patch(1) would treat -b as different meaning (the functionality
is to be provided by --suffix).  Looking at the usage here in diffutils,
it seems that we can just get rid of the -b .orig stuff.  This resolves
a problem that can triggered if we move toward to a more permissively
licensed patch(1) program.
@
text
@a29 6
.for f in diff.c context.c
${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff
	patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
CLEANFILES+= ${f}
.endfor

@


1.19.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.19.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
@d1 1
a1 1
# $FreeBSD: stable/9/gnu/usr.bin/diff/Makefile 204227 2010-02-22 22:32:24Z delphij $
@


1.19.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.19.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/gnu/usr.bin/diff/Makefile 204227 2010-02-22 22:32:24Z delphij $
@


1.19.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.19.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/gnu/usr.bin/diff/Makefile 204227 2010-02-22 22:32:24Z delphij $
@


1.18
log
@style.Makefile(5)
@
text
@d32 1
a32 1
	patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
@


1.18.2.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.18.2.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/diff/Makefile 172593 2007-10-12 18:03:00Z obrien $
@


1.18.2.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.18.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/gnu/usr.bin/diff/Makefile 172593 2007-10-12 18:03:00Z obrien $
@


1.18.2.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.18.2.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.18.2.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.17
log
@Update build skeleton after diffutils 2.8.7 update.
@
text
@d18 2
a23 2
CFLAGS+=-DHAVE_CONFIG_H
CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\"
@


1.17.2.1
log
@MFC: rev 1.18: style.Makefile(5)
@
text
@a17 2
CFLAGS+=-DHAVE_CONFIG_H
CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\"
d22 2
@


1.17.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/gnu/usr.bin/diff/Makefile 177250 2008-03-16 08:03:48Z obrien $
@


1.17.2.1.8.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.17.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/gnu/usr.bin/diff/Makefile 177250 2008-03-16 08:03:48Z obrien $
@


1.17.2.1.6.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.17.2.1.4.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.17.2.1.2.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.16
log
@Oops, use -I${DESTDIR}/usr/include/gnu instead of ... /../../include/gnu
@
text
@d3 4
a6 1
.PATH: ${.CURDIR}/../../../contrib/diff
d9 5
a13 2
SRCS=   analyze.c cmpbuf.c context.c diff.c dir.c ed.c \
	ifdef.c io.c normal.c prepend_args.c side.c util.c version.c
d18 4
a21 2
CFLAGS+=-I${.CURDIR}/../../../contrib/diff \
	-I${DESTDIR}/usr/include/gnu
d30 6
@


1.16.8.1
log
@MFC: diffutils 2.8.7.
@
text
@d3 1
a3 4
DIFFSRC=${.CURDIR}/../../../contrib/diff/src
.PATH: ${DIFFSRC} \
       ${.CURDIR}/../../../contrib/diff/lib \
       ${.CURDIR}/../../../contrib/diff/man
d6 2
a7 5
SRCS=   analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \
	normal.c side.c util.c \
	xmalloc.c strtoumax.c cmpbuf.c exitfail.c error.c quotesys.c \
	strftime.c c-stack.c basename.c exclude.c hard-locale.c \
	file-type.c posixver.c prepargs.c version-etc.c
d12 2
a13 4
CFLAGS+=-I${DESTDIR}/usr/include/gnu
CFLAGS+=-I${.CURDIR}/../../../contrib/diff
CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
a21 6
.for f in diff.c context.c
${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff
	patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
CLEANFILES+= ${f}
.endfor

@


1.16.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/gnu/usr.bin/diff/Makefile 171454 2007-07-15 01:24:46Z delphij $
@


1.16.8.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.15
log
@Remove files no longer needed
Switch back to regex.h
@
text
@d13 1
a13 1
	-I${.CURDIR}/../../../../include/gnu
@


1.14
log
@Fixed style of DPADD and LDADD assignments as per style.Makefile(5).
@
text
@d6 1
a6 1
SRCS=	analyze.c cmpbuf.c context.c diff.c dir.c ed.c getopt.c getopt1.c \
d12 2
a13 1
CFLAGS+=-I${.CURDIR}/../../../contrib/diff
@


1.13
log
@s/dir.h/dir.c/
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/diff/Makefile,v 1.12 1999/11/26 03:06:33 obrien Exp $
d18 2
a19 2
DPADD+=	${LIBGNUREGEX}
LDADD+=	-lgnuregex
@


1.13.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/gnu/usr.bin/diff/Makefile 53715 1999-11-26 12:29:48Z phk $
@


1.12
log
@Style changes -- whitespace and sorting.
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/diff/Makefile,v 1.11 1999/11/26 02:51:43 obrien Exp $
d6 1
a6 1
SRCS=	analyze.c cmpbuf.c context.c diff.c dir.h ed.c getopt.c getopt1.c \
@


1.11
log
@* Support the environtmental var "DIFF_OPTIONS".  Which can hold a set of
default options for diff.  These options are interpreted first and can be
overwritten by explicit command line parameters.
* Add the "-o" option to specify old-traditional output style.
* Add utility functions for env vars obtained from GNU Grep 2.3h.
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/diff/Makefile,v 1.10 1999/08/27 23:35:33 peter Exp $
d3 1
a3 1
.PATH:  ${.CURDIR}/../../../contrib/diff
d6 2
a7 2
SRCS=	diff.c analyze.c io.c context.c ed.c normal.c ifdef.c util.c dir.c \
	version.c getopt.c getopt1.c side.c cmpbuf.c prepend_args.c
d16 1
a16 1
SUBDIR+= doc
d18 2
a19 2
DPADD+= ${LIBGNUREGEX}
LDADD+= -lgnuregex
@


1.10
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d7 1
a7 1
	version.c getopt.c getopt1.c side.c cmpbuf.c
@


1.9
log
@Define PR_PROGRAM properly
@
text
@d1 1
a1 1
# $Id: Makefile,v 1.7 1997/02/22 15:45:24 peter Exp $
@


1.9.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.9.2.2
log
@Add prepend_args.c
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/diff/Makefile,v 1.9.2.1 1999/08/29 14:33:00 peter Exp $
d7 1
a7 1
	version.c getopt.c getopt1.c side.c cmpbuf.c prepend_args.c
@


1.8
log
@Switch to contrib version
@
text
@d14 1
@


1.7
log
@Revert $FreeBSD$ to $Id$
@
text
@d1 4
a4 1
# $Id$
d8 5
@


1.6
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.5
log
@Build and install diff.info..

As Bruce said, this is a little bogus, it'd be nice if bsd.prog.mk knew
about .texi in the same way as it does man pages..

Submitted by: bde
@
text
@d1 1
a1 1
# $Id$
@


1.5.2.1
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.4
log
@Use -lgnuregex
@
text
@d1 1
a1 1

d6 2
@


1.4.4.1
log
@Update the diff tools to diffutils-2.7 as in -current.  This is more
compatable with the more recent cvs releases with remote access.
@
text
@d1 1
a1 1
# $Id: Makefile,v 1.5 1995/10/29 09:08:32 peter Exp $
a5 2

SUBDIR+= doc
@


1.4.4.2
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.3
log
@Updated to GNU diffutils 2.6
@
text
@d4 1
a4 1
	version.c regex.c getopt.c getopt1.c side.c cmpbuf.c
d6 3
a8 1
MAN=	diff.1
@


1.2
log
@From: Larry Jones <scjones@@thor.sdrc.com>
Subject: man pages for diff et al.

I finally got tired of not having man pages for diff and friends, so I
edited the appropriate sections of the texinfo manual into man format.
@
text
@d4 2
a5 5
	version.c regex.c getopt.c getopt1.c side.c
CFLAGS+=-DDIRENT=1 -DHAVE_UNISTD_H=1 -DHAVE_DUP2=1 -DHAVE_MEMCHR=1 \
	-DHAVE_STRERROR=1 -DHAVE_WAITPID=1 -DHAVE_FCNTL_H=1 \
	-DHAVE_STRING_H=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_TIME_H=1 \
	-DHAVE_ST_BLKSIZE=1 
@


1.1
log
@Initial revision
@
text
@d9 1
a9 1
NOMAN=noman
@


1.1.1.1
log
@GNU Diff 2.3
@
text
@@
