[csw-devel] SF.net SVN: gar:[5045] csw/mgar/pkg/phpldapadmin/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon May 25 18:31:58 CEST 2009
Revision: 5045
http://gar.svn.sourceforge.net/gar/?rev=5045&view=rev
Author: dmichelsen
Date: 2009-05-25 16:31:57 +0000 (Mon, 25 May 2009)
Log Message:
-----------
phpldapadmin: New directory structure, mGAR v2
Modified Paths:
--------------
csw/mgar/pkg/phpldapadmin/trunk/Makefile
csw/mgar/pkg/phpldapadmin/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall
Removed Paths:
-------------
csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.depend
csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.gspec
csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.postinstall
csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preremove
Property Changed:
----------------
csw/mgar/pkg/phpldapadmin/trunk/
Property changes on: csw/mgar/pkg/phpldapadmin/trunk
___________________________________________________________________
Modified: svn:externals
- gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/phpldapadmin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/Makefile 2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/Makefile 2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,5 +1,5 @@
GARNAME = phpldapadmin
-GARVERSION = 1.1.0.6
+GARVERSION = 1.1.0.7
CATEGORIES = apps
DESCRIPTION = Web-based LDAP browser to manage your LDAP server
@@ -15,7 +15,7 @@
MASTER_SITES = $(SF_MIRRORS)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWphpldapadmin,depend postinstall preremove)
+DISTFILES += CSWphpldapadmin.preinstall
# We define upstream file regex so we can be notifed of new upstream software release
UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=61828
@@ -27,15 +27,23 @@
TEST_SCRIPTS =
INSTALL_SCRIPTS = custom
+PRESERVECONF = $(sharedstatedir)/www/phpldapadmin/config/config.php.CSW
+
+LICENSE = LICENSE
+ARCHALL = 1
+
include gar/category.mk
install-custom:
@echo " ==> Installing $(GARNAME)"
+ @rm -rf $(DESTDIR)$(sharedstatedir)/www/phpldapadmin
+ @ginstall -d $(DESTDIR)$(sharedstatedir)/www
+ @cp -R $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/phpldapadmin
+ @(cd $(DESTDIR)$(sharedstatedir)/www/phpldapadmin/config; \
+ mv config.php.example config.php.CSW)
+ @find $(DESTDIR)$(sharedstatedir) -name .cvsignore -exec rm \{\} \;
@rm -rf $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin
@ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs
- @cp -R $(WORKSRC) $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin
- @cp $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin/config/config.php.example \
- $(DESTDIR)/$(prefix)/apache2/share/htdocs/phpldapadmin/config/config.php.CSW
- @find $(DESTDIR)$(prefix) -name .cvsignore -exec rm \{\} \;
+ @ln -s $(sharedstatedir)/www/phpldapadmin/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/phpldapadmin/trunk/checksums
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/checksums 2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/checksums 2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,5 +1,2 @@
-f763977c46d09c5801d9af4ebde07a4f download/phpldapadmin-1.1.0.6.tar.gz
-45c8d22ee54b7ecf7a18b85de0777f28 download/CSWphpldapadmin.gspec
-0a5093f77c31ac9a30572e2ef9e2c57f download/CSWphpldapadmin.depend
-640e8d4ce62a9d2d5508f68f4284cf1f download/CSWphpldapadmin.postinstall
-aa80ac77696d9292018d0188350b49c5 download/CSWphpldapadmin.preremove
+13fec0afd8f7808698e2942da7ba3218 download/CSWphpldapadmin.preinstall
+a9129f81b347e98c2b31552d1adc4b51 download/phpldapadmin-1.1.0.7.tar.gz
Deleted: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.depend
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.depend 2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.depend 2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,5 +0,0 @@
-P CSWapache2 apache2 - Apache 2.2 web server
-P CSWap2modphp5 ap2_modphp5 - PHP 5 - Apache 2.2.x Module
-P CSWphp5ldap php5_ldap - PHP 5 - OpenLDAP Extension
-P CSWphp5gettext php5_gettext - PHP 5 - GNU gettext Extension
-P CSWphp5session php5_session - PHP 5 - Session Extension
Deleted: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.gspec
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.gspec 2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.gspec 2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,5 +0,0 @@
-%var bitname phpldapadmin
-%var pkgname CSWphpldapadmin
-%var arch all
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/LICENSE
Deleted: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.postinstall
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.postinstall 2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.postinstall 2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-CONFDIR=${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin/config
-
-# Copy templates
-template_list="config.php"
-
-echo Copying CSW templates:
-for file in $template_list
-do
- filepath=${CONFDIR}/$file
- if [ ! -f "$filepath" ] && [ -f "$filepath.CSW" ]; then
- echo " creating $filepath"
- cp $filepath.CSW $filepath
- else
- echo " preserving $filepath"
- fi
-done
-
-/usr/bin/cat <<EOF
-
-NOTE: You need to configure phpLDAPadmin. Edit the file
- "/opt/csw/apache2/share/htdocs/phpldapadmin/config/config.php"
-to do so. An example config file is provided in
- "/opt/csw/apache2/share/htdocs/phpldapadmin/config/config.php.example".
-
-EOF
-
-exit 0
Copied: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall (from rev 4338, csw/mgar/pkg/mantis/trunk/files/CSWmantis.preinstall)
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall (rev 0)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preinstall 2009-05-25 16:31:57 UTC (rev 5045)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+if [ -d ${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin ]; 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
+to
+ /opt/csw/share/www/phpldapadmin/htdocs
+
+Your files are being moved to the new install location.
+
+!! Please press Ctrl-C in the next 5 seconds if you don't !!
+!! want this to happen automatically but want to move the !!
+!! files manually. !!
+EOF
+
+ sleep 5
+ 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/htdocs; tar xvf -)
+ rm -rf ${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin
+fi
+
+exit 0
Deleted: csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preremove
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preremove 2009-05-25 16:14:35 UTC (rev 5044)
+++ csw/mgar/pkg/phpldapadmin/trunk/files/CSWphpldapadmin.preremove 2009-05-25 16:31:57 UTC (rev 5045)
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-CONFDIR=${CSW_PREFIX}/apache2/share/htdocs/phpldapadmin/config
-
-# Copy templates
-template_list="config.php"
-
-echo Removing unmodified CSW templates:
-for file in $template_list
-do
- filepath=${CONFDIR}/$file
- if [ -f "${filepath}" ] && [ -f "${filepath}.CSW" ] && cmp -s "${filepath}" "${filepath}.CSW"; then
- echo " removing $filepath"
- rm -f "${filepath}"
- else
- echo " preserving $filepath"
- fi
-done
-
-exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list