summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip M. Gollucci <pgollucci@FreeBSD.org>2010-06-10 03:32:07 +0000
committerPhilip M. Gollucci <pgollucci@FreeBSD.org>2010-06-10 03:32:07 +0000
commitb4019e0dfc189d8967959868f3e9e782a281bbf9 (patch)
tree41d0495ab0947a0bf7c149616f1d21dd757cadf2
parent- Update to 1.6 (diff)
- Update to 1.1.1
- Submitter is now maintainer (also original author) PR: ports/147710 Submitted by: "James P. Howard, II" <jh@jameshoward.us>
Notes
Notes: svn path=/head/; revision=256284
-rw-r--r--textproc/freegrep/Makefile19
-rw-r--r--textproc/freegrep/distinfo6
-rw-r--r--textproc/freegrep/files/patch-aa20
-rw-r--r--textproc/freegrep/files/patch-ab15
-rw-r--r--textproc/freegrep/pkg-plist4
5 files changed, 24 insertions, 40 deletions
diff --git a/textproc/freegrep/Makefile b/textproc/freegrep/Makefile
index 3d0eee17d9bc..205f4a8d32a7 100644
--- a/textproc/freegrep/Makefile
+++ b/textproc/freegrep/Makefile
@@ -6,20 +6,25 @@
#
PORTNAME= freegrep
-PORTVERSION= 0.16
-PORTREVISION= 1
+PORTVERSION= 1.1
CATEGORIES= textproc
-MASTER_SITES= http://www.vocito.com/downloads/software/grep/
+MASTER_SITES= ftp://ftp.jameshoward.us/pub/howardjp/grep/ \
+ http://github.com/downloads/howardjp/freegrep/
DISTNAME= grep-${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= jh@jameshoward.us
COMMENT= An implementation of grep(1) under a BSD-friendly license
-LIB_DEPENDS= iberty.1:${PORTSDIR}/devel/freelibiberty
+USE_BZIP2= YES
-CFLAGS:= -I${LOCALBASE}/include/freelibiberty ${CFLAGS}
+PLIST_FILES= bin/grep \
+ bin/egrep \
+ bin/fgrep \
+ bin/zgrep \
+ bin/zegrep \
+ bin/zfgrep
-MAN1= grep.1 egrep.1 fgrep.1 zgrep.1
+MAN1= grep.1 egrep.1 fgrep.1 zgrep.1 zegrep.1 zfgrep.1
post-extract:
@(cd ${WRKSRC}; ${RM} -f .depend)
diff --git a/textproc/freegrep/distinfo b/textproc/freegrep/distinfo
index bc6e22468e80..7551d1a1446c 100644
--- a/textproc/freegrep/distinfo
+++ b/textproc/freegrep/distinfo
@@ -1,3 +1,3 @@
-MD5 (grep-0.16.tar.gz) = 403623b26c42159c49216b5eca98b717
-SHA256 (grep-0.16.tar.gz) = bb930af7b3958e198002b0ce4c41a05a91bba426ea630c03a722379e191ebcd6
-SIZE (grep-0.16.tar.gz) = 9712
+MD5 (grep-1.1.tar.bz2) = d8d6a273fdb5a013363c12292fca1a06
+SHA256 (grep-1.1.tar.bz2) = 632c4b2efb14f65bbfe86ae3bcec2517aae1d380539352a2e67d2d2c3dc39513
+SIZE (grep-1.1.tar.bz2) = 14089
diff --git a/textproc/freegrep/files/patch-aa b/textproc/freegrep/files/patch-aa
index 610769dfb00e..999f96408e51 100644
--- a/textproc/freegrep/files/patch-aa
+++ b/textproc/freegrep/files/patch-aa
@@ -1,18 +1,16 @@
---- Makefile.orig Fri Nov 5 17:28:02 1999
-+++ Makefile Fri Jun 30 12:24:05 2000
-@@ -9,8 +9,13 @@
- grep.1 fgrep.1 \
- grep.1 zgrep.1
+--- Makefile.orig 2010-06-07 19:39:01.000000000 -0500
++++ Makefile 2010-06-08 19:14:59.000000000 -0500
+@@ -15,7 +15,12 @@
+ grep.1 zegrep.1 \
+ grep.1 zfgrep.1
--CFLAGS+= -I/usr/local/include -Wall -pedantic
+-CFLAGS+= -Wall
+DESTDIR= ${PREFIX}
+BINDIR= /bin
+MANDIR= /man/man
+NO_MANCOMPRESS= 1
-
--LDADD= -lz -L/usr/local/lib/ -liberty
-+CFLAGS+= -I${LOCALBASE}/include -Wall -pedantic
+
-+LDADD= -lz -L${LOCALBASE}/lib -liberty
++CFLAGS+= -Wall -pedantic
- .include <bsd.prog.mk>
+ .if ${OPSYS} == "Minix"
+ CPPFLAGS+= -DNOZ -D_POSIX_SOURCE -D_MINIX
diff --git a/textproc/freegrep/files/patch-ab b/textproc/freegrep/files/patch-ab
deleted file mode 100644
index 73a0b3a93d0d..000000000000
--- a/textproc/freegrep/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- util.c.orig Tue Feb 3 13:36:42 2004
-+++ util.c Tue Feb 3 13:39:49 2004
-@@ -72,10 +72,11 @@
- while ((p = fts_read(fts)) != NULL) {
- switch (p->fts_info) {
- case FTS_DNR:
-- break;
-+ /* FALL THROUGH */
- case FTS_ERR:
- errx(1, "%s: %s", p->fts_path, strerror(p->fts_errno));
- break;
-+ case FTS_D:
- case FTS_DP:
- break;
- default:
diff --git a/textproc/freegrep/pkg-plist b/textproc/freegrep/pkg-plist
deleted file mode 100644
index 2dbc17548819..000000000000
--- a/textproc/freegrep/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/grep
-bin/egrep
-bin/fgrep
-bin/zgrep