update to use correct patch

diff --git a/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild
index 05283544340c8b3b0da58266dd4900371b79293f..5a4e0c518fa7b2bb7f1080b04474efa888a39a00 100644 (file)
--- a/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild,v 1.2 2002/10/14 17:24:17 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r1.ebuild,v 1.3 2002/10/19 06:54:51 azarah Exp $
 
 IUSE="nls build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="Tools to make diffs and compare files"
 SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
 
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -34,9 +34,10 @@ src_unpack() {
 
        # Build fails with make -j5 or greater on pentium4.  This is because
        # the jobs creating the opjects, which depend on paths.h is sheduled
-       # at the same time paths.h is generated.  This closes bug #8934.
+       # at the same time paths.h is generated.  This patch just fix a small
+       # typeo that caused this.  This closes bug #8934.
        # <azarah@gentoo.org> (14 Oct 2002)
-       cd ${S}; patch -p1 < ${FILESDIR}/${P}-fix-multi-job-build.patch2 || die
+       cd ${S}; patch -p1 < ${FILESDIR}/${P}-Makefile-fix-typeo.patch || die
 }
 
 src_compile() {

diff --git a/sys-apps/diffutils/files/diffutils-2.8.4-Makefile-fix-typeo.patch b/sys-apps/diffutils/files/diffutils-2.8.4-Makefile-fix-typeo.patch
new file mode 100644 (file)
index 0000000..75cf72b
--- /dev/null
+++ b/sys-apps/diffutils/files/diffutils-2.8.4-Makefile-fix-typeo.patch
@@ -0,0 +1,24 @@
+diff -urN diffutils-2.8.4/src/Makefile.am diffutils-2.8.4.azarah/src/Makefile.am
+--- diffutils-2.8.4/src/Makefile.am    2002-06-17 07:55:42.000000000 +0200
++++ diffutils-2.8.4.azarah/src/Makefile.am     2002-10-19 08:53:41.000000000 +0200
+@@ -37,7 +37,7 @@
+ 
+ MOSTLYCLEANFILES = paths.h
+ 
+-cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT): paths.h
++cmp.$(OBJEXT) diff3.$(OBJEXT) diff.$(OBJEXT) sdiff.$(OBJEXT): paths.h
+ paths.h:
+       (echo '#define DEFAULT_DIFF_PROGRAM "$(bindir)/'`echo diff|sed '$(transform)'`'"' && \
+        echo '#define LOCALEDIR "$(localedir)"') >$@
+diff -urN diffutils-2.8.4/src/Makefile.in diffutils-2.8.4.azarah/src/Makefile.in
+--- diffutils-2.8.4/src/Makefile.in    2002-06-28 09:04:20.000000000 +0200
++++ diffutils-2.8.4.azarah/src/Makefile.in     2002-10-19 08:54:09.000000000 +0200
+@@ -410,7 +410,7 @@
+       uninstall-binPROGRAMS uninstall-info-am
+ 
+ 
+-cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT): paths.h
++cmp.$(OBJEXT) diff3.$(OBJEXT) diff.$(OBJEXT) sdiff.$(OBJEXT): paths.h
+ paths.h:
+       (echo '#define DEFAULT_DIFF_PROGRAM "$(bindir)/'`echo diff|sed '$(transform)'`'"' && \
+        echo '#define LOCALEDIR "$(localedir)"') >$@

diff --git a/sys-apps/diffutils/files/diffutils-2.8.4-fix-multi-job-build.patch b/sys-apps/diffutils/files/diffutils-2.8.4-fix-multi-job-build.patch
deleted file mode 100644 (file)
index a1c29e7..0000000
--- a/sys-apps/diffutils/files/diffutils-2.8.4-fix-multi-job-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN diffutils-2.8.4/src/Makefile.in diffutils-2.8.4.azarah/src/Makefile.in
---- diffutils-2.8.4/src/Makefile.in    2002-06-28 09:04:20.000000000 +0200
-+++ diffutils-2.8.4.azarah/src/Makefile.in     2002-10-14 11:49:11.000000000 +0200
-@@ -254,13 +254,13 @@
- distclean-depend:
-       -rm -rf ./$(DEPDIR)
- 
--.c.o:
-+.c.o: paths.h
- @AMDEP_TRUE@  source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@  depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- @AMDEP_TRUE@  $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
- 
--.c.obj:
-+.c.obj: paths.h
- @AMDEP_TRUE@  source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@  depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- @AMDEP_TRUE@  $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

diff --git a/sys-apps/diffutils/files/diffutils-2.8.4-fix-multi-job-build.patch2 b/sys-apps/diffutils/files/diffutils-2.8.4-fix-multi-job-build.patch2
deleted file mode 100644 (file)
index bb70448..0000000
--- a/sys-apps/diffutils/files/diffutils-2.8.4-fix-multi-job-build.patch2
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN diffutils-2.8.4/src/Makefile.in diffutils-2.8.4.azarah/src/Makefile.in
---- diffutils-2.8.4/src/Makefile.in    2002-06-28 09:04:20.000000000 +0200
-+++ diffutils-2.8.4.azarah/src/Makefile.in     2002-10-14 19:03:33.000000000 +0200
-@@ -410,6 +410,7 @@
-       uninstall-binPROGRAMS uninstall-info-am
- 
- 
-+cmp.c diff3.c diff.c sdiff.c: paths.h
- cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT): paths.h
- paths.h:
-       (echo '#define DEFAULT_DIFF_PROGRAM "$(bindir)/'`echo diff|sed '$(transform)'`'"' && \