[119431] trunk/dports/science/molden

ryandesign at macports.org ryandesign at macports.org
Fri Apr 25 03:04:30 PDT 2014


Revision: 119431
          https://trac.macports.org/changeset/119431
Author:   ryandesign at macports.org
Date:     2014-04-25 03:04:30 -0700 (Fri, 25 Apr 2014)
Log Message:
-----------
molden: update to 5.1-20140214085900; make gcc48 the default variant

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	2014-04-25 09:53:29 UTC (rev 119430)
+++ trunk/dports/science/molden/Portfile	2014-04-25 10:04:30 UTC (rev 119431)
@@ -12,9 +12,9 @@
 PortGroup xcodeversion 1.0
 
 name                molden
-version             5.0.6-20130409112100
+version             5.1-20140214085900
 set version_number  [lindex [split ${version} -] 0]
-set branch          [join [lrange [split ${version} .] 0 1] .]
+set branch          [join [lrange [split ${version_number} .] 0 1] .]
 categories          science graphics chemistry
 license             Restrictive Noncommercial
 maintainers         openmaintainer jochen
@@ -24,8 +24,8 @@
 dist_subdir         ${name}/${version}
 master_sites        ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/
 
-checksums           rmd160  67f0d02d2579a29b03d806de94873532442eef06 \
-                    sha256  b22339129140095fdb3f2a5b9b11518e1bb81cc0fd02a627aa44575294b064cf
+checksums           rmd160  60b8270b96f04625ce409eef1706f0fdbad3b9fc \
+                    sha256  499dda72075f0e4ab0306d1a0834fdd26edcc8ed7a2562fdf741bb2fc8787261
 
 description         Molecular graphics visualisation tool
 long_description    Molden is a package for displaying Molecular Density from \
@@ -96,7 +96,7 @@
 }
 
 if {![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset gcc48]} {
-    default_variants +gcc47
+    default_variants +gcc48
 }
 
 variant opengl description "Install moldenogl OpenGL helper program" {

Modified: trunk/dports/science/molden/files/patch-makefile.diff
===================================================================
--- trunk/dports/science/molden/files/patch-makefile.diff	2014-04-25 09:53:29 UTC (rev 119430)
+++ trunk/dports/science/molden/files/patch-makefile.diff	2014-04-25 10:04:30 UTC (rev 119431)
@@ -1,5 +1,5 @@
---- makefile.orig	2011-03-02 07:19:00.000000000 -0600
-+++ makefile	2011-03-15 17:30:45.000000000 -0500
+--- makefile.orig	2014-02-14 02:57:13.000000000 -0600
++++ makefile	2014-04-25 05:00:06.000000000 -0500
 @@ -17,7 +17,7 @@
  FC = gfortran
  LIBS =  -lX11 -lm
@@ -9,36 +9,41 @@
  
  empty :=
  choosefc := 
-@@ -27,7 +27,7 @@
+@@ -27,10 +27,10 @@
  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
+  ifeq ($(os), Debian)
+-    LIBSG = -L/usr/lib/X11 -lGLU -lGL -lX11 -lm
++    LIBSG = -L at PREFIX@/lib -lGLU -lGL -lX11 -lm
+  endif
+ 
   choosefc := 'yes'
- endif
-@@ -77,12 +77,12 @@
- #
+@@ -82,13 +82,9 @@
  
  ifeq ($(uname), Linux)
+ FFLAGS =
+-LIBS =  -L/usr/X11R6/lib -lX11 -lm
++LIBS =  -L at PREFIX@/lib -lX11 -lm
+ LDR = ${FC}
 -CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
+- ifeq ($(os), Debian)
+-    CFLAGS = -c -I/usr/include/X11 -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
+-    LIBS =  -L/usr/lib/X11 -lX11 -lm
+- endif
 +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
-+LIBS =  -L at PREFIX@/lib -lX11 -lm
- LDR = ${FC}
- endif
- 
-@@ -95,10 +95,10 @@
+@@ -103,10 +99,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
+-CFLAGS= -std=gnu89 -Wno-return-type -DDARWIN -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
++CFLAGS= -std=gnu89 -Wno-return-type -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
@@ -47,7 +52,7 @@
  LDR = ${FC}
  endif
  
-@@ -229,7 +229,7 @@
+@@ -237,7 +233,7 @@
  # and the full opengl version of molden 'gmolden', (does not need glut)
  # (make gmolden)
  #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140425/6ba2d7b8/attachment.html>


More information about the macports-changes mailing list