diff options
| -rw-r--r-- | sys-apps/grep/Manifest | 5 | ||||
| -rw-r--r-- | sys-apps/grep/files/grep-2.5.1a-BJA-pcre-pkgconfig.diff | 12 | ||||
| -rw-r--r-- | sys-apps/grep/files/grep-2.5.4-BJA-pcre-pkgconfig.diff | 25 | ||||
| -rw-r--r-- | sys-apps/grep/grep-2.5.4-r1.ebuild | 44 |
4 files changed, 83 insertions, 3 deletions
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index 90f29efa..11195516 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -9,10 +9,13 @@ AUX grep-2.5.1-manpage.patch 612 RMD160 1ba80343c963b6830a8bb258b3317b8e7c3ccfcc AUX grep-2.5.1-oi.patch 1715 RMD160 af03849546ee0122883fb7efe2e45960f1636673 SHA1 8cde3d2ef33d88a24ea8bf0dee9c27b7a1b91d03 SHA256 c6c35e6b6b6ebe8f198240b85ec2acd6154e95fdc3a314dec10614fca2e3399d 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-BJA-pcre-pkgconfig.diff 459 RMD160 41a8126d5ddf2868c15c48274e1bee1969c9fa8a SHA1 1d8fa446399e868a77f1f9a94797cd8df556a8fe SHA256 3d096dc3214d92c2f2fa20f4f29f45d27739f97bb9a8876c69838edf545684f7 +AUX grep-2.5.1a-BJA-pcre-pkgconfig.diff 631 RMD160 ecb5c1a72b6b844b46d714a355ff62efb085f9e1 SHA1 b0903b160bcb7e8d688b558ffa95bbd6a827458b SHA256 8aca60abc6cd1fa327bfaa9067e59df28e282f42730eae1001428c180ff6b952 AUX grep-2.5.1a-nls.patch 1227 RMD160 c49d3604ff65b586ace6fa75a478c367cf6a0c62 SHA1 fdd1ac6d076640489fd11c405c73f490b372c414 SHA256 a92c1e75d95fadee1f4af86e818637cf54bcf9b01ece08653d23e4c31bc7c279 AUX grep-2.5.3-nls.patch 1339 RMD160 1f395f9bea5097c92a258cf4b06ff186a8a8710b SHA1 c72efe2cc35295acf5611b11369c827489575edf SHA256 fbeab3c37dcea3905aad14b87eddc14d035532af6fa0f3a126c52d0ca709edea 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 +AUX grep-2.5.4-BJA-pcre-pkgconfig.diff 639 RMD160 dfc5ecdba7c94ab25eb0edf76aabb08126e92ae3 SHA1 f2c10e89adac8cf554bd40e9fbb485af132a49ad SHA256 2e641b75c51263cf6f3f7dbe56ebb1479d2d55e7f620e8ba3de8300a7119c994 DIST grep-2.5.1a.tar.bz2 527386 RMD160 f02c36c5a1efe805eafb0b4c0171ddb7ff15fbeb SHA1 2cd082775d30be463c0ac674a00595eb56fda22e SHA256 38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132 +DIST grep-2.5.4.tar.bz2 723181 RMD160 52abf25681bc6830f372ea7607480da69eaa06fd SHA1 9bbd4f02b18bb264e0fcb17293b6f0445c8694d2 SHA256 0abec64e01458fbd032e33351d8071602a959529ea796965e98338ee83a40020 EBUILD grep-2.5.1a-r1.ebuild 2103 RMD160 4ca1dd228f668e40dd89e3bcb9087e6b0b6cbb60 SHA1 e0061bcbd23984a514a36a26565a1e451545a46b SHA256 383c9a303fbdc4f6366d04a854bd83558317cb2375d666e0a0be06a84ea5adac +EBUILD grep-2.5.4-r1.ebuild 1210 RMD160 ccbc677e14ccb170a72b0ebf46d449c1e6df4cc9 SHA1 dbbdce2c0e1328f64aab28b645b18af8129dc78e SHA256 6f3a4f409c9831dd93078bb3acb3fe04664afe7ddcbf6fe3f520615275e649d7 diff --git a/sys-apps/grep/files/grep-2.5.1a-BJA-pcre-pkgconfig.diff b/sys-apps/grep/files/grep-2.5.1a-BJA-pcre-pkgconfig.diff index 8e167619..f0b77e3c 100644 --- a/sys-apps/grep/files/grep-2.5.1a-BJA-pcre-pkgconfig.diff +++ b/sys-apps/grep/files/grep-2.5.1a-BJA-pcre-pkgconfig.diff @@ -1,6 +1,14 @@ --- configure.in.ori 2002-03-26 16:48:16.000000000 +0100 -+++ configure.in 2009-05-13 19:05:10.000000000 +0200 -@@ -134,10 +134,10 @@ ++++ configure.in 2009-05-13 20:36:31.000000000 +0200 +@@ -27,6 +27,7 @@ + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_RANLIB ++PKG_PROG_PKG_CONFIG + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_SYS_LARGEFILE +@@ -134,10 +135,10 @@ # support for pcre if test x"$testpcre" = x"yes"; then diff --git a/sys-apps/grep/files/grep-2.5.4-BJA-pcre-pkgconfig.diff b/sys-apps/grep/files/grep-2.5.4-BJA-pcre-pkgconfig.diff new file mode 100644 index 00000000..2b9e4b19 --- /dev/null +++ b/sys-apps/grep/files/grep-2.5.4-BJA-pcre-pkgconfig.diff @@ -0,0 +1,25 @@ +--- configure.ac.ori 2009-02-10 05:35:21.000000000 +0100 ++++ configure.ac 2009-05-13 20:53:20.000000000 +0200 +@@ -43,6 +43,7 @@ + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_RANLIB ++PKG_PROG_PKG_CONFIG + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_SYS_LARGEFILE +@@ -153,10 +154,10 @@ + + # support for pcre + if test x"$testpcre" = x"yes"; then +- if pcre-config --cflags >/dev/null 2>&1; then +- CPPFLAGS="$CPPFLAGS `pcre-config --cflags`" +- LIBS="$LIBS `pcre-config --libs`" +- fi ++ PKG_CHECK_MODULES(pcre, [libpcre]) ++ CPPFLAGS="$CPPFLAGS $pcre_CFLAGS" ++ LIBS="$LIBS $pcre_LIBS" ++ + AC_CHECK_LIB(pcre, pcre_exec) + fi + diff --git a/sys-apps/grep/grep-2.5.4-r1.ebuild b/sys-apps/grep/grep-2.5.4-r1.ebuild new file mode 100644 index 00000000..88126474 --- /dev/null +++ b/sys-apps/grep/grep-2.5.4-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.4-r1.ebuild,v 1.1 2009/04/09 16:09:35 loki_val Exp $ + +EAPI=2 + +inherit eutils autotools + +DESCRIPTION="GNU regular expression matcher" +HOMEPAGE="http://www.gnu.org/software/grep/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2 + mirror://gentoo/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="nls pcre" + +RDEPEND="nls? ( virtual/libintl ) + pcre? ( >=dev-libs/libpcre-7.8-r1 )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.5.3-po-builddir-fix.patch + epatch "${FILESDIR}"/${PN}-2.5.3-nls.patch + epatch "${FILESDIR}"/${P}-BJA-pcre-pkgconfig.diff + + AT_M4DIR=m4 eautoreconf +} + +src_configure() { + econf \ + --bindir=/bin \ + $(use_enable nls) \ + $(use_enable pcre perl-regexp) \ + $(use elibc_FreeBSD || echo --without-included-regex) \ + || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog NEWS README THANKS TODO +} |