From c291d24dbe9c6f3e3b971601ef85fe1bb950a8f8 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 13 Sep 2011 23:13:47 +0000
Subject: - Fix build on 9.X

Reported by:	pointyhat (via pav)
---
 textproc/bsdgrep/Makefile             |  4 ----
 textproc/bsdgrep/files/patch-Makefile | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 textproc/bsdgrep/files/patch-Makefile

(limited to 'textproc/bsdgrep')

diff --git a/textproc/bsdgrep/Makefile b/textproc/bsdgrep/Makefile
index 7e6248141e35..7784e371c8d6 100644
--- a/textproc/bsdgrep/Makefile
+++ b/textproc/bsdgrep/Makefile
@@ -60,10 +60,6 @@ PLIST_SUB+=	NLS=""
 MAKE_ENV+=	WITHOUT_GNU_COMPAT=yes
 .endif
 
-# XXX: fix upstream
-post-patch:
-	${REINPLACE_CMD} 's/xzefgrep/xzegrep/g' ${WRKSRC}/Makefile
-
 pre-install:
 .if defined(WITH_NLS)
 	${MKDIR} ${LOCALBASE}/share/nls/gl_ES.ISO8859-1
diff --git a/textproc/bsdgrep/files/patch-Makefile b/textproc/bsdgrep/files/patch-Makefile
new file mode 100644
index 000000000000..5bcd88bb126f
--- /dev/null
+++ b/textproc/bsdgrep/files/patch-Makefile
@@ -0,0 +1,27 @@
+--- Makefile.old	2011-09-14 01:10:08.000000000 +0200
++++ Makefile	2011-09-14 01:10:38.000000000 +0200
+@@ -4,15 +4,7 @@
+ 
+ .include <bsd.own.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
+ 
+ # Extra files ported backported form some regex improvements
+@@ -30,7 +22,7 @@
+ 	${BINDIR}/grep ${BINDIR}/bzegrep \
+ 	${BINDIR}/grep ${BINDIR}/bzfgrep \
+ 	${BINDIR}/grep ${BINDIR}/xzgrep \
+-	${BINDIR}/grep ${BINDIR}/xzefgrep \
++	${BINDIR}/grep ${BINDIR}/xzegrep \
+ 	${BINDIR}/grep ${BINDIR}/xzfgrep \
+ 	${BINDIR}/grep ${BINDIR}/lzgrep \
+ 	${BINDIR}/grep ${BINDIR}/lzegrep \
-- 
cgit v1.2.3