SOURCES: rt-layout.patch - part of it already merged

[arekm]

Author: arekm                        Date: Tue Jun  6 09:55:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- part of it already merged

---- Files affected:
SOURCES:
   rt-layout.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/rt-layout.patch
diff -u SOURCES/rt-layout.patch:1.1 SOURCES/rt-layout.patch:1.2
--- SOURCES/rt-layout.patch:1.1	Thu Oct 14 21:09:12 2004
+++ SOURCES/rt-layout.patch	Tue Jun  6 11:55:45 2006
@@ -32,25 +32,3 @@
  <Layout FreeBSD>
    prefix:		/usr/local
    exec_prefix:		${prefix}
---- m4/rt_layout.m4.bak	2004-10-14 17:55:37.000000000 +0200
-+++ m4/rt_layout.m4	2004-10-14 18:18:41.000000000 +0200
-@@ -21,14 +21,15 @@
- 		pldconf=./config.pld
- 		$PERL  -0777 -p -e "\$layout = '$2';"  -e '
- 		s/.*<Layout\s+$layout>//gims; 
--		s/\<\/Layout\>.*//s; 
--		s/^#.*$//m;
-+		s/<\/Layout>.*//s; 
-+		s/^#.*$//gm;
- 		s/^\s+//gim;
- 		s/\s+$/\n/gim;
- 		s/\+$/\/rt3/gim;
- 		# m4 will not let us just use $1, we need @S|@1
--		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
--		s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
-+#		s/^((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
-+		# uh, should be [:=], but m4 apparently substitutes something...
-+		s/^(.*?)\s*(?::|=)\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
- 		 ' < $1 > $pldconf
- 
- 		if test -s $pldconf; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rt-layout.patch?r1=1.1&r2=1.2&f=u