5 files changed, 97 insertions, 11 deletions
diff --git a/www-apps/lxr/ChangeLog b/www-apps/lxr/ChangeLog
index 9cf973d48bcd..130dc8d4091b 100644
--- a/www-apps/lxr/ChangeLog
+++ b/www-apps/lxr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/lxr
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.9 2006/02/13 15:16:11 mcummings Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/ChangeLog,v 1.10 2006/06/15 03:50:38 vapier Exp $
+
+*lxr-0.9.5 (15 Jun 2006)
+
+  15 Jun 2006; Mike Frysinger <vapier@gentoo.org> files/postinstall-en.txt,
+  files/reconfig, +lxr-0.9.5.ebuild:
+  Version bump and webapp-config cleanups.
 
   13 Feb 2006; Michael Cummings <mcummings@gentoo.org> lxr-0.3.1.ebuild:
   Virtuals for perl-core
diff --git a/www-apps/lxr/files/digest-lxr-0.9.5 b/www-apps/lxr/files/digest-lxr-0.9.5
new file mode 100644
index 000000000000..66e0a8905a4e
--- /dev/null
+++ b/www-apps/lxr/files/digest-lxr-0.9.5
@@ -0,0 +1,3 @@
+MD5 b4eb6428ef27e4fe3923dfe8abf5cb94 lxr-0.9.5.tgz 105230
+RMD160 fd6e8ae9c9940083e0550872fb8ac729342aad89 lxr-0.9.5.tgz 105230
+SHA256 5b126b8180a1c56fef5a89b9335a0b5d6e467850bf62b29a9f44b12107a74c8e lxr-0.9.5.tgz 105230
diff --git a/www-apps/lxr/files/postinstall-en.txt b/www-apps/lxr/files/postinstall-en.txt
index 8da1468851dc..07412c4da554 100644
--- a/www-apps/lxr/files/postinstall-en.txt
+++ b/www-apps/lxr/files/postinstall-en.txt
@@ -1,4 +1,5 @@
 0. Create a db for lxr:
+
  MySQL: run mysql and read in the initdb file using:
    \. ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
 
@@ -6,7 +7,7 @@
    createuser lxr
    createdb -U lxr lxr
    psql -U lxr lxr
-   \i ${MY_SQLSCRIPTSDIR}/postgressql/${PVR}_create.sql
+   \i ${MY_SQLSCRIPTSDIR}/postgresql/${PVR}_create.sql
 
 1. Edit ${MY_INSTALLDIR}/lxr.conf and set:
  - db settings
@@ -38,6 +39,6 @@ you must take special care not to make lxr.conf visible to the world. If you
 are not using mod_perl, use .htaccess_cgi instead.
 
 5. Create the index:
- ${MY_INSTALLDIR}/genxref --url http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+ ${MY_INSTALLDIR}/genxref --url http://${VHOST_HOSTNAME}${VHOST_APPDIR}
 
-6. Browse to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/source
+6. Browse to http://${VHOST_HOSTNAME}${VHOST_APPDIR}/source
diff --git a/www-apps/lxr/files/reconfig b/www-apps/lxr/files/reconfig
index bf90b9f92657..e9e2f47b3f69 100644
--- a/www-apps/lxr/files/reconfig
+++ b/www-apps/lxr/files/reconfig
@@ -2,15 +2,20 @@
 
 die() {
 	echo "#####"
-	echo $1
+	echo "$@"
 	echo "#####"
 	exit 1
 }
 
-if [ $1 = "install" ]; then
-	sed -e "s|/lxr|/${VHOST_APPDIR}|
-			s|http://192.168.1.3/lxr|${VHOST_HOSTNAME}/${VHOST_APPDIR}|" -i ${MY_INSTALLDIR}/lxr.conf || die
-
-elif [ $1 = "clean" ]; then
+if [[ $1 == "install" ]] ; then
+	cd "${MY_INSTALLDIR}" || die
+	files="lxr.conf $(ls ._cfg*lxr.conf 2>/dev/null)"
+	sed -i \
+		-e "s|/lxr|${VHOST_APPDIR}|" \
+		-e "s|192.168.1.3/lxr|${VHOST_HOSTNAME}${VHOST_APPDIR}|" \
+		${files} || die
+elif [[ $1 = "clean" ]] ; then
 	echo $1
 fi
+
+exit 0
diff --git a/www-apps/lxr/lxr-0.9.5.ebuild b/www-apps/lxr/lxr-0.9.5.ebuild
new file mode 100644
index 000000000000..dd0a79ec44b4
--- /dev/null
+++ b/www-apps/lxr/lxr-0.9.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/lxr/lxr-0.9.5.ebuild,v 1.1 2006/06/15 03:50:38 vapier Exp $
+
+inherit perl-module webapp multilib eutils
+
+DESCRIPTION="general purpose source code indexer and cross-referener with a web-based frontend"
+HOMEPAGE="http://sourceforge.net/projects/lxr"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cvs freetext mysql postgres"
+
+RDEPEND="dev-util/ctags
+	net-www/apache
+	freetext? ( >=www-apps/swish-e-2.1 )
+	dev-lang/perl
+	dev-perl/DBI
+	dev-perl/File-MMagic
+	cvs? ( app-text/rcs )
+	postgres? ( dev-db/postgresql dev-perl/DBD-Pg )
+	mysql? ( >=dev-db/mysql-4 dev-perl/DBD-mysql )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/initdb-mysql.patch
+
+	sed -i \
+		-e 's|/usr/local/bin/swish-e|/usr/bin/swish-e|' \
+		-e 's|/usr/bin/ctags|/usr/bin/exuberant-ctags|' \
+		-e "s|'glimpse|#'glimpse|g" \
+		-e "s:/path/to/lib:${VENDOR_LIB}:" \
+		templates/lxr.conf
+	sed -i \
+		-e 's|Apache::Registry|ModPerl::PerlRun|' \
+		.htaccess
+	sed -i \
+		-e 's|require Local;|require LXR::Local;|' \
+		-e 's|use Local;|use LXR::Local;|' \
+		-e 's|package Local;|package LXR::Local;|' \
+		Local.pm lib/LXR/Common.pm diff find ident search source
+}
+
+# prevent eclasses from overriding this
+src_compile() { :; }
+
+src_install() {
+	perlinfo
+	webapp_src_preinst
+
+	insinto "${VENDOR_LIB}"
+	doins -r lib/LXR || die
+	insinto "${VENDOR_LIB}"/LXR
+	doins Local.pm
+
+	dodoc BUGS CREDITS.txt ChangeLog HACKING INSTALL notes .htaccess* swish-e.conf
+
+	exeinto "${MY_HTDOCSDIR}"
+	doexe diff find genxref ident search source || die
+	insinto "${MY_HTDOCSDIR}"
+	doins .htaccess* templates/* || die
+
+	webapp_configfile "${MY_HTDOCSDIR}"/lxr.conf "${MY_HTDOCSDIR}"/.htaccess
+	webapp_sqlscript mysql initdb-mysql
+	webapp_sqlscript postgresql initdb-postgres
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/reconfig
+	webapp_src_install
+}