Author: baggins Date: Tue Apr 12 09:30:28 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 0.9.9
---- Files affected:
packages/lxr:
lxr-INC.patch (1.2 -> 1.3) , lxr-conf.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/lxr/lxr-INC.patch
diff -u packages/lxr/lxr-INC.patch:1.2 packages/lxr/lxr-INC.patch:1.3
--- packages/lxr/lxr-INC.patch:1.2 Thu Feb 23 19:06:32 2006
+++ packages/lxr/lxr-INC.patch Tue Apr 12 11:30:23 2011
@@ -10,18 +10,6 @@
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
@@ -70,3 +58,16 @@
use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in
./lib
use LXR::Common qw(:html);
+--- lxr-0.9.9/apache2-require.pl~ 2011-03-27 17:54:44.000000000 +0200
++++ lxr-0.9.9/apache2-require.pl 2011-04-12 11:16:23.189246238 +0200
+@@ -1,7 +1,7 @@
+-#!/usr/bin/env perl -w
++#!/usr/bin/perl -w
+ @INC= ( @INC
+- , "." # <- LXR root directory
+- , "./lib" # <- LXR library directory
++ , "@@LXRDIR@@" # <- LXR root directory
++ , "@@PERLVENDOR@@" # <- LXR library directory
+ );
+
+ 1;
================================================================
Index: packages/lxr/lxr-conf.patch
diff -u packages/lxr/lxr-conf.patch:1.3 packages/lxr/lxr-conf.patch:1.4
--- packages/lxr/lxr-conf.patch:1.3 Thu Feb 23 19:06:32 2006
+++ packages/lxr/lxr-conf.patch Tue Apr 12 11:30:23 2011
@@ -1,137 +1,70 @@
-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 @@
+--- lxr-0.9.9/templates/lxr.conf.orig 2011-04-12 11:17:51.000000000 +0200
++++ lxr-0.9.9/templates/lxr.conf 2011-04-12 11:29:12.173904238 +0200
+@@ -17,15 +17,15 @@
- # Path to glimpse executables.
# Define this OR the swish-e variable depending which search
engine you want to use.
-- 'glimpsebin' => '/info/lxr/bin/glimpse',
-- 'glimpseindex' => '/info/lxr/bin/glimpseindex',
-+ #'glimpsebin' => '/usr/bin/glimpse',
-+ #'glimpseindex' => '/usr/bin/glimpseindex',
-
+ # Path to glimpse executables.
+- , 'glimpsebin' => '/usr/local/bin/glimpse'
+- , 'glimpseindex' => '/usr/local/bin/glimpseindex'
++ , 'glimpsebin' => '/usr/bin/glimpse'
++ , 'glimpseindex' => '/usr/bin/glimpseindex'
# Location of SWISH-E binary
-- 'swishbin' => '/usr/local/bin/swish-e',
-+ 'swishbin' => '/usr/bin/swish-e',
+- , 'swishbin' => '/usr/local/bin/swish-e'
++ , 'swishbin' => '/usr/bin/swish-e'
# Path to Exuberant Ctags executable
- 'ectagsbin' => '/usr/bin/ctags',
-@@ -21,10 +21,10 @@
- 'tmpdir' => '/tmp',
+ , 'ectagsbin' => '/usr/bin/ctags'
+ # Location of the ectags.conf file
+- , 'ectagsconf' => '/path/to/lib/LXR/Lang/ectags.conf'
++ , 'ectagsconf' => '@@PERLVENDOR@@/LXR/Lang/ectags.conf'
+
+ # Paths for CVS module
+ , 'cvspath' => '/bin:/usr/local/bin:/usr/bin:/usr/sbin'
+@@ -67,7 +67,7 @@
+
'(bitmap|bmp|gif|icon|jp2|jpg|jpeg|pjpg|pjpeg|png|tif|tiff|xbm|xpm)'
# Location of the Generic.pm config file
-- 'genericconf' => '/path/to/lib/LXR/Lang/generic.conf',
-+ 'genericconf' => '@@PERLVENDOR@@/LXR/Lang/generic.conf',
+- , 'genericconf' => '/path/to/lib/LXR/Lang/generic.conf'
++ , 'genericconf' => '@@PERLVENDOR@@/LXR/Lang/generic.conf'
+
+ # How to map files to languages
+ # Note that the string for the key and the first entry in the
+@@ -163,7 +163,7 @@
- # Location of the ectags.conf file
-- 'ectagsconf' => '/path/to/lib/LXR/Lang/ectags.conf',
-+ 'ectagsconf' => '@@PERLVENDOR@@/LXR/Lang/ectags.conf',
-
- # Paths for CVS module
- 'cvspath' => '/bin:/usr/local/bin:/usr/bin:/usr/sbin',
-@@ -36,7 +36,7 @@
# Configuration for http://192.168.1.3/lxr.
# baseurl is used to select configuration block.
-
-- 'baseurl' => 'http://192.168.1.3/lxr', # Put your URL here
-+ 'baseurl' => 'http://localhost/lxr', # Put your URL here
+- 'baseurl' => 'http://192.168.1.3/lxr' # Put your URL here
++ 'baseurl' => 'http://localhost/lxr' # Put your URL here
# baseurl_aliases allows other URLs to be used to reach
the site
# comment this out if you do not want any aliases
- 'baseurl_aliases' => [ 'http://localhost/lxr',
'http://mydomain/lxr' ],
-@@ -51,7 +51,7 @@
- # This can come from a file, a function or be
explicitly
- # ennumerated.
- # From a file:
-- 'range' => [ readfile('src/versions') ],
-+ 'range' => [ qw(linux) ],
-
- # Explicitly:
- # 'range' => [qw(v1 v2 v3.1 v4 experimental)],
-@@ -64,13 +64,14 @@
- # }, # deferred function
call.
-
- # The default version to display
-- 'default' => '1.0.6'
-+ 'default' => 'linux'
- },
-
- # Define typed variable "a". First value is default.
- 'a' => {
- 'name' => 'Architecture',
-- 'range' => [qw(i386 alpha arm m68k mips ppc
sparc sparc64)]
-+ 'range' => [qw(alpha arm arm26 cris frv h8300
i386 ia64 m32r m68k m68knommu mips parisc powerpc ppc s390 sh sh64 sparc
sparc64 um v850 x86_64 xtensa)],
-+ 'default' => 'i386'
- },
- },
-
-@@ -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 @@
+ , 'baseurl_aliases' =>
+@@ -197,7 +197,7 @@
# indexed-src/version2/...
# The names of the version directories must match the values
for the Version
- # variable above.
-- 'sourceroot' => '/home/malcolm/indexed-src',
-+ 'sourceroot' => '/usr/src/',
+ # variable (see the version selection subsection).
+- , 'sourceroot' => '/home/malcolm/indexed-src'
++ , 'sourceroot' => '/usr/src'
# 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
-@@ -115,10 +116,10 @@
- # 'sourceroot' => 'bk:/some/repository/here',
-
- # The name to display for this source tree
-- 'sourcerootname' => 'Example',
-+ 'sourcerootname' => 'linux',
-
- # Any parameters to the source access method should be
specified below
-- 'sourceparams' => {'cachepath' => '/a/path/here'},
-+ #'sourceparams' => {'cachepath' => '/a/path/here'},
-
- # The DBI identifier for the database to use
- # For mysql, the format is dbi:mysql:dbname=<name>
-@@ -128,18 +129,18 @@
-
- # If you need to specify the username or password for the
database connection,
- # uncomment the following two lines
-- # 'dbpass' => 'foo',
-- # 'dbuser' => 'lxr',
-+ 'dbpass' => 'lxr',
-+ 'dbuser' => 'lxr',
-
- # If you need multiple lxr configurations in one database, set
different table
- # prefixes for them.
- # 'dbprefix' => 'lxr_',
+@@ -232,7 +232,7 @@
+ # annotations are switched on, too!
+ #
+ , 'sourceparams' =>
+- { 'cachepath' => '/a/path/here'
++ { 'cachepath' => '/var/tmp'
+ , 'do_annotate' => 1,
+ , 'do_blame' => 1
+ }
+@@ -351,9 +351,9 @@
+ # , 'dbprefix' => 'lxr_'
# For using glimpse, the directory to store the .glimpse files
in is required
-- 'glimpsedir' => '/path/to/glimpse/databases',
-+ 'glimpsedir' => '/var/lib/lxr/glimpse',
+- , 'glimpsedir' => '/path/to/glimpse/databases'
++ , 'glimpsedir' => '/var/lib/lxr/glimpse'
# Location of swish-e index database files if using swish-e
-- 'swishdir' => '/a/directory/here/',
-+ 'swishdir' => '/var/lib/lxr/swish',
-
- # where to look for include files inside the sourcetree. This
is used to hyperlink
- # to included files.
+- , 'swishdir' => '/a/directory/here/'
++ , 'swishdir' => '/var/lib/lxr/swish'
+ }
+ )
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lxr/lxr-INC.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lxr/lxr-conf.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
