Fix for bug 238475.

Package-Manager: portage-2.2_rc20/cvs/FreeBSD 7.0-RELEASE i386

4 files changed, 31 insertions, 5 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 2ddcd8fc1899..94c5e63c216c 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/grep
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.78 2008/10/07 09:39:19 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.79 2008/12/31 16:35:44 the_paya Exp $
+
+  31 Dec 2008; Javier Villavicencio <the_paya@gentoo.org>
+  +files/grep-2.5.3-po-builddir-fix.patch, grep-2.5.3-r1.ebuild:
+  Fix for bug 238475.
 
   07 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
   +files/grep-2.5.3-yesno-test-fix.patch, grep-2.5.3-r1.ebuild:
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index dbb1427d5baa..2a3028dca1a5 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.5.1-utf8-case.patch 933 RMD160 1619e4b6710047049e5776a45732b2709b117cfa SHA1 51c9ea9363370041b2c0a9b7dcc83bfd739a4723 SHA256 4f48ab49da2ec948f329dea2a133cc6f0e602e265958cf09efd554510640ae1e
 AUX grep-2.5.1-bracket.patch 339 RMD160 0333e5113b7285ce92b4a68d89d25ff7b81211f0 SHA1 7882dc95b6cb69d64e4c68425c3a44f0c324aa71 SHA256 1a0a64ce2cfaaeef687f5d2131d12358d4c8ae3dfeceb81cf6abf6ccf17d085c
 AUX grep-2.5.1-color.patch 313 RMD160 b4c787993fc05065bb8ec4f7b3007778650c8958 SHA1 623c25f3686adc40287ea244dd079c1e50c55c64 SHA256 f628a2a1800c9374eeece94c39b561dffd80b7f8ec587f25d00bd6301b32321d
@@ -10,11 +13,19 @@ AUX grep-2.5.1-oi.patch 1715 RMD160 af03849546ee0122883fb7efe2e45960f1636673 SHA
 AUX grep-2.5.1-perl-segv.patch 410 RMD160 e5310adbd2befa5d30001f634f7142366cc20d00 SHA1 6a1d5bfaec46180fa56bb1c42f0fd86ea7b52509 SHA256 bc7d84e7c6ce9ecfbe3ff9a1d91a6d12183ca7553fe3eebfaa4a7f15157662e4
 AUX grep-2.5.1-restrict_arr.patch 410 RMD160 cfb62007664e37e4a3b193af0452808d0c2eb798 SHA1 ff2f1c38b487e30d958aab29033b4568116267b8 SHA256 458a43f9e069df1ef12e47ca879d0b9db5707b22080ccc7cd31bb8e6bcdc05aa
 AUX grep-2.5.1a-nls.patch 1227 RMD160 c49d3604ff65b586ace6fa75a478c367cf6a0c62 SHA1 fdd1ac6d076640489fd11c405c73f490b372c414 SHA256 a92c1e75d95fadee1f4af86e818637cf54bcf9b01ece08653d23e4c31bc7c279
+AUX grep-2.5.3-po-builddir-fix.patch 252 RMD160 e2d58380b32de1ba6ecf47a4d2f93bd25186cbb5 SHA1 0cf165687ae45c3a79f37497a0dc7bf40ed3fa7a SHA256 5475ff7cb45b1b744618b5687ea8e130a4922888bd222f230a6f2856fc0c8b4a
 AUX grep-2.5.3-yesno-test-fix.patch 1553 RMD160 31871333dc9595bbedc70571ff7453bc7bf5479f SHA1 1068fd1f5b6f346a8ea73487f6bebf12e79437d2 SHA256 0b366ffa3f13aedfdb714e2151486476bd50d784176b564c0ddabd5943a97f25
 DIST grep-2.5.1a.tar.bz2 527386 RMD160 f02c36c5a1efe805eafb0b4c0171ddb7ff15fbeb SHA1 2cd082775d30be463c0ac674a00595eb56fda22e SHA256 38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132
 DIST grep-2.5.3.tar.bz2 618184 RMD160 dafa692fd67dfcd1c94115e9831d291b29fa7729 SHA1 53227ca9a01d5548448372f9b2e9111adf159f3b SHA256 d22dd8d626e557271aa555e7a06884a0114968845400ce1e7ab6f82b1f44b8fd
 DIST grep_2.5.3~dfsg-6.diff.gz 17449 RMD160 88e13b03b661924b5a85bb783f9e936a3a5cfeab SHA1 d700ecdc27d45ba195e2c2d05c25365920788f71 SHA256 cd1253d672bcda0b530a0ac0ece8c4953353018a8a9d4dd0395333fc30a12cd9
 EBUILD grep-2.5.1a-r1.ebuild 1987 RMD160 1cfee753db688fb73ec637c3130cc0ee95e786d1 SHA1 f9f924b92d8f5e6fa9a654320d19626e0c7f2a43 SHA256 189e58f579c4bb4a689b650c352eb022cdc9df1d66355d9590ba5b570658cc11
