# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1234771460 0
# Node ID ff4c00ab546ffc7edae71257a24df8f54ab655b8
# Parent  a26ef49252622caa448c7c503e7ffecc8fc1e3c9
squirrelmail plugins: post_remove -> pre_remove

diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-archive/receipt
--- a/squirrelmail-archive/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-archive/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -23,7 +23,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-autocomplete/receipt
--- a/squirrelmail-autocomplete/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-autocomplete/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -24,7 +24,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-autorespond/receipt
--- a/squirrelmail-autorespond/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-autorespond/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -28,7 +28,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-bookmarks/receipt
--- a/squirrelmail-bookmarks/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-bookmarks/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -29,7 +29,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-calendard-file-backend/receipt
--- a/squirrelmail-calendard-file-backend/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-calendard-file-backend/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -24,7 +24,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-calendard-sql-backend/receipt
--- a/squirrelmail-calendard-sql-backend/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-calendard-sql-backend/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -29,7 +29,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-html/receipt
--- a/squirrelmail-html/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-html/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -23,7 +23,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-html_mail/receipt
--- a/squirrelmail-html_mail/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-html_mail/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -36,7 +36,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 	rm /etc/apache/conf.d/$SOURCE
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-ldapuser/receipt
--- a/squirrelmail-ldapuser/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-ldapuser/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -35,7 +35,7 @@
 EOT
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 	sed -i "/plugins.$SOURCE.doc/d" /etc/openldap/slapd.conf
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-legend/receipt
--- a/squirrelmail-legend/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-legend/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -23,7 +23,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-msg_flags/receipt
--- a/squirrelmail-msg_flags/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-msg_flags/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -26,10 +26,10 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	( cd /usr/share/squirrelmail/plugins/$SOURCE
 	  patch -R -p0 < patches/$SOURCE-squirrelmail-$(. $INSTALLED/squirrelmail/receipt; echo $VERSION).diff )
-	sed -i "/$PACKAGE/d" $INSTALLED/squirrelmail/modifiers
+	sed -i "/^$PACKAGE\$/d" $INSTALLED/squirrelmail/modifiers
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-multilogin/receipt
--- a/squirrelmail-multilogin/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-multilogin/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -10,7 +10,7 @@
 WEB_SITE="http://www.squirrelmail.org/"
 DEPENDS="squirrelmail squirrelmail-compatibility-plugin"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/config-multilogin.php"
+CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -19,25 +19,25 @@
 		 $fs/var/lib/squirrelmail/slitaz.org/data
 	cp -a $SOURCE $fs/usr/share/squirrelmail/plugins
 	mv $fs/usr/share/squirrelmail/plugins/$SOURCE/config.sample.php \
-		$fs/etc/squirrelmail/config-multilogin.php
-	ln -s /etc/squirrelmail/config-multilogin.php \
+		$fs/etc/squirrelmail/config-$SOURCE.php
+	ln -s /etc/squirrelmail/config-$SOURCE.php \
 		$fs/usr/share/squirrelmail/plugins/$SOURCE/config.php
-	( cd $fs/etc/squirrelmail ; patch -p0 ) < stuff/config-multilogin.u
+	( cd $fs/etc/squirrelmail ; patch -p0 ) < stuff/config-$SOURCE.u
 }
 
 post_install()
 {
 	chown www $1/var/lib/squirrelmail/slitaz.org/data
-	( cd $1/usr/share/squirrelmail/plugins/multilogin
-	  patch -p0 < patches/multilogin-squirrelmail-$(. $1/$INSTALLED/squirrelmail/receipt; echo $VERSION).diff )
+	( cd $1/usr/share/squirrelmail/plugins/$SOURCE
+	  patch -p0 < patches/$SOURCE-squirrelmail-$(. $1/$INSTALLED/squirrelmail/receipt; echo $VERSION).diff )
 	echo "$PACKAGE" >> $1/$INSTALLED/squirrelmail/modifiers
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
-	( cd /usr/share/squirrelmail/plugins/multilogin
-	  patch -R -p0 < patches/multilogin-squirrelmail-$(. $INSTALLED/squirrelmail/receipt; echo $VERSION).diff )
-	sed -i "/$PACKAGE/d" $INSTALLED/squirrelmail/modifiers
+	( cd /usr/share/squirrelmail/plugins/$SOURCE
+	  patch -R -p0 < patches/$SOURCE-squirrelmail-$(. $INSTALLED/squirrelmail/receipt; echo $VERSION).diff )
+	sed -i "/^$PACKAGE\$/d" $INSTALLED/squirrelmail/modifiers
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-notes/receipt
--- a/squirrelmail-notes/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-notes/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -28,7 +28,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-quota/receipt
--- a/squirrelmail-quota/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-quota/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -10,7 +10,7 @@
 WEB_SITE="http://www.squirrelmail.org/"
 DEPENDS="squirrelmail squirrelmail-compatibility-plugin"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/config-quota.php"
+CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -18,10 +18,10 @@
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail
 	cp -a $SOURCE $fs/usr/share/squirrelmail/plugins
 	mv $fs/usr/share/squirrelmail/plugins/$SOURCE/config.sample.php \
-		$fs/etc/squirrelmail/config-quota.php
+		$fs/etc/squirrelmail/config-$SOURCE.php
 	sed -i "s/settings\['quota_type'\] = 0/settings['quota_type'] = 1/" \
-		$fs/etc/squirrelmail/config-quota.php
-	ln -s /etc/squirrelmail/config-quota.php \
+		$fs/etc/squirrelmail/config-$SOURCE.php
+	ln -s /etc/squirrelmail/config-$SOURCE.php \
 		$fs/usr/share/squirrelmail/plugins/$SOURCE/config.php
 }
 
@@ -30,7 +30,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-shared_calendars/receipt
--- a/squirrelmail-shared_calendars/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-shared_calendars/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -28,7 +28,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-sieve/receipt
--- a/squirrelmail-sieve/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-sieve/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -28,7 +28,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-sizes/receipt
--- a/squirrelmail-sizes/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-sizes/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -23,7 +23,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-smallcal/receipt
--- a/squirrelmail-smallcal/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-smallcal/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -26,7 +26,7 @@
 EOF
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-spamassassin/receipt
--- a/squirrelmail-spamassassin/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-spamassassin/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -10,6 +10,7 @@
 WEB_SITE="http://www.squirrelmail.org/"
 DEPENDS="squirrelmail"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
+SUGGESTED="spamassassin"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -23,7 +24,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r a26ef4925262 -r ff4c00ab546f squirrelmail-vkeyboard/receipt
--- a/squirrelmail-vkeyboard/receipt	Sun Feb 15 22:54:18 2009 +0000
+++ b/squirrelmail-vkeyboard/receipt	Mon Feb 16 08:04:20 2009 +0000
@@ -10,7 +10,7 @@
 WEB_SITE="http://www.squirrelmail.org/"
 DEPENDS="squirrelmail"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/config-vkeyboard.php"
+CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -18,8 +18,8 @@
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail
 	cp -a $SOURCE $fs/usr/share/squirrelmail/plugins
 	mv $fs/usr/share/squirrelmail/plugins/$SOURCE/config.php.sample \
-		$fs/etc/squirrelmail/config-vkeyboard.php
-	ln -s /etc/squirrelmail/config-vkeyboard.php \
+		$fs/etc/squirrelmail/config-$SOURCE.php
+	ln -s /etc/squirrelmail/config-$SOURCE.php \
 		$fs/usr/share/squirrelmail/plugins/$SOURCE/config.php
 }
 
@@ -28,7 +28,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php
 }
 
-post_remove()
+pre_remove()
 {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }