fluxus_homebrew.patch

diff --git a/SConstruct b/SConstruct
index 7bca3cc..c405a57 100644
--- a/SConstruct
+++ b/SConstruct
@@ -27,8 +27,8 @@ if sys.platform == 'darwin':
 	file.close()
 	Prefix = ARGUMENTS.get('Prefix','/opt/local')
 	RacketPrefix = ARGUMENTS.get('RacketPrefix', RacketBin[:-5])
-	RacketInclude = ARGUMENTS.get('RacketInclude', RacketPrefix + "/include")
-	RacketLib = ARGUMENTS.get('RacketLib', RacketPrefix + "/lib")
+	RacketInclude = ARGUMENTS.get('RacketInclude', RacketPrefix + "/include/racket")
+	RacketLib = ARGUMENTS.get('RacketLib', RacketPrefix + "/lib/racket")
 elif sys.platform == 'win32':
 	Prefix = ARGUMENTS.get('Prefix','c:/Program Files/Fluxus')
 	RacketPrefix = ARGUMENTS.get('RacketPrefix','c:/Program Files/Racket')
@@ -46,11 +46,7 @@ DataInstall = DESTDIR + DataLocation
 FluxusCollectsLocation = Prefix + "/lib"
 CollectsInstall = DESTDIR + FluxusCollectsLocation + "/fluxus-" + FluxusVersion
 DocsInstall = DESTDIR + Prefix + "/share/doc/fluxus-" + FluxusVersion
-
-if sys.platform == 'darwin' or sys.platform == 'win32':
-        RacketCollectsLocation = RacketPrefix + "/collects/"
-else:
-        RacketCollectsLocation = RacketLib + "/collects/"
+RacketCollectsLocation = RacketLib + "/collects/"
 
 if sys.platform == 'darwin' and GetOption('app'):
 		RacketCollectsLocation = 'collects/' # not used relative racket collects path and
@@ -69,6 +65,7 @@ LibPaths     = [
         RacketLib,
         RacketLib+"/..",
         "/usr/lib",
+        "/usr/X11/lib",
         "../../libfluxus"]
 
 IncludePaths = [
@@ -76,6 +73,8 @@ IncludePaths = [
         "/usr/include",
         "/usr/local/include/freetype2",  # arg - freetype needs to be
         "/usr/include/freetype2",        # on the include path :(
+        "/usr/X11/include",
+        "/usr/X11/include/freetype2",
         RacketInclude,
         "../../libfluxus/src"]
 
@@ -202,6 +201,16 @@ if not GetOption('clean'):
         print '--------------------------------------------------------'
         print 'Fluxus: Configuring Build Environment'
         print '--------------------------------------------------------'
+        # detect ode precision
+        if not GetOption('clean'):
+          try:
+            odec = subprocess.Popen(['ode-config', '--cflags', '--libs'], stdout=subprocess.PIPE)
+            ode_str = odec.communicate()
+            if isinstance(ode_str[0], str):
+              env.MergeFlags(ode_str[0])
+          except:
+            print 'WARNING: unable to run ode-config, cannot detect ODE precision'
+
         conf = Configure(env)
 
         # check Racket and OpenAL frameworks on osx
@@ -234,23 +243,16 @@ if not GetOption('clean'):
         # ... but we shouldn't forget to add them to LIBS manually
         env.Replace(LIBS = [rec[0] for rec in LibList])
 
-# detect ode precision
-if not GetOption('clean'):
-	try:
-		odec = subprocess.Popen(['ode-config', '--cflags', '--libs'], stdout=subprocess.PIPE)
-		ode_str = odec.communicate()
-		if isinstance(ode_str[0], str):
-			env.MergeFlags(ode_str[0])
-	except:
-		print 'WARNING: unable to run ode-config, cannot detect ODE precision'
-
 # link ode statically
 if static_ode and not GetOption('clean'):
 	if 'ode' in env['LIBS']:
 		env['LIBS'].remove('ode')
 		env['LIBS'].append(File('%s/lib/libode.a' % Prefix))
 
-if env['PLATFORM'] == 'darwin':
+if env['PLATFORM'] == 'darwin' and not GetOption('clean'):
+	env['LIBS'].append('racket3m')
+
+
 	env.Append(FRAMEWORKPATH = [RacketLib])
 	env.Append(CCFLAGS = ' -DOS_X') # required by PLT 4.2.5
 
@@ -264,9 +266,9 @@ if env['PLATFORM'] == 'darwin':
 		# add jack as a framework
 		env['LIBS'].remove('jack')
 		# FIXME: check if Jackmp is available when making an app
-		env.Append(FRAMEWORKS = Split("GLUT OpenGL CoreAudio CoreFoundation Racket Jackmp"))
+		env.Append(FRAMEWORKS = Split("GLUT OpenGL CoreAudio CoreFoundation Jackmp"))
 	else:
-		env.Append(FRAMEWORKS = Split("GLUT OpenGL CoreAudio Racket"))
+		env.Append(FRAMEWORKS = Split("GLUT OpenGL CoreAudio"))
 
 
 ################################################################################
@@ -373,7 +375,7 @@ if env['PLATFORM'] == 'win32':
 				   "BinaryModulesLocation", "static_modules", "static_ode", "Prefix"])
 
 else:
-	SConscript(dirs = Split("libfluxus modules fluxa addons"),
+	SConscript(dirs = Split("libfluxus modules fluxa"),
            exports = ["env", "CollectsInstall", "DataInstall", "MZDYN", "BinInstall", \
 				   "BinaryModulesLocation", "static_modules", "static_ode", "Prefix"])
 
diff --git a/modules/fluxus-audio/SConscript b/modules/fluxus-audio/SConscript
index 0d2f7b1..c3219c9 100644
--- a/modules/fluxus-audio/SConscript
+++ b/modules/fluxus-audio/SConscript
@@ -13,11 +13,11 @@ else:
 if static_modules: Target = "fluxus-audio_ss"
 
 Install = BinaryModulesLocation
-Libs =  Split("jack fftw3 sndfile")
+Libs =  Split("jack fftw3 sndfile racket3m")
 Frameworks = []
 
 if env['PLATFORM'] == 'darwin':
-	Frameworks = Split("CoreAudio Racket")
+	Frameworks = Split("CoreAudio")
 
 # link libraries statically when making an os x app
 if env['PLATFORM'] == 'darwin' and GetOption('app'):
diff --git a/modules/fluxus-engine/SConscript b/modules/fluxus-engine/SConscript
index 98539d8..798c228 100644
--- a/modules/fluxus-engine/SConscript
+++ b/modules/fluxus-engine/SConscript
@@ -16,14 +16,14 @@ else:
 
 if static_modules: Target = "fluxus-engine_ss"
 
-Libs = Split("GLEW fluxus png ode tiff jpeg freetype")
+Libs = Split("GLEW fluxus png ode tiff jpeg freetype racket3m")
 Frameworks = []
 
 Install = BinaryModulesLocation
 if env['PLATFORM'] != 'darwin':
 	Libs += Split("GL GLU glut")
 else:
-	Frameworks = Split("GLUT OpenGL Racket")
+	Frameworks = Split("GLUT OpenGL")
 
 if env['PLATFORM'] == 'win32':
 	    Libs = Split("libmzsch3m_6ncc9s fluxus glu32 glew32 glut32 opengl32 png ode tiff jpeg freetype")
diff --git a/modules/fluxus-midi/SConscript b/modules/fluxus-midi/SConscript
index 7ee03fa..c1e7442 100644
--- a/modules/fluxus-midi/SConscript
+++ b/modules/fluxus-midi/SConscript
@@ -25,9 +25,9 @@ if env['PLATFORM'] == 'posix':
 	Frameworks = []
 	env.Append(CCFLAGS = ' -D__LINUX_ALSASEQ__')
 elif env['PLATFORM'] == 'darwin':
-	Libs = []
+	Libs = ['racket3m']
 	env.Append(CCFLAGS = ' -D__MACOSX_CORE__')
-	Frameworks = ['CoreMIDI', 'CoreAudio', 'CoreFoundation', 'Racket']
+	Frameworks = ['CoreMIDI', 'CoreAudio', 'CoreFoundation']
 
 if static_modules:
 	env.StaticLibrary(source = Source, 
diff --git a/modules/fluxus-openal/SConscript b/modules/fluxus-openal/SConscript
index 2dd9768..f51f45f 100644
--- a/modules/fluxus-openal/SConscript
+++ b/modules/fluxus-openal/SConscript
@@ -16,7 +16,7 @@ if static_modules: Target = "fluxus-openal_ss"
 
 Install = BinaryModulesLocation
 
-if env['PLATFORM'] == 'darwin': Libs = []
+if env['PLATFORM'] == 'darwin': Libs = ['racket3m']
 elif env['PLATFORM'] == 'win32': Libs = ['libmzsch3m_6ncc9s', 'openal32']
 else: Libs=['openal']
 
@@ -27,7 +27,7 @@ Source = Split("src/FluxAudio.cpp \
 		[MZDYN]
 
 if env['PLATFORM'] == 'darwin':
-	Frameworks = ['OpenAL', 'Racket']
+	Frameworks = ['OpenAL']
 
 if static_modules:
 	env.StaticLibrary(source = Source, 
diff --git a/modules/fluxus-osc/SConscript b/modules/fluxus-osc/SConscript
index 69befa1..92ff357 100644
--- a/modules/fluxus-osc/SConscript
+++ b/modules/fluxus-osc/SConscript
@@ -13,7 +13,7 @@ else:
 if static_modules: Target = "fluxus-osc_ss"
 
 Install = BinaryModulesLocation
-Libs = Split("lo")
+Libs = ['lo', 'racket3m']
 Frameworks = []
 
 Source = Split("src/FluxusOSC.cpp \
@@ -22,7 +22,7 @@ Source = Split("src/FluxusOSC.cpp \
 		[MZDYN]
 
 if env['PLATFORM'] == 'darwin':
-	Frameworks = ['Racket']
+	Frameworks = []
 
 if static_modules:
 	env.StaticLibrary(source = Source,