SOURCES: lxr-INC.patch, lxr-conf.patch - @INC path fixes

baggins baggins at pld-linux.org
Thu Feb 23 19:06:37 CET 2006


Author: baggins                      Date: Thu Feb 23 18:06:37 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- @INC path fixes

---- Files affected:
SOURCES:
   lxr-INC.patch (1.1 -> 1.2) , lxr-conf.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/lxr-INC.patch
diff -u SOURCES/lxr-INC.patch:1.1 SOURCES/lxr-INC.patch:1.2
--- SOURCES/lxr-INC.patch:1.1	Wed Feb 22 20:36:08 2006
+++ SOURCES/lxr-INC.patch	Thu Feb 23 19:06:32 2006
@@ -1,11 +1,72 @@
---- lxr-0.9.4/genxref~	2004-07-21 22:44:30.000000000 +0200
-+++ lxr-0.9.4/genxref	2006-02-22 20:32:25.000000000 +0100
+diff -ur lxr-0.9.4/diff lxr-0.9.4-INC/diff
+--- lxr-0.9.4/diff	2006-02-23 16:49:14.000000000 +0100
++++ lxr-0.9.4-INC/diff	2006-02-23 16:49:41.000000000 +0100
+@@ -26,7 +26,7 @@
+ $CVSID = '$Id$ ';
+ 
+ use strict;
+-use lib '.'; # for Local.pm
++use lib '@@LXRDIR@@'; # for Local.pm
+ use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib
+ 
+ use LXR::Common qw(:html);
+diff -ur lxr-0.9.4/find lxr-0.9.4-INC/find
+--- lxr-0.9.4/find	2004-09-02 17:26:42.000000000 +0200
++++ lxr-0.9.4-INC/find	2006-02-23 16:49:47.000000000 +0100
+@@ -26,7 +26,7 @@
+ $CVSID = '$Id$ ';
+ 
+ use strict;
+-use lib '.'; # for Local.pm
++use lib '@@LXRDIR@@'; # for Local.pm
+ use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib
+ 
+ use LXR::Common qw(:html);
+diff -ur lxr-0.9.4/genxref lxr-0.9.4-INC/genxref
+--- lxr-0.9.4/genxref	2006-02-23 16:49:14.000000000 +0100
++++ lxr-0.9.4-INC/genxref	2006-02-23 16:49:35.000000000 +0100
 @@ -16,7 +16,7 @@
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
  use strict;
 -use lib 'lib';
-+use lib '@@DATADIR@@';
++use lib '@@LXRDIR@@';
  use Fcntl;
  use Getopt::Long;
  use IO::Handle;
+diff -ur lxr-0.9.4/ident lxr-0.9.4-INC/ident
+--- lxr-0.9.4/ident	2004-09-02 17:26:42.000000000 +0200
++++ lxr-0.9.4-INC/ident	2006-02-23 16:49:54.000000000 +0100
+@@ -26,7 +26,7 @@
+ $CVSID = '$Id$ ';
+ 
+ use strict;
+-use lib '.'; # for Local.pm
++use lib '@@LXRDIR@@'; # for Local.pm
+ use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib
+ 
+ use LXR::Common qw(:html);
+diff -ur lxr-0.9.4/search lxr-0.9.4-INC/search
+--- lxr-0.9.4/search	2006-02-23 16:49:14.000000000 +0100
++++ lxr-0.9.4-INC/search	2006-02-23 16:50:00.000000000 +0100
+@@ -26,7 +26,7 @@
+ $CVSID = '$Id$ ';
+ 
+ use strict;
+-use lib '.'; # for Local.pm
++use lib '@@LXRDIR@@'; # for Local.pm
+ use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib
+ 
+ use LXR::Common qw(:html);
+diff -ur lxr-0.9.4/source lxr-0.9.4-INC/source
+--- lxr-0.9.4/source	2006-02-23 16:49:14.000000000 +0100
++++ lxr-0.9.4-INC/source	2006-02-23 16:50:12.000000000 +0100
+@@ -27,7 +27,7 @@
+ $CVSID = '$Id$ ';
+ 
+ use strict;
+-use lib '.';    # for Local.pm
++use lib '@@LXRDIR@@';    # for Local.pm
+ use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" };  # if LXR modules are in ./lib
+ 
+ use LXR::Common qw(:html);

