On 2011/05/30 04:05, Marc Espie wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: [email protected] 2011/05/30 04:05:03
>
> Modified files:
> security/prelude: Makefile.inc
>
> Log message:
> someone should really take a closer look at their LIBTOOL.
> In the meantime, avoid gnu-grep, to have reproducible builds.
> (especially since ggrep is half-broken with new vmmap)
>
not tested extensively, but this version at least passes its own
regress tests.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ggrep/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 20 Nov 2010 17:22:41 -0000 1.10
+++ Makefile 30 May 2011 10:27:54 -0000
@@ -2,34 +2,34 @@
COMMENT= GNU versions of grep pattern matching utilities
-DISTNAME= grep-2.5.1
+DISTNAME= grep-2.8
PKGNAME= g${DISTNAME}
-REVISION = 1
CATEGORIES= sysutils
HOMEPAGE= http://www.gnu.org/software/grep/grep.html
MAINTAINER= Christian Weisgerber <[email protected]>
-# GPL
+# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+
WANTLIB= c pcre
MASTER_SITES= ${MASTER_SITE_GNU:=grep/}
MODULES= devel/gettext
LIB_DEPENDS= devel/pcre
+BUILD_DEPENDS= devel/gperf
SEPARATE_BUILD= simple
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS= --program-prefix=g
+CONFIGURE_ARGS= --program-prefix=g --disable-silent-rules
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-USE_GROFF = Yes
-CONFIGURE_ENV+= ac_cv_func_mbrtowc=no
+USE_GROFF= Yes
post-build:
@perl -i -pe 's/\bgrep\b/ggrep/g' ${WRKBUILD}/src/[ef]grep
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/ggrep/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 5 Apr 2007 17:26:11 -0000 1.3
+++ distinfo 30 May 2011 10:27:54 -0000
@@ -1,5 +1,5 @@
-MD5 (grep-2.5.1.tar.gz) = hd8CTtyflokDX2s94ox3MQ==
-RMD160 (grep-2.5.1.tar.gz) = ltH9oil6A6EcfS/OoW7//1XSy9A=
-SHA1 (grep-2.5.1.tar.gz) = g0x/ObNduvfJB0wUqHZdajpYvzA=
-SHA256 (grep-2.5.1.tar.gz) = 0sBocBr66RS5oHB/KvbDc1Vse3YZExaa4Kevqf1bJEI=
-SIZE (grep-2.5.1.tar.gz) = 683093
+MD5 (grep-2.8.tar.gz) = yy38UCxa/HpKbl9s79aFDg==
+RMD160 (grep-2.8.tar.gz) = DJu3J6BEWT46423C6n7LSkdKlnM=
+SHA1 (grep-2.8.tar.gz) = CXv8urqAmFKNQcdf9NhThKEAbMg=
+SHA256 (grep-2.8.tar.gz) = 2kjQ4gvOqsx9Bb/LzLNMPe4MUL1+gN5SIv1eMZgJryc=
+SIZE (grep-2.8.tar.gz) = 1757034
Index: patches/patch-doc_grep_1
===================================================================
RCS file: patches/patch-doc_grep_1
diff -N patches/patch-doc_grep_1
--- patches/patch-doc_grep_1 23 Dec 2003 23:21:12 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-doc_grep_1,v 1.1 2003/12/23 23:21:12 naddy Exp $
---- doc/grep.1.orig 2003-12-23 16:37:10.000000000 +0100
-+++ doc/grep.1 2003-12-23 16:37:37.000000000 +0100
-@@ -191,6 +191,7 @@ Interpret
- .I PATTERN
- as a list of fixed strings, separated by newlines,
- any of which is to be matched.
-+.TP
- .BR \-P ", " \-\^\-perl-regexp
- Interpret
- .I PATTERN
Index: patches/patch-doc_grep_in_1
===================================================================
RCS file: patches/patch-doc_grep_in_1
diff -N patches/patch-doc_grep_in_1
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_grep_in_1 30 May 2011 10:27:54 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- doc/grep.in.1.orig Mon May 30 11:21:14 2011
++++ doc/grep.in.1 Mon May 30 11:21:34 2011
+@@ -102,6 +102,7 @@ Interpret
+ .I PATTERN
+ as a list of fixed strings, separated by newlines,
+ any of which is to be matched.
++.TP
+ .RB ( \-F
+ is specified by \s-1POSIX\s0.)
+ .TP
