diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-07-01 00:04:39 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-01 00:04:39 +0000 |
| commit | a332670cef34636ff327a12131feaa4d7ef2158b (patch) | |
| tree | c20c2667a1623d6785f45675e671f4f133fa994e /sys-apps | |
| parent | I'll take care of netatalk from now on. (diff) | |
| download | gentoo-2-a332670cef34636ff327a12131feaa4d7ef2158b.tar.gz gentoo-2-a332670cef34636ff327a12131feaa4d7ef2158b.tar.bz2 gentoo-2-a332670cef34636ff327a12131feaa4d7ef2158b.zip | |
fix patch to be correct
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/man/ChangeLog | 4 | ||||
| -rw-r--r-- | sys-apps/man/files/man-1.6-parallel-make.patch | 26 |
2 files changed, 16 insertions, 14 deletions
diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog index 934ec83d0850..50ff432a663d 100644 --- a/sys-apps/man/ChangeLog +++ b/sys-apps/man/ChangeLog @@ -1,10 +1,10 @@ # ChangeLog for sys-apps/man # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.69 2005/06/30 10:18:45 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.70 2005/07/01 00:04:39 vapier Exp $ 30 Jun 2005; Luca Barbato <lu_zero@gentoo.org> +files/man-1.6-parallel-make.patch, man-1.6.ebuild: - Proper fix by Octavio Ruiz (Ta^3) <tacvbo@tacvbo.net> fixes bug #97439 + Proper fix by Octavio Ruiz (Ta^3) fixes bug #97439. 30 Jun 2005; Luca Barbato <lu_zero@gentoo.org> man-1.6.ebuild: Forced -j1 in the ebuild diff --git a/sys-apps/man/files/man-1.6-parallel-make.patch b/sys-apps/man/files/man-1.6-parallel-make.patch index dbf8c8e82bff..172ba5f84fcd 100644 --- a/sys-apps/man/files/man-1.6-parallel-make.patch +++ b/sys-apps/man/files/man-1.6-parallel-make.patch @@ -1,6 +1,9 @@ -diff -ur man-1.6.orig/Makefile.in man-1.6/Makefile.in ---- man-1.6.orig/Makefile.in 2005-06-30 04:38:50.000000000 -0500 -+++ man-1.6/Makefile.in 2005-06-30 04:39:21.000000000 -0500 +Fix parallel building + +src/Makefile.in fixes by Octavio Ruiz http://bugs.gentoo.org/97439 + +--- man-1.6/Makefile.in ++++ man-1.6/Makefile.in @@ -33,13 +33,13 @@ source: src/Makefile cd src; $(MAKE) @@ -17,15 +20,14 @@ diff -ur man-1.6.orig/Makefile.in man-1.6/Makefile.in % cd msgs; $(MAKE) %gencat/gencat: -diff -ur man-1.6.orig/src/Makefile.in man-1.6/src/Makefile.in ---- man-1.6.orig/src/Makefile.in 2005-06-30 04:38:50.000000000 -0500 -+++ man-1.6/src/Makefile.in 2005-06-30 04:39:21.000000000 -0500 -@@ -56,7 +56,7 @@ +--- man-1.6/src/Makefile.in ++++ man-1.6/src/Makefile.in +@@ -52,7 +52,7 @@ + man-config.o man-getopt.o man.o manpath.o to_cat.o: defs.h + different.o man.o: different.h + man.o manfile.o: glob.h +-different.o gripes.o man-config.o man-getopt.o man.o manpath.o util.o: gripes.h gripedefs.h ++different.o gripes.o man-config.o man-getopt.o man.o manfile.o manpath.o util.o: gripes.h gripedefs.h different.o man-config.o man-getopt.o man.o manpath.o: man-config.h gripes.o man-config.o man-getopt.o man.o manpath.o util.o: man.h man-getopt.o man.o manpath.o: man-getopt.h --man.o manfile.o to_cat.o: manfile.h -+man.o manfile.o to_cat.o: manfile.h gripes.h gripedefs.h - man.o man-iconv.o: man-iconv.h - man.o manpath.o: manpath.h - man-config.o: paths.h |