diff options
| author | Gabor Kovesdan <gabor@FreeBSD.org> | 2011-10-02 15:28:46 +0000 |
|---|---|---|
| committer | Gabor Kovesdan <gabor@FreeBSD.org> | 2011-10-02 15:28:46 +0000 |
| commit | 967926347926a434d921e60df6ab2972c2b502b1 (patch) | |
| tree | 82f0e3f74dfbcddaf2a15913b3fd591baaaf0b1d /textproc/bsdgrep | |
| parent | b7461ea7eee54363f431cecd2f595f4b316f8c6d (diff) | |
| download | ports-967926347926a434d921e60df6ab2972c2b502b1.tar.gz ports-967926347926a434d921e60df6ab2972c2b502b1.zip | |
- Fix build on >=9.X
Reported by: eadler
Notes
Notes:
svn path=/head/; revision=282798
Diffstat (limited to 'textproc/bsdgrep')
| -rw-r--r-- | textproc/bsdgrep/Makefile | 3 | ||||
| -rw-r--r-- | textproc/bsdgrep/files/patch-Makefile | 21 |
2 files changed, 19 insertions, 5 deletions
diff --git a/textproc/bsdgrep/Makefile b/textproc/bsdgrep/Makefile index 2b412a95d64a..d579c4a39b51 100644 --- a/textproc/bsdgrep/Makefile +++ b/textproc/bsdgrep/Makefile @@ -35,8 +35,7 @@ MLINKS= grep.1 bzegrep.1 \ MAKE_ENV+= BINDIR="${PREFIX}/bin" \ MANDIR="${MANPREFIX}/man/man" \ CATDIR="${MANPREFIX}/man/man" \ - NLSDIR="${PREFIX}/share/nls" \ - MK_BSD_GREP="yes" + NLSDIR="${PREFIX}/share/nls" OPTIONS= NLS "Compile with NLS support" on \ GNU_COMPAT "Use GNU regex library (recommended)" on diff --git a/textproc/bsdgrep/files/patch-Makefile b/textproc/bsdgrep/files/patch-Makefile index 5cc40a3b3294..f1ab0cafd90a 100644 --- a/textproc/bsdgrep/files/patch-Makefile +++ b/textproc/bsdgrep/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2011-09-21 15:26:48.000000000 +0200 -+++ Makefile 2011-09-21 15:29:01.000000000 +0200 -@@ -4,16 +4,9 @@ +--- Makefile.orig 2011-10-02 00:39:02.000000000 +0200 ++++ Makefile 2011-10-02 17:25:40.000000000 +0200 +@@ -4,23 +4,15 @@ .include <bsd.own.mk> @@ -18,3 +18,18 @@ # Extra files ported backported form some regex improvements .PATH: ${.CURDIR}/regex + SRCS+= fastmatch.c hashtable.c tre-compile.c tre-fastmatch.c xmalloc.c + CFLAGS+=-I${.CURDIR}/regex + +-.if ${MK_BSD_GREP} == "yes" + LINKS= ${BINDIR}/grep ${BINDIR}/egrep \ + ${BINDIR}/grep ${BINDIR}/fgrep \ + ${BINDIR}/grep ${BINDIR}/zgrep \ +@@ -50,7 +42,6 @@ + grep.1 lzgrep.1 \ + grep.1 lzegrep.1 \ + grep.1 lzfgrep.1 +-.endif + + LDADD= -lz -lbz2 -llzma + DPADD= ${LIBZ} ${LIBBZ2} ${LIBLZMA} |