[61061] trunk/dports/science/cdf

1 Dec 2009

Revision: 61061
          http://trac.macports.org/changeset/61061
Author:   ryandesign@macports.org
Date:     2009-12-01 07:27:00 -0800 (Tue, 01 Dec 2009)
Log Message:
-----------
cdf: update from 3.2 (mislabeled "32") to 3.3.0

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	2009-12-01 14:04:58 UTC (rev 61060)
+++ trunk/dports/science/cdf/Portfile	2009-12-01 15:27:00 UTC (rev 61061)
@@ -3,7 +3,10 @@
 PortSystem 1.0
 
 name		cdf
-version		32
+epoch		1
+version		3.3.0
+set my_branch	[join [lrange [split ${version} .] 0 1] ""]
+set my_version	${my_branch}_[lindex [split ${version} .] 2]
 maintainers	nomaintainer
 platforms	darwin
 categories	science
@@ -16,54 +19,50 @@
 		independent fashion. 
 
 homepage	http://cdf.gsfc.nasa.gov/
-master_sites	http://distfiles.macports.org/${dist_subdir} \
-				ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/${name}${version}/unix
+master_sites	ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/${name}${my_version}/unix \
+		ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/obsolete/${name}${my_branch}/${name}${my_version}/unix
 
-distfiles	${name}${version}-dist-all${extract.suffix}
+distname	${name}${my_version}-dist
+extract.suffix	-all${extract.suffix}
 
-checksums	sha1 c24a88dee108ab3ae7787697350f77ca3e9bd776
+checksums	md5     3ce6409c616675611cb8050c0496b071 \
+		sha1    8ae0a2585a580394a41a746ac53808a408fa0c01 \
+		rmd160  280ef2b91f8b39df7daa4149202965f07dbb3118
 
-depends_build	port:gcc42
+configure.compiler	macports-gcc-4.4
+depends_lib	port:gcc44 \
+		port:ncurses
 
 fetch.use_epsv	no
 use_configure	no
-worksrcdir	${name}${version}-dist-readonly
+use_parallel_build	no
 
-platform darwin i386 {
-		  global cdf_arch
-		  set cdf_arch i386
-}
-
-platform darwin powerpc {
-		  global cdf_arch
-		  set cdf_arch ppc
+post-patch	{
+		  reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Makefile
+		  reinplace "s|\\\$(INSTALLDIR)/bin/definitions\\.\\(\[BCK\]\\)|${prefix}/bin/definitions.\\1|" ${worksrcpath}/Makefile
 		}
 
-patchfiles	patch-Makefile
+build.args	FORTRAN=yes
 
-post-patch	{
-		  reinplace "s|-L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1|`gcc-mp-4.2 -print-libgcc-file-name`|g" ${worksrcpath}/Makefile
-		  reinplace "s|-L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64|`gcc-mp-4.2 -print-libgcc-file-name`|g" ${worksrcpath}/Makefile
-		  reinplace "s|-L/usr/lib/gcc/i686-apple-darwin8/4.0.1|`gcc-mp-4.2 -print-libgcc-file-name`|g" ${worksrcpath}/Makefile
+platform darwin {
+	patchfiles-append patch-Makefile
+	build.args-append OS=macosx
+}
 
-		  reinplace "s|/Developer/SDKs/MacOSX10.4u.sdk/usr/lib|${prefix}/lib|g" ${worksrcpath}/Makefile
-		}
+if {[info exists build_arch]} {
+	build.args-append ENV=${configure.build_arch}
+}
 
 pre-build	{
-		  build.pre_args OS=macosx ENV=${cdf_arch} FORTRAN=yes FC=gfortran-mp-4.2 ${build.target}
+		  build.args-append CC=${configure.cc} FC=${configure.fc}
 		}
 
 destroot.destdir INSTALLDIR=${destroot}${prefix}
-pre-destroot	{
-		  reinplace "s|(INSTALLDIR)/bin/definitions.B|/${prefix}/bin/definitions.B|" ${worksrcpath}/Makefile
-		  reinplace "s|(INSTALLDIR)/bin/definitions.C|/${prefix}/bin/definitions.C|" ${worksrcpath}/Makefile
-		  reinplace "s|(INSTALLDIR)/bin/definitions.K|/${prefix}/bin/definitions.K|" ${worksrcpath}/Makefile
-		}
 
 post-destroot	{
-		  reinplace "s|${destroot}${prefix}|${prefix}|" ${destroot}${prefix}/bin/definitions.B
-		  reinplace "s|${destroot}${prefix}|${prefix}|" ${destroot}${prefix}/bin/definitions.C
-		  reinplace "s|${destroot}${prefix}|${prefix}|" ${destroot}${prefix}/bin/definitions.K
+		  reinplace "s|${destroot}${prefix}|${prefix}|" ${destroot}${prefix}/bin/definitions.B \
+			  ${destroot}${prefix}/bin/definitions.C \
+			  ${destroot}${prefix}/bin/definitions.K
 
 		  system "install_name_tool -id ${prefix}/lib/libcdf.dylib ${destroot}${prefix}/lib/libcdf.dylib"
 		}

Modified: trunk/dports/science/cdf/files/patch-Makefile
===================================================================
--- trunk/dports/science/cdf/files/patch-Makefile	2009-12-01 14:04:58 UTC (rev 61060)
+++ trunk/dports/science/cdf/files/patch-Makefile	2009-12-01 15:27:00 UTC (rev 61061)
@@ -1,62 +1,80 @@
---- Makefile.sav	2008-02-02 13:16:04.000000000 -0500
-+++ Makefile	2008-02-02 13:16:48.000000000 -0500
-@@ -171,43 +171,43 @@
- EXEEXT_macosx=
+--- Makefile.orig	2009-05-13 09:17:26.000000000 -0500
++++ Makefile	2009-12-01 09:22:28.000000000 -0600
+@@ -173,55 +173,55 @@
  
  CURSES_macosx_ppc=yes
--CC_macosx_ppc=gcc
-+CC_macosx_ppc=gcc-mp-4.2
- LD_macosx_ppc=libtool -syslibroot /Developer/SDKs/MacOSX10.4u.sdk -arch_only ppc
--LDOPTIONS_macosx_ppc=-dynamic
-+LDOPTIONS_macosx_ppc=-dynamic -headerpad_max_install_names
+ CC_macosx_ppc=gcc
+-LD_macosx_ppc=libtool -syslibroot /Developer/SDKs/MacOSX10.4u.sdk -arch_only ppc
++LD_macosx_ppc=libtool -arch_only ppc
+ LDOPTIONS_macosx_ppc=-dynamic
  PIC_macosx_ppc=
 -COPTIONS_macosx_ppc=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -D__ppc__ -D__MACH__ -D__APPLE__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
-+COPTIONS_macosx_ppc=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -D__ppc__ -D__MACH__ -D__APPLE__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
- COPTIONSld_macosx_ppc=-arch ppc -isysroot/Developer/SDKs/MacOSX10.4u.sdk
+-COPTIONSld_macosx_ppc=-arch ppc -isysroot/Developer/SDKs/MacOSX10.4u.sdk
++COPTIONS_macosx_ppc=-I@PREFIX@/include -D__ppc__ -D__MACH__ -D__APPLE__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
++COPTIONSld_macosx_ppc=-I@PREFIX@/include
  FOPTIONS_macosx_ppc=-w
  FOPTIONSld_macosx_ppc=
- CURSESLIB_macosx_ppc=-lcurses
+-CURSESLIB_macosx_ppc=-lcurses
 -SYSLIBSexe_macosx_ppc=-L/Developer/SDKs/MacOSX10.4u.sdk -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 -lm -lc -lgcc -lSystemStubs
 -SYSLIBSshr_macosx_ppc=-L/Developer/SDKs/MacOSX10.4u.sdk -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 -lm -lc -lgcc -lSystemStubs
-+SYSLIBSexe_macosx_ppc=-L/Developer/SDKs/MacOSX10.4u.sdk -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 -lm -lc -lSystemStubs
-+SYSLIBSshr_macosx_ppc=-L/Developer/SDKs/MacOSX10.4u.sdk -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1 -lm -lc -lSystemStubs
++CURSESLIB_macosx_ppc=-lncurses
++SYSLIBSexe_macosx_ppc=-L@PREFIX@/lib -lm -lc -lgcc -lSystemStubs
++SYSLIBSshr_macosx_ppc=-L@PREFIX@/lib -lm -lc -lgcc -lSystemStubs
  
  CURSES_macosx_ppc64=yes
--CC_macosx_ppc64=gcc
-+CC_macosx_ppc64=gcc-mp-4.2
- LD_macosx_ppc64=libtool -syslibroot /Developer/SDKs/MacOSX10.4u.sdk -arch_only ppc64
--LDOPTIONS_macosx_ppc64=-dynamic
-+LDOPTIONS_macosx_ppc64=-dynamic -headerpad_max_install_names
+ CC_macosx_ppc64=gcc
+-LD_macosx_ppc64=libtool -syslibroot /Developer/SDKs/MacOSX10.4u.sdk -arch_only ppc64
++LD_macosx_ppc64=libtool -arch_only ppc64
+ LDOPTIONS_macosx_ppc64=-dynamic
  PIC_macosx_ppc64=
--COPTIONS_macosx_ppc64=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -arch ppc64 -m64 -DMACOSX64 -D__ppc__ -D__MACH__ -D__APPLE__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
-+COPTIONS_macosx_ppc64=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -m64 -DMACOSX64 -D__ppc__ -D__MACH__ -D__APPLE__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
- COPTIONSld_macosx_ppc64=-arch ppc64 -isysroot/Developer/SDKs/MacOSX10.4u.sdk
+-COPTIONS_macosx_ppc64=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -arch ppc64 -m64 -D__ppc__ -D__MACH__ -D__APPLE__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
+-COPTIONSld_macosx_ppc64=-arch ppc64 -isysroot/Developer/SDKs/MacOSX10.4u.sdk
++COPTIONS_macosx_ppc64=-I@PREFIX@/include -m64 -D__ppc__ -D__MACH__ -D__APPLE__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
++COPTIONSld_macosx_ppc64=-I@PREFIX@/include
  FOPTIONS_macosx_ppc64=-w
  FOPTIONSld_macosx_ppc64=
- CURSESLIB_macosx_ppc64=-lcurses
--SYSLIBSexe_macosx_ppc64=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64 -lm -lc -gcc
--SYSLIBSshr_macosx_ppc64=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64 -lm -lc -gcc
-+SYSLIBSexe_macosx_ppc64=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64 -lm -lc
-+SYSLIBSshr_macosx_ppc64=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64 -lm -lc
+-CURSESLIB_macosx_ppc64=-lcurses
+-SYSLIBSexe_macosx_ppc64=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64 -lm -lc -lgcc
+-SYSLIBSshr_macosx_ppc64=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ppc64 -lm -lc -lgcc
++CURSESLIB_macosx_ppc64=-lncurses
++SYSLIBSexe_macosx_ppc64=-L@PREFIX@/lib -lm -lc -lgcc
++SYSLIBSshr_macosx_ppc64=-L@PREFIX@/lib -lm -lc -lgcc
  
  CURSES_macosx_i386=yes
--CC_macosx_i386=gcc
-+CC_macosx_i386=gcc-mp-4.2
- LD_macosx_i386=libtool -syslibroot /Developer/SDKs/MacOSX10.4u.sdk -arch_only i386
--LDOPTIONS_macosx_i386=-dynamic
-+LDOPTIONS_macosx_i386=-dynamic -headerpad_max_install_names
+ CC_macosx_i386=gcc
+ LD_macosx_i386=libtool -arch_only i386
+ LDOPTIONS_macosx_i386=-dynamic
  PIC_macosx_i386=
--COPTIONS_macosx_i386=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -Di386 -D__MACH__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
--COPTIONSld_macosx_i386=-arch i386 -isysroot/Developer/SDKs/MacOSX10.4u.sdk
-+COPTIONS_macosx_i386=-isysroot/Developer/SDKs/MacOSX10.4u.sdk -Di386 -D__MACH__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
-+COPTIONSld_macosx_i386=-isysroot/Developer/SDKs/MacOSX10.4u.sdk
+-COPTIONS_macosx_i386=-mmacosx-version-min=10.4 -arch i386 -Di386 -D__MACH__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
+-COPTIONSld_macosx_i386=-mmacosx-version-min=10.4 -arch i386
++COPTIONS_macosx_i386=-I@PREFIX@/include -Di386 -D__MACH__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
++COPTIONSld_macosx_i386=-I@PREFIX@/include
  FOPTIONS_macosx_i386=-w
  FOPTIONSld_macosx_i386=
- CURSESLIB_macosx_i386=-lcurses
--SYSLIBSexe_macosx_i386=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/i686-apple-darwin8/4.0.1 -lm -lc -lgcc
--SYSLIBSshr_macosx_i386=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/i686-apple-darwin8/4.0.1 -lm -lc -lgcc
-+SYSLIBSexe_macosx_i386=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/i686-apple-darwin8/4.0.1 -lm -lc 
-+SYSLIBSshr_macosx_i386=-L/Developer/SDKs/MacOSX10.4u.sdk/usr/lib -L/usr/lib/gcc/i686-apple-darwin8/4.0.1 -lm -lc
+-CURSESLIB_macosx_i386=-lcurses
+-SYSLIBSexe_macosx_i386=-L/Developer/SDKs/MacOSX10.5u.sdk/usr/lib -L/usr/lib/gcc/i686-apple-darwin9/4.0.1 -lm -lc -lgcc
+-SYSLIBSshr_macosx_i386=-L/Developer/SDKs/MacOSX10.5u.sdk/usr/lib -L/usr/lib/gcc/i686-apple-darwin9/4.0.1 -lm -lc -lgcc
++CURSESLIB_macosx_i386=-lncurses
++SYSLIBSexe_macosx_i386=-L@PREFIX@/lib -lm -lc -lgcc
++SYSLIBSshr_macosx_i386=-L@PREFIX@/lib -lm -lc -lgcc
  
- # CURSES_macosx_i386_64=yes
- # CC_macosx_i386_64=/usr/bin/gcc -arch x86_64
+ CURSES_macosx_x86_64=yes
+ CC_macosx_x86_64=gcc
+ LD_macosx_x86_64=libtool -arch_only x86_64 
+ LDOPTIONS_macosx_x86_64=-dynamic
+ PIC_macosx_x86_64=
+-COPTIONS_macosx_x86_64=-mmacosx-version-min=10.4 -arch x86_64 -Di386 -D__MACH__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
+-COPTIONSld_macosx_x86_64=-mmacosx-version-min=10.4 -arch x86_64 
++COPTIONS_macosx_x86_64=-I@PREFIX@/include -Di386 -D__MACH__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE
++COPTIONSld_macosx_x86_64=-I@PREFIX@/include
+ FOPTIONS_macosx_x86_64=-w -m64
+ FOPTIONSld_macosx_x86_64=-m64
+-CURSESLIB_macosx_x86_64=-lcurses
+-SYSLIBSexe_macosx_x86_64=-lm -lc 
+-SYSLIBSshr_macosx_x86_64=-lm -lc
++CURSESLIB_macosx_x86_64=-lncurses
++SYSLIBSexe_macosx_x86_64=-L@PREFIX@/lib -lm -lc 
++SYSLIBSshr_macosx_x86_64=-L@PREFIX@/lib -lm -lc
+ 
+ #------------------------------------------------------------------------------
+ # Macros for OSF (Digital UNIX).

    

[61061] trunk/dports/science/cdf

ryandesign＠macports.org