Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Apr 2021 10:58:28 GMT
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b54974bf33c7 - main - Remove textproc/bsdsort
Message-ID:  <202104211058.13LAwSbT059561@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b54974bf33c767167f058350819fa7b9c3142f02

commit b54974bf33c767167f058350819fa7b9c3142f02
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-21 08:33:48 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-04-21 10:57:20 +0000

    Remove textproc/bsdsort
    
    FWICT it's just an old version of sort(1).
---
 MOVED                                |  1 +
 textproc/Makefile                    |  1 -
 textproc/bsdsort/Makefile            | 43 ------------------------------------
 textproc/bsdsort/distinfo            |  2 --
 textproc/bsdsort/files/patch-sort.c  | 11 ---------
 textproc/bsdsort/files/patch-vsort.h | 11 ---------
 textproc/bsdsort/pkg-descr           |  6 -----
 7 files changed, 1 insertion(+), 74 deletions(-)

diff --git a/MOVED b/MOVED
index b6da06f3962a..0b1a1174772d 100644
--- a/MOVED
+++ b/MOVED
@@ -16293,3 +16293,4 @@ x11-toolkits/qt5-gtkplatform||2021-04-17|Has expired: Archived upstream
 textproc/py-markdown3|textproc/py-markdown|2021-04-20|markdown3 confilicts with too many ports
 security/fbopenssl||2021-04-20|Unmaintained, abandoned, does not build with recent OS versions
 devel/gearmand-devel||2021-04-20|Unmaintained, abandoned, has not built for over half a year
+textproc/bsdsort||2021-04-21|Old version of sort(1)
diff --git a/textproc/Makefile b/textproc/Makefile
index eec612bc6bb2..a1b3714f497b 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -78,7 +78,6 @@
     SUBDIR += br-aspell
     SUBDIR += bsddiff
     SUBDIR += bsdgrep
-    SUBDIR += bsdsort
     SUBDIR += btparse
     SUBDIR += c2html
     SUBDIR += c2man
diff --git a/textproc/bsdsort/Makefile b/textproc/bsdsort/Makefile
deleted file mode 100644
index fde2c71c791a..000000000000
--- a/textproc/bsdsort/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Created by: Gabor Kovesdan <gabor@FreeBSD.org>
-
-PORTNAME=	sort
-PORTVERSION=	20120716
-CATEGORIES=	textproc
-MASTER_SITES=	LOCAL/gabor
-PKGNAMEPREFIX=	bsd-
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	BSD-licensed version of sort
-
-LICENSE=	BSD2CLAUSE
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-MAKE_ENV+=	BINDIR="${PREFIX}/bin" \
-		MANDIR="${MANPREFIX}/man/man" \
-		CATDIR="${MANPREFIX}/man/man" \
-		NLSDIR="${PREFIX}/share/nls" \
-		NO_WERROR="defined" \
-		MK_GNU_SORT="no"
-USES=		uidfix
-
-CFLAGS+=	-std=c99
-
-PLIST_FILES=	bin/sort \
-		bin/bsdsort \
-		bin/gnusort \
-		man/man1/sort.1.gz
-
-OPTIONS_DEFINE=		THREADS NLS
-OPTIONS_DEFAULT=	THREADS
-OPTIONS_SUB=		yes
-
-NLS_MAKE_ENV_OFF=	WITHOUT_NLS=yes
-NLS_PLIST_FILES=	share/nls/hu_HU.ISO8859-2/sort.cat
-THREADS_MAKE_ENV=	WITH_THREADS=yes
-
-post-install:
-	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s sort bsdsort)
-	${LN} -s /usr/bin/sort ${STAGEDIR}${PREFIX}/bin/gnusort
-
-.include <bsd.port.mk>
diff --git a/textproc/bsdsort/distinfo b/textproc/bsdsort/distinfo
deleted file mode 100644
index 2888224a604b..000000000000
--- a/textproc/bsdsort/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (sort-20120716.tar.gz) = a30c577b78730f6acf2fe6aed154dbe906fc6834998c8f67c9b7e30fb10755a4
-SIZE (sort-20120716.tar.gz) = 40754
diff --git a/textproc/bsdsort/files/patch-sort.c b/textproc/bsdsort/files/patch-sort.c
deleted file mode 100644
index f2cc676237ea..000000000000
--- a/textproc/bsdsort/files/patch-sort.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- sort.c.orig	2012-07-04 20:25:12.000000000 +0400
-+++ sort.c	2014-01-21 07:18:36.832891740 +0400
-@@ -146,7 +146,7 @@
- #define	NUMBER_OF_MUTUALLY_EXCLUSIVE_FLAGS 6
- static const char mutually_exclusive_flags[NUMBER_OF_MUTUALLY_EXCLUSIVE_FLAGS] = { 'M', 'n', 'g', 'R', 'h', 'V' };
- 
--struct option long_options[] = {
-+static struct option long_options[] = {
- 				{ "batch-size", required_argument, NULL, BS_OPT },
- 				{ "buffer-size", required_argument, NULL, 'S' },
- 				{ "check", optional_argument, NULL, 'c' },
diff --git a/textproc/bsdsort/files/patch-vsort.h b/textproc/bsdsort/files/patch-vsort.h
deleted file mode 100644
index a966e5c111fe..000000000000
--- a/textproc/bsdsort/files/patch-vsort.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- vsort.h.orig	2014-08-15 12:06:55.000000000 -0400
-+++ vsort.h	2014-08-15 12:07:03.000000000 -0400
-@@ -28,7 +28,7 @@
-  */
- 
- #if !defined(__VSORT_H__)
--#define _VSORT_H__
-+#define __VSORT_H__
- 
- #include "bwstring.h"
- 
diff --git a/textproc/bsdsort/pkg-descr b/textproc/bsdsort/pkg-descr
deleted file mode 100644
index 8f79dfa58589..000000000000
--- a/textproc/bsdsort/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This a BSD-licensed version of the well-known sort utility that has been
-rewritten from scratch by Gabor Kovesdan <gabor@FreeBSD.org> and later
-developed by Oleg Moskalenko <oleg.moskalenko@citrix.com>.  This
-implementation is meant to be a replacement of GNU sort for FreeBSD.
-Currently, it seems to be quite feature-complete but performance needs
-some improvements.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104211058.13LAwSbT059561>