summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/confix')
-rw-r--r--dev-util/confix/ChangeLog8
-rw-r--r--dev-util/confix/files/2.1.0/fast-install.patch11
2 files changed, 11 insertions, 8 deletions
diff --git a/dev-util/confix/ChangeLog b/dev-util/confix/ChangeLog
index 18384cb66bf6..de12d584f5f9 100644
--- a/dev-util/confix/ChangeLog
+++ b/dev-util/confix/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/confix
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.8 2008/12/17 15:00:48 mduft Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.9 2009/01/26 14:08:47 mduft Exp $
+
+ 26 Jan 2009; Markus Duft <mduft@gentoo.org>
+ files/2.1.0/fast-install.patch:
+ corrected minor issue with fast-install patch.
*confix-2.1.0-r3 (17 Dec 2008)
diff --git a/dev-util/confix/files/2.1.0/fast-install.patch b/dev-util/confix/files/2.1.0/fast-install.patch
index f64582579bab..0c3778ae7f73 100644
--- a/dev-util/confix/files/2.1.0/fast-install.patch
+++ b/dev-util/confix/files/2.1.0/fast-install.patch
@@ -1,6 +1,6 @@
diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.0/libconfix/core/automake/file_installer.py
--- Confix-2.1.0.orig/libconfix/core/automake/file_installer.py 2008-10-21 11:17:30 +0200
-+++ Confix-2.1.0/libconfix/core/automake/file_installer.py 2008-12-17 11:58:32 +0100
++++ Confix-2.1.0/libconfix/core/automake/file_installer.py 2009-01-26 15:02:50 +0100
@@ -22,6 +22,11 @@
from libconfix.core.utils.paragraph import Paragraph
from libconfix.core.utils import const
@@ -159,7 +159,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.
def automake_install_prefixfiles_(self, makefile_am):
for dirname, filelist in self.dir2filedict_(file2dirdict=self.prefixfiles_).iteritems():
# define directory
-@@ -291,17 +401,93 @@
+@@ -291,17 +401,92 @@
pass
pass
@@ -232,12 +232,11 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.
+ 'done; \\',
+ 'test -z "$${__f}" && exit 0; \\',
+ 'cp -fp $${__f} ' + targetdir + ' || exit 1; \\',
-+ 'chmod ' + mode + ' $${__tf} || exit 1; \\',
-+ 'touch ' + rulename + ';']))
++ 'chmod ' + mode + ' $${__tf} || exit 1;']))
+ makefile_am.add_element(
+ Rule(targets=[rulename + '_clean'],
+ prerequisites=[],
-+ commands=['rm -f ' + rulename + ' ' + str(' ' + targetdir + '/').join([''] + files) + ';']))
++ commands=['rm -f ' + str(' ' + targetdir + '/').join([''] + files) + ';']))
+ pass
+
+ def fast_install_private_headers_(self, makefile_am):
@@ -258,7 +257,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.
makefile_am.add_element(install_local_rule)
makefile_am.add_element(clean_local_rule)
-@@ -321,20 +507,37 @@
+@@ -321,20 +506,37 @@
commands=['-$(mkinstalldirs) '+targetdir]))
# copy files