[94709] trunk/dports/science/cdf

[ryandesign at macports.org]

Revision: 94709
          https://trac.macports.org/changeset/94709
Author:   ryandesign at macports.org
Date:     2012-06-27 01:40:49 -0700 (Wed, 27 Jun 2012)
Log Message:
-----------
cdf: update to 3.4.1; add gcc47 variant; add openmaintainer

Modified Paths:
--------------
    trunk/dports/science/cdf/Portfile
    trunk/dports/science/cdf/files/patch-Makefile

Modified: trunk/dports/science/cdf/Portfile
===================================================================
--- trunk/dports/science/cdf/Portfile	2012-06-27 08:03:00 UTC (rev 94708)
+++ trunk/dports/science/cdf/Portfile	2012-06-27 08:40:49 UTC (rev 94709)
@@ -5,11 +5,11 @@
 
 name                    cdf
 epoch                   1
-version                 3.4.0
+version                 3.4.1
 set my_branch           [join [lrange [split ${version} .] 0 1] ""]
 set my_version          ${my_branch}_[join [lrange [split ${version} .] 2 end] "_"]
 set my_short_version    ${my_branch}_[lindex [split ${version} .] 2]
-maintainers             ryandesign
+maintainers             ryandesign openmaintainer
 platforms               darwin
 categories              science
 
@@ -29,8 +29,8 @@
 worksrcdir              ${name}${my_short_version}-dist
 extract.suffix          -all${extract.suffix}
 
-checksums               rmd160  895e1ecc37a216bd9b493a33553dca33a1270a97 \
-                        sha256  7fc74bb95f27d61dae605c5d6158a06050e3ccb85b7de4e3261b39bc13eb95cb
+checksums               rmd160  4e3ebd5892c63db07a9f33fca9a3527883c5e09a \
+                        sha256  a8779a3c34c7aa123e6231960db21a5c321baf09f1725319bf358b05af58b666
 
 depends_lib             port:ncurses
 
@@ -76,22 +76,27 @@
     move ${destroot}${prefix}/CDFLeapSeconds.txt ${docdir}
 }
 
-variant gcc44 conflicts gcc45 gcc46 description {Use gcc44} {
+variant gcc44 conflicts gcc45 gcc46 gcc47 description {Use gcc44} {
     depends_lib-append  port:gcc44
     configure.compiler  macports-gcc-4.4
 }
 
-variant gcc45 conflicts gcc44 gcc46 description {Use gcc45} {
+variant gcc45 conflicts gcc44 gcc46 gcc47 description {Use gcc45} {
     depends_lib-append  port:gcc45
     configure.compiler  macports-gcc-4.5
 }
 
-variant gcc46 conflicts gcc44 gcc45 description {Use gcc46} {
+variant gcc46 conflicts gcc44 gcc45 gcc47 description {Use gcc46} {
     depends_lib-append  port:gcc46
     configure.compiler  macports-gcc-4.6
 }
 
-if {![variant_isset gcc44] && ![variant_isset gcc46]} {
+variant gcc47 conflicts gcc44 gcc45 gcc46 description {Use gcc47} {
+    depends_lib-append  port:gcc47
+    configure.compiler  macports-gcc-4.7
+}
+
+if {![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47]} {
     default_variants +gcc45
 }
 

Modified: trunk/dports/science/cdf/files/patch-Makefile
===================================================================
--- trunk/dports/science/cdf/files/patch-Makefile	2012-06-27 08:03:00 UTC (rev 94708)
+++ trunk/dports/science/cdf/files/patch-Makefile	2012-06-27 08:40:49 UTC (rev 94709)
@@ -1,6 +1,6 @@
---- Makefile.orig	2011-08-12 10:26:11.000000000 -0500
-+++ Makefile	2011-10-18 02:06:08.000000000 -0500
-@@ -194,9 +194,9 @@
+--- Makefile.orig	2012-06-19 08:05:21.000000000 -0500
++++ Makefile	2012-06-27 02:50:50.000000000 -0500
+@@ -196,9 +196,9 @@
  ifeq ("$(MACOSX)","Darwin")
  KERNELVERSION=$(shell uname -r | cut -f1 -d.)
  ifeq ("$(KERNELVERSION)","9")
@@ -12,7 +12,7 @@
  MACOSxFopt=-m64
  endif
  endif
-@@ -216,43 +216,43 @@
+@@ -218,43 +218,43 @@
  
  CURSES_macosx_ppc=yes
  CC_macosx_ppc=gcc
@@ -73,7 +73,7 @@
  SYSLIBSshr_macosx_i386=$(MACOSxlink)
  
  CURSES_macosx_x86_64=yes
-@@ -260,13 +260,13 @@
+@@ -262,13 +262,13 @@
  LD_macosx_x86_64=libtool -arch_only x86_64 
  LDOPTIONS_macosx_x86_64=-dynamic
  PIC_macosx_x86_64=
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120627/0886b8e6/attachment.html>