Convert to ARCH. Add in a compatibility CFLAG for osx 10.5

svn:r16703

diff --git a/contrib/polipo/Makefile.osx b/contrib/polipo/Makefile.osx
index 2314c3e3279e60f1a8f1ef3f1b72b79ac4cb1ce9..8e748e2adb2c3acff6545f055d530b91154a3ff9 100644 (file)
--- a/contrib/polipo/Makefile.osx
+++ b/contrib/polipo/Makefile.osx
@@ -30,7 +30,7 @@ FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \
 
 DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES)
 
-UNIVERSAL = -O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
+UNIVERSAL = -O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
 LDFLAGS = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
 CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) $(UNIVERSAL)
 

diff --git a/contrib/polipo/package.sh b/contrib/polipo/package.sh
index fea13b7ad93093f08f6f2f5fd8eb58ff61dc08b6..83f74212be6765c7affd3eaa35208a9276c42c79 100644 (file)
--- a/contrib/polipo/package.sh
+++ b/contrib/polipo/package.sh
@@ -18,16 +18,16 @@ 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") OS="leopard" ARCH="universal";;
-       "10.4") OS="tiger" ARCH="universal";;
-       "10.3") OS="panther" ARCH="ppc";;
-       "10.2") OS="jaguar" ARCH="ppc";;
-       "10.1") OS="puma" ARCH="ppc";;
-       "10.0") OS="cheetah" ARCH="ppc";;
-       *) OS="unknown";;
+    "10.5") ARCH="universal";;
+       "10.4") ARCH="universal";;
+       "10.3") ARCH="ppc";;
+       "10.2") ARCH="ppc";;
+       "10.1") ARCH="ppc";;
+       "10.0") ARCH="ppc";;
+       *) ARCH="unknown";;
     esac
 else
-  OS="unknown"
+  ARCH="unknown"
 fi
 
 # Where will we put our temporary files?
@@ -78,10 +78,10 @@ $PACKAGEMAKER -build              \
 
 find $BUILD_DIR/output -print0 | sudo xargs -0 chown root:wheel
 
-mv $BUILD_DIR/output "$BUILD_DIR/Polipo-$VERSION-$OS-$ARCH"
-rm -f "Polipo-$VERSION-$OS-$ARCH-Bundle.dmg"
+mv $BUILD_DIR/output "$BUILD_DIR/Polipo-$VERSION-$ARCH"
+rm -f "Polipo-$VERSION-$ARCH-Bundle.dmg"
 USER="`whoami`"
-sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/Polipo-$VERSION-$OS-$ARCH" "Polipo-$VERSION-$OS-$ARCH.dmg"
-sudo chown "$USER" "Polipo-$VERSION-$OS-$ARCH.dmg"
+sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/Polipo-$VERSION-$ARCH" "Polipo-$VERSION-$ARCH.dmg"
+sudo chown "$USER" "Polipo-$VERSION-$ARCH.dmg"
 
 #sudo rm -rf $BUILD_DIR