Date: Wed, 16 Sep 2009 11:31:07 +0800 From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/136377: [MAINTAINER] science/netcdf: update to 4.0.1 Message-ID: <20090916033104.GA21411@bonjour.sunpoet.net> In-Reply-To: <200907061200.n66C0Bet054952@freefall.freebsd.org> References: <20090706115710.3C54D2AEC4C5@sunpoet.net> <200907061200.n66C0Bet054952@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Fix the patch. --EVF5PPMfhYS0aIcm Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="netcdf4.patch" diff -ruN --exclude=CVS /usr/ports/science/netcdf4/Makefile /usr/ports/sunpoet/netcdf4/Makefile --- /usr/ports/science/netcdf4/Makefile 2009-06-24 09:53:00.000000000 +0800 +++ /usr/ports/sunpoet/netcdf4/Makefile 2009-07-06 19:54:59.000000000 +0800 @@ -6,7 +6,7 @@ # PORTNAME= netcdf -PORTVERSION= 4.0 +PORTVERSION= 4.0.1 CATEGORIES= science MASTER_SITES= http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \ ftp://ftp.unidata.ucar.edu/pub/netcdf/ \ @@ -19,8 +19,8 @@ LATEST_LINK= netcdf4 CONFIGURE_ARGS= --disable-f77 --disable-f90 \ - --enable-cxx --enable-cxx-4 --enable-netcdf-4 --enable-shared \ - --with-hdf5=${LOCALBASE} --with-zlib=/usr + --enable-cxx --enable-cxx-4 --enable-ncgen4 --enable-netcdf-4 \ + --enable-shared --with-hdf5=${LOCALBASE} --with-zlib=/usr CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran" MAKE_ENV+= MAKEINFOFLAGS="--no-split" INFODIR="${PREFIX}/${INFO_PATH}" @@ -49,14 +49,14 @@ post-patch: .if defined(NOPORTDOCS) - @${REINPLACE_CMD} -e '814 s/install-docDATA //' \ + @${REINPLACE_CMD} -e '829 s/install-docDATA //' \ ${WRKSRC}/man4/Makefile.in .endif @${REINPLACE_CMD} -e \ 's/\(@INSTALL_DOCS_TRUE@MAN.*\)/# \1/' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ - '274 s/\(info_docs\).*/html_docs\)/' \ + '288 s/\(info_docs\).*/html_docs\)/' \ ${WRKSRC}/man4/Makefile.in post-configure: diff -ruN --exclude=CVS /usr/ports/science/netcdf4/distinfo /usr/ports/sunpoet/netcdf4/distinfo --- /usr/ports/science/netcdf4/distinfo 2009-01-02 14:39:12.455781000 +0800 +++ /usr/ports/sunpoet/netcdf4/distinfo 2009-04-03 01:10:47.000000000 +0800 @@ -1,3 +1,3 @@ -MD5 (netcdf-4.0.tar.gz) = afc057b07b6e6843556dcfbc4ced402c -SHA256 (netcdf-4.0.tar.gz) = 4f6934fd862b2e0f5a6ddcd8ef5f86a03d8aebfd106bc09c97afc80fe2ad5c96 -SIZE (netcdf-4.0.tar.gz) = 11584002 +MD5 (netcdf-4.0.1.tar.gz) = a251453c5477599f050fa4e593295186 +SHA256 (netcdf-4.0.1.tar.gz) = 290e377aa2e9419bb50a2fa1038d6e77d36f239a8a9c3be9e3a9319f1e484d19 +SIZE (netcdf-4.0.1.tar.gz) = 8018998 diff -ruN --exclude=CVS /usr/ports/science/netcdf4/pkg-descr /usr/ports/sunpoet/netcdf4/pkg-descr --- /usr/ports/science/netcdf4/pkg-descr 1999-07-30 22:12:53.000000000 +0800 +++ /usr/ports/sunpoet/netcdf4/pkg-descr 2009-09-16 11:17:43.000000000 +0800 @@ -6,4 +6,4 @@ scientific data. The netCDF software was developed at the Unidata Program Center in Boulder, Colorado. -WWW: http://www.unidata.ucar.edu/packages/netcdf/ +WWW: http://www.unidata.ucar.edu/software/netcdf/ diff -ruN --exclude=CVS /usr/ports/science/netcdf4/pkg-plist /usr/ports/sunpoet/netcdf4/pkg-plist --- /usr/ports/science/netcdf4/pkg-plist 2009-01-02 14:39:12.456791000 +0800 +++ /usr/ports/sunpoet/netcdf4/pkg-plist 2009-07-14 08:27:05.000000000 +0800 @@ -8,7 +8,7 @@ lib/libnetcdf.a lib/libnetcdf.la lib/libnetcdf.so -lib/libnetcdf.so.5 +lib/libnetcdf.so.6 lib/libnetcdf_c++.a lib/libnetcdf_c++.la lib/libnetcdf_c++.so diff -ruN --exclude=CVS /usr/ports/science/cdo/Makefile /usr/ports/sunpoet/cdo/Makefile --- /usr/ports/science/cdo/Makefile 2009-06-24 09:53:00.000000000 +0800 +++ /usr/ports/sunpoet/cdo/Makefile 2009-07-14 10:57:07.000000000 +0800 @@ -8,6 +8,7 @@ PORTNAME= cdo PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= http://www.mpimet.mpg.de/fileadmin/software/cdo/ \ http://sunpoet.net/distfiles/ @@ -47,7 +48,7 @@ .if (${NETCDF_VER} == 4) HDF5_VER= 18 WITH_HDF5= yes -LIB_DEPENDS+= netcdf.5:${PORTSDIR}/science/netcdf4 +LIB_DEPENDS+= netcdf.6:${PORTSDIR}/science/netcdf4 .else LIB_DEPENDS+= netcdf.4:${PORTSDIR}/science/netcdf .endif diff -ruN --exclude=CVS /usr/ports/science/py-netCDF4/Makefile /usr/ports/sunpoet/py-netCDF4/Makefile --- /usr/ports/science/py-netCDF4/Makefile 2009-07-06 02:13:26.000000000 +0800 +++ /usr/ports/sunpoet/py-netCDF4/Makefile 2009-07-14 10:54:19.000000000 +0800 @@ -7,6 +7,7 @@ PORTNAME= netCDF4 PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= science python MASTER_SITES= http://netcdf4-python.googlecode.com/files/ \ CHEESESHOP @@ -18,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy RUN_DEPENDS= ${BUILD_DEPENDS} LIB_DEPENDS= hdf5.6:${PORTSDIR}/science/hdf5-18 \ - netcdf.5:${PORTSDIR}/science/netcdf4 + netcdf.6:${PORTSDIR}/science/netcdf4 USE_PYTHON= 2.5+ USE_PYDISTUTILS= yes diff -ruN --exclude=CVS /usr/ports/math/p5-NetCDF/Makefile /usr/ports/sunpoet/p5-NetCDF/Makefile --- /usr/ports/math/p5-NetCDF/Makefile 2009-02-04 13:49:33.000000000 +0800 +++ /usr/ports/sunpoet/p5-NetCDF/Makefile 2009-07-14 10:57:58.000000000 +0800 @@ -7,6 +7,7 @@ PORTNAME= NetCDF PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= math perl5 MASTER_SITES= ftp://ftp.unidata.ucar.edu/pub/netcdf-perl/ PKGNAMEPREFIX= p5- @@ -19,7 +20,7 @@ NETCDF_VER?= 4 .if (${NETCDF_VER} == 4) -LIB_DEPENDS= netcdf.5:${PORTSDIR}/science/netcdf4 +LIB_DEPENDS= netcdf.6:${PORTSDIR}/science/netcdf4 .else LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf .endif --EVF5PPMfhYS0aIcm--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090916033104.GA21411>