Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Jun 2010 20:24:33 -0500 (EST)
From:      "James P. Howard, II" <jh@jameshoward.us>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        "James P. Howard, II" <jh@jameshoward.us>
Subject:   ports/147710: upgrade textproc/freegrep
Message-ID:  <201006090124.o591OXt5030925@byzantine.jameshoward.us>
Resent-Message-ID: <201006090210.o592A5Ig065533@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         147710
>Category:       ports
>Synopsis:       upgrade textproc/freegrep
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 09 02:10:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     James P. Howard II
>Release:        FreeBSD 8.0-STABLE i386
>Organization:
N/A
>Environment:
System: FreeBSD byzantine.jameshoward.us 8.0-STABLE FreeBSD 8.0-STABLE #4: Sat Jan 23 22:07:32 EST 2010 root@byzantine.jameshoward.us:/usr/obj/usr/src/sys/BYZANTINE i386

>Description:
	This is a patch to update textproc/freegrep to the latest version.
>How-To-Repeat:
	N/A
>Fix:

diff -Nur freegrep.orig/Makefile freegrep/Makefile
--- freegrep.orig/Makefile	2010-06-08 19:51:35.000000000 -0500
+++ freegrep/Makefile	2010-06-08 20:14:08.000000000 -0500
@@ -6,18 +6,19 @@
 #
 
 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
+USE_BZIP2=	YES
 
-LIB_DEPENDS=	iberty.1:${PORTSDIR}/devel/freelibiberty
-
-CFLAGS:=	-I${LOCALBASE}/include/freelibiberty ${CFLAGS}
+PLIST_FILES=	bin/grep	\
+		bin/egrep	\
+		bin/fgrep	\
+		bin/zgrep
 
 MAN1=		grep.1 egrep.1 fgrep.1 zgrep.1
 
diff -Nur freegrep.orig/distinfo freegrep/distinfo
--- freegrep.orig/distinfo	2010-06-08 19:51:35.000000000 -0500
+++ freegrep/distinfo	2010-06-08 20:14:08.000000000 -0500
@@ -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 -Nur freegrep.orig/files/patch-aa freegrep/files/patch-aa
--- freegrep.orig/files/patch-aa	2010-06-08 19:51:35.000000000 -0500
+++ freegrep/files/patch-aa	2010-06-08 20:14:08.000000000 -0500
@@ -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 -Nur freegrep.orig/files/patch-ab freegrep/files/patch-ab
--- freegrep.orig/files/patch-ab	2010-06-08 19:51:35.000000000 -0500
+++ freegrep/files/patch-ab	1969-12-31 19:00:00.000000000 -0500
@@ -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 -Nur freegrep.orig/pkg-plist freegrep/pkg-plist
--- freegrep.orig/pkg-plist	2010-06-08 19:51:35.000000000 -0500
+++ freegrep/pkg-plist	1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-bin/grep
-bin/egrep
-bin/fgrep
-bin/zgrep
>Release-Note:
>Audit-Trail:
>Unformatted:



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