head	1.16;
access;
symbols
	RELENG_8_4:1.16.0.2
	RELENG_9_1_0_RELEASE:1.13.4.1.4.2
	RELENG_9_1:1.13.4.1.0.4
	RELENG_9_1_BP:1.13.4.1
	RELENG_8_3_0_RELEASE:1.13.2.1.8.1
	RELENG_8_3:1.13.2.1.0.8
	RELENG_8_3_BP:1.13.2.1
	RELENG_9_0_0_RELEASE:1.13.4.1.2.1
	RELENG_9_0:1.13.4.1.0.2
	RELENG_9_0_BP:1.13.4.1
	RELENG_9:1.13.0.4
	RELENG_9_BP:1.13
	RELENG_7_4_0_RELEASE:1.12.18.1.8.1
	RELENG_8_2_0_RELEASE:1.13.2.1.6.1
	RELENG_7_4:1.12.18.1.0.8
	RELENG_7_4_BP:1.12.18.1
	RELENG_8_2:1.13.2.1.0.6
	RELENG_8_2_BP:1.13.2.1
	RELENG_8_1_0_RELEASE:1.13.2.1.4.1
	RELENG_8_1:1.13.2.1.0.4
	RELENG_8_1_BP:1.13.2.1
	RELENG_7_3_0_RELEASE:1.12.18.1.6.1
	RELENG_7_3:1.12.18.1.0.6
	RELENG_7_3_BP:1.12.18.1
	RELENG_8_0_0_RELEASE:1.13.2.1.2.1
	RELENG_8_0:1.13.2.1.0.2
	RELENG_8_0_BP:1.13.2.1
	RELENG_8:1.13.0.2
	RELENG_8_BP:1.13
	RELENG_7_2_0_RELEASE:1.12.18.1.4.1
	RELENG_7_2:1.12.18.1.0.4
	RELENG_7_2_BP:1.12.18.1
	RELENG_7_1_0_RELEASE:1.12.18.1.2.1
	RELENG_6_4_0_RELEASE:1.12.24.1
	RELENG_7_1:1.12.18.1.0.2
	RELENG_7_1_BP:1.12.18.1
	RELENG_6_4:1.12.0.24
	RELENG_6_4_BP:1.12
	RELENG_7_0_0_RELEASE:1.12
	RELENG_6_3_0_RELEASE:1.12
	RELENG_7_0:1.12.0.22
	RELENG_7_0_BP:1.12
	RELENG_6_3:1.12.0.20
	RELENG_6_3_BP:1.12
	RELENG_7:1.12.0.18
	RELENG_7_BP:1.12
	RELENG_6_2_0_RELEASE:1.12
	RELENG_6_2:1.12.0.16
	RELENG_6_2_BP:1.12
	RELENG_5_5_0_RELEASE:1.12
	RELENG_5_5:1.12.0.14
	RELENG_5_5_BP:1.12
	RELENG_6_1_0_RELEASE:1.12
	RELENG_6_1:1.12.0.12
	RELENG_6_1_BP:1.12
	RELENG_6_0_0_RELEASE:1.12
	RELENG_6_0:1.12.0.10
	RELENG_6_0_BP:1.12
	RELENG_6:1.12.0.8
	RELENG_6_BP:1.12
	RELENG_5_4_0_RELEASE:1.12
	RELENG_5_4:1.12.0.6
	RELENG_5_4_BP:1.12
	RELENG_4_11_0_RELEASE:1.4
	RELENG_4_11:1.4.0.26
	RELENG_4_11_BP:1.4
	RELENG_5_3_0_RELEASE:1.12
	RELENG_5_3:1.12.0.4
	RELENG_5_3_BP:1.12
	RELENG_5:1.12.0.2
	RELENG_5_BP:1.12
	RELENG_4_10_0_RELEASE:1.4
	RELENG_4_10:1.4.0.24
	RELENG_4_10_BP:1.4
	RELENG_5_2_1_RELEASE:1.8
	RELENG_5_2_0_RELEASE:1.8
	RELENG_5_2:1.8.0.2
	RELENG_5_2_BP:1.8
	RELENG_4_9_0_RELEASE:1.4
	RELENG_4_9:1.4.0.22
	RELENG_4_9_BP:1.4
	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.4
	RELENG_4_8:1.4.0.20
	RELENG_4_8_BP:1.4
	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.4
	RELENG_4_7:1.4.0.18
	RELENG_4_7_BP:1.4
	RELENG_4_6_2_RELEASE:1.4
	RELENG_4_6_1_RELEASE:1.4
	RELENG_4_6_0_RELEASE:1.4
	RELENG_4_6:1.4.0.16
	RELENG_4_6_BP:1.4
	RELENG_4_5_0_RELEASE:1.4
	RELENG_4_5:1.4.0.14
	RELENG_4_5_BP:1.4
	RELENG_4_4_0_RELEASE:1.4
	RELENG_4_4:1.4.0.12
	RELENG_4_4_BP:1.4
	RELENG_4_3_0_RELEASE:1.4
	RELENG_4_3:1.4.0.10
	RELENG_4_3_BP:1.4
	RELENG_4_2_0_RELEASE:1.4
	RELENG_4_1_1_RELEASE:1.4
	PRE_SMPNG:1.4
	RELENG_4_1_0_RELEASE:1.4
	RELENG_3_5_0_RELEASE:1.4
	RELENG_4_0_0_RELEASE:1.4
	RELENG_4:1.4.0.8
	RELENG_4_BP:1.4
	RELENG_3_4_0_RELEASE:1.4
	RELENG_3_3_0_RELEASE:1.4
	RELENG_3_2_PAO:1.4.0.6
	RELENG_3_2_PAO_BP:1.4
	RELENG_3_2_0_RELEASE:1.4
	RELENG_3_1_0_RELEASE:1.4
	RELENG_3:1.4.0.4
	RELENG_3_BP:1.4
	RELENG_2_2_8_RELEASE:1.4
	RELENG_3_0_0_RELEASE:1.4
	RELENG_2_2_7_RELEASE:1.4
	RELENG_2_2_6_RELEASE:1.4
	RELENG_2_2_5_RELEASE:1.4
	RELENG_2_2_2_RELEASE:1.4
	RELENG_2_2_1_RELEASE:1.4
	RELENG_2_2_0_RELEASE:1.4
	RELENG_2_1_7_RELEASE:1.2.8.3
	RELENG_2_1_6_1_RELEASE:1.2.8.3
	RELENG_2_1_6_RELEASE:1.2.8.3
	RELENG_2_2:1.4.0.2
	RELENG_2_2_BP:1.4
	RELENG_2_1_5_RELEASE:1.2.8.3
	RELENG_2_1_0_RELEASE:1.2.8.1
	RELENG_2_1_0:1.2.0.8
	RELENG_2_1_0_BP:1.2
	RELENG_2_0_5_RELEASE:1.2
	RELENG_2_0_5:1.2.0.6
	RELENG_2_0_5_BP:1.2
	RELENG_2_0_5_ALPHA:1.2
	RELEASE_2_0:1.2
	BETA_2_0:1.2
	ALPHA_2_0:1.2.0.4
	MOVED_NEWCVS:1.2
	FINAL_1_1_5:1.2
	ALPHA_1_1_5:1.2
	FINAL_1_1:1.2
	GAMMA_1_1:1.2
	BETA_1_1:1.2.0.2
	BP_BETA_1_1:1.2
	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
	TEXT_1_6:1.1.1.1
	GNU:1.1.1;
