jaromail

commit 4266d92df396553f282f0109ae08cbea2708686e
parent cd200c1b0a5d6f565412890995fa6cf7129b8f5e
Author: Jaromil <jaromil@dyne.org>
Date:   Thu, 16 Aug 2012 08:46:34 -0700

small fixes to osx build and install

Diffstat:
M
build/build-osx.sh
 | 
15
+++++++++------
M
install.sh
 | 
15
++++++++++++++-

2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/build/build-osx.sh b/build/build-osx.sh
@@ -6,8 +6,7 @@
 # mutt
 # sudo port -vc install mutt-devel +gnuregex +gpgme +headercache +imap +pop +sasl +smtp +ssl +tokyocabinet +universal
 
-# gpg
-# sudo port install gpg +universal
+# pinentry
 # sudo port install pinentry +universal
 
 # msmtp
@@ -120,8 +119,14 @@ $cc -DHAS_STDINT_H -DHAS_INTTYPES_H \
     mairix/nvp.o mairix/reader.o mairix/search.o mairix/tok.o
 popd
 
+# build our own dotlock
+pushd src
+$cc -c dotlock.c
+$cc -o dotlock dotlock.o
+popd
+
 # build our own msmtp
-# port deps: libidn ...
+# port deps: libidn gnutls
 pushd src/msmtp
 print "SMTP Simple mail transport protocol agent"
 CC="$cc" LD=/usr/bin/ld CPP=/usr/bin/cpp \
@@ -137,11 +142,9 @@ cp src/fetchdate build/osx/
 cp src/fetchaddr build/osx/
 cp src/mairix/mairix build/osx/
 cp src/msmtp/src/msmtp build/osx/
+cp src/dotlock build/osx/
 copydeps /opt/local/bin/mutt
-copydeps /opt/local/bin/mutt_dotlock
-mv build/osx/mutt_dotlock build/osx/dotlock
 copydeps build/osx/msmtp
-copydeps /opt/local/bin/gpg
 copydeps /opt/local/bin/pinentry
 copydeps /opt/local/bin/lynx
 
diff --git a/install.sh b/install.sh
@@ -251,7 +251,20 @@ cp -a src/stats/* $WORKDIR/.stats
     cp src/fetchdate $WORKDIR/bin/
 
     case $OS in
-	MAC) cp -a build/osx/* $WORKDIR/bin ;;
+	MAC)
+	    test $(which msmtp) || cp build/osx/msmtp* $WORKDIR/bin
+	    test $(which lynx)  || cp build/osx/lynx* $WORKDIR/bin
+	    test $(which mutt)  || cp build/osx/mutt* $WORKDIR/bin
+	    test $(which pinentry)  || cp build/osx/pinentry* $WORKDIR/bin
+
+	    cp build/osx/dotlock $WORKDIR/bin
+	    cp build/osx/fetchdate $WORKDIR/bin
+	    cp build/osx/fetchaddr $WORKDIR/bin
+	    cp build/osx/mairix $WORKDIR/bin
+	    cp build/osx/ABQuery $WORKDIR/bin
+	    cp -r build/osx/dylib $WORKDIR/bin
+	    ;;
+
 	GNU) cp -a build/gnu/* $WORKDIR/bin
 #rm -f $WORKDIR/bin/dotlock
 #cat <<EOF > $WORKDIR/bin/dotlock