[76974] trunk/dports/science/molden

[ryandesign at macports.org]

Revision: 76974
          http://trac.macports.org/changeset/76974
Author:   ryandesign at macports.org
Date:     2011-03-15 15:57:00 -0700 (Tue, 15 Mar 2011)
Log Message:
-----------
molden: update to 5.0-20110314091200; see #28796

Modified Paths:
--------------
    trunk/dports/science/molden/Portfile
    trunk/dports/science/molden/files/patch-makefile.diff

Modified: trunk/dports/science/molden/Portfile
===================================================================
--- trunk/dports/science/molden/Portfile	2011-03-15 22:55:28 UTC (rev 76973)
+++ trunk/dports/science/molden/Portfile	2011-03-15 22:57:00 UTC (rev 76974)
@@ -12,7 +12,7 @@
 PortGroup xcodeversion 1.0
 
 name                molden
-version             5.0-20110302100900
+version             5.0-20110314091200
 set version_number  [lindex [split ${version} -] 0]
 categories          science graphics
 maintainers         openmaintainer jochen
@@ -21,8 +21,8 @@
 dist_subdir         ${name}/${version}
 master_sites        ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/
 
-checksums           sha1    9002bfff36e0d89159d40b01a02a7555f53d3b9a \
-                    rmd160  6db5b0177bfa8c927ebc06df43de802c3775e2d8
+checksums           sha1    bc427c55134016a693b1897684e0862775da4ea4 \
+                    rmd160  d1b3a4c4c4c67645fbe8b76188cc916594af6a63
 
 description         Molecular graphics visualisation tool
 long_description    Molden is a package for displaying Molecular Density from \

Modified: trunk/dports/science/molden/files/patch-makefile.diff
===================================================================
--- trunk/dports/science/molden/files/patch-makefile.diff	2011-03-15 22:55:28 UTC (rev 76973)
+++ trunk/dports/science/molden/files/patch-makefile.diff	2011-03-15 22:57:00 UTC (rev 76974)
@@ -1,30 +1,53 @@
---- makefile.orig	2011-02-22 05:01:50.000000000 -0600
-+++ makefile	2011-03-09 23:36:12.000000000 -0600
+--- makefile.orig	2011-03-02 07:19:00.000000000 -0600
++++ makefile	2011-03-15 17:30:45.000000000 -0500
 @@ -17,7 +17,7 @@
- CC = cc
+ FC = gfortran
  LIBS =  -lX11 -lm
  LDR = ${FC} 
 -LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
 +LIBSG = -L at PREFIX@/lib -lGLU -lGL -lXmu -lX11 -lm
- # Ubuntu:
- #LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lX11 -lm
  
-@@ -45,11 +45,11 @@
- # 'external gfortran_iargc'
+ empty :=
+ choosefc := 
+@@ -27,7 +27,7 @@
+ ifeq ($(uname), Linux)
+  os := $(shell head -n 1 /etc/issue | cut -d" " -f1)
+  ifeq ($(os), Ubuntu)
+-    LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lX11 -lm
++    LIBSG = -L at PREFIX@/lib -lGLU -lGL -lX11 -lm
+  endif
+  choosefc := 'yes'
+ endif
+@@ -77,12 +77,12 @@
  #
  
+ ifeq ($(uname), Linux)
 -CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
-+CFLAGS = -fomit-frame-pointer -ftree-vectorize -funroll-loops -O3 -c -I/usr/include/malloc -I at PREFIX@/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
- FC = g77
- #FC = gfortran
--FFLAGS =
++CFLAGS = -c -I at PREFIX@/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
+ ifeq ($(os), FreeBSD)
+ CFLAGS = ${CFLAGS} -DFREEBSD
+ endif
+ FFLAGS =
 -LIBS =  -L/usr/X11R6/lib -lX11 -lm
-+FFLAGS = -fomit-frame-pointer -ftree-vectorize -funroll-loops -O3
 +LIBS =  -L at PREFIX@/lib -lX11 -lm
  LDR = ${FC}
+ endif
  
- # 64 bit machines:
-@@ -201,7 +201,7 @@
+@@ -95,10 +95,10 @@
+ # Mac OS X g77
+ #
+ CC=cc
+-CFLAGS= -DDARWIN -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
++CFLAGS= -DDARWIN -I at PREFIX@/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
+ FFLAGS=-O3 -funroll-loops
+-LIBS = -L/usr/X11R6/lib -lX11 -lm
+-LIBSG = -L/usr/X11R6/lib -lGLU "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib" -lGL -lXmu -lX11 -lm
++LIBS = -L at PREFIX@/lib -lX11 -lm
++LIBSG = -L at PREFIX@/lib -lGLU -lGL -lXmu -lX11 -lm
+ LDR = ${FC}
+ endif
+ 
+@@ -229,7 +229,7 @@
  # and the full opengl version of molden 'gmolden', (does not need glut)
  # (make gmolden)
  #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110315/2fdfbc2d/attachment-0001.html>