[vidalia-svn] r3090: Updated directions to build the osx bundle. (vidalia/trunk/pkg/osx)

[phobos@xxxxxxxxxxxxxxxxxxx]

Author: phobos
Date: 2008-09-13 23:00:24 -0400 (Sat, 13 Sep 2008)
New Revision: 3090

Modified:
   vidalia/trunk/pkg/osx/build-bundle.txt
Log:
Updated directions to build the osx bundle.


Modified: vidalia/trunk/pkg/osx/build-bundle.txt
===================================================================
--- vidalia/trunk/pkg/osx/build-bundle.txt	2008-09-14 02:45:33 UTC (rev 3089)
+++ vidalia/trunk/pkg/osx/build-bundle.txt	2008-09-14 03:00:24 UTC (rev 3090)
@@ -31,54 +31,52 @@
    make && make install
  
  
-Privoxy
-7. Download the OS X Privoxy package from 
-   http://prdownloads.sourceforge.net/ijbswa/privoxyosx_setup_3.0.3.zip?download
-  
-   Note the location in which you save this .zip file, because you will need
-   to specify it in Step 8.
+Polipo
+7. Download the OS X Polipo source with tor modifications from 
+  http://interloper.org/tmp/polipo/polipo-1.0.4-with-tor-mods.tgz
 
+8. Follow the directions to build polipo at
+  https://www.torproject.org/svn/trunk/contrib/polipo/README
 
 Tor
-8. Download and extract the latest Tor source from
+9. Download and extract the latest Tor source from
    https://www.torproject.org/download
 
    Note the location in which you extract Tor's source, because you will need
    to specify it in Step 8.
    
-9. Configure Tor with the following:
+10. Configure Tor with the following:
    ./configure --prefix=/Library/Tor --bindir=/Library/Tor --sysconfdir=/Library
 
 Vidalia
-10. Configure Vidalia with the following:
+11. Configure Vidalia with the following:
       cmake -DOSX_FAT_BINARY=1 . 
 
    The Vidalia binary on OS X links to Qt statically, so you will need to have
    your Qt installation configured appropriately.
 
-11. Run `make` to build Vidalia.
+12. Run `make` to build Vidalia.
 
-12. Download the latest Torbutton and LICENSE file from https://torbutton.torproject.org/dev/.
+13. Download the latest Torbutton and LICENSE file from https://torbutton.torproject.org/dev/.
 Remember where you put this file.
 
    
 Finish
-12. From Vidalia's pkg/ directory in Vidalia's source, run the following:
-     ./package.sh osx-bundle <path-to-tor> <privoxy-package.zip>
+14. From Vidalia's pkg/ directory in Vidalia's source, run the following:
+     ./package.sh osx-bundle <path-to-tor> <path-to-polipo> <path-to-torbutton>
   
   Example:
-     ./package.sh osx-bundle ~/tor-0.2.0.11-alpha ~/privoxyosx_setup_3.0.3.zip
+     ./package.sh osx-bundle ~/tor-0.2.0.11-alpha ~/tmp/polipo-1.0.4/ ~/tmp/
 
-  The script that builds the .mpkg (pkg/osx/bundle/buildmpkg.sh) gets Tor's
+  The script that builds the .dmg (pkg/osx/bundle/builddmg.sh) gets Tor's
   version number from the directory name, so it should be named appropriately,
   as in the example above.
   
-The resulting .dmg containg the .mpkg and necessary licenses will be placed in
-the 'pkg' directory under Vidalia's source.
+The resulting .dmg will be placed in the 'pkg' directory under Vidalia's source.
 
 NOTE: Steps 1-6 only need to be done once initially, unless you need to change the
 packaged version of Libevent or Qt. Step 7 also only needs to be done once,
-unless Privoxy ever gets updated. Steps 8-9 need to be repeated when the
-bundled version of Tor changes. Steps 10-11 need to be repeated when the
+unless Privoxy ever gets updated. Steps 9-10 need to be repeated when the
+bundled version of Tor changes. Steps 11-12 need to be repeated when the
 bundled version of Vidalia changes.