From e52353d7798e772da3f4d3f17c4bd0b51620a1a3 Mon Sep 17 00:00:00 2001
From: Sebastian Hahn <sebastian@torproject.org>
Date: Tue, 16 Feb 2010 05:47:24 +0100
Subject: [PATCH] Update polipo build instructions for OS X 10.6

---
 contrib/polipo/README     |  8 +++++---
 contrib/polipo/package.sh | 11 ++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/contrib/polipo/README b/contrib/polipo/README
index e05ab0ceec..8bc23a09d9 100644
--- a/contrib/polipo/README
+++ b/contrib/polipo/README
@@ -49,8 +49,10 @@ installation package.
 ---------------------------------------------
 OSX Universal Binary and Installation package
 ---------------------------------------------
+You'll need the contrib/polipo directory from Tor's source distribution.
 1) Copy Makefile.osx over Makefile.
 2) Run 'make'.
-3) Copy the contents of this directory into a directory named "contrib".
-4) Run './contrib/package.sh'
-5) You should have a Polipo-version.dmg ready for installation.
+3) Copy the contents of contrib/polipo into a directory named "contrib".
+4) Run 'chmod +x ./contrib/package.sh'
+5) Run './contrib/package.sh'
+6) You should have a Polipo-version.dmg ready for installation.
diff --git a/contrib/polipo/package.sh b/contrib/polipo/package.sh
index 4ec72c81d8..61bd496f55 100644
--- a/contrib/polipo/package.sh
+++ b/contrib/polipo/package.sh
@@ -17,8 +17,9 @@ if [ -x /usr/bin/sw_vers ]; then
 # the OS version
   OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2`
     case "$OSVER" in
-    "10.5") ARCH="universal";;
-	"10.4") ARCH="universal";;
+	"10.6") ARCH="i386";;
+	"10.5") ARCH="i386";;
+	"10.4") ARCH="i386";;
 	"10.3") ARCH="ppc";;
 	"10.2") ARCH="ppc";;
 	"10.1") ARCH="ppc";;
@@ -62,7 +63,7 @@ EOF
 
 ### Assemble documentation
 
-groff polipo.man -T ps -m man | pstopdf -i -o $BUILD_DIR/polipo_packageroot/polipo.pdf
+groff polipo.man -T ps -m man | /usr/bin/pstopdf -i -o $BUILD_DIR/polipo_packageroot/polipo.pdf
 texi2html polipo.texi && cp polipo.html $BUILD_DIR/polipo_packageroot/polipo.html
 
 find $BUILD_DIR/polipo_packageroot -print0 |sudo xargs -0 chown root:wheel
@@ -77,8 +78,8 @@ $PACKAGEMAKER -build              \
 
 find $BUILD_DIR/output -print0 | sudo xargs -0 chown root:wheel
 
-mv $BUILD_DIR/output "$BUILD_DIR/Polipo-$VERSION-$ARCH"
-rm -f "Polipo-$VERSION-$ARCH-Bundle.dmg"
+sudo mv $BUILD_DIR/output "$BUILD_DIR/Polipo-$VERSION-$ARCH"
+sudo rm -f "Polipo-$VERSION-$ARCH-Bundle.dmg"
 USER="`whoami`"
 sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/Polipo-$VERSION-$ARCH" "Polipo-$VERSION-$ARCH.dmg"
 sudo chown "$USER" "Polipo-$VERSION-$ARCH.dmg"