[gentoo-commits] gentoo-x86 commit in sys-apps/preload/files: preload-0.6.4-use-help2man-as-usual.patch preload-0.6.4-use-make-dependencies.patch

[gentoo-commits] gentoo-x86 commit in sys-apps/preload/files: preload-0.6.4-use-help2man-as-usual.patch preload-0.6.4-use-make-dependencies.patch

[Pacho Ramos (pacho)]

pacho       10/09/06 15:36:10

  Added:                preload-0.6.4-use-help2man-as-usual.patch
                        preload-0.6.4-use-make-dependencies.patch
  Log:
  Apply Flameeyes' patches to fix parallel compilation (bug #244966 by Jeremy Olexa). Also use 'elog' instead of 'einfo' and drop old 'eerror' message. Move to EAPI 2.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/preload/files/preload-0.6.4-use-help2man-as-usual.patch?rev=1.1&content-type=text/plain

Index: preload-0.6.4-use-help2man-as-usual.patch
===================================================================
--- src/Makefile.am~	2009-04-15 23:46:04.000000000 +0200
+++ src/Makefile.am	2010-04-09 12:56:45.000000000 +0200
@@ -54,23 +54,11 @@
 
 dist_man_MANS = preload.8
 
-$(srcdir)/preload.8: cmdline.c ../configure.ac preload.8.i
-	$(MAKE) $(AM_MAKEFLAGS) preload
-	@echo "Creating $@ using help2man(1)"
-	@$(top_builddir)/missing --run \
-	   help2man --no-info --section=8 --include=preload.8.i \
-	   	    --help-option="-H" --output="$@.tmp" \
-		    --name 'Adaptive readahead daemon' ./preload \
-	 && mv "$@.tmp" "$@" \
-	  || ($(RM) "$@"; \
-	      echo Failed to update preload.8, the man page may be outdated >&2; \
-	      (test -f "$@" || echo help2man is required to generate this file. >> "$@"));
-
-install-data-hook:
-	@cd "$(DESTDIR)$(man8dir)" && gzip -c preload.8 > preload.8.gz.tmp && mv preload.8.gz.tmp preload.8.gz && $(RM) preload.8
-
-uninstall-hook:
-	$(RM) "$(DESTDIR)$(man8dir)/preload.8.gz"
+preload.8: preload preload.8.i
+	-$(HELP2MAN) \
+		--no-info --section=8 --include=preload.8.i \
+		--help-option="-H" --output="$@" \
+		--name 'Adaptive readahead daemon' ./$^
 
 ######################################################################
 



1.1                  sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/preload/files/preload-0.6.4-use-make-dependencies.patch?rev=1.1&content-type=text/plain

Index: preload-0.6.4-use-make-dependencies.patch
===================================================================
--- src/Makefile.am~	2010-04-09 12:56:45.000000000 +0200
+++ src/Makefile.am	2010-04-09 12:58:36.000000000 +0200
@@ -8,8 +8,6 @@
 		-DLOGDIR='"${logdir}"'	\
 		-DPKGLOCALSTATEDIR='"${pkglocalstatedir}"'
 
-preload.o cmdline.o preload.8: Makefile
-
 sbin_PROGRAMS = preload
 
 preload_SOURCES =	\
@@ -64,8 +62,7 @@
 
 MAINTAINERCLEANFILES += preload.conf.debug
 
-preload.conf.debug:
-	$(MAKE) $(AM_MAKEFLAGS) preload.conf
+preload.conf.debug: preload.conf
 	cp preload.conf preload.conf.debug
 
 RUNPREQ = preload preload.conf.debug