[36293] trunk/dports/science/molden

jochen at macports.org jochen at macports.org
Fri Apr 25 13:52:31 PDT 2008


Revision: 36293
          http://trac.macosforge.org/projects/macports/changeset/36293
Author:   jochen at macports.org
Date:     2008-04-25 13:52:30 -0700 (Fri, 25 Apr 2008)

Log Message:
-----------
follow stealth upgrade,
use gcc43 instead of gcc42,
provide OpenGL variant,
install some docs,
remove livecheck, I have no clue how to get it working at this time...

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	2008-04-25 20:49:04 UTC (rev 36292)
+++ trunk/dports/science/molden/Portfile	2008-04-25 20:52:30 UTC (rev 36293)
@@ -12,16 +12,16 @@
 
 name                molden
 version             4.6
-revision            6
+revision            7
 categories          science graphics
 maintainers         openmaintainer jochen
 homepage            http://www.cmbi.ru.nl/molden/molden.html
 master_sites        ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/
 distname            molden${version}
 dist_subdir         molden-${version}_${revision}
-checksums           md5 78b08724cb4054983e2b36e76fbb6cce \
-                    sha1 47ebab76d74f2c24a460f8365952253561c13cf0 \
-                    rmd160 5949bbe03fdf8ff11a4de79f8074c73bbddfb223
+checksums           md5 0501d2192c4a178f91fb560c02cf68aa \
+                    sha1 7e940a0eea8b38fc5a39e0effd09e72568f9adf4 \
+                    rmd160 6f63a5180019ff4ad703d122e9050f57d7f7d083
 
 description         Molecular graphics visualisation tool
 long_description    Molden is a package for displaying Molecular Density from \
@@ -33,15 +33,24 @@
                     Please register your copy of molden at: \
                     http://www.cmbi.ru.nl/molden/form.html
 
-depends_build       port:gcc42 port:gmake
-depends_lib         lib:libX11.6:XFree86
+depends_build       port:gmake
+depends_lib         port:gcc43 lib:libX11.6:XFree86
 patchfiles          patch-makefile.diff
 use_parallel_build  yes
 configure.cmd       true
 configure.pre_args
 build.target        molden
 build.cmd           nice -n ${buildnicevalue} gmake -j${buildmakejobs}
-destroot            { xinstall -W ${worksrcpath} molden ${destroot}${prefix}/bin }
+destroot            {
+    xinstall -W ${worksrcpath} molden   ${destroot}${prefix}/bin
+    xinstall -m 755 -d ${destroot}${prefix}/share/doc/molden
+    xinstall -W ${worksrcpath} HISTORY  ${destroot}${prefix}/share/doc/molden/
+    xinstall -W ${worksrcpath} README   ${destroot}${prefix}/share/doc/molden/
+    xinstall -W ${worksrcpath} REGISTER ${destroot}${prefix}/share/doc/molden/
+    if { [variant_isset opengl] } {
+        xinstall -W ${worksrcpath} moldenogl ${destroot}${prefix}/bin
+    }    
+}
 
 post-install        { ui_msg "**************************************************"
                       ui_msg "In order to keep up support for Molden, proof that"
@@ -51,7 +60,7 @@
                       ui_msg "**************************************************"
                     }
 
-
-livecheck.check     md5
-livecheck.url       ${master_sites}
-livecheck.md5       652811aa24cb3fda5e903d4715f38802
+variant opengl {
+    depends_lib-append      port:glut
+    build.target-append     moldenogl
+}

Modified: trunk/dports/science/molden/files/patch-makefile.diff
===================================================================
--- trunk/dports/science/molden/files/patch-makefile.diff	2008-04-25 20:49:04 UTC (rev 36292)
+++ trunk/dports/science/molden/files/patch-makefile.diff	2008-04-25 20:52:30 UTC (rev 36293)
@@ -1,42 +1,38 @@
-*** makefile.orig	Tue May 15 14:25:07 2007
---- makefile		Tue May 15 14:26:47 2007
-***************
-*** 12,18 ****
-  #
-  #	Disregard compiler warnings on rdmolf.f
-  #
-! CC = cc
-  LIBS =  -lX11 -lm
-  LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
-  
---- 12,18 ----
-  #
-  #	Disregard compiler warnings on rdmolf.f
-  #
-! CC = gcc-mp-4.2
-  LIBS =  -lX11 -lm
-  LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
-  
-***************
-*** 47,56 ****
-  # 'external iargc' in molden.f
-  #
-! CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
-! FC = g77
-! FFLAGS =
-  LIBS =  -L/usr/X11R6/lib -lX11 -lm
-! LDR = g77   
-  # 64 bit machines:
-  #LIBS =  -L/usr/X11R6/lib64 -lX11 -lm
-  #
---- 47,56 ----
-  # 'external iargc' in molden.f
-  #
-! FC = gfortran-mp-4.2
-! FFLAGS += -std=gnu -O2
-! CFLAGS += -O2 -c -I/usr/X11R6/include -I/usr/include/malloc -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
-  LIBS =  -L/usr/X11R6/lib -lX11 -lm
-! LDR = gfortran-mp-4.2 -std=gnu
-  # 64 bit machines:
-  #LIBS =  -L/usr/X11R6/lib64 -lX11 -lm
-  #
+--- makefile.orig	2008-02-23 15:40:42.000000000 +0100
++++ makefile	2008-04-25 22:26:21.000000000 +0200
+@@ -12,7 +12,7 @@
+ #
+ #	Disregard compiler warnings on rdmolf.f
+ #
+-CC = cc
++CC = gcc-mp-4.3
+ LIBS =  -lX11 -lm
+ LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
+ 
+@@ -52,11 +52,12 @@
+ # with GCC4.0 or higher replace the line with:
+ # 'external gfortran_iargc'
+ #
+-CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
+-FC = g77
+-FFLAGS =
+-LIBS =  -L/usr/X11R6/lib -lX11 -lm
+-LDR = g77   
++FC = gfortran-mp-4.3
++FFLAGS += -fomit-frame-pointer -ftree-vectorize -funroll-loops -O3
++CFLAGS += -fomit-frame-pointer -ftree-vectorize -funroll-loops -O3 -c -I/usr/X11R6/include -I/usr/include/malloc -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
++LIBS = -L/usr/X11R6/lib -lX11 -lm
++LDR = gfortran-mp-4.3
++
+ # 64 bit machines:
+ #LIBS =  -L/usr/X11R6/lib64 -lX11 -lm
+ #
+@@ -191,7 +192,7 @@
+ # and the full opengl version of molden 'gmolden', (does not need glut)
+ # (make gmolden)
+ #
+-LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm
++LIBSOGL = -L/opt/local/lib -L/usr/X11R6/lib -lglut -lGLU -lGL -lXmu -lX11 -lm -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+ #
+ # on linux :
+ #

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080425/a7dbc060/attachment.html


More information about the macports-changes mailing list