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

0
@@ -1,43 +1,39 @@
0
-*** makefile.orig	Tue May 15 14:25:07 2007
0
---- makefile		Tue May 15 14:26:47 2007
0
-***************
0
-*** 12,18 ****
0
-  #
0
-  #	Disregard compiler warnings on rdmolf.f
0
-  #
0
-! CC = cc
0
-  LIBS =  -lX11 -lm
0
-  LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
0
-  
0
---- 12,18 ----
0
-  #
0
-  #	Disregard compiler warnings on rdmolf.f
0
-  #
0
-! CC = gcc-mp-4.2
0
-  LIBS =  -lX11 -lm
0
-  LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
0
-  
0
-***************
0
-*** 47,56 ****
0
-  # 'external iargc' in molden.f
0
-  #
0
-! CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
0
-! FC = g77
0
-! FFLAGS =
0
-  LIBS =  -L/usr/X11R6/lib -lX11 -lm
0
-! LDR = g77   
0
-  # 64 bit machines:
0
-  #LIBS =  -L/usr/X11R6/lib64 -lX11 -lm
0
-  #
0
---- 47,56 ----
0
-  # 'external iargc' in molden.f
0
-  #
0
-! FC = gfortran-mp-4.2
0
-! FFLAGS += -std=gnu -O2
0
-! CFLAGS += -O2 -c -I/usr/X11R6/include -I/usr/include/malloc -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
0
-  LIBS =  -L/usr/X11R6/lib -lX11 -lm
0
-! LDR = gfortran-mp-4.2 -std=gnu
0
-  # 64 bit machines:
0
-  #LIBS =  -L/usr/X11R6/lib64 -lX11 -lm
0
-  #
0
+--- makefile.orig	2008-02-23 15:40:42.000000000 +0100
0
++++ makefile	2008-04-25 22:26:21.000000000 +0200
0
+@@ -12,7 +12,7 @@
0
+ #
0
+ #	Disregard compiler warnings on rdmolf.f
0
+ #
0
+-CC = cc
0
++CC = gcc-mp-4.3
0
+ LIBS =  -lX11 -lm
0
+ LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
0
+ 
0
+@@ -52,11 +52,12 @@
0
+ # with GCC4.0 or higher replace the line with:
0
+ # 'external gfortran_iargc'
0
+ #
0
+-CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
0
+-FC = g77
0
+-FFLAGS =
0
+-LIBS =  -L/usr/X11R6/lib -lX11 -lm
0
+-LDR = g77   
0
++FC = gfortran-mp-4.3
0
++FFLAGS += -fomit-frame-pointer -ftree-vectorize -funroll-loops -O3
0
++CFLAGS += -fomit-frame-pointer -ftree-vectorize -funroll-loops -O3 -c -I/usr/X11R6/include -I/usr/include/malloc -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
0
++LIBS = -L/usr/X11R6/lib -lX11 -lm
0
++LDR = gfortran-mp-4.3
0
++
0
+ # 64 bit machines:
0
+ #LIBS =  -L/usr/X11R6/lib64 -lX11 -lm
0
+ #
0
+@@ -191,7 +192,7 @@
0
+ # and the full opengl version of molden 'gmolden', (does not need glut)
0
+ # (make gmolden)
0
+ #
0
+-LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm
0
++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
0
+ #
0
+ # on linux :
0
+ #