Updated reconfig script to allow changes during an upgrade, resolves #107033

Package-Manager: portage-2.0.51.22-r2

diff --git a/www-apps/viewcvs/ChangeLog b/www-apps/viewcvs/ChangeLog
index 4e96d6649a3d14fd5c8bf85d38db4b497748d1ae..160d7a76e7ec9f246f39967c4ad98506d2b305bf 100644 (file)
--- a/www-apps/viewcvs/ChangeLog
+++ b/www-apps/viewcvs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/viewcvs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/ChangeLog,v 1.21 2005/10/03 13:36:22 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/viewcvs/ChangeLog,v 1.22 2005/10/03 14:06:18 ramereth Exp $
+
+  03 Oct 2005; Lance Albertson <ramereth@gentoo.org> files/reconfig:
+  * Updated reconfig script to allow changes during an upgrade, resolves #107033
 
   03 Oct 2005; Lance Albertson <ramereth@gentoo.org>
   +files/viewcvs-mysql-4.0.sql, +files/viewcvs-mysql-4.1.sql:

diff --git a/www-apps/viewcvs/Manifest b/www-apps/viewcvs/Manifest
index b2c96a6616e30ec202fd5f324633679294675f2c..266c6638b5bb0a2d83a8c8a0cbd77948cbdab620 100644 (file)
--- a/www-apps/viewcvs/Manifest
+++ b/www-apps/viewcvs/Manifest
@@ -1,4 +1,4 @@
-MD5 8a5aa422cb10556b2543e0f52984a5ca ChangeLog 7287
+MD5 e2e9bf810f09bd3bd77392e2e1ed2383 ChangeLog 7438
 MD5 fa8daabae86da3beefbc3ea1e5ccd42c metadata.xml 779
 MD5 de35d046cef5f9b95a5ddce9f2bf990d viewcvs-0.9.2_p20041207-r1.ebuild 2536
 MD5 60259d2075951e829e25d800b66e6e5b viewcvs-0.9.3.ebuild 1479
@@ -8,7 +8,7 @@ MD5 524fd70c52d3a112e9f7560f45a81ca5 viewcvs-1.0_pre20050929.ebuild 3302
 MD5 63be22bf657c7d52e524b1a74c92cf2c files/digest-viewcvs-1.0_pre20050523 69
 MD5 1ebd12b88a2c6a6964c0d02b5c82911a files/digest-viewcvs-0.9.3 65
 MD5 9777bfdf8cffc9f8a930dca991d05c11 files/postinstall-en.txt 354
-MD5 3a92f638d236d5821ab2c2e5ceda8f5d files/reconfig 519
+MD5 12fb198ba0e0736a29ee719e25ab44fb files/reconfig 962
 MD5 48783b2b9bd95be9a4eb1525a0bf708a files/digest-viewcvs-0.9.2_p20041207-r1 69
 MD5 550579a3a648e62d01ec4c3c3ee47327 files/viewcvs-CAN-2004-1062.patch 341
 MD5 26ecfea58fa51e62bc28985ff0f73048 files/digest-viewcvs-0.9.4 65

diff --git a/www-apps/viewcvs/files/reconfig b/www-apps/viewcvs/files/reconfig
index 54d68da2717bb7e413ae5b9ee2f8af6dca3fb1d4..a11dd1f67844530381d31f2be6e7edbf28c86e0a 100644 (file)
--- a/www-apps/viewcvs/files/reconfig
+++ b/www-apps/viewcvs/files/reconfig
@@ -1,13 +1,18 @@
 #!/bin/bash
-# $Id: reconfig,v 1.5 2005/10/03 05:06:28 ramereth Exp $
+# $Id: reconfig,v 1.6 2005/10/03 14:06:18 ramereth Exp $
 
-if [ $1 = "install" ]; then
-       find ${VHOST_CGIBINDIR}/viewcvs ${VHOST_ROOT}/viewcvs ${VHOST_ROOT}/htdocs/. -type f \
-       | xargs sed -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${VHOST_ROOT}/viewcvs/lib\"|g
-       s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${VHOST_ROOT}/viewcvs/viewcvs.conf\",g
-       s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${VHOST_ROOT}/viewcvs,g 
-       s,\(<VIEWCVS_APACHE_LIBRARY_DIRECTORY>\),${VHOST_ROOT}/viewcvs/lib,g" -i
-       
-elif [ $1 = "clean" ]; then
-       echo $1
+if [ $1 = "install" ] ; then
+    find ${VHOST_CGIBINDIR}/viewcvs ${VHOST_ROOT}/viewcvs ${VHOST_ROOT}/htdocs/. -type f \
+    | xargs sed -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${VHOST_ROOT}/viewcvs/lib\"|g
+    s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${VHOST_ROOT}/viewcvs/viewcvs.conf\",g
+    s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${VHOST_ROOT}/viewcvs,g 
+    s,\(<VIEWCVS_APACHE_LIBRARY_DIRECTORY>\),${VHOST_ROOT}/viewcvs/lib,g" -i
+elif [ $1 = "upgrade" ] ; then
+    find ${VHOST_CGIBINDIR}/viewcvs ${VHOST_ROOT}/viewcvs ${VHOST_ROOT}/htdocs/. -type f \
+    | xargs sed -e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"${VHOST_ROOT}/viewcvs/lib\"|g
+    s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${VHOST_ROOT}/viewcvs/viewcvs.conf\",g
+    s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${VHOST_ROOT}/viewcvs,g 
+    s,\(<VIEWCVS_APACHE_LIBRARY_DIRECTORY>\),${VHOST_ROOT}/viewcvs/lib,g" -i
+elif [ $1 = "clean" ] ; then
+    echo $1
 fi