head	1.11;
access;
symbols
	v_2002_03_22:1.1.1.1 NETBSD:1.1.1;
locks; strict;
comment	@# @;


1.11
date	2012.11.17.01.54.29;	author svnexp;	state Exp;
branches;
next	1.10;

1.10
date	2012.10.18.15.39.29;	author ed;	state Exp;
branches;
next	1.9;

1.9
date	2012.10.13.18.40.39;	author gabor;	state Exp;
branches;
next	1.8;

1.8
date	2012.06.27.05.59.01;	author gabor;	state Exp;
branches;
next	1.7;

1.7
date	2012.06.27.05.50.15;	author gabor;	state Exp;
branches;
next	1.6;

1.6
date	2012.05.11.12.37.16;	author gabor;	state Exp;
branches;
next	1.5;

1.5
date	2002.04.08.20.50.12;	author ache;	state dead;
branches;
next	1.4;

1.4
date	2002.04.06.21.09.31;	author obrien;	state Exp;
branches;
next	1.3;

1.3
date	2002.04.06.21.03.33;	author obrien;	state Exp;
branches;
next	1.2;

1.2
date	2002.04.06.13.59.43;	author des;	state Exp;
branches;
next	1.1;

1.1
date	2002.03.22.13.53.52;	author markm;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2002.03.22.13.53.52;	author markm;	state Exp;
branches;
next	;


desc
@@


1.11
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/usr.bin/sort/Makefile 241695 2012-10-18 15:39:29Z ed $

.include <bsd.own.mk>

PROG=	sort

SRCS=	bwstring.c coll.c file.c mem.c radixsort.c sort.c vsort.c

sort.1: sort.1.in
	/usr/bin/sed ${MAN_SUB} ${.ALLSRC} >${.TARGET}

CLEANFILES+= sort.1

.if defined(WITH_THREADS)
CFLAGS+= -DSORT_THREADS
LDFLAGS+= -lpthread -lmd
MAN_SUB+= -e 's|%%THREADS%%||g'
.else
LDFLAGS+= -lmd
MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g'
.endif

.if !defined(WITHOUT_NLS)
NLS+=	hu_HU.ISO8859-2
NLSSRCFILES= ${NLS:S@@$@@.msg@@}
MAN_SUB+= -e 's|%%NLS%%||g'
.for lang in ${NLS}
NLSSRCDIR_${lang}= ${.CURDIR}/nls
.endfor
.else
CFLAGS+= -DWITHOUT_NLS
MAN_SUB+= -e 's|%%NLS%%|\.\\"|g'
.endif

.include <bsd.prog.mk>
@


1.10
log
@SVN rev 241695 on 2012-10-18 15:39:29Z by ed

Remove WARNS=6 lines.

WARNS=6 is already implied at this point.
@
text
@d1 1
a1 1
# $FreeBSD$
@


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

- Remove GNU sort and the WITH_GNU_SORT knob
@
text
@a8 2
WARNS=	6

@


1.8
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
@a4 1
.if ${MK_GNU_SORT} != "yes"
a5 7
.else
PROG=	bsdsort
CLEANFILES+= bsdsort.1

bsdsort.1: sort.1
	cp ${.ALLSRC} ${.TARGET}
.endif
@


1.7
log
@SVN rev 237628 on 2012-06-27 05:50:15Z by gabor

- Disable threaded sort by default
- Fix typo in the NLS support
@
text
@d5 1
a5 1
.if ${MK_BSD_SORT} == "yes"
@


1.6
log
@SVN rev 235267 on 2012-05-11 12:37:16Z by gabor

Add a BSD-licensed sort rewrite that was started by me and later completed
with the major functionality and optimizations by Oleg Moskalenko.
It is compatible with the latest version of POSIX and the current GNU sort
version that we have in base.  Beside this, it implements all the
functionality introduced in later versions of GNU sort.  For now, it will
be installed as "bsdsort", keeping GNU sort as the default sort
implementation.
@
text
@d24 1
a24 1
.if !defined(WITHOUT_THREADS)
d42 1
a42 1
MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g'
@


1.5
log
@Remove it in favour of GNU sort
@
text
@d1 1
a1 1
#	$FreeBSD: src/usr.bin/sort/Makefile,v 1.4 2002/04/06 21:09:31 obrien Exp $
d3 1
a3 2
SRCDIR=	${.CURDIR}/../../contrib/sort
.PATH: ${SRCDIR}
d5 1
d7 37
a43 3
SRCS=	append.c fields.c files.c fsort.c init.c msort.c sort.c tmp.c
MAN=	sort.1
CFLAGS+= -I${SRCDIR} -DNO__RCSID -DNO__SCCSID
@


1.4
log
@Use the new features of cdefs.h.
@
text
@d1 1
a1 1
#	$FreeBSD$
@


1.3
log
@Fix style.
@
text
@d9 1
a9 1
CFLAGS+= -I${SRCDIR} -include ${.CURDIR}/netbsd.h
@


1.2
log
@Build a working version of sort(1) from contrib.  Use netbsd.h as a hack
to avoid bringing the sources off the vendor branch just to #ifdef out
the RCS and SCCS IDs.
@
text
@d4 1
d9 1
a9 1
CFLAGS+=-I${SRCDIR} -include ${.CURDIR}/netbsd.h
a11 2

.PATH:	${SRCDIR}
@


1.1
log
@Initial revision
@
text
@d1 3
a3 2
#	$NetBSD: Makefile,v 1.3 2001/01/08 19:16:49 jdolecek Exp $
#	from: @@(#)Makefile	8.1 (Berkeley) 6/6/93
d7 2
d11 2
@


1.1.1.1
log
@Vendor import NETBSD's sort(1). This will be a replacement for
our GNU sort, as discussed 6 months or more ago.
@
text
@@
