Changeset 58362


Ignore:
Timestamp:
Sep 27, 2009, 9:08:26 PM (11 years ago)
Author:
ryandesign@…
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

Location:
trunk/dports/science/molden
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/molden/Portfile

    r58354 r58362  
    1010
    1111PortSystem 1.0
     12PortGroup xcodeversion 1.0
    1213
    1314name                molden
    14 version             4.6
    15 revision            13
     15version             4.8
    1616categories          science graphics
    1717maintainers         openmaintainer jochen
     
    2020dist_subdir         ${name}/${version}_${revision}
    2121master_sites        ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/
    22 checksums           md5 3b4e7fa4a323c7e283c0348fc6bb3b2d \
    23                     sha1 83f17d2079b83cc790689485c139301407313463 \
    24                     rmd160 b75ec4c23001695044e82d9f8b8542cb45b3009c
     22checksums           md5     b4a2ba88236f49d60fa0cd62c56ee5c3 \
     23                    sha1    4cb6787d47ab1367cf620a8c74ec17facfd4fe58 \
     24                    rmd160  6e8405ebbcca3a9c4645b45e2d0da05531d24537
    2525
    2626description         Molecular graphics visualisation tool
     
    3636platforms           darwin
    3737depends_build       port:gmake
    38 depends_lib         port:gcc43 port:xorg-libX11
     38depends_lib         port:xorg-libX11
    3939patchfiles          patch-makefile.diff
     40post-patch {
     41    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/makefile
     42}
     43
     44minimum_xcodeversions {9 3.1}
    4045use_parallel_build  yes
    4146use_configure       no
    4247build.target        molden
    4348build.cmd           gmake
     49pre-build {
     50    build.args      CC=${configure.cc} \
     51                    FC=${configure.fc}
     52}
    4453
    4554destroot {
     
    4857    xinstall -m 755 -d ${docdir}
    4958    xinstall -W ${worksrcpath} \
     59        COMMERCIAL_LICENSE \
     60        CopyRight \
    5061        HISTORY \
    5162        README \
     
    6273                    }
    6374
     75variant gcc43 conflicts gcc44 description {Build using gcc43} {
     76    depends_lib-append      port:gcc43
     77    configure.compiler      macports-gcc-4.3
     78}
     79
     80variant gcc44 conflicts gcc43 description {Build using gcc44} {
     81    depends_lib-append      port:gcc44
     82    configure.compiler      macports-gcc-4.4
     83}
     84
     85if {![variant_isset gcc43] && ![variant_isset gcc44]} {
     86    default_variants        +gcc43
     87}
     88
    6489variant opengl description "Install moldenogl OpenGL helper program" {
    6590    depends_lib-append      port:mesa
     
    7095}
    7196
    72 set distfile_date   20081219110900
     97set distfile_date   20090925081300
    7398livecheck.version   ${version}-${distfile_date}
    7499livecheck.type      regex
  • trunk/dports/science/molden/files/patch-makefile.diff

    r36293 r58362  
    1 --- makefile.orig       2008-02-23 15:40:42.000000000 +0100
    2 +++ makefile    2008-04-25 22:26:21.000000000 +0200
    3 @@ -12,7 +12,7 @@
     1--- makefile.orig       2009-09-21 11:01:33.000000000 -0500
     2+++ makefile    2009-09-26 23:42:41.000000000 -0500
     3@@ -14,7 +14,7 @@
    44 #
    5  #      Disregard compiler warnings on rdmolf.f
     5 CC = cc
     6 LIBS =  -lX11 -lm
     7-LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
     8+LIBSG = -L@PREFIX@/lib -lGLU -lGL -lXmu -lX11 -lm
     9 LDR = ${FC}
     10 
    611 #
    7 -CC = cc
    8 +CC = gcc-mp-4.3
    9  LIBS =  -lX11 -lm
    10  LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lXmu -lX11 -lm
    11  
    12 @@ -52,11 +52,12 @@
    13  # with GCC4.0 or higher replace the line with:
     12@@ -41,11 +41,11 @@
    1413 # 'external gfortran_iargc'
    1514 #
     15 
    1616-CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
    17 -FC = g77
     17+CFLAGS = -fomit-frame-pointer -ftree-vectorize -funroll-loops -O3 -c -I/usr/include/malloc -I@PREFIX@/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
     18 FC = g77
     19 #FC = gfortran
    1820-FFLAGS =
    1921-LIBS =  -L/usr/X11R6/lib -lX11 -lm
    20 -LDR = g77   
    21 +FC = gfortran-mp-4.3
    22 +FFLAGS += -fomit-frame-pointer -ftree-vectorize -funroll-loops -O3
    23 +CFLAGS += -fomit-frame-pointer -ftree-vectorize -funroll-loops -O3 -c -I/usr/X11R6/include -I/usr/include/malloc -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
    24 +LIBS = -L/usr/X11R6/lib -lX11 -lm
    25 +LDR = gfortran-mp-4.3
    26 +
     22+FFLAGS = -fomit-frame-pointer -ftree-vectorize -funroll-loops -O3
     23+LIBS =  -L@PREFIX@/lib -lX11 -lm
     24 LDR = ${FC}
     25 
    2726 # 64 bit machines:
    28  #LIBS =  -L/usr/X11R6/lib64 -lX11 -lm
    29  #
    30 @@ -191,7 +192,7 @@
     27@@ -197,7 +197,7 @@
    3128 # and the full opengl version of molden 'gmolden', (does not need glut)
    3229 # (make gmolden)
    3330 #
    3431-LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm
    35 +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
     32+LIBSOGL = -L@PREFIX@/lib -lglut -lGLU -lGL -lXmu -lX11 -lm
    3633 #
    3734 # on linux :
Note: See TracChangeset for help on using the changeset viewer.