From ac0b7f121b5949c0e2e3d04832e608b45ab8f908 Mon Sep 17 00:00:00 2001
From: Jason Lewis <jason@dickson.st>
Date: Mon, 9 Jul 2012 16:43:42 +1000
Subject: added auto-loads to scad-mode.el so when it is installed via
 elpa/marmalade it sets everything up for the user so they don't have to edit
 their init.el file.

scad-mode should turn on automatically for any files that end in .scad

diff --git a/contrib/scad-mode.el b/contrib/scad-mode.el
index e3eee0d..5961b08 100644
--- a/contrib/scad-mode.el
+++ b/contrib/scad-mode.el
@@ -4,8 +4,9 @@
 ;; Maintainer: Len Trigg <lenbok@gmail.com>
 ;; Created:    March 2010
 ;; Modified:   06 July 2012
+;; Keywords:   languages
 ;; URL:        https://raw.github.com/openscad/openscad/master/contrib/scad-mode.el
-;; Version:    $Revision: 89 $
+;; Version:    90.0
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -24,19 +25,27 @@
 
 ;;; Commentary:
 ;;
-;; This is a separate mode to implement the SCAD constructs and
-;; font-locking.
+;; This is a major-mode to implement the SCAD constructs and
+;; font-locking for openscad
 ;;
-;; To use, insert the following into your emacs startup:
+;; If installing manually, insert the following into your emacs startup:
 ;;
 ;; (autoload 'scad-mode "scad-mode" "Major mode for editing SCAD code." t)
 ;; (add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode))
+;;
+;; or
+;;
+;; install from marmalade: http://marmalade-repo.org/
+;; M-x install-package <ENTER> scad-mode <ENTER>
+
 
 ;;; To Do:
 ;; - Support for background/debug/root/disable modifiers
 ;; - Font lock of non-built-in function calls
 
-;;; Autoload mode trigger
+;;; Code:
+
+;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode))
 
 (defcustom scad-command
-- 
cgit v0.10.1


From d8ca1de649188a3d33ddd3988e803b4b1e8d5776 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 9 Jul 2012 17:31:02 -0400
Subject: Qt 4.8 requires explicit QMAKESPEC


diff --git a/setenv_mjau.sh b/setenv_mjau.sh
index 3b9fd92..851cf0e 100644
--- a/setenv_mjau.sh
+++ b/setenv_mjau.sh
@@ -1,5 +1,6 @@
 export OPENSCAD_LIBRARIES=$PWD/../libraries/install
 export DYLD_LIBRARY_PATH=$OPENSCAD_LIBRARIES/lib
+export QMAKESPEC=macx-g++
 
 #export OPENCSGDIR=$PWD/../OpenCSG-1.3.0
 #export CGALDIR=$PWD/../install/CGAL-3.6
-- 
cgit v0.10.1


From 38a4585d1a9abe9c779c5d0677bfc81c407db371 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 9 Jul 2012 17:31:29 -0400
Subject: Tweaks for Qt 4.8 and correct mpfr download link


diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh
index 405f7aa..3e352e1 100755
--- a/scripts/macosx-build-dependencies.sh
+++ b/scripts/macosx-build-dependencies.sh
@@ -10,7 +10,7 @@
 #  -6   Build only 64-bit binaries
 #
 # Prerequisites:
-# - MacPorts: curl
+# - MacPorts: curl, cmake
 # - Qt4
 #
 # FIXME:
@@ -24,6 +24,7 @@ SRCDIR=$BASEDIR/src
 DEPLOYDIR=$BASEDIR/install
 MAC_OSX_VERSION_MIN=10.5
 OPTION_32BIT=true
+export QMAKESPEC=macx-g++
 
 printUsage()
 {
@@ -129,11 +130,11 @@ build_mpfr()
   cd $BASEDIR/src
   rm -rf mpfr-$version
   if [ ! -f mpfr-$version.tar.bz2 ]; then
-    curl -O http://www.mpfr.org/mpfr-current/mpfr-$version.tar.bz2
+    curl -O http://www.mpfr.org/mpfr-$version/mpfr-$version.tar.bz2
   fi
   tar xjf mpfr-$version.tar.bz2
   cd mpfr-$version
-  curl -O http://www.mpfr.org/mpfr-current/allpatches
+  curl -O http://www.mpfr.org/mpfr-$version/allpatches
   patch -N -Z -p1 < allpatches 
   if $OPTION_32BIT; then
     mkdir build-i386
-- 
cgit v0.10.1