-EBUILD grep-2.5.3-r1.ebuild 1474 RMD160 29e08b6a0d845936ff2353a62fd35839f8028f4e SHA1 0f8db8c49d67ea50370d54c0c16629bf13477ecc SHA256 75a0d1a68133fcac0715fd8616d0847ab51f16d01a0c14a6d4548e7ad91712e4
-MISC ChangeLog 11221 RMD160 018a67f5c9ab0ca69575116e0c99203700a31da6 SHA1 2c1dc0b5dec9ac4531c3c71cd3f675b526ddbc15 SHA256 c3fdb684caa225d29cb62ccb1e298eb3faa80c89f28c377f36eecdd965a56095
+EBUILD grep-2.5.3-r1.ebuild 1552 RMD160 acdcedfca51134afa758ed81558614eeea46a70d SHA1 1c5b94852b1e5dae8482aa78f5e053cbfbf77255 SHA256 bffd9ce5db5718a98094bd32ff46c48cc3edc9153d48130a66ce5d19f394a7d0
+MISC ChangeLog 11367 RMD160 8b11dd4cc4271cbd4c57652603d7dcb736893050 SHA1 82b01756107dc7d6b62237fb8f19a80a49f91be1 SHA256 e778c73f1eaa35b197a5b173e1fa82b85513cb15f3e3d3d3e279bd9266c71a40
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (FreeBSD)
+
+iEYEARECAAYFAklbn2oACgkQoAP6MIsfg8KGswCfUAq42A7wJ45TQt5PxQIu2dYz
+/SsAn2kwFWOMbSgPhNZQ5ogv6FsBO++o
+=nWUN
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/grep/files/grep-2.5.3-po-builddir-fix.patch b/sys-apps/grep/files/grep-2.5.3-po-builddir-fix.patch
new file mode 100644
index 000000000000..7d3e334f37b5
--- /dev/null
+++ b/sys-apps/grep/files/grep-2.5.3-po-builddir-fix.patch
@@ -0,0 +1,10 @@
+--- grep-2.5.3/po/Makefile.in.in.orig	2006-11-24 20:53:21 -0300
++++ grep-2.5.3/po/Makefile.in.in	2008-10-26 18:31:06 -0200
+@@ -13,6 +13,7 @@
+ @SET_MAKE@
+ 
+ srcdir = @srcdir@
++top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ 
diff --git a/sys-apps/grep/grep-2.5.3-r1.ebuild b/sys-apps/grep/grep-2.5.3-r1.ebuild
index c5a5b99d282f..5a3508b58086 100644
--- a/sys-apps/grep/grep-2.5.3-r1.ebuild
+++ b/sys-apps/grep/grep-2.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.3-r1.ebuild,v 1.2 2008/10/07 09:39:19 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.3-r1.ebuild,v 1.3 2008/12/31 16:35:44 the_paya Exp $
 
 inherit flag-o-matic eutils
 
@@ -31,6 +31,7 @@ src_unpack() {
 	EPATCH_MULTI_MSG="Applying Debian patchset (${DEB_VER}) ..." \
 	epatch ${P}~dfsg/debian/patches/
 	epatch "${FILESDIR}"/${P}-yesno-test-fix.patch
+	epatch "${FILESDIR}"/${P}-po-builddir-fix.patch
 	use static && append-ldflags -static
 }
 
@@ -39,7 +40,7 @@ src_compile() {
 		--bindir=/bin \
 		$(use_enable nls) \
 		$(use_enable pcre perl-regexp) \
-		--without-included-regex \
+		$(use elibc_FreeBSD || echo --without-included-regex) \
 		|| die "econf failed"
 
 	use static || sed -i 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' src/Makefile