Date: Sat, 8 Mar 2014 18:58:53 +0200 (EET) From: Johannes Jost Meixner <xmj@chaot.net> To: FreeBSD-gnats-submit@freebsd.org Cc: sunpoet@FreeBSD.org Subject: ports/187377: [PATCH] science/netcdf: update to 4.3.1.1 Message-ID: <3780912944.enqueue@mx12.chaot.net> Resent-Message-ID: <201403081700.s28H01uU007092@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187377 >Category: ports >Synopsis: [PATCH] science/netcdf: update to 4.3.1.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Mar 08 17:00:01 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Johannes Jost Meixner >Release: FreeBSD 11.0-CURRENT amd64 >Organization: Goldener Grund OUe >Environment: System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #0: Sun Feb 16 19:07:27 EET 2014 >Description: - Update to 4.3.1.1 - Add doxygen dependency for documentation building - Update LIB_DEPENDS to new format - Add staging Port maintainer (sunpoet@FreeBSD.org) is cc'd. port test: ok testport: ok redports: https://redports.org/buildarchive/20140308164700-19796/ Generated with FreeBSD Port Tools 1.00.2014.03.07 (mode: update, diff: SVN) >How-To-Repeat: >Fix: --- netcdf-4.3.1.1.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 347523) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= netcdf -PORTVERSION= 4.1.3 -PORTREVISION= 3 +PORTVERSION= 4.3.1.1 CATEGORIES= science MASTER_SITES= http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \ ftp://ftp.unidata.ucar.edu/pub/netcdf/ \ @@ -12,10 +11,14 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT?= Library for machine-independent, array-oriented data access +BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen +LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5-18 + CONFLICTS_INSTALL= hdf-4.[0-9]* netcdf-3.[0-9]* netcdf3-3.[0-9]* PORTSCOUT= limit:^4\. OPTIONS_DEFINE= DAP FORTRAN SZIP +OPTIONS_DEFAULT= DAP DAP_DESC= Build DAP client and remote testing FORTRAN_DESC= Build library for Fortran SZIP_DESC= SZIP support (required if HDF5 was built with SZIP) @@ -22,26 +25,23 @@ CONFIGURE_ARGS= --enable-cxx --enable-cxx-4 --enable-netcdf-4 --enable-shared \ --with-hdf5=${LOCALBASE} --with-zlib=/usr -CPPFLAGS+= -I${LOCALBASE}/include -fPIC -DPIC +CFLAGS+= -I${LOCALBASE}/include -fPIC -DPIC -I${WRKSRC}/include +CPPFLAGS+= -I${LOCALBASE}/include -fPIC -DPIC -I${WRKSRC}/include GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib -LIB_DEPENDS= hdf5.7:${PORTSDIR}/science/hdf5-18 MAKE_ENV= INFODIR="${PREFIX}/${INFO_PATH}" MAKEINFOFLAGS="--no-split" USE_LDCONFIG= yes -USES= pathfix +USES= pathfix cmake INFO= netcdf netcdf-c netcdf-cxx netcdf-f77 netcdf-f90 \ netcdf-install netcdf-tutorial -MAN1= nccopy.1 ncdump.1 ncgen.1 ncgen3.1 -MAN3= netcdf.3 -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDAP} CONFIGURE_ARGS+=--enable-dap --with-curl=${LOCALBASE} \ --with-curl-config=${LOCALBASE}/bin/curl-config -LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl .else CONFIGURE_ARGS+=--disable-dap .endif @@ -49,7 +49,6 @@ .if ${PORT_OPTIONS:MFORTRAN} CPPFLAGS+= -DpgiFortran CONFLICTS+= netcdf-4.* -MAN3+= netcdf_f77.3 netcdf_f90.3 PKGNAMESUFFIX+= -ftn PLIST_SUB+= FORTRAN="" USES+= fortran @@ -61,19 +60,27 @@ .if ${PORT_OPTIONS:MSZIP} CONFIGURE_ARGS+=--with-szlib=${LOCALBASE} -LIB_DEPENDS+= sz.2:${PORTSDIR}/science/szip +LIB_DEPENDS+= libsz.so:${PORTSDIR}/science/szip +LDFLAGS+= -lsz .endif -post-configure: - @cd ${WRKSRC}/man4 && ${SETENV} ${MAKE_ENV} ${MAKE} maintainer-clean-aminfo -.for i in ${INFO} - @cd ${WRKSRC}/man4 && makeinfo --no-split ${i}.texi -.endfor +post-patch: + ${REINPLACE_CMD} -E 's/\<netcdf.h\>/\"include\/netcdf.h\"/' ${WRKSRC}/ncdump/*.c + ${REINPLACE_CMD} -E 's/\<netcdf.h\>/\"include\/netcdf.h\"/' ${WRKSRC}/nc_test/*.c +post-build: + @cd ${WRKSRC}/man4 && ${LOCALBASE}/bin/doxygen . + +compress-man: + ${GZIP_CMD} ${STAGEDIR}${MANPREFIX}/share/man/man3/netcdf.3 +. for man_page in nccopy\.1 ncdump\.1 ncgen\.1 ncgen3\.1 + ${GZIP_CMD} ${STAGEDIR}${MANPREFIX}/share/man/man1/${man_page} +. endfor + post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR}/ - cd ${WRKSRC}/man4 && ${INSTALL_DATA} *.html *.pdf *.txt ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ + @cd ${WRKSRC}/man4/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .endif regression-test test: build Index: distinfo =================================================================== --- distinfo (revision 347523) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (netcdf-4.1.3.tar.gz) = 44447a72711e2b75cb91c5a235dd6bcf2a6bddd0206614ccac83c1f47af02253 -SIZE (netcdf-4.1.3.tar.gz) = 11095305 +SHA256 (netcdf-4.3.1.1.tar.gz) = 09a4123d631714f488a2dc43292a7218e5241f2cf9288d2dbc8347d2fe176cad +SIZE (netcdf-4.3.1.1.tar.gz) = 4729750 Index: files/patch-cxx4-ncGroup.cpp =================================================================== --- files/patch-cxx4-ncGroup.cpp (revision 347523) +++ files/patch-cxx4-ncGroup.cpp (working copy) @@ -1,29 +0,0 @@ ---- cxx4/ncGroup.cpp.orig -+++ cxx4/ncGroup.cpp -@@ -218,7 +218,7 @@ - - // search in child groups of the children - if(location == ChildrenOfChildrenGrps || location == AllChildrenGrps || location == AllGrps ) { -- map<string,NcGroup>::iterator it; -+ multimap<string,NcGroup>::iterator it; - multimap<string,NcGroup> groups(getGroups(ChildrenGrps)); - for (it=groups.begin();it!=groups.end();it++) { - multimap<string,NcGroup> childGroups(it->second.getGroups(AllChildrenGrps)); -@@ -1251,7 +1251,7 @@ - // search in current group and parent groups. - NcGroup tmpGroup(*this); - multimap<string,NcDim>::iterator itD; -- map<string,NcVar>::iterator itV; -+ multimap<string,NcVar>::iterator itV; - while(1) { - // get the collection of NcDim objects defined in this group. - multimap<string,NcDim> dimTmp(tmpGroup.getDims()); -@@ -1289,7 +1289,7 @@ - // search in current group and parent groups. - multimap<string,NcDim>::iterator itD; - NcGroup tmpGroup(*this); -- map<string,NcVar>::iterator itV; -+ multimap<string,NcVar>::iterator itV; - while(1) { - // get the collection of NcDim objects defined in this group. - multimap<string,NcDim> dimTmp(tmpGroup.getDims()); Index: pkg-plist =================================================================== --- pkg-plist (revision 347523) +++ pkg-plist (working copy) @@ -3,83 +3,82 @@ bin/ncdump bin/ncgen bin/ncgen3 -include/ncAtt.h -include/ncByte.h -include/ncChar.h -include/ncCheck.h -include/ncCompoundType.h -include/ncDim.h -include/ncDouble.h -include/ncEnumType.h -include/ncException.h -include/ncFile.h -include/ncFloat.h -include/ncGroup.h -include/ncGroupAtt.h -include/ncInt.h -include/ncInt64.h -include/ncOpaqueType.h -include/ncShort.h -include/ncString.h -include/ncType.h -include/ncUbyte.h -include/ncUint.h -include/ncUint64.h -include/ncUshort.h -include/ncVar.h -include/ncVarAtt.h -include/ncVlenType.h -include/ncvalues.h -include/netcdf include/netcdf.h -include/netcdf.hh -include/netcdfcpp.h -%%FORTRAN%%include/netcdf.inc -%%FORTRAN%%include/netcdf.mod -%%FORTRAN%%include/typesizes.mod -lib/libnetcdf.a -lib/libnetcdf.la lib/libnetcdf.so -lib/libnetcdf.so.7 -lib/libnetcdf_c++.a -lib/libnetcdf_c++.la -lib/libnetcdf_c++.so -lib/libnetcdf_c++.so.4 -lib/libnetcdf_c++4.a -lib/libnetcdf_c++4.la -lib/libnetcdf_c++4.so -lib/libnetcdf_c++4.so.1 -%%FORTRAN%%lib/libnetcdff.a -%%FORTRAN%%lib/libnetcdff.la -%%FORTRAN%%lib/libnetcdff.so -%%FORTRAN%%lib/libnetcdff.so.5 -libdata/pkgconfig/netcdf.pc -%%PORTDOCS%%%%DOCSDIR%%/nccopy-man-1.html -%%PORTDOCS%%%%DOCSDIR%%/ncdump-man-1.html -%%PORTDOCS%%%%DOCSDIR%%/ncgen-man-1.html -%%PORTDOCS%%%%DOCSDIR%%/ncgen3-man-1.html -%%PORTDOCS%%%%DOCSDIR%%/netcdf-c.html -%%PORTDOCS%%%%DOCSDIR%%/netcdf-c.pdf -%%PORTDOCS%%%%DOCSDIR%%/netcdf-c.txt -%%PORTDOCS%%%%DOCSDIR%%/netcdf-cxx.html -%%PORTDOCS%%%%DOCSDIR%%/netcdf-cxx.pdf -%%PORTDOCS%%%%DOCSDIR%%/netcdf-cxx.txt -%%PORTDOCS%%%%DOCSDIR%%/netcdf-f77.html -%%PORTDOCS%%%%DOCSDIR%%/netcdf-f77.pdf -%%PORTDOCS%%%%DOCSDIR%%/netcdf-f77.txt -%%PORTDOCS%%%%DOCSDIR%%/netcdf-f90.html -%%PORTDOCS%%%%DOCSDIR%%/netcdf-f90.pdf -%%PORTDOCS%%%%DOCSDIR%%/netcdf-f90.txt -%%PORTDOCS%%%%DOCSDIR%%/netcdf-install.html -%%PORTDOCS%%%%DOCSDIR%%/netcdf-install.pdf -%%PORTDOCS%%%%DOCSDIR%%/netcdf-install.txt -%%PORTDOCS%%%%DOCSDIR%%/netcdf-man-3.html -%%PORTDOCS%%%%DOCSDIR%%/netcdf-tutorial.html -%%PORTDOCS%%%%DOCSDIR%%/netcdf-tutorial.pdf -%%PORTDOCS%%%%DOCSDIR%%/netcdf-tutorial.txt -%%PORTDOCS%%%%DOCSDIR%%/netcdf.html -%%PORTDOCS%%%%DOCSDIR%%/netcdf.pdf -%%PORTDOCS%%%%DOCSDIR%%/netcdf.txt -%%PORTDOCS%%%%DOCSDIR%%/netcdf_f77-man.html -%%PORTDOCS%%%%DOCSDIR%%/netcdf_f90-man.html +lib/libnetcdf.so.4.3.1.1 +lib/libnetcdf.so.7.2.0 +share/cmake/netcdf-config-version.cmake +share/cmake/netcdf-config.cmake +share/cmake/netcdf-targets-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/netcdf-targets.cmake +%%PORTDOCS%%%%DOCSDIR%%/bc_s.png +%%PORTDOCS%%%%DOCSDIR%%/bdwn.png +%%PORTDOCS%%%%DOCSDIR%%/closed.png +%%PORTDOCS%%%%DOCSDIR%%/doxygen.css +%%PORTDOCS%%%%DOCSDIR%%/doxygen.png +%%PORTDOCS%%%%DOCSDIR%%/dynsections.js +%%PORTDOCS%%%%DOCSDIR%%/ftv2blank.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2cl.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2doc.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2folderclosed.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2folderopen.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2lastnode.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2link.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2mlastnode.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2mnode.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2mo.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2node.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2ns.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2plastnode.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2pnode.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2splitbar.png +%%PORTDOCS%%%%DOCSDIR%%/ftv2vertline.png +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/jquery.js +%%PORTDOCS%%%%DOCSDIR%%/md_Building-with-CMake.html +%%PORTDOCS%%%%DOCSDIR%%/md_windows-binaries.html +%%PORTDOCS%%%%DOCSDIR%%/nav_f.png +%%PORTDOCS%%%%DOCSDIR%%/nav_g.png +%%PORTDOCS%%%%DOCSDIR%%/nav_h.png +%%PORTDOCS%%%%DOCSDIR%%/netCDF-CMake.html +%%PORTDOCS%%%%DOCSDIR%%/open.png +%%PORTDOCS%%%%DOCSDIR%%/pages.html +%%PORTDOCS%%%%DOCSDIR%%/search/all_62.html +%%PORTDOCS%%%%DOCSDIR%%/search/all_62.js +%%PORTDOCS%%%%DOCSDIR%%/search/all_69.html +%%PORTDOCS%%%%DOCSDIR%%/search/all_69.js +%%PORTDOCS%%%%DOCSDIR%%/search/all_77.html +%%PORTDOCS%%%%DOCSDIR%%/search/all_77.js +%%PORTDOCS%%%%DOCSDIR%%/search/close.png +%%PORTDOCS%%%%DOCSDIR%%/search/mag_sel.png +%%PORTDOCS%%%%DOCSDIR%%/search/nomatches.html +%%PORTDOCS%%%%DOCSDIR%%/search/pages_62.html +%%PORTDOCS%%%%DOCSDIR%%/search/pages_62.js +%%PORTDOCS%%%%DOCSDIR%%/search/pages_69.html +%%PORTDOCS%%%%DOCSDIR%%/search/pages_69.js +%%PORTDOCS%%%%DOCSDIR%%/search/pages_77.html +%%PORTDOCS%%%%DOCSDIR%%/search/pages_77.js +%%PORTDOCS%%%%DOCSDIR%%/search/search.css +%%PORTDOCS%%%%DOCSDIR%%/search/search.js +%%PORTDOCS%%%%DOCSDIR%%/search/search_l.png +%%PORTDOCS%%%%DOCSDIR%%/search/search_m.png +%%PORTDOCS%%%%DOCSDIR%%/search/search_r.png +%%PORTDOCS%%%%DOCSDIR%%/sync_off.png +%%PORTDOCS%%%%DOCSDIR%%/sync_on.png +%%PORTDOCS%%%%DOCSDIR%%/tab_a.png +%%PORTDOCS%%%%DOCSDIR%%/tab_b.png +%%PORTDOCS%%%%DOCSDIR%%/tab_h.png +%%PORTDOCS%%%%DOCSDIR%%/tab_s.png +%%PORTDOCS%%%%DOCSDIR%%/tabs.css +%%PORTDOCS%%%%DOCSDIR%%/winbin.html +share/man/man1/nccopy.1.gz +share/man/man1/ncdump.1.gz +share/man/man1/ncgen.1.gz +share/man/man1/ncgen3.1.gz +share/man/man3/netcdf.3.gz +%%PORTDOCS%%@dirrm %%DOCSDIR%%/search %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrmtry share/cmake +@dirrmtry man/man1 +@dirrmtry man/man3 +@dirrmtry man --- netcdf-4.3.1.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3780912944.enqueue>