summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2011-05-26 15:19:28 +0000
committerPatrick McLean <chutzpah@gentoo.org>2011-05-26 15:19:28 +0000
commit00ce3e677b1785f06e440d7e68992eb600dc485e (patch)
treec8a19fcfb423830c422f0b1b67dd91c8abf8a880 /www-plugins/nspluginwrapper
parentVersion bump. Added patch to check for /proc/acpi instead of /proc/acpi/info.... (diff)
downloadgentoo-2-00ce3e677b1785f06e440d7e68992eb600dc485e.tar.gz
gentoo-2-00ce3e677b1785f06e440d7e68992eb600dc485e.tar.bz2
gentoo-2-00ce3e677b1785f06e440d7e68992eb600dc485e.zip
Update parallel make patch, it appears that the earlier one failed on some systems (bug #274609).
(Portage version: 2.1.9.49/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins/nspluginwrapper')
-rw-r--r--www-plugins/nspluginwrapper/ChangeLog7
-rw-r--r--www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch10
2 files changed, 13 insertions, 4 deletions
diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog
index 69cf7b8222f9..5f6dea4eb05d 100644
--- a/www-plugins/nspluginwrapper/ChangeLog
+++ b/www-plugins/nspluginwrapper/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-plugins/nspluginwrapper
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.11 2011/05/25 01:15:25 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.12 2011/05/26 15:19:28 chutzpah Exp $
+
+ 26 May 2011; Patrick McLean <chutzpah@gentoo.org>
+ files/nspluginwrapper-1.4.0-parallel-make.patch:
+ Update parallel make patch, it appears that the earlier one failed on some
+ systems (bug #274609).
*nspluginwrapper-1.4.0-r1 (25 May 2011)
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch
index 1fc423dc34c5..168923da17f6 100644
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch
@@ -25,16 +25,20 @@ diff -ur nspluginwrapper-1.4.0.orig//Makefile nspluginwrapper-1.4.0/Makefile
install.viewer:
install.libnoxshm:
endif
- install.viewer.bin: $(npviewer_PROGRAM)
+-install.viewer.bin: $(npviewer_PROGRAM)
++install.viewer.bin: install.dirs $(npviewer_PROGRAM)
$(INSTALL) -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM)
-install.viewer.glue::
+install.viewer.glue:: install.dirs
p=$(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM:%.bin=%); \
echo "#!/bin/sh" > $$p; \
echo "TARGET_OS=$(TARGET_OS)" >> $$p; \
-@@ -274,11 +274,11 @@
+@@ -272,13 +272,13 @@
+ echo "esac" >> $$p; \
+ echo ". $(npcommondir)/$(nploader_PROGRAM)" >> $$p; \
chmod 755 $$p
- do.install.libnoxshm: $(libnoxshm_LIBRARY)
+-do.install.libnoxshm: $(libnoxshm_LIBRARY)
++do.install.libnoxshm: install.dirs $(libnoxshm_LIBRARY)
$(INSTALL) -m 755 $(STRIP_OPT) $(libnoxshm_LIBRARY) $(DESTDIR)$(nptargetdir)/$(libnoxshm_LIBRARY)
-install.config: $(npconfig_PROGRAM)
+install.config: install.dirs $(npconfig_PROGRAM)