git: adfededdb754 - main - textproc/bsdgrep: Remove expired port

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Sun, 31 Dec 2023 00:07:30 UTC
The branch main has been updated by bofh:

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

commit adfededdb754944329964a3a3ebc91eed3823690
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-12-29 21:36:53 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-12-31 00:06:16 +0000

    textproc/bsdgrep: Remove expired port
    
    2023-12-31 textproc/bsdgrep: Merged into base from 13
---
 MOVED                                       |  1 +
 textproc/Makefile                           |  1 -
 textproc/bsdgrep/Makefile                   | 49 -----------------
 textproc/bsdgrep/distinfo                   |  3 --
 textproc/bsdgrep/files/patch-Makefile       | 84 -----------------------------
 textproc/bsdgrep/files/patch-tests_Makefile | 58 --------------------
 textproc/bsdgrep/pkg-descr                  |  4 --
 textproc/bsdgrep/pkg-plist                  | 43 ---------------
 8 files changed, 1 insertion(+), 242 deletions(-)

diff --git a/MOVED b/MOVED
index 25a3d5399cb0..3b24d2df1b5f 100644
--- a/MOVED
+++ b/MOVED
@@ -8205,3 +8205,4 @@ www/varnish6|www/varnish7|2023-12-31|Has expired: Unsupported version upstream,
 net-im/teamwords||2023-12-31|Has expired: Depends on deprecated www/qt5-webkit
 devel/eris||2023-12-31|Has expired: There has been no release for most of the Worldforge libraries in the past 10 years.
 devel/zanata-platform||2023-12-31|Has expired: Depends on expired java/wildfly10, last release from 2018
+textproc/bsdgrep||2023-12-31|Has expired: Merged into base from 13
diff --git a/textproc/Makefile b/textproc/Makefile
index 2bd8cffd9503..557df02e71d5 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -84,7 +84,6 @@
     SUBDIR += br-aspell
     SUBDIR += bsd-spell
     SUBDIR += bsddiff
-    SUBDIR += bsdgrep
     SUBDIR += btparse
     SUBDIR += c2html
     SUBDIR += c2man