locks; strict;
comment	@# @;


1.16
date	2012.10.13.18.40.39;	author gabor;	state dead;
branches
	1.16.2.1;
next	1.15;

1.15
date	2012.06.27.05.59.01;	author gabor;	state Exp;
branches;
next	1.14;

1.14
date	2012.05.11.12.47.21;	author gabor;	state Exp;
branches;
next	1.13;

1.13
date	2007.10.12.18.15.40;	author obrien;	state Exp;
branches
	1.13.2.1
	1.13.4.1;
next	1.12;

1.12
date	2004.08.12.06.02.28;	author tjr;	state Exp;
branches
	1.12.8.1
	1.12.18.1
	1.12.24.1;
next	1.11;

1.11
date	2004.07.02.11.09.55;	author tjr;	state Exp;
branches;
next	1.10;

1.10
date	2004.07.02.09.34.37;	author tjr;	state Exp;
branches;
next	1.9;

1.9
date	2004.02.17.01.08.34;	author ache;	state Exp;
branches;
next	1.8;

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

1.7
date	2002.06.08.10.34.12;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	2002.04.08.12.12.06;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	2002.03.29.09.11.38;	author markm;	state dead;
branches;
next	1.4;

1.4
date	96.02.12.06.45.32;	author nate;	state Exp;
branches;
next	1.3;

