[58362] trunk/dports/science/molden
ryandesign at macports.org
ryandesign at macports.org
Sun Sep 27 14:08:28 PDT 2009
Revision: 58362
http://trac.macports.org/changeset/58362
Author: ryandesign at macports.org
Date: 2009-09-27 14:08:26 -0700 (Sun, 27 Sep 2009)
Log Message:
-----------
molden: update to 4.8, also install some more doc files, always link with MacPorts X11 instead of just in the opengl variant, no longer hardcode /opt/local in opengl variant, remove Xcode 3.0 libGL.dylib workaround and require Xcode 3.1 on Leopard, use configure.compiler and add gcc43 and gcc44 variants with gcc43 the default because that is what was used for the previous port version; gcc44 can become the default later. See #21645
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 2009-09-27 20:53:47 UTC (rev 58361)
+++ trunk/dports/science/molden/Portfile 2009-09-27 21:08:26 UTC (rev 58362)
@@ -9,19 +9,19 @@
# Feel free to update checksums whenever a stealth upgrade of molden is out...
PortSystem 1.0
+PortGroup xcodeversion 1.0
name molden
-version 4.6
-revision 13
+version 4.8
categories science graphics
maintainers openmaintainer jochen
homepage http://www.cmbi.ru.nl/molden/molden.html
distname molden${version}
dist_subdir ${name}/${version}_${revision}
master_sites ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/
-checksums md5 3b4e7fa4a323c7e283c0348fc6bb3b2d \
- sha1 83f17d2079b83cc790689485c139301407313463 \
- rmd160 b75ec4c23001695044e82d9f8b8542cb45b3009c
+checksums md5 b4a2ba88236f49d60fa0cd62c56ee5c3 \
+ sha1 4cb6787d47ab1367cf620a8c74ec17facfd4fe58 \
+ rmd160 6e8405ebbcca3a9c4645b45e2d0da05531d24537
description Molecular graphics visualisation tool
long_description Molden is a package for displaying Molecular Density from \
@@ -35,18 +35,29 @@
platforms darwin
depends_build port:gmake
-depends_lib port:gcc43 port:xorg-libX11
+depends_lib port:xorg-libX11
patchfiles patch-makefile.diff
+post-patch {
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/makefile
+}
+
+minimum_xcodeversions {9 3.1}
use_parallel_build yes
use_configure no
build.target molden
build.cmd gmake
+pre-build {
+ build.args CC=${configure.cc} \
+ FC=${configure.fc}
+}
destroot {
xinstall -W ${worksrcpath} molden ${destroot}${prefix}/bin
set docdir ${destroot}${prefix}/share/doc/molden
xinstall -m 755 -d ${docdir}
xinstall -W ${worksrcpath} \
+ COMMERCIAL_LICENSE \
+ CopyRight \
HISTORY \
README \
REGISTER \
@@ -61,6 +72,20 @@
ui_msg "**************************************************"
}
+variant gcc43 conflicts gcc44 description {Build using gcc43} {
+ depends_lib-append port:gcc43
+ configure.compiler macports-gcc-4.3
+}
+
+variant gcc44 conflicts gcc43 description {Build using gcc44} {
+ depends_lib-append port:gcc44
+ configure.compiler macports-gcc-4.4
+}
+
+if {![variant_isset gcc43] && ![variant_isset gcc44]} {
+ default_variants +gcc43
+}
+
variant opengl description "Install moldenogl OpenGL helper program" {
depends_lib-append port:mesa
build.target-append moldenogl
@@ -69,7 +94,7 @@
}
}
-set distfile_date 20081219110900
+set distfile_date 20090925081300
livecheck.version ${version}-${distfile_date}
livecheck.type regex
livecheck.url http://www.ryandesign.com/macports/version.php/${name}
Modified: trunk/dports/science/molden/files/patch-makefile.diff
===================================================================
--- trunk/dports/science/molden/files/patch-makefile.diff 2009-09-27 20:53:47 UTC (rev 58361)
+++ trunk/dports/science/molden/files/patch-makefile.diff 2009-09-27 21:08:26 UTC (rev 58362)
@@ -1,38 +1,35 @@
---- makefile.orig 2008-02-23 15:40:42.000000000 +0100
-+++ makefile 2008-04-25 22:26:21.000000000 +0200
-@@ -12,7 +12,7 @@
+--- makefile.orig 2009-09-21 11:01:33.000000000 -0500
++++ makefile 2009-09-26 23:42:41.000000000 -0500
+@@ -14,7 +14,7 @@
#
- # Disregard compiler warnings on rdmolf.f
- #
--CC = cc
-+CC = gcc-mp-4.3
+ CC = cc
LIBS = -lX11 -lm
- LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
+-LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
++LIBSG = -L at PREFIX@/lib -lGLU -lGL -lXmu -lX11 -lm
+ LDR = ${FC}
-@@ -52,11 +52,12 @@
- # with GCC4.0 or higher replace the line with:
+ #
+@@ -41,11 +41,11 @@
# 'external gfortran_iargc'
#
+
-CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
--FC = g77
++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 =
-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
-+
++FFLAGS = -fomit-frame-pointer -ftree-vectorize -funroll-loops -O3
++LIBS = -L at PREFIX@/lib -lX11 -lm
+ LDR = ${FC}
+
# 64 bit machines:
- #LIBS = -L/usr/X11R6/lib64 -lX11 -lm
- #
-@@ -191,7 +192,7 @@
+@@ -197,7 +197,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
++LIBSOGL = -L at PREFIX@/lib -lglut -lGLU -lGL -lXmu -lX11 -lm
#
# on linux :
#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090927/e702c305/attachment.html>
More information about the macports-changes
mailing list