diff --git a/textproc/bsdgrep/Makefile b/textproc/bsdgrep/Makefile
deleted file mode 100644
index 5d1645c04020..000000000000
--- a/textproc/bsdgrep/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-PORTNAME=	grep
-DISTVERSION=	2.6.0
-DISTVERSIONSUFFIX=	-FreeBSD
-PORTEPOCH=	1
-CATEGORIES=	textproc
-MASTER_SITES=	LOCAL/kevans
-PKGNAMEPREFIX=	bsd-
-
-MAINTAINER=	kevans@FreeBSD.org
-COMMENT=	BSD-licensed version of grep
-WWW=		https://www.freebsd.org/projects/ideas/ #p-bsdtexttools
-
-LICENSE=	BSD2CLAUSE
-
-DEPRECATED=	Merged into base from 13
-EXPIRATION_DATE=	2023-12-31
-# This port should be deprecated once stable/12 goes EoL.  bsdgrep shipped by
-# default in FreeBSD 13.0.
-IGNORE_FreeBSD_13=	only for FreeBSD 12.x
-IGNORE_FreeBSD_14=	only for FreeBSD 12.x
-
-USES=	uidfix
-
-MAKE_ENV+=	BINDIR="${PREFIX}/bin" \
-		MANDIR="${MANPREFIX}/man/man" \
-		CATDIR="${MANPREFIX}/man/man" \
-		NLSDIR="${PREFIX}/share/nls" \
-		WITHOUT_TESTS=yes
-CFLAGS+=	-std=gnu99
-
-OPTIONS_DEFINE=	GNU_COMPAT NLS
-OPTIONS_DEFAULT=	GNU_COMPAT
-OPTIONS_SUB=		yes
-GNU_COMPAT_DESC=	Use GNU regex library (recommended)
-
-CONFLICTS=	gnugrep
-
-NLS_MAKE_ENV=	MK_NLS=yes
-NLS_MAKE_ENV_OFF=	MK_NLS=no
-GNU_COMPAT_MAKE_ENV=	MK_GNU_GREP_COMPAT=yes
-GNU_COMPAT_MAKE_ENV_OFF=MK_GNU_GREP_COMPAT=no
-
-pre-install-NLS-on:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/nls/gl_ES.ISO8859-1
-
-post-install:
-	${RLN} ${STAGEDIR}${PREFIX}/bin/grep ${STAGEDIR}${PREFIX}/bin/bsdgrep
-
-.include <bsd.port.mk>
diff --git a/textproc/bsdgrep/distinfo b/textproc/bsdgrep/distinfo
deleted file mode 100644
index a2da6778ad46..000000000000
--- a/textproc/bsdgrep/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1524157347
-SHA256 (grep-2.6.0-FreeBSD.tar.gz) = 228f246c1ed07a71525624b1eaf6243c2e28a99220d13683507eb1c722375ea1
-SIZE (grep-2.6.0-FreeBSD.tar.gz) = 36243
diff --git a/textproc/bsdgrep/files/patch-Makefile b/textproc/bsdgrep/files/patch-Makefile
deleted file mode 100644
index 3d0357b3aede..000000000000
--- a/textproc/bsdgrep/files/patch-Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
---- Makefile.orig	2017-10-19 20:07:52 UTC
-+++ Makefile
-@@ -2,31 +2,14 @@
- #	$FreeBSD: head/usr.bin/grep/Makefile 322515 2017-08-14 19:21:37Z ngie $
- #	$OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $
- 
--.include <src.opts.mk>
-+.include <bsd.opts.mk>
--
--.if ${MK_BSD_GREP} == "yes"
- PROG=	grep
--.else
--PROG=	bsdgrep
--CLEANFILES+= bsdgrep.1
- 
--bsdgrep.1: grep.1
--	${CP} ${.ALLSRC} ${.TARGET}
--.endif
- SRCS=	file.c grep.c queue.c util.c
--
--.if ${MK_BSD_GREP_FASTMATCH} == "yes"
--# Extra files ported backported for some regex improvements
--.PATH: ${.CURDIR}/regex
--SRCS+=	fastmatch.c hashtable.c tre-compile.c tre-fastmatch.c
--CFLAGS+=-I${.CURDIR}/regex
--.else
- CFLAGS+= -DWITHOUT_FASTMATCH
--.endif
- 
- CFLAGS.gcc+= --param max-inline-insns-single=500
- 
--.if ${MK_BSD_GREP} == "yes"
- LINKS=	${BINDIR}/grep ${BINDIR}/egrep \
- 	${BINDIR}/grep ${BINDIR}/fgrep \
- 	${BINDIR}/grep ${BINDIR}/rgrep \
-@@ -40,14 +22,11 @@ MLINKS= grep.1 egrep.1 \
- 	grep.1 zgrep.1 \
- 	grep.1 zegrep.1 \
- 	grep.1 zfgrep.1
--.endif
- 
--LIBADD=	z
-+LDADD=	-lz
- 
--.if ${MK_LZMA_SUPPORT} != "no"
--LIBADD+=	lzma
-+LDADD+=	-llzma
- 
--.if ${MK_BSD_GREP} == "yes"
- LINKS+=	${BINDIR}/${PROG} ${BINDIR}/xzgrep \
- 	${BINDIR}/${PROG} ${BINDIR}/xzegrep \
- 	${BINDIR}/${PROG} ${BINDIR}/xzfgrep \
-@@ -61,29 +40,19 @@ MLINKS+= grep.1 xzgrep.1 \
- 	 grep.1 lzgrep.1 \
- 	 grep.1 lzegrep.1 \
- 	 grep.1 lzfgrep.1
--.endif
--.else
--CFLAGS+= -DWITHOUT_LZMA
--.endif
- 
--.if ${MK_BZIP2_SUPPORT} != "no"
--LIBADD+=	bz2
-+LDADD+=	-lbz2
- 
--.if ${MK_BSD_GREP} == "yes"
- LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \
- 	${BINDIR}/grep ${BINDIR}/bzegrep \
- 	${BINDIR}/grep ${BINDIR}/bzfgrep
- MLINKS+= grep.1 bzgrep.1 \
- 	 grep.1 bzegrep.1 \
- 	 grep.1 bzfgrep.1
--.endif
--.else
--CFLAGS+= -DWITHOUT_BZIP2
--.endif
- 
- .if ${MK_GNU_GREP_COMPAT} != "no"
- CFLAGS+= -I${SYSROOT:U${DESTDIR}}/usr/include/gnu -DWITH_GNU
--LIBADD+=	gnuregex
-+LDADD+=	-lgnuregex
- .endif
- 
- .if ${MK_NLS} != "no"
diff --git a/textproc/bsdgrep/files/patch-tests_Makefile b/textproc/bsdgrep/files/patch-tests_Makefile
deleted file mode 100644
index 1bb5360e9877..000000000000
--- a/textproc/bsdgrep/files/patch-tests_Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
---- tests/Makefile.orig	2020-11-20 14:03:37 UTC
-+++ tests/Makefile
-@@ -3,55 +3,5 @@
- PACKAGE=	tests
- 
- ATF_TESTS_SH+=	grep_freebsd_test
--NETBSD_ATF_TESTS_SH=	grep_test
--
--${PACKAGE}FILES+=		d_basic.out
--${PACKAGE}FILES+=		d_begin_end_a.out
--${PACKAGE}FILES+=		d_begin_end_b.out
--${PACKAGE}FILES+=		d_binary.out
--${PACKAGE}FILES+=		d_color_a.in
--${PACKAGE}FILES+=		d_color_a.out
--${PACKAGE}FILES+=		d_color_b.in
--${PACKAGE}FILES+=		d_color_b.out
--${PACKAGE}FILES+=		d_color_c.out
--${PACKAGE}FILES+=		d_context2_a.out
--${PACKAGE}FILES+=		d_context2_b.out
--${PACKAGE}FILES+=		d_context2_c.out
--${PACKAGE}FILES+=		d_context_a.in
--${PACKAGE}FILES+=		d_context_a.out
--${PACKAGE}FILES+=		d_context_b.in
--${PACKAGE}FILES+=		d_context_e.in
--${PACKAGE}FILES+=		d_context_b.out
--${PACKAGE}FILES+=		d_context_c.out
--${PACKAGE}FILES+=		d_context_d.out
--${PACKAGE}FILES+=		d_context_e.out
--${PACKAGE}FILES+=		d_context_f.out
--${PACKAGE}FILES+=		d_context_g.out
--${PACKAGE}FILES+=		d_egrep.out
--${PACKAGE}FILES+=		d_escmap.in
--${PACKAGE}FILES+=		d_f_file_empty.in
--${PACKAGE}FILES+=		d_file_exp.in
--${PACKAGE}FILES+=		d_file_exp.out
--${PACKAGE}FILES+=		d_ignore_case.out
--${PACKAGE}FILES+=		d_input
--${PACKAGE}FILES+=		d_invert.in
--${PACKAGE}FILES+=		d_invert.out
--${PACKAGE}FILES+=		d_oflag_zerolen_a.in
--${PACKAGE}FILES+=		d_oflag_zerolen_a.out
--${PACKAGE}FILES+=		d_oflag_zerolen_b.in
--${PACKAGE}FILES+=		d_oflag_zerolen_b.out
--${PACKAGE}FILES+=		d_oflag_zerolen_c.in
--${PACKAGE}FILES+=		d_oflag_zerolen_c.out
--${PACKAGE}FILES+=		d_oflag_zerolen_d.in
--${PACKAGE}FILES+=		d_oflag_zerolen_e.in
--${PACKAGE}FILES+=		d_oflag_zerolen_e.out
--${PACKAGE}FILES+=		d_recurse.out
--${PACKAGE}FILES+=		d_recurse_symlink.err
--${PACKAGE}FILES+=		d_recurse_symlink.out
--${PACKAGE}FILES+=		d_whole_line.out
--${PACKAGE}FILES+=		d_word_regexps.out
--${PACKAGE}FILES+=		d_zgrep.out
--
--.include <netbsd-tests.test.mk>
- 
- .include <bsd.test.mk>
diff --git a/textproc/bsdgrep/pkg-descr b/textproc/bsdgrep/pkg-descr
deleted file mode 100644
index 62c1481cc30e..000000000000
--- a/textproc/bsdgrep/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is the BSD-licensed version of the well-known grep utility, obtained from
-OpenBSD. It lacks some features of GNU grep. It is a proposed project idea
-to replace the GNU grep with this one, but it needs to be completed first.
-Patches are highly appreciated.
diff --git a/textproc/bsdgrep/pkg-plist b/textproc/bsdgrep/pkg-plist
deleted file mode 100644
index 872e4582748f..000000000000
--- a/textproc/bsdgrep/pkg-plist
+++ /dev/null
@@ -1,43 +0,0 @@
-bin/bsdgrep
-bin/bzegrep
-bin/bzfgrep
-bin/bzgrep
-bin/egrep
-bin/fgrep
-bin/grep
-bin/lzegrep
-bin/lzfgrep
-bin/lzgrep
-bin/rgrep
-bin/xzegrep
-bin/xzfgrep
-bin/xzgrep
-bin/zgrep
-bin/zegrep
-bin/zfgrep
-man/man1/bzegrep.1.gz
-man/man1/bzfgrep.1.gz
-man/man1/bzgrep.1.gz
-man/man1/egrep.1.gz
-man/man1/fgrep.1.gz
-man/man1/grep.1.gz
-man/man1/lzegrep.1.gz
-man/man1/lzfgrep.1.gz
-man/man1/lzgrep.1.gz
-man/man1/rgrep.1.gz
-man/man1/xzegrep.1.gz
-man/man1/xzfgrep.1.gz
-man/man1/xzgrep.1.gz
-man/man1/zegrep.1.gz
-man/man1/zfgrep.1.gz
-man/man1/zgrep.1.gz
-%%NLS%%share/nls/es_ES.ISO8859-1/grep.cat
-%%NLS%%share/nls/gl_ES.ISO8859-1/grep.cat
-%%NLS%%share/nls/hu_HU.ISO8859-2/grep.cat
-%%NLS%%share/nls/ja_JP.eucJP/grep.cat
-%%NLS%%share/nls/ja_JP.SJIS/grep.cat
-%%NLS%%share/nls/ja_JP.UTF-8/grep.cat
-%%NLS%%share/nls/pt_BR.ISO8859-1/grep.cat
-%%NLS%%share/nls/ru_RU.KOI8-R/grep.cat
-%%NLS%%share/nls/uk_UA.UTF-8/grep.cat
-%%NLS%%share/nls/zh_CN.UTF-8/grep.cat