summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2004-06-12 05:36:56 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2004-06-12 05:36:56 +0000
commit7b2479ae2d112c7cff5009ea4c0c8a2e141ebbc2 (patch)
tree032a489830e33eb222ff4b1dab425ef7fdaa87fc /sys-apps/grep
parentStable on alpha, bug #53367. (Manifest recommit) (diff)
downloadgentoo-2-7b2479ae2d112c7cff5009ea4c0c8a2e141ebbc2.tar.gz
gentoo-2-7b2479ae2d112c7cff5009ea4c0c8a2e141ebbc2.tar.bz2
gentoo-2-7b2479ae2d112c7cff5009ea4c0c8a2e141ebbc2.zip
agriffis reminded me of the pcre use flag which is much more accurate. Also, link only libpcre statically which should be much nicer for anyone who wants to use pcre.
Diffstat (limited to 'sys-apps/grep')
-rw-r--r--sys-apps/grep/ChangeLog10
-rw-r--r--sys-apps/grep/Manifest2
-rw-r--r--sys-apps/grep/files/digest-grep-2.5.1-r4 (renamed from sys-apps/grep/files/digest-grep-2.5.1-r3)0
-rw-r--r--sys-apps/grep/grep-2.5.1-r4.ebuild (renamed from sys-apps/grep/grep-2.5.1-r3.ebuild)17
4 files changed, 23 insertions, 6 deletions
diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 04bbd75196b6..70edf9060796 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-apps/grep
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.26 2004/06/11 23:36:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.27 2004/06/12 05:36:56 mr_bones_ Exp $
+
+*grep-2.5.1-r4 (11 Jun 2004)
+
+ 11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> grep-2.5.1-r3.ebuild,
+ grep-2.5.1-r4.ebuild:
+ agriffis reminded me of the pcre use flag which is much more accurate.
+ Also, link only libpcre statically which should be much nicer for anyone
+ who wants to use pcre.
11 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> grep-2.5.1-r2.ebuild:
clean older ebuild
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index f2752d75aa23..c48b3f5f50c9 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -2,7 +2,9 @@ MD5 1d99f51097455c3c7b729119c631f802 ChangeLog 4188
MD5 3e56378adb5662b815f5785cb02c6c9c grep-2.5.1-r1.ebuild 1522
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
MD5 486e939fb4e94d3026094587387c0ed3 grep-2.5.1-r3.ebuild 1619
+MD5 94207122bffecb3be455d7f1870135fa grep-2.5.1-r4.ebuild 1754
MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r1 62
MD5 9b382fe04d2e5d86aea020215ceca879 files/gentoo-sparc32-dfa.patch 383
+MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r4 62
MD5 41f77ef6693dc91a37b5ec51ce5a3e2d files/2.5.1-manpage.patch 283
MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r3 62
diff --git a/sys-apps/grep/files/digest-grep-2.5.1-r3 b/sys-apps/grep/files/digest-grep-2.5.1-r4
index ef03a032aa20..ef03a032aa20 100644
--- a/sys-apps/grep/files/digest-grep-2.5.1-r3
+++ b/sys-apps/grep/files/digest-grep-2.5.1-r4
diff --git a/sys-apps/grep/grep-2.5.1-r3.ebuild b/sys-apps/grep/grep-2.5.1-r4.ebuild
index 832ff54ce3ad..db637d7036f5 100644
--- a/sys-apps/grep/grep-2.5.1-r3.ebuild
+++ b/sys-apps/grep/grep-2.5.1-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r3.ebuild,v 1.1 2004/06/11 23:35:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r4.ebuild,v 1.1 2004/06/12 05:36:56 mr_bones_ Exp $
inherit gnuconfig flag-o-matic eutils
@@ -13,11 +13,13 @@ SRC_URI="http://ftp.club.cc.cmu.edu/pub/gnu/${PN}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="build nls perl static"
+IUSE="build nls pcre static"
RDEPEND="virtual/glibc"
DEPEND="${RDEPEND}
- perl? ( dev-libs/libpcre )
+ pcre? (
+ >=sys-apps/sed-4
+ dev-libs/libpcre )
nls? ( sys-devel/gettext )"
src_unpack() {
@@ -32,15 +34,20 @@ src_unpack() {
}
src_compile() {
- if use static || use perl ; then
+ if use static ; then
append-flags -static
append-ldflags -static
fi
econf \
$(use_enable nls) \
- $(use_enable perl perl-regexp) \
+ $(use_enable pcre perl-regexp) \
--bindir=/bin \
|| die "econf failed"
+ if use pcre ; then
+ sed -i \
+ -e 's:-lpcre:/usr/lib/libpcre.a:g' {lib,src}/Makefile \
+ || die "sed Makefile failed"
+ fi
emake || die "emake failed"
}