diff -uNr pymol-1.6.0/modules/pmg_tk/PMGApp.py pymol-1.6.0.fink/modules/pmg_tk/PMGApp.py
--- pymol-1.6.0/modules/pmg_tk/PMGApp.py	2013-11-26 13:30:39.000000000 -0500
+++ pymol-1.6.0.fink/modules/pmg_tk/PMGApp.py	2013-11-26 13:37:32.000000000 -0500
@@ -180,7 +180,7 @@
         self.fifo.put(cmmd)
 
     def my_show(self,win,center=1):
-        if sys.platform!='linux2':
+        if (sys.platform!='linux2') and (sys.platform!='darwin'):
             win.show()
         else: # autocenter, deiconify, and run mainloop
             # this is a workaround for a bug in the
@@ -198,7 +198,7 @@
             win.deiconify()
 
     def my_withdraw(self,win):
-        if sys.platform!='linux2':
+        if (sys.platform!='linux2') or (sys.platform!='darwin'):
             win.withdraw()
         else: 
             win.destroy()
diff -uNr pymol-1.6.0/modules/pmg_tk/skins/normal/__init__.py pymol-1.6.0.fink/modules/pmg_tk/skins/normal/__init__.py
--- pymol-1.6.0/modules/pmg_tk/skins/normal/__init__.py	2013-11-26 13:30:39.000000000 -0500
+++ pymol-1.6.0.fink/modules/pmg_tk/skins/normal/__init__.py	2013-11-26 13:37:32.000000000 -0500
@@ -237,7 +237,7 @@
         self.buttonArea.destroy()
 
     def my_show(self,win,center=1):
-        if sys.platform!='linux2':
+        if (sys.platform!='linux2') and (sys.platform!='darwin'):
             win.show()
         else: # autocenter, deiconify, and run mainloop
             # this is a workaround for a bug in the
@@ -256,13 +256,13 @@
 #         win.show()
             
     def my_withdraw(self,win):
-        if sys.platform!='linux2':
+        if (sys.platform!='linux2') or (sys.platform!='darwin'):
             win.withdraw()
         else: 
             win.destroy()
 
     def my_activate(self,win,center=1,focus=None):
-        if sys.platform!='linux2':
+        if (sys.platform!='linux2') and (sys.platform!='darwin'):
             win.activate()
         else: # autocenter, deiconify, and run mainloop
             # this is a workaround for a bug in the
@@ -283,7 +283,7 @@
             win.mainloop()
             
     def my_deactivate(self,win):
-        if sys.platform!='linux2':
+        if (sys.platform!='linux2') or (sys.platform!='darwin'):
             win.deactivate()
         else: # autocenter, deiconify, and run mainloop
             win.destroy()
diff -uNr pymol-1.6.0/modules/pmg_tk/startup/apbs_tools.py pymol-1.6.0.fink/modules/pmg_tk/startup/apbs_tools.py
--- pymol-1.6.0/modules/pmg_tk/startup/apbs_tools.py	2013-11-26 13:30:39.000000000 -0500
+++ pymol-1.6.0.fink/modules/pmg_tk/startup/apbs_tools.py	2013-11-26 13:37:32.000000000 -0500
@@ -160,7 +160,7 @@
 #
 APBS_BINARY_LOCATION = None # corresponding environment variable: APBS_BINARY_DIR
 APBS_WEB_LOCATION = None # corresponding environment variable: APBS_WEB_DIR
-APBS_PSIZE_LOCATION = None # corresponding environment variable: APBS_PSIZE_DIR
+APBS_PSIZE_LOCATION = '@FINKPREFIX@/share/apbs/tools/manip' # corresponding environment variable: APBS_PSIZE_DIR
 APBS_PDB2PQR_LOCATION = None # corresponding environment variable: APBS_PDB2PQR_DIR
 TEMPORARY_FILE_DIR = tempfile.gettempdir() # corresponding environment variable: TEMP
 
diff -uNr pymol-1.6.0/modules/pymol/__init__.py pymol-1.6.0.fink/modules/pymol/__init__.py
--- pymol-1.6.0/modules/pymol/__init__.py	2013-11-26 13:30:38.000000000 -0500
+++ pymol-1.6.0.fink/modules/pymol/__init__.py	2013-11-26 13:37:32.000000000 -0500
@@ -142,7 +142,7 @@
                 if (pymol_file[0:1] not in [ '\\', '/' ]) and pymol_file[1:2]!=':': 
                     pymol_file = os.getcwd()+"/"+pymol_file # make path absolute
 
-                pymol_path = re.sub(r"[\/\\][^\/\\]*$","/pymol_path",pymol_file)
+                pymol_path = re.sub(r"[\/\\][^\/\\]*$","",pymol_file)
 
                 if os.path.isdir(pymol_path):
                     os.environ['PYMOL_PATH'] = pymol_path
diff -uNr pymol-1.6.0/pymol.cmd pymol-1.6.0.fink/pymol.cmd
--- pymol-1.6.0/pymol.cmd	1969-12-31 19:00:00.000000000 -0500
+++ pymol-1.6.0.fink/pymol.cmd	2013-11-26 13:37:32.000000000 -0500
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# PyMOL startup script
+#
+# ==============================================================
+# Set PYMOL_PATH to point at the correct location on your system
+#
+PYMOL_PATH=@FINKPREFIX@/lib/python2.X/site-packages/pymol
+export PYMOL_PATH
+HasRadeon=($(system_profiler SPDisplaysDataType | grep Radeon ))
+# ==============================================================
+if [[ -z "$HasRadeon"  ]];then
+    exec @FINKPREFIX@/bin/python2.X  @FINKPREFIX@/lib/python2.X/site-packages/pymol/__init__.py -d "_ set stereo_double_pump_mono,quiet=1" "$@"
+else
+    exec @FINKPREFIX@/bin/python2.X  @FINKPREFIX@/lib/python2.X/site-packages/pymol/__init__.py -d "_ set stereo_double_pump_mono,quiet=1" -M "$@"
+fi
diff -uNr pymol-1.6.0/setup.py pymol-1.6.0.fink/setup.py
--- pymol-1.6.0/setup.py	2013-11-26 13:30:28.000000000 -0500
+++ pymol-1.6.0.fink/setup.py	2013-11-26 13:37:32.000000000 -0500
@@ -242,7 +242,7 @@
     try:
         prefix_path = os.environ['PREFIX_PATH'].split(os.pathsep)
     except KeyError:
-        prefix_path = ["/usr", "/usr/X11", "/opt/local", "/sw"]
+        prefix_path = ["@FINKPREFIX@", "/usr", "/usr/X11"]
 
     for prefix in prefix_path:
         inc_dirs += filter(os.path.isdir, [prefix + s for s in ["/include", "/include/freetype2"]])