1.3
date	95.08.23.05.35.03;	author pst;	state Exp;
branches;
next	1.2;

1.2
date	93.11.08.17.09.21;	author nate;	state Exp;
branches
	1.2.8.1;
next	1.1;

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

1.16.2.1
date	2012.10.13.18.40.39;	author svnexp;	state dead;
branches;
next	1.16.2.2;

1.16.2.2
date	2013.03.28.13.02.53;	author svnexp;	state Exp;
branches;
next	;

1.13.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.13.2.1.2.1
	1.13.2.1.4.1
	1.13.2.1.6.1
	1.13.2.1.8.1;
next	1.13.2.2;

1.13.2.2
date	2012.11.17.10.36.00;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.13.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.13.2.1.8.2;

1.13.2.1.8.2
date	2012.11.17.08.24.41;	author svnexp;	state Exp;
branches;
next	;

1.13.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.13.4.1.2.1
	1.13.4.1.4.1;
next	1.13.4.2;

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

1.13.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.13.4.1.2.2;

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

1.13.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.13.4.1.4.2;

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

1.12.8.1
date	2012.11.17.07.39.24;	author svnexp;	state Exp;
branches;
next	;

1.12.18.1
date	2008.03.16.08.03.11;	author obrien;	state Exp;
branches
	1.12.18.1.2.1
	1.12.18.1.4.1
	1.12.18.1.6.1
	1.12.18.1.8.1;
next	1.12.18.2;

1.12.18.2
date	2012.11.17.08.01.38;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.12.18.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.12.18.1.8.2;

1.12.18.1.8.2
date	2012.11.17.08.16.40;	author svnexp;	state Exp;
branches;
next	;

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

1.2.8.1
date	95.08.30.07.08.17;	author davidg;	state Exp;
branches;
next	1.2.8.2;

1.2.8.2
date	96.05.29.22.37.12;	author jkh;	state Exp;
branches;
next	1.2.8.3;

1.2.8.3
date	96.06.05.02.43.37;	author jkh;	state Exp;
branches;
next	;

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


desc
@@


1.16
log
@SVN rev 241511 on 2012-10-13 18:40:39Z by gabor

- Remove GNU sort and the WITH_GNU_SORT knob
@
text
@# $FreeBSD: src/gnu/usr.bin/sort/Makefile,v 1.15 2012/06/27 05:59:01 gabor Exp $

SORTDIR= ${.CURDIR}/../../../contrib/gnu-sort
.PATH: ${SORTDIR}/lib ${SORTDIR}/src ${SORTDIR}/man

.include <bsd.own.mk>

.if ${MK_GNU_SORT} == "yes"
PROG=	sort
.else
PROG=	gnusort

CLEANFILES+= gnusort.1
gnusort.1: sort.1
	cp ${.ALLSRC} ${.TARGET}
.endif

SRCS=   sort.c \
	__fpending.c \
	argmatch.c \
	closeout.c \
	dup-safer.c \
	error.c \
	exitfail.c \
	fopen-safer.c \
	hard-locale.c \
	human.c \
	long-options.c \
	memcoll.c \
	physmem.c \
	posixver.c \
	quote.c \
	quotearg.c \
	strnlen.c \
	umaxtostr.c \
	version-etc.c \
	xalloc-die.c \
	xmalloc.c \
	xmemcoll.c \
	xstrtoul.c \
	xstrtoumax.c

