INterim commit

diff --git a/cyrus-sasl b/cyrus-sasl
index 05c7a77..a62f564 160000 (submodule)
--- a/cyrus-sasl
+++ b/cyrus-sasl
@@ -1 +1 @@
-Subproject commit 05c7a774bfb33da2514677cbabd804ebd409a0ec
+Subproject commit a62f564e8d4ae563c847c938919345fcbf7a5d5a

diff --git a/mac-client-installer/README.MacOsBuildInstructions b/mac-client-installer/README.MacOsBuildInstructions
index eba65bd..fea6242 100644 (file)
--- a/mac-client-installer/README.MacOsBuildInstructions
+++ b/mac-client-installer/README.MacOsBuildInstructions
@@ -61,6 +61,12 @@ $ exit
 choose  [1] Rerun phase build
 
 
+*** Error during phase checkout of krb5: could not unpack tarball (expected krb5-1.9.2-signed.tar dir) *** [1/1]
+choose [4] Start shell
+unpack file ~/gtk/source/krb5-1.9.2.tar.gz to create directory krb5-1.9.2
+$ exit
+choose [2] Ignore error and continue to configure
+
 ### Old instructions
 
 

diff --git a/mac-client-installer/moonshot-mac.modules b/mac-client-installer/moonshot-mac.modules
index 8ead3c3..4c0f208 100644 (file)
--- a/mac-client-installer/moonshot-mac.modules
+++ b/mac-client-installer/moonshot-mac.modules
@@ -9,9 +9,6 @@
     <repository type="git" name="moonshot-ui.janet.git"
     href="http://www.project-moonshot.org/git/moonshot-ui.git"/>
     
-    <repository type="git" name="moonshot-ui.gitorious.git"
-    href="git@gitorious.codethink.co.uk:moonshot-ui/moonshot-ui.git"/>
-    
     <repository type="tarball" name="ftp.cyrus-sasl.org" default="yes"
     href="ftp://ftp.cyrusimap.org/cyrus-sasl/"/>
 
@@ -26,7 +23,7 @@
     </metamodule>
 
     
-    <autotools id="moonshot-ui" makeinstallargs="install icons app-bundle">
+    <autotools id="moonshot-ui" makeinstallargs="install  DESTDIR=$HOME/moonshot/mac-client-installer/moonshot icons app-bundle">
         <branch 
             repo="moonshot.janet.git" module="moonshot-ui.git">
         </branch>
@@ -60,15 +57,12 @@
         </dependencies>
     </tarball>
 
-     
     <autotools id="moonshot" autogenargs="--enable-acceptor=no --with-krb5=$PREFIX"
         makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/moonshot">
         <branch 
         repo="moonshot.janet.git" module="moonshot.git">
         <patch file="0001-Move-moonshot-files-up.patch" strip="1"/>
         </branch>
-        <dependencies>
-       </dependencies>
     </autotools>
 
     <repository type="git" name="moonshotclient.gitorious.git"
@@ -78,10 +72,7 @@
         makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/sasl">
         <branch 
             repo="moonshotclient.gitorious.git" module="cyrus-sasl.git">
-            <patch file="0002-For-Mac-OS-install-the-framework-in-DESTDIR-Library-.patch" strip="1"/>
         </branch>
-        <dependencies>
-        </dependencies>
     </autotools>
 
 

diff --git a/mac-client-installer/resources/README.GssLibs b/mac-client-installer/resources/README.GssLibs
deleted file mode 100644 (file)
index fe644b9..0000000
--- a/mac-client-installer/resources/README.GssLibs
+++ /dev/null
@@ -1,14 +0,0 @@
-----------------------------------------------------------------------
- Libraries have been installed in:
-    /Users/pete/tmp/usr/local/lib/gss
-
- If you ever happen to want to link against installed libraries
- in a given directory, LIBDIR, you must either use libtool, and
- specify the full pathname of the library, or use the `-LLIBDIR'
- flag during linking and do at least one of the following:
-    - add LIBDIR to the `DYLD_LIBRARY_PATH' environment variable
-      during execution
-
- See any operating system documentation about shared libraries for
- more information, such as the ld(1) and ld.so(8) manual pages.
- ----------------------------------------------------------------------

diff --git a/mac-client-installer/resources/README.saslPlugins b/mac-client-installer/resources/README.saslPlugins
deleted file mode 100644 (file)
index a13f371..0000000
--- a/mac-client-installer/resources/README.saslPlugins
+++ /dev/null
@@ -1,15 +0,0 @@
-********************************************************
-* WARNING:
-* Plugins are being installed into /usr/local/lib/sasl2,
-* but the library will look for them in /usr/lib/sasl2.
-* You need to make sure that the plugins will eventually
-* be in /usr/lib/sasl2 -- the easiest way is to make a
-* symbolic link from /usr/lib/sasl2 to /usr/local/lib/sasl2,
-* but this may not be appropriate for your site, so this
-* installation procedure won't do it for you.
-*
-* If you don't want to do this for some reason, you can
-* set the location where the library will look for plugins
-* by setting the environment variable SASL_PATH to the path
-* the library should use.
-********************************************************

diff --git a/mac-client-installer/resources/README.saslPlugins.txt b/mac-client-installer/resources/README.saslPlugins.txt
deleted file mode 100644 (file)
index a13f371..0000000
--- a/mac-client-installer/resources/README.saslPlugins.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-********************************************************
-* WARNING:
-* Plugins are being installed into /usr/local/lib/sasl2,
-* but the library will look for them in /usr/lib/sasl2.
-* You need to make sure that the plugins will eventually
-* be in /usr/lib/sasl2 -- the easiest way is to make a
-* symbolic link from /usr/lib/sasl2 to /usr/local/lib/sasl2,
-* but this may not be appropriate for your site, so this
-* installation procedure won't do it for you.
-*
-* If you don't want to do this for some reason, you can
-* set the location where the library will look for plugins
-* by setting the environment variable SASL_PATH to the path
-* the library should use.
-********************************************************

diff --git a/mac-client-installer/resources/readme.txt b/mac-client-installer/resources/readme.txt
deleted file mode 100644 (file)
index 7b53bc2..0000000
--- a/mac-client-installer/resources/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-hello this is a readme file