Update to 1.9.1.

Submitted by:	bjk

1 files changed, 2 insertions, 123 deletions

diff --git a/science/vmd/files/patch-configure b/science/vmd/files/patch-configure
index ce3c93112e3c..7f1d31386128 100644
--- a/science/vmd/files/patch-configure
+++ b/science/vmd/files/patch-configure
@@ -13,24 +13,7 @@
  
  
  # optionally override hard-coded defaults above with environment variables
-@@ -48,6 +48,7 @@
- # AIX5          - compile on an RS/6000 machine (gcc/g++/xlc/xlC)
- # AIX6          - compile on an RS/6000 machine (gcc/g++/xlc/xlC)
- # FREEBSD       - compile on a FreeBSD machine (gcc/g++)
-+# FREEBSDAMD64  - compile on a FreeBSD machine (gcc/g++)
- # HPUX11        - compile on an HP-UX 11.0 machine (cc/CC/cc/aCC)
- # IRIX6         - compile on an SGI, IRIX 6.X or later, 32-bit ABI
- # IRIX6_64      - compile on an SGI, IRIX 6.X or later, 64-bit ABI
-@@ -153,7 +154,7 @@
- 
- #################### Parse command line options   ###########
- # list of allowed architectures
--@archlist=('IRIX6', 'IRIX6_64', 'FREEBSD', 'HPUX11', 'AIX4', 'AIX5', 'AIX5_64', 'AIX6_64', 'LINUX', 'LINUXALPHA', 'LINUXAMD64', 'LINUXIA64', 'LINUXPPC', 'LINUXPPC64', 'MACOSX', 'MACOSXX86', 'MACOSXX86_64', 'TRU64', 'SOLARIS2', 'SOLARIS2_64', 'SOLARISX86', 'SOLARISX86_64', 'WIN32', 'WIN64');
-+@archlist=('IRIX6', 'IRIX6_64', 'FREEBSD', 'FREEBSDAMD64', 'HPUX11', 'AIX4', 'AIX5', 'AIX5_64', 'AIX6_64', 'LINUX', 'LINUXALPHA', 'LINUXAMD64', 'LINUXIA64', 'LINUXPPC', 'LINUXPPC64', 'MACOSX', 'MACOSXX86', 'MACOSXX86_64', 'TRU64', 'SOLARIS2', 'SOLARIS2_64', 'SOLARISX86', 'SOLARISX86_64', 'WIN32', 'WIN64');
- 
- if ($#ARGV == -1) {
-     $text = `cat configure.options`;
-@@ -747,8 +748,8 @@
+@@ -788,8 +788,8 @@
  # This may be commented out if not required.
  $libtachyon_defines     = "-DVMDLIBTACHYON";
  $libtachyon_dir         = "$vmd_library_dir/tachyon";
@@ -41,111 +24,7 @@
  $libtachyon_libs        = "-ltachyon";
  @libtachyon_cc          = ();
  @libtachyon_cu          = ();
-@@ -1478,9 +1479,11 @@
-     $def_imageviewer="display %s";
- 
-     # XFree 4.0 Direct Rendering Interface and GLX 
--    $opengl_dir         = "/usr/X11R6";
--    $opengl_include     = "-I$opengl_dir/include";
--    $opengl_library     = "-L$opengl_dir/lib";
-+    $opengl_dir         = "/usr/local";
-+# -DGLX_GLXEXT_LEGACY is required for patched OpenGLExtensions.C to compile.
-+# See patched OpenGLExtensions.C for explanation.
-+    $opengl_include     = "-DGLX_GLXEXT_LEGACY -I$opengl_dir/include";
-+    $opengl_library     = "-L$opengl_dir/lib -L/usr/local/lib";
-     $opengl_libs        = "-lGL -lGLU"; 
- 
-     $arch_lex      = "flex";
-@@ -1492,17 +1495,17 @@
-     $arch_shld        = "g++ -shared";
-     $arch_shlibname   = "so";
-     $arch_shcppopts   = "-fPIC";
--    $arch_shldopts    = "-L/usr/local/lib -L/usr/X11R6/lib";
-+    $arch_shldopts    = "-L/usr/local/lib";
- 
-     $arch_opt_flag    = "-m32 -fno-for-scope -Wno-deprecated -Wall -O3";
-     $arch_copts       = "-m32 -Wall -O3";
- 
-     if ($config_static) {
-       $arch_lopts       = "-static";
--      $mesa_libs        = "-lMesaGL -lMesaGLU -L/usr/X11R6/lib -lXext -lX11";
-+      $mesa_libs        = "-lMesaGL -lMesaGLU -L/usr/local/lib -lXext -lX11";
-     } else {
-       $arch_lopts       = "";
--      $mesa_libs        = "-lGL -lGLU -L/usr/X11R6/lib -lXext -lX11";
-+      $mesa_libs        = "-lGL -lGLU -L/usr/local/lib -lXext -lX11";
-     }
- 
-     if ($config_shared) {
-@@ -1515,7 +1518,66 @@
- 
-     # this is to make tcl happy,
-     # also needed for plugins
--    $system_libs .= " -ldl";
-+    # $system_libs .= " -ldl";
-+ 
-+    if ($config_python) {
-+      # this is to make python happy
-+      $system_libs .= " -lutil";
-+    }
-+
-+    # this is necessary for the embedded Python interpreter to dynamically
-+    # load shared libraries.  It increases the size of the binary by 200k.
-+    $arch_lopts .= " -Xlinker -export-dynamic";
-+}
-+
-+
-+
-+if ($config_arch eq "FREEBSDAMD64") {
-+    $def_imageviewer="display %s";
-+    if ($config_lp64) {
-+      print "LP64 ABI is already the default on this platform.\n";
-+    }
-+
-+    # XFree 4.0 Direct Rendering Interface and GLX 
-+    $opengl_dir         = "/usr/local";
-+# -DGLX_GLXEXT_LEGACY is required for patched OpenGLExtensions.C to compile.
-+# See patched OpenGLExtensions.C for explanation.
-+    $opengl_include     = "-DGLX_GLXEXT_LEGACY -I$opengl_dir/include";
-+    $opengl_library     = "-L$opengl_dir/lib -L/usr/local/lib";
-+    $opengl_libs        = "-lGL -lGLU"; 
-+
-+    $arch_lex      = "flex";
-+    $arch_yacc     = "bison -b y -d ";  # If standard yacc doesn't work
-+
-+    $arch_cc          = "gcc";
-+    $arch_ccpp        = "g++";
-+    $arch_depend_flag = "-MM";
-+    $arch_shld        = "ld -shared";
-+    $arch_shlibname   = "so";
-+    $arch_shcppopts   = "-fPIC";
-+    $arch_shldopts    = "-L/usr/local/lib -L/usr/local/lib";
-+
-+    $arch_opt_flag	= "-m64 -Wall -O3 -ffast-math";
-+    $arch_copts	        = "-m64 -Wall -O3 -ffast-math";
-+
-+    if ($config_static) {
-+      $arch_lopts       = "-static";
-+      $mesa_libs        = "-lMesaGL -lMesaGLU -L/usr/local/lib -lXext -lX11";
-+    } else {
-+      $arch_lopts       = "";
-+      $mesa_libs        = "-lGL -lGLU -L/usr/local/lib -lXext -lX11";
-+    }
-+
-+    if ($config_shared) {
-+      $arch_lopts       = "-shared";
-+    }
-+
-+    # a hack - to be removed, just keeps make happy
-+    $arch_template_repository = "foobar";
-+
-+    # this is to make tcl happy,
-+    # also needed for plugins
-+    # $system_libs .= " -ldl";
-  
-     if ($config_python) {
-       # this is to make python happy
-@@ -2715,10 +2777,10 @@
+@@ -2942,10 +2942,10 @@
  
  # compiler and compiler directives 
  CC          = $arch_cc