summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-10-19 06:54:51 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-10-19 06:54:51 +0000
commit9244b9c1effaf409dbf0484136b67afec7c350c8 (patch)
tree57f07a255986e521a9dd4e2f88312362d648c3d3 /sys-apps/diffutils/files
parentchase latest release + some small fixes (diff)
downloadhistorical-9244b9c1effaf409dbf0484136b67afec7c350c8.tar.gz
historical-9244b9c1effaf409dbf0484136b67afec7c350c8.tar.bz2
historical-9244b9c1effaf409dbf0484136b67afec7c350c8.zip
update to use correct patch
Diffstat (limited to 'sys-apps/diffutils/files')
-rw-r--r--sys-apps/diffutils/files/diffutils-2.8.4-Makefile-fix-typeo.patch24
-rw-r--r--sys-apps/diffutils/files/diffutils-2.8.4-fix-multi-job-build.patch19
-rw-r--r--sys-apps/diffutils/files/diffutils-2.8.4-fix-multi-job-build.patch211
3 files changed, 24 insertions, 30 deletions
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
index 000000000000..75cf72b795e6
--- /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
index a1c29e7f7036..000000000000
--- 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
index bb704483224c..000000000000
--- 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)'`'"' && \