[csw-devel] SF.net SVN: gar:[8617] csw/mgar/pkg/phpldapadmin/trunk

[dmichelsen at users.sourceforge.net]

Revision: 8617
          http://gar.svn.sourceforge.net/gar/?rev=8617&view=rev
Author:   dmichelsen
Date:     2010-02-17 12:55:18 +0000 (Wed, 17 Feb 2010)

Log Message:
-----------
phpldapadmin: Update to 1.2.0.5 and fix #4283

Modified Paths:
--------------
    csw/mgar/pkg/phpldapadmin/trunk/Makefile
    csw/mgar/pkg/phpldapadmin/trunk/checksums
    csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall

Modified: csw/mgar/pkg/phpldapadmin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/Makefile	2010-02-17 12:06:24 UTC (rev 8616)
+++ csw/mgar/pkg/phpldapadmin/trunk/Makefile	2010-02-17 12:55:18 UTC (rev 8617)
@@ -1,5 +1,5 @@
 GARNAME = phpldapadmin
-GARVERSION = 1.2.0.4
+GARVERSION = 1.2.0.5
 CATEGORIES = apps
 
 DESCRIPTION = Web-based LDAP browser to manage your LDAP server

Modified: csw/mgar/pkg/phpldapadmin/trunk/checksums
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/checksums	2010-02-17 12:06:24 UTC (rev 8616)
+++ csw/mgar/pkg/phpldapadmin/trunk/checksums	2010-02-17 12:55:18 UTC (rev 8617)
@@ -1,2 +1,2 @@
-87983d70476a8a80332f0c3c188d9c2d  download/CSWphpldapadmin.preinstall
-a2d914e22c1b114738eca91c80c0d09c  download/phpldapadmin-1.2.0.4.tgz
+e0065aa1e6f36ccd29f73e691903d436  CSWphpldapadmin.preinstall
+d75f043686da4c1e333ca160b0d26c01  phpldapadmin-1.2.0.5.tgz

Modified: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall	2010-02-17 12:06:24 UTC (rev 8616)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall	2010-02-17 12:55:18 UTC (rev 8617)
@@ -1,14 +1,17 @@
 #!/bin/sh
 
 CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-if [ -d ${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin ]; then
+SOURCE=${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin
+TARGET=${CSW_PREFIX}/share/www/phpldapadmin
+
+if [ -d ${SOURCE} -a \! -h ${SOURCE} ]; then
   /usr/bin/cat <<EOF
 
 ERROR: You seem to have a previous installation of phpLDAPadmin.
 The install location has changed from
-  /opt/csw/apache2/share/htdocs/phpldapadmin
+  ${SOURCE}
 to
-  /opt/csw/share/www/phpldapadmin/htdocs
+  ${TARGET}
 
 Your files are being moved to the new install location.
 
@@ -21,10 +24,9 @@
   echo
   echo "Copying old files:"
   echo
-  mkdir -p ${CSW_PREFIX}/share/www/phpldapadmin/htdocs
-  (cd ${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin; tar cf - .) | \
-	(cd ${CSW_PREFIX}/share/www/phpldapadmin; tar xvf -)
-  rm -rf ${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin
+  mkdir -p ${TARGET}/htdocs
+  (cd ${SOURCE}; tar cf - .) | (cd ${TARGET}; tar xvf -)
+  rm -rf ${SOURCE}
 fi
 
 exit 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.