From 72676e507e2b52b822e997bed4fb716c6dfdb353 Mon Sep 17 00:00:00 2001
From: Renat Lumpau <rl03@gentoo.org>
Date: Sun, 4 Dec 2005 22:43:35 +0000
Subject: Fixes for w-c-1.50 Package-Manager: portage-2.0.51.22-r2

---
 www-apps/twiki/ChangeLog                |  6 +++++-
 www-apps/twiki/Manifest                 | 14 ++------------
 www-apps/twiki/files/postinstall-en.txt |  6 +++---
 www-apps/twiki/files/reconfig           | 11 ++++++-----
 4 files changed, 16 insertions(+), 21 deletions(-)

(limited to 'www-apps/twiki')

diff --git a/www-apps/twiki/ChangeLog b/www-apps/twiki/ChangeLog
index 665aaf07bb3a..22c98c521912 100644
--- a/www-apps/twiki/ChangeLog
+++ b/www-apps/twiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/twiki
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.18 2005/11/10 14:05:00 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.19 2005/12/04 22:40:23 rl03 Exp $
+
+  04 Dec 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  files/reconfig:
+  Fixes for w-c-1.50
 
   10 Nov 2005; Renat Lumpau <rl03@gentoo.org> twiki-20041030-r1.ebuild:
   DEPEND on app-arch/unzip wrt bug #112054.
diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index 03a1041ccf3f..ff332a4fa555 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0d8009de158a121e3cd78b854cefed80 twiki-20041030-r1.ebuild 1589
 MD5 c16525040c09bb881930fefd91045d59 ChangeLog 3794
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 MD5 e2754c98027bd6468cfe636616377892 files/exec_command.patch 2445
 MD5 d6ef3da92ece6d68c83fa4be8f6f97be files/twiki.conf 508
 MD5 fab10473182738fadb4188bf90af8162 files/execwithsearch.patch 653
-MD5 81a10e4ed2ea4d51fd1001d051951a61 files/postinstall-en.txt 795
+MD5 ade44a9892b0925e73e2aae832a08e0f files/postinstall-en.txt 790
 MD5 4369d80c9ef3589ccebce4a23095082b files/digest-twiki-20041030-r1 138
-MD5 f4898afe44208d27fee4ab3910b8cc88 files/reconfig 588
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDc1OZEzitwsaoONoRAswuAJ9CQn96EuCYIcJ//BqJg7PlmsAUogCfZLWb
-b8pO2LSOh+JcwVyRs+l6oHw=
-=HJqr
------END PGP SIGNATURE-----
+MD5 ccb6e12008c8bb68dce61d0ab690a70d files/reconfig 639
diff --git a/www-apps/twiki/files/postinstall-en.txt b/www-apps/twiki/files/postinstall-en.txt
index c70a30ed65d3..9f2f04a354b1 100644
--- a/www-apps/twiki/files/postinstall-en.txt
+++ b/www-apps/twiki/files/postinstall-en.txt
@@ -1,8 +1,8 @@
 
-You are almost done! 
+You are almost done!
 
-1. Apache configs have been installed for you. You will need to restart
-   Apache for them to take effect.
+1. Apache configs have been installed for you. You will need to edit them
+   to set the correct paths!
 
 2. You may want to edit TWiki's config to suit your needs:
    ${MY_INSTALLDIR}/lib/TWiki.cfg
diff --git a/www-apps/twiki/files/reconfig b/www-apps/twiki/files/reconfig
index 80d6883fb2a8..59e8525acee1 100644
--- a/www-apps/twiki/files/reconfig
+++ b/www-apps/twiki/files/reconfig
@@ -8,11 +8,12 @@ die() {
 }
 
 if [ $1 = "install" ]; then
-	if [ -a /etc/apache/vhosts.d/twiki.conf ]; then
-		sed -e "s|HOST|${VHOST_HOSTNAME}|
-		s|DOCROOT|${VHOST_HTDOCSDIR}|
-		s|ROOTDIR|${MY_INSTALLDIR}|g" -i /etc/apache/vhosts.d/twiki.conf || die "sed failed"
-	fi
+	# don't change Apache files - breaks sandbox
+	#if [ -a /etc/apache/vhosts.d/twiki.conf ]; then
+	#	sed -e "s|HOST|${VHOST_HOSTNAME}|
+	#	s|DOCROOT|${VHOST_HTDOCSDIR}|
+	#	s|ROOTDIR|${MY_INSTALLDIR}|g" -i /etc/apache/vhosts.d/twiki.conf || die "sed failed"
+	#fi
 
 	# fix lib locations
 	sed -e "s|../lib|${MY_INSTALLDIR}/lib|" -i ${MY_INSTALLDIR}/bin/setlib.cfg || die
-- 
cgit v1.2.3-65-gdbad