From owner-svn-ports-head@freebsd.org Thu Oct 18 00:27:03 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 99F4E10E2B8E; Thu, 18 Oct 2018 00:27:03 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 502B396D6E; Thu, 18 Oct 2018 00:27:03 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 46E3418206; Thu, 18 Oct 2018 00:27:03 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9I0R30P082023; Thu, 18 Oct 2018 00:27:03 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9I0R1EU082014; Thu, 18 Oct 2018 00:27:01 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201810180027.w9I0R1EU082014@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Thu, 18 Oct 2018 00:27:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482316 - in head/science/cgnslib: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: in head/science/cgnslib: . files X-SVN-Commit-Revision: 482316 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Oct 2018 00:27:03 -0000 Author: jrm Date: Thu Oct 18 00:27:01 2018 New Revision: 482316 URL: https://svnweb.freebsd.org/changeset/ports/482316 Log: science/cgnslib: Update to 3.3.1 and modernize - Obtain sources from GitHub - Use option helpers - Remove SZIP option, since HDF5 always wants to link to it Approved by: thierry (maintainer) Differential Revision: https://reviews.freebsd.org/D17432 Deleted: head/science/cgnslib/files/patch-src_cgnstools_utilities_p3dfout.c Modified: head/science/cgnslib/Makefile (contents, props changed) head/science/cgnslib/distinfo (contents, props changed) head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_calcwish.c (contents, props changed) head/science/cgnslib/files/patch-src_cgnstools_cgnsplot_plotwish.c (contents, props changed) head/science/cgnslib/files/patch-src_cgnstools_cgnsview_cgiowish.c (contents, props changed) head/science/cgnslib/files/patch-src_cgnstools_utilities_binaryio.h (contents, props changed) head/science/cgnslib/files/patch-src_make.defs.in (contents, props changed) head/science/cgnslib/pkg-descr (contents, props changed) head/science/cgnslib/pkg-plist (contents, props changed) Modified: head/science/cgnslib/Makefile ============================================================================== --- head/science/cgnslib/Makefile Wed Oct 17 23:47:30 2018 (r482315) +++ head/science/cgnslib/Makefile Thu Oct 18 00:27:01 2018 (r482316) @@ -2,12 +2,10 @@ # $FreeBSD$ PORTNAME= cgnslib -DISTVERSION= 3.2.1 -PORTREVISION= 13 +DISTVERSIONPREFIX= v +DISTVERSION= 3.3.1 PORTEPOCH= 1 CATEGORIES= science -MASTER_SITES= SF/cgns/${PORTNAME}_${PORTVERSION:R}/ -DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT= CFD General Notation System library code @@ -18,57 +16,40 @@ LICENSE_FILE= ${WRKSRC}/license.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= cmake +USE_GITHUB= yes +GH_ACCOUNT= CGNS +GH_PROJECT= CGNS USE_LDCONFIG= yes -OPTIONS_DEFINE= HDF5 SZIP TESTS TOOLS -HDF5_DESC= Enable HDF5 interface -TESTS_DESC= Enable test programs -TOOLS_DESC= Build the CGNSTools package -SZIP_DESC= SZIP support in HDF5 +OPTIONS_DEFINE= HDF5 TESTS TOOLS +OPTIONS_DEFAULT= HDF5 TESTS TOOLS +OPTIONS_SUB= yes -OPTIONS_DEFAULT=HDF5 TESTS TOOLS +HDF5_DESC= Enable HDF5 interface +TESTS_DESC= Enable test programs +TOOLS_DESC= Build the CGNSTools package +SZIP_DESC= SZIP support in HDF5 -.include +HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 libsz.so:science/szip +HDF5_CMAKE_BOOL= CGNS_ENABLE_HDF5 +HDF5_CMAKE_ON= -DHDF5_INCLUDE_PATH:PATH="${LOCALBASE}/include" -.if ${PORT_OPTIONS:MHDF5} -LIB_DEPENDS+= libhdf5.so:science/hdf5 -CMAKE_ARGS+= -DCGNS_ENABLE_HDF5:BOOL=TRUE -DHDF5_NEED_ZLIB:BOOL=TRUE \ - -DHDF5_INCLUDE_PATH:PATH="${LOCALBASE}/include" -PLIST_SUB+= HDF5="" -. if ${PORT_OPTIONS:MSZIP} -CMAKE_ARGS+= -DHDF5_NEED_SZIP:BOOL=OFF -. endif -.else -CMAKE_ARGS+= -DCGNS_ENABLE_HDF5:BOOL=OFF -PLIST_SUB+= HDF5="@comment " -.endif +TESTS_USES= fortran +TESTS_CMAKE_BOOL= ENABLE_TESTS CGNS_ENABLE_FORTRAN -.if ${PORT_OPTIONS:MTESTS} -USES+= fortran -CMAKE_ARGS+= -DCGNS_ENABLE_TESTS:BOOL=TRUE -DCGNS_ENABLE_FORTRAN:BOOL=TRUE -TESTSBIN= cgwrite cgread test_partial -.endif +TOOLS_USES= gl localbase tk +TOOLS_USE= GL=gl,glu XORG=x11,xmu +TOOLS_CMAKE_BOOL= CGNS_BUILD_CGNSTOOLS +TOOLS_CMAKE_ON= -DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}" \ + -DTK_INCLUDE_PATH:STRING="${TK_INCLUDEDIR}" -.if ${PORT_OPTIONS:MTOOLS} -USES+= tk -USE_GL= gl glu -USE_XORG= x11 xmu -CMAKE_ARGS+= -DCGNS_BUILD_CGNSTOOLS:BOOL=TRUE \ - -DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}" \ - -DTK_INCLUDE_PATH:STRING="${TK_INCLUDEDIR}" -PLIST_SUB+= TOOLS="" -.else -PLIST_SUB+= TOOLS="@comment " -.endif - -LIBVER= ${PORTVERSION:R} - do-test-TESTS-on: -.for pg in ${TESTSBIN} +.for pg in cgwrite cgread test_partial @(cd ${BUILD_WRKSRC}/src/tests; ./${pg}) .endfor post-install: - ${LN} -sf libcgns.so.${LIBVER} ${STAGEDIR}${PREFIX}/lib/libcgns.so.${LIBVER:R} + ${RLN} ${STAGEDIR}${PREFIX}/lib/libcgns.so.${DISTVERSION:R} \ + ${STAGEDIR}${PREFIX}/lib/libcgns.so.${DISTVERSION:R:R} .include Modified: head/science/cgnslib/distinfo ============================================================================== --- head/science/cgnslib/distinfo Wed Oct 17 23:47:30 2018 (r482315) +++ head/science/cgnslib/distinfo Thu Oct 18 00:27:01 2018 (r482316) @@ -1,2 +1,3 @@ -SHA256 (cgnslib_3.2.1.tar.gz) = 34306316f04dbf6484343a4bc611b3bf912ac7dbc3c13b581defdaebbf6c1fc3 -SIZE (cgnslib_3.2.1.tar.gz) = 865223 +TIMESTAMP = 1538602109 +SHA256 (CGNS-CGNS-v3.3.1_GH0.tar.gz) = 81093693b2e21a99c5640b82b267a495625b663d7b8125d5f1e9e7aaa1f8d469 +SIZE (CGNS-CGNS-v3.3.1_GH0.tar.gz) = 3340675 Modified: head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_calcwish.c ============================================================================== --- head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_calcwish.c Wed Oct 17 23:47:30 2018 (r482315) +++ head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_calcwish.c Thu Oct 18 00:27:01 2018 (r482316) @@ -1,5 +1,5 @@ ---- src/cgnstools/cgnscalc/calcwish.c.orig 2011-02-12 23:52:41.000000000 +0100 -+++ src/cgnstools/cgnscalc/calcwish.c 2012-03-13 22:15:02.000000000 +0100 +--- src/cgnstools/cgnscalc/calcwish.c.orig 2017-07-17 21:51:06 UTC ++++ src/cgnstools/cgnscalc/calcwish.c @@ -20,8 +20,10 @@ * Sun shared libraries to be used for Tcl. */ Modified: head/science/cgnslib/files/patch-src_cgnstools_cgnsplot_plotwish.c ============================================================================== --- head/science/cgnslib/files/patch-src_cgnstools_cgnsplot_plotwish.c Wed Oct 17 23:47:30 2018 (r482315) +++ head/science/cgnslib/files/patch-src_cgnstools_cgnsplot_plotwish.c Thu Oct 18 00:27:01 2018 (r482316) @@ -1,5 +1,5 @@ ---- ./src/cgnstools/cgnsplot/plotwish.c.orig 2011-02-12 23:50:31.000000000 +0100 -+++ ./src/cgnstools/cgnsplot/plotwish.c 2012-03-13 22:19:20.000000000 +0100 +--- src/cgnstools/cgnsplot/plotwish.c.orig 2017-07-17 21:51:06 UTC ++++ src/cgnstools/cgnsplot/plotwish.c @@ -20,8 +20,10 @@ * Sun shared libraries to be used for Tcl. */ Modified: head/science/cgnslib/files/patch-src_cgnstools_cgnsview_cgiowish.c ============================================================================== --- head/science/cgnslib/files/patch-src_cgnstools_cgnsview_cgiowish.c Wed Oct 17 23:47:30 2018 (r482315) +++ head/science/cgnslib/files/patch-src_cgnstools_cgnsview_cgiowish.c Thu Oct 18 00:27:01 2018 (r482316) @@ -1,5 +1,5 @@ ---- ./src/cgnstools/cgnsview/cgiowish.c.orig 2011-02-12 23:47:39.000000000 +0100 -+++ ./src/cgnstools/cgnsview/cgiowish.c 2012-03-13 22:04:59.000000000 +0100 +--- src/cgnstools/cgnsview/cgiowish.c.orig 2017-07-17 21:51:06 UTC ++++ src/cgnstools/cgnsview/cgiowish.c @@ -20,8 +20,10 @@ * Sun shared libraries to be used for Tcl. */ Modified: head/science/cgnslib/files/patch-src_cgnstools_utilities_binaryio.h ============================================================================== --- head/science/cgnslib/files/patch-src_cgnstools_utilities_binaryio.h Wed Oct 17 23:47:30 2018 (r482315) +++ head/science/cgnslib/files/patch-src_cgnstools_utilities_binaryio.h Thu Oct 18 00:27:01 2018 (r482316) @@ -1,5 +1,5 @@ ---- ./src/cgnstools/utilities/binaryio.h.orig 2011-02-12 23:52:26.000000000 +0100 -+++ ./src/cgnstools/utilities/binaryio.h 2012-03-13 22:38:55.000000000 +0100 +--- src/cgnstools/utilities/binaryio.h.orig 2017-07-17 21:51:06 UTC ++++ src/cgnstools/utilities/binaryio.h @@ -98,7 +98,7 @@ # define MACH_LOCAL MACH_WIN32 #endif Modified: head/science/cgnslib/files/patch-src_make.defs.in ============================================================================== --- head/science/cgnslib/files/patch-src_make.defs.in Wed Oct 17 23:47:30 2018 (r482315) +++ head/science/cgnslib/files/patch-src_make.defs.in Thu Oct 18 00:27:01 2018 (r482316) @@ -1,6 +1,6 @@ ---- ./src/make.defs.in.orig 2011-03-12 00:38:33.000000000 +0100 -+++ ./src/make.defs.in 2012-03-13 21:31:59.000000000 +0100 -@@ -16,7 +16,7 @@ +--- src/make.defs.in.orig 2017-07-17 21:51:06 UTC ++++ src/make.defs.in +@@ -16,7 +16,7 @@ CFLAGS = @CFLAGS@ @SYSCFLAGS@ COOUT = @COOUT@ CEOUT = @CEOUT@ LDFLAGS = @LDFLAGS@ @@ -9,7 +9,7 @@ #------------------------------------------------------------------------ # SPACE - used to force a space in the compiler executable output flag -@@ -64,7 +64,7 @@ +@@ -68,7 +68,7 @@ BUILDFORTRAN = @BUILDFORTRAN@ F77 = @F77@ FFLAGS = @FFLAGS@ @SYSFFLAGS@ FEOUT = @FEOUT@ Modified: head/science/cgnslib/pkg-descr ============================================================================== --- head/science/cgnslib/pkg-descr Wed Oct 17 23:47:30 2018 (r482315) +++ head/science/cgnslib/pkg-descr Thu Oct 18 00:27:01 2018 (r482316) @@ -2,4 +2,4 @@ The CFD General Notation System (CGNS) provides a stan recovering computer data associated with the numerical solution of the equations of fluid dynamics. -WWW: http://www.cgns.org/ +WWW: http://cgns.github.io/ Modified: head/science/cgnslib/pkg-plist ============================================================================== --- head/science/cgnslib/pkg-plist Wed Oct 17 23:47:30 2018 (r482315) +++ head/science/cgnslib/pkg-plist Thu Oct 18 00:27:01 2018 (r482316) @@ -1,14 +1,9 @@ -bin/adf2hdf -bin/cgconfig -bin/cgnscalc -bin/cgnscheck -bin/cgnscompress -bin/cgnsconvert -bin/cgnsdiff -bin/cgnslist -bin/cgnsnames -bin/cgnsnodes -bin/cgnsplot +%%HDF5%%bin/adf2hdf +%%HDF5%%bin/hdf2adf +%%TOOLS%%bin/cgconfig +%%TOOLS%%bin/cgnscalc +%%TOOLS%%bin/cgnsnodes +%%TOOLS%%bin/cgnsplot %%TOOLS%%bin/cgnstools/aflr3_to_cgns %%TOOLS%%bin/cgnstools/calcwish %%TOOLS%%bin/cgnstools/cgiowish @@ -29,22 +24,28 @@ bin/cgnsplot %%TOOLS%%bin/cgnstools/tecplot_to_cgns %%TOOLS%%bin/cgnstools/tetgen_to_cgns %%TOOLS%%bin/cgnstools/vgrid_to_cgns +%%TOOLS%%bin/cgnsview +%%TOOLS%%bin/unitconv +bin/cgnscheck +bin/cgnscompress +bin/cgnsconvert +bin/cgnsdiff +bin/cgnslist +bin/cgnsnames bin/cgnsupdate -bin/cgnsview -bin/hdf2adf -bin/unitconv +%%TESTS%%include/cgns.mod include/cgnsBuild.defs include/cgns_io.h include/cgnsconfig.h include/cgnslib.h -include/cgnslib_f.h include/cgnstypes.h include/cgnstypes_f.h +include/cgnstypes_f03.h include/cgnswin_f.h lib/libcgns.a lib/libcgns.so lib/libcgns.so.3 -lib/libcgns.so.3.2 +lib/libcgns.so.3.3 %%TOOLS%%share/cgnstools/aflr3.tcl %%TOOLS%%share/cgnstools/balloon.tcl %%TOOLS%%share/cgnstools/cgns-icon.xbm