[packages/rt.git] / rt-layout.patch

--- config.layout~	2004-03-28 06:04:08.000000000 +0200
+++ config.layout	2004-10-14 17:37:13.000000000 +0200
@@ -59,6 +59,31 @@
   customlibdir:		${customdir}/lib
 </Layout>
 
+<Layout FHS>
+  prefix:		/usr/local
+  exec_prefix:		${prefix}
+  bindir:		${prefix}/bin
+  sbindir:		${prefix}/sbin
+  sysconfdir:		/etc+
+  datadir:		${prefix}/share
+# FIXME: missing support for lib64
+  libdir:		${prefix}/lib
+  mandir:		${datadir}/man
+# FIXME: no such directory in FHS; shouldn't go to somewhere in "${datadir}/rt/"?
+  htmldir:		${datadir}/html
+  manualdir:		${datadir}/doc
+  localstatedir:	/var
+  logfiledir:		${localstatedir}/log
+# XXX: "/var/cache/mason/*"?
+  masonstatedir:	${localstatedir}/cache/mason_data
+  sessionstatedir:	${localstatedir}/cache/session_data
+  customdir:		${prefix}/local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+</Layout>
+
 <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
Commit	Line	Data
a33f81b0	1	--- config.layout~ 2004-03-28 06:04:08.000000000 +0200
	2	+++ config.layout 2004-10-14 17:37:13.000000000 +0200
	3	@@ -59,6 +59,31 @@
	4	customlibdir: ${customdir}/lib
	5	</Layout>
	6
	7	+<Layout FHS>
	8	+ prefix: /usr/local
	9	+ exec_prefix: ${prefix}
	10	+ bindir: ${prefix}/bin
	11	+ sbindir: ${prefix}/sbin
	12	+ sysconfdir: /etc+
	13	+ datadir: ${prefix}/share
	14	+# FIXME: missing support for lib64
	15	+ libdir: ${prefix}/lib
	16	+ mandir: ${datadir}/man
	17	+# FIXME: no such directory in FHS; shouldn't go to somewhere in "${datadir}/rt/"?
	18	+ htmldir: ${datadir}/html
	19	+ manualdir: ${datadir}/doc
	20	+ localstatedir: /var
	21	+ logfiledir: ${localstatedir}/log
	22	+# XXX: "/var/cache/mason/*"?
	23	+ masonstatedir: ${localstatedir}/cache/mason_data
	24	+ sessionstatedir: ${localstatedir}/cache/session_data
	25	+ customdir: ${prefix}/local
	26	+ custometcdir: ${customdir}/etc
	27	+ customhtmldir: ${customdir}/html
	28	+ customlexdir: ${customdir}/po
	29	+ customlibdir: ${customdir}/lib
	30	+</Layout>
	31	+
	32	<Layout FreeBSD>
	33	prefix: /usr/local
	34	exec_prefix: ${prefix}
	35	--- m4/rt_layout.m4.bak 2004-10-14 17:55:37.000000000 +0200
	36	+++ m4/rt_layout.m4 2004-10-14 18:18:41.000000000 +0200
	37	@@ -21,14 +21,15 @@
	38	pldconf=./config.pld
	39	$PERL -0777 -p -e "\$layout = '$2';" -e '
	40	s/.*<Layout\s+$layout>//gims;
	41	- s/\<\/Layout\>.*//s;
	42	- s/^#.*$//m;
	43	+ s/<\/Layout>.*//s;
	44	+ s/^#.*$//gm;
	45	s/^\s+//gim;
	46	s/\s+$/\n/gim;
	47	s/\+$/\/rt3/gim;
	48	# m4 will not let us just use $1, we need @S\|@1
	49	- s/^\s((?:bin\|sbin\|libexec\|data\|sysconf\|sharedstate\|localstate\|lib\|include\|oldinclude\|info\|man)dir)\s:\s(.)$/@S\|@1=@S\|@2/gim;
	50	- s/^\s(.?)\s:\s(.*)$/\(test "x\@S\|@@S\|@1" = "xNONE" \|\| test "x\@S\|@@S\|@1" = "x") && @S\|@1=@S\|@2/gim;
	51	+# s/^((?:bin\|sbin\|libexec\|data\|sysconf\|sharedstate\|localstate\|lib\|include\|oldinclude\|info\|man)dir)\s:\s(.*)$/@S\|@1=@S\|@2/gim;
	52	+ # uh, should be [:=], but m4 apparently substitutes something...
	53	+ s/^(.?)\s(?::\|=)\s(.)$/\(test "x\@S\|@@S\|@1" = "xNONE" \|\| test "x\@S\|@@S\|@1" = "x") && @S\|@1=@S\|@2/gim;
	54	' < $1 > $pldconf
	55
	56	if test -s $pldconf; then