jaromail

commit 5078b72e47fff01a78f7ff2803a116b6a2faf822
parent 541b17199ce87b09b2ce859e342253a34e591c76
Author: Jaromil <jaromil@dyne.org>
Date:   Fri, 28 Sep 2012 11:35:29 +0200

fixed dotlock for mutt

Diffstat:
M
build/build-gnu.sh
 | 
1
+
M
build/build-osx.sh
 | 
6
+++++-
M
src/mutt-1.5.21/init.h
 | 
3
++-

3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/build/build-gnu.sh b/build/build-gnu.sh
@@ -113,6 +113,7 @@ case $distro in
 		popd
 		cp src/mutt-1.5.21/mutt build/gnu/mutt-jaro
 		cp src/mutt-1.5.21/pgpewrap build/gnu/pgpewrap
+		cp src/mutt-1.5.21/mutt_dotlock build/gnu/dotlock-mutt
 	}
 
 	{ test "$target" = "mixmaster" } && { 
diff --git a/build/build-osx.sh b/build/build-osx.sh
@@ -180,7 +180,10 @@ fi
 	--with-mixmaster=${root}/src/mixmaster --enable-pgp \
 	> /dev/null
     make mutt > /dev/null
-    { test $? = 0 } && { cp mutt mutt-jaro }
+    { test $? = 0 } && {
+	 mv mutt mutt-jaro
+	 mv mutt_dotlock dotlock-mutt
+    }
     popd
 }
 
@@ -199,6 +202,7 @@ fi
 # cp src/msmtp/src/msmtp build/osx/
     cp -v src/dotlock build/osx/
     copydeps ${root}/src/mutt-1.5.21/mutt-jaro
+    copydeps ${root}/src/mutt-1.5.21/dotlock-mutt
     copydeps ${root}/src/mutt-1.5.21/pgpewrap
     copydeps /opt/local/bin/gfind
     copydeps /opt/local/bin/msmtp
diff --git a/src/mutt-1.5.21/init.h b/src/mutt-1.5.21/init.h
@@ -615,7 +615,8 @@ struct option_t MuttVars[] = {
   ** filtered message is read from the standard output.
   */
 #if defined(DL_STANDALONE) && defined(USE_DOTLOCK)
-  { "dotlock_program",  DT_PATH, R_NONE, UL &MuttDotlock, UL BINDIR "/mutt_dotlock" },
+  //{ "dotlock_program",  DT_PATH, R_NONE, UL &MuttDotlock, UL BINDIR "/mutt_dotlock" },
+  { "dotlock_program",  DT_PATH, R_NONE, UL &MuttDotlock, "dotlock-mutt" },
   /*
   ** .pp
   ** Contains the path of the \fCmutt_dotlock(8)\fP binary to be used by