CFLAGS+=-DHAVE_CONFIG_H -DHAVE_LANGINFO_H=1 -DHAVE_NL_LANGINFO=1 \
	-I${.CURDIR} -I${SORTDIR}/lib

.include <bsd.prog.mk>
@


1.16.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:02:53 +0000
@
text
@d1 46
@


1.16.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 35
# $FreeBSD: releng/8.4/gnu/usr.bin/sort/Makefile 172595 2007-10-12 18:15:40Z obrien $

SORTDIR= ${.CURDIR}/../../../contrib/gnu-sort
.PATH: ${SORTDIR}/lib ${SORTDIR}/src ${SORTDIR}/man

PROG=	sort
SRCS=   sort.c \
	__fpending.c \
	argmatch.c \
	closeout.c \
	dup-safer.c \
	error.c \
	exitfail.c \
	fopen-safer.c \
	hard-locale.c \
	human.c \
	long-options.c \
	memcoll.c \
	physmem.c \
	posixver.c \
	quote.c \
	quotearg.c \
	strnlen.c \
	umaxtostr.c \
	version-etc.c \
	xalloc-die.c \
	xmalloc.c \
	xmemcoll.c \
	xstrtoul.c \
	xstrtoumax.c

CFLAGS+=-DHAVE_CONFIG_H -DHAVE_LANGINFO_H=1 -DHAVE_NL_LANGINFO=1 \
	-I${.CURDIR} -I${SORTDIR}/lib

.include <bsd.prog.mk>
@


1.15
log
@SVN rev 237629 on 2012-06-27 05:59:01Z by gabor

- Switch to BSD sort as default sort.  GNU sort will still be installed as
  "gnusort".  Most of the BSD sort development work was done by
  Oleg Moskalenko <oleg.moskalenko@@citrix.com>.
- GNU grep can be set to default by setting WITH_GNU_GREP.  It will cause
  BSD sort to be installed as "bsdsort".

Portbuild tested by:    linimon
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.14
log
@SVN rev 235268 on 2012-05-11 12:47:21Z by gabor

- Hook up BSD sort to the build.  By default, it will be installed as
  "bsdsort" and GNU sort will be the default "sort".  When WITH_BSD_SORT
  is set, BSD sort will be the default "sort" and GNU sort will be installed
  as "gnusort".
@
text
@d8 1
a8 1
.if ${MK_BSD_SORT} != "yes"
@


1.13
log
@style.Makefile(5)
@
text
@d6 3
d10 8
@


1.13.4.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.13.4.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/sort/Makefile 172595 2007-10-12 18:15:40Z obrien $
@


1.13.4.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.13.4.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/gnu/usr.bin/sort/Makefile 172595 2007-10-12 18:15:40Z obrien $
@


1.13.4.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.13.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/gnu/usr.bin/sort/Makefile 172595 2007-10-12 18:15:40Z obrien $
@


1.13.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.13.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/sort/Makefile 172595 2007-10-12 18:15:40Z obrien $
@


1.13.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.13.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/gnu/usr.bin/sort/Makefile 172595 2007-10-12 18:15:40Z obrien $
@


1.13.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.13.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.13.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.12
log
@Hook xalloc-die.c up to the build.
@
text
@d32 2
a33 2
CFLAGS+=-I${.CURDIR} -I${SORTDIR}/lib -DHAVE_CONFIG_H \
	-DHAVE_LANGINFO_H=1 -DHAVE_NL_LANGINFO=1
@


1.12.8.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/gnu/usr.bin/sort/Makefile 133549 2004-08-12 06:02:28Z tjr $
@


1.12.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.12.18.1
log
@MFC: rev 1.13: style.Makefile(5)
@
text
@d32 2
a33 2
CFLAGS+=-DHAVE_CONFIG_H -DHAVE_LANGINFO_H=1 -DHAVE_NL_LANGINFO=1 \
	-I${.CURDIR} -I${SORTDIR}/lib
@


1.12.18.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/gnu/usr.bin/sort/Makefile 177249 2008-03-16 08:03:11Z obrien $
@


1.12.18.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.12.18.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/gnu/usr.bin/sort/Makefile 177249 2008-03-16 08:03:11Z obrien $
@


1.12.18.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.12.18.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.12.18.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.11
log
@Hook strnlen.c up to the build - the i18n patch uses it.
@
text
@d26 1
@


1.10
log
@Update build infrastructure for sort from GNU coreutils 5.2.1.
@
text
@d23 1
@


1.9
log
@Remove getopt*.c, we already have compatible getopt_long() in libc
@
text
@d8 1
d10 1
d13 1
d23 1
d31 1
a31 1
	-DHAVE_LANGINFO_H=1 -DHAVE_NL_LANGINFO=1 -DLOCALEDIR=\"\"
@


1.8
log
@Upgrade to textutils 2.1 sort
@
text
@a11 2
	getopt.c \
	getopt1.c \
@


1.7
log
@Activate new GNU sort from contrib
@
text
@d28 2
a29 1
CFLAGS+=-I${.CURDIR} -I${SORTDIR}/lib -DHAVE_CONFIG_H
@


1.6
log
@Revive GNU sort
@
text
@d2 4
d7 20
a26 1
SRCS=	sort.c error.c version.c long-options.c getopt.c getopt1.c xstrtod.c
d28 1
a28 1
CFLAGS+=-I${.CURDIR} -DHAVE_CONFIG_H
@


1.5
log
@Boot this into the Attic. We now have (Net)BSD sort.
@
text
@d1 1
@


1.4
log
@Merged in FreeBSD changes.
@
text
@@


1.3
log
@Fix compilation warnings.
@
text
@d2 1
a2 7
SRCS=	sort.c error.c version.c long-options.c getopt.c getopt1.c

CFLAGS+=-I${.CURDIR} -DDIRENT=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_LONG_DOUBLE=1	\
	-DHAVE_ST_BLKSIZE=1 -DHAVE_VPRINTF=1 -DRETSIGTYPE=void	\
	-DSTDC_HEADERS=1 -DHAVE_STRERROR=1 -DHAVE_FCNTL_H=1	\
	-DHAVE_LIMITS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRING_H=1	\
	-DHAVE_UNISTD_H=1
d4 1
@


1.2
log
@Updated to GNU textutils 1.9
@
text
@d6 1
a6 1
	-DSTDC_HEADERS=1 -DDHAVE_STRERROR=1 -DHAVE_FCNTL_H=1	\
@


1.2.8.1
log
@Brought in change from rev 1.3: fix typo.
@
text
@d6 1
a6 1
	-DSTDC_HEADERS=1 -DHAVE_STRERROR=1 -DHAVE_FCNTL_H=1	\
@


1.2.8.2
log
@Merge from HEAD, except:

	Clients that used gnumalloc still do, despite the merge.  We're not
	bringing phkmalloc over.

	Thread stuff left out.

	PCCARD support left out.
@
text
@d2 7
a8 1
SRCS=	sort.c error.c version.c long-options.c getopt.c getopt1.c xstrtod.c
a9 1
CFLAGS+=-I${.CURDIR} -DHAVE_CONFIG_H
@


1.2.8.3
log
@This 3rd mega-commit should hopefully bring us back to where we were.
I can get it to `make world' succesfully, anyway!
@
text
@d2 1
a2 7
SRCS=	sort.c error.c version.c long-options.c getopt.c getopt1.c

CFLAGS+=-I${.CURDIR} -DDIRENT=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_LONG_DOUBLE=1	\
	-DHAVE_ST_BLKSIZE=1 -DHAVE_VPRINTF=1 -DRETSIGTYPE=void	\
	-DSTDC_HEADERS=1 -DHAVE_STRERROR=1 -DHAVE_FCNTL_H=1	\
	-DHAVE_LIMITS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRING_H=1	\
	-DHAVE_UNISTD_H=1
d4 1
@


1.1
log
@Initial revision
@
text
@d1 8
a9 2
PROG=	sort
SRCS=	sort.c error.c
@


1.1.1.1
log
@GNU Textutils-1.6
@
text
@@