================================================================
Index: SOURCES/lxr-conf.patch
diff -u SOURCES/lxr-conf.patch:1.2 SOURCES/lxr-conf.patch:1.3
--- SOURCES/lxr-conf.patch:1.2	Wed Feb 22 20:36:43 2006
+++ SOURCES/lxr-conf.patch	Thu Feb 23 19:06:32 2006
@@ -1,5 +1,6 @@
---- lxr-0.9.4/templates/lxr.conf.orig	2005-04-30 23:30:07.000000000 +0200
-+++ lxr-0.9.4/templates/lxr.conf	2006-02-21 17:17:48.000000000 +0100
+diff -ur lxr-0.9.4/templates/lxr.conf lxr-0.9.4-conf/templates/lxr.conf
+--- lxr-0.9.4/templates/lxr.conf	2006-02-23 16:46:00.000000000 +0100
++++ lxr-0.9.4-conf/templates/lxr.conf	2006-02-23 16:48:09.000000000 +0100
 @@ -8,11 +8,11 @@
  
  		# Path to glimpse executables.
@@ -20,11 +21,11 @@
  
  		# Location of the Generic.pm config file
 -		'genericconf' => '/path/to/lib/LXR/Lang/generic.conf',
-+		'genericconf' => 'PERLVENDOR/LXR/Lang/generic.conf',
++		'genericconf' => '@@PERLVENDOR@@/LXR/Lang/generic.conf',
  
  		# Location of the ectags.conf file
 -		'ectagsconf' => '/path/to/lib/LXR/Lang/ectags.conf',
-+		'ectagsconf' => 'PERLVENDOR/LXR/Lang/ectags.conf',
++		'ectagsconf' => '@@PERLVENDOR@@/LXR/Lang/ectags.conf',
   		
   		# Paths for CVS module
    		'cvspath' => '/bin:/usr/local/bin:/usr/bin:/usr/sbin',
@@ -63,7 +64,33 @@
  			},
  		},
  
-@@ -101,7 +101,7 @@
+@@ -81,16 +82,16 @@
+ 		},
+ 
+ 		# Templates used for headers and footers
+-		'htmlhead'       => 'html-head.html',
+-		'htmltail'       => 'html-tail.html',
+-		'htmldir'        => 'html-dir.html',
+-		'htmlident'      => 'html-ident.html',
+-		'htmlident_refs' => 'html-ident-refs.html',
+-		'htmlfind'       => 'html-find.html',
+-		'htmlsearch'     => 'html-search-swish.html',
++		'htmlhead'       => '@@LXRDIR@@/html-head.html',
++		'htmltail'       => '@@LXRDIR@@/html-tail.html',
++		'htmldir'        => '@@LXRDIR@@/html-dir.html',
++		'htmlident'      => '@@LXRDIR@@/html-ident.html',
++		'htmlident_refs' => '@@LXRDIR@@/html-ident-refs.html',
++		'htmlfind'       => '@@LXRDIR@@/html-find.html',
++		'htmlsearch'     => '@@LXRDIR@@/html-search-swish.html',
+ 
+-		'sourcehead'    => 'html-head.html',
+-		'sourcedirhead' => 'html-head.html',
++		'sourcehead'    => '@@LXRDIR@@/html-head.html',
++		'sourcedirhead' => '@@LXRDIR@@/html-head.html',
+ 		'stylesheet'    => 'lxr.css',
+ 
+ 		# sourceroot - where to get the source files from
+@@ -101,7 +102,7 @@
  		#  indexed-src/version2/...
  		# The names of the version directories must match the values for the Version
  		# variable above.
@@ -72,9 +99,9 @@
  
  		# Alternatively, this can specify a CVS repository by setting the value to "cvs:"
  		# followed by the path to the repository.  Note this must be file accessible - remote
-@@ -109,10 +110,10 @@
- 		#     'sourceroot'	=> 'cvs:/hom/karsk/a/CVSROOT/linux',
- 
+@@ -115,10 +116,10 @@
+ 		#     'sourceroot' => 'bk:/some/repository/here',
+ 		
  		# The name to display for this source tree
 -		'sourcerootname' => 'Example',
 +		'sourcerootname' => 'linux',
@@ -85,7 +112,7 @@
  
  		# The DBI identifier for the database to use
  		# For mysql, the format is dbi:mysql:dbname=<name>
-@@ -119,8 +119,8 @@
+@@ -128,18 +129,18 @@
  
  		# If you need to specify the username or password for the database connection,
  		# uncomment the following two lines
@@ -96,7 +123,6 @@
  
  		# If you need multiple lxr configurations in one database, set different table
  		# prefixes for them.
-@@ -127,10 +127,10 @@
  		#  'dbprefix' => 'lxr_',
  
  		# For using glimpse, the directory to store the .glimpse files in is required
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/lxr-INC.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/lxr-conf.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list