summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2007-05-23 21:35:50 +0000
committerChristian Heim <phreak@gentoo.org>2007-05-23 21:35:50 +0000
commit8ab00a16721b54f0132a7f2abeae9ab243725ef2 (patch)
treee4117373013ee422be47c3cd3bd123668b40c057 /2.2/patches
parentUpdating the apache-tools patch, there's atm a bug (or not?) in eutils.eclass... (diff)
downloadapache-8ab00a16721b54f0132a7f2abeae9ab243725ef2.tar.gz
apache-8ab00a16721b54f0132a7f2abeae9ab243725ef2.tar.bz2
apache-8ab00a16721b54f0132a7f2abeae9ab243725ef2.zip
Updated patch, using -p0 to get around that stupid epatch bug (or whatever).
Diffstat (limited to '2.2/patches')
-rw-r--r--2.2/patches/04_all_gentoo-apache-tools.patch12
1 files changed, 5 insertions, 7 deletions
diff --git a/2.2/patches/04_all_gentoo-apache-tools.patch b/2.2/patches/04_all_gentoo-apache-tools.patch
index 9df1738..02fccdd 100644
--- a/2.2/patches/04_all_gentoo-apache-tools.patch
+++ b/2.2/patches/04_all_gentoo-apache-tools.patch
@@ -1,7 +1,6 @@
-diff -Nur httpd-2.2.4.orig/Makefile.in httpd-2.2.4/Makefile.in
---- httpd-2.2.4.orig/Makefile.in 2005-11-13 07:33:15.000000000 +0100
-+++ httpd-2.2.4/Makefile.in 2007-05-23 20:46:19.000000000 +0200
-@@ -204,8 +204,9 @@
+--- ../httpd-2.2.4.orig/Makefile.in 2005-11-13 07:33:15.000000000 +0100
++++ ./Makefile.in 2007-05-23 23:32:09.000000000 +0200
+@@ -204,8 +204,9 @@ install-man:
@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@@ -13,9 +12,8 @@ diff -Nur httpd-2.2.4.orig/Makefile.in httpd-2.2.4/Makefile.in
@if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
$(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
else \
-diff -Nur httpd-2.2.4.orig/support/Makefile.in httpd-2.2.4/support/Makefile.in
---- httpd-2.2.4.orig/support/Makefile.in 2005-07-07 01:15:34.000000000 +0200
-+++ httpd-2.2.4/support/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+--- ../httpd-2.2.4.orig/support/Makefile.in 2005-07-07 01:15:34.000000000 +0200
++++ ./support/Makefile.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,72 +0,0 @@
-DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std