Revision: 117515 https://trac.macports.org/changeset/117515 Author: takeshi@macports.org Date: 2014-03-01 19:37:34 -0800 (Sat, 01 Mar 2014) Log Message: ----------- ncarg: applied the patch provided by ryandesign, closing #38687 Modified Paths: -------------- trunk/dports/science/ncarg/Portfile Modified: trunk/dports/science/ncarg/Portfile =================================================================== --- trunk/dports/science/ncarg/Portfile 2014-03-02 00:22:58 UTC (rev 117514) +++ trunk/dports/science/ncarg/Portfile 2014-03-02 03:37:34 UTC (rev 117515) @@ -25,15 +25,12 @@ http://www.ncl.ucar.edu/Download/files/:g2clib distname ncl_${name}-${version} -worksrcdir ncl_${name}-${version} set ncl_src ${distname}${extract.suffix} set g2clib_version 1.2.3 set g2clib_src g2clib-${g2clib_version}-patch${extract.suffix} set g2clib_worksrcdir g2clib-${g2clib_version}-patch distfiles ${ncl_src}:ncl \ ${g2clib_src}:g2clib -checksums ncl_ncarg-6.1.0.tar.gz \ - g2clib-1.2.3-patch.tar.gz \ checksums ${ncl_src} \ md5 a13d4a97d1d580a24fe144d127e4ce31 \ @@ -154,10 +151,10 @@ } pre-configure { - system "cd ${workpath}/${g2clib_worksrcdir}; make all" + system -W ${workpath}/${g2clib_worksrcdir} "make all" file copy ${workpath}/${g2clib_worksrcdir}/libgrib2c.a ${worksrcpath} - system "cd ${worksrcpath}/config; \ - CC=${configure.cc} \ + system -W ${worksrcpath}/config \ + "CC=${configure.cc} \ CFLAGS=${configure.cflags} \ make -f Makefile.ini; \ ./ymake -config `pwd`" @@ -166,7 +163,7 @@ } } configure { - system "cd ${worksrcpath}; ./Configure -v << EOF + system -W ${worksrcpath} "./Configure -v << EOF y @@ -195,7 +192,7 @@ post-configure { # reinplace "s| -lsz||g" ${worksrcpath}/makefile # reinplace "s| -lsz||g" ${worksrcpath}/config/Site.local - system "cd ${worksrcpath}; make Info" + system -W ${worksrcpath} "make Info" system "cat ${worksrcpath}/config/Site.local" } @@ -216,7 +213,7 @@ # Check if ncl is built here. post-build { if {![file exists ${worksrcpath}/ni/src/ncl/ncl]} { - ui_error "ncl did not built" + return -code error "ncl did not get built" } }