Hi, This diff updates matio to the latest release. Changed licensing to BSD. Tested on amd64.
Comments ? OK ? -- Alexandr Shadchin Index: Makefile =================================================================== RCS file: /cvs/ports/math/matio/Makefile,v retrieving revision 1.14 diff -u -p -w -r1.14 Makefile --- Makefile 11 Mar 2016 20:28:27 -0000 1.14 +++ Makefile 17 Dec 2016 20:55:33 -0000 @@ -2,44 +2,23 @@ COMMENT= library for reading and writing Matlab MAT files -DISTNAME= matio-1.3.2 -REVISION= 1 -SHARED_LIBS= matio 1.0 +DISTNAME= matio-1.5.9 +SHARED_LIBS= matio 2.0 # 6.0 CATEGORIES= math HOMEPAGE= http://sourceforge.net/projects/matio/ -# LGPL +# BSD PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matio/} -EXTRACT_SUFX= .tar.bz2 -MODULES= fortran -MODFORTRAN_COMPILER = g77 -WANTLIB= ${MODFORTRAN_WANTLIB} m -BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS} -LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS} +WANTLIB = c hdf5 m z + +LIB_DEPENDS= math/hdf5 CONFIGURE_STYLE=gnu -CONFIGURE_ENV += FC=${MODFORTRAN_COMPILER} -CONFIGURE_ARGS= --enable-fortran=no \ - --enable-test=yes - -TESTS= copy write writecompressed writecell readslab \ - writeslab writesparse writenan writeinf readslab4 ind2sub sub2ind \ - write_compressed_cell write_compressed_sparse - -do-test: -.for t in ${TESTS} - @echo "Testing ${t}" - @cd ${WRKBUILD}/test && ./test_mat ${t} -.endfor - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/matio - ${INSTALL_DATA} ${WRKSRC}/libmatio.pdf ${PREFIX}/share/doc/matio - rm -r ${PREFIX}/share/matio - rm -r ${PREFIX}/bin/test_* +CONFIGURE_ARGS= --enable-mat73 \ + --with-hdf5=${LOCALBASE} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/math/matio/distinfo,v retrieving revision 1.4 diff -u -p -w -r1.4 distinfo --- distinfo 18 Jan 2015 03:14:27 -0000 1.4 +++ distinfo 17 Dec 2016 20:55:33 -0000 @@ -1,2 +1,2 @@ -SHA256 (matio-1.3.2.tar.bz2) = XcmS+QJZeTYuQ8eID+tFOurywOfIbDsuwp0o2LBSZCo= -SIZE (matio-1.3.2.tar.bz2) = 817645 +SHA256 (matio-1.5.9.tar.gz) = vrf5ZYMexbTvQ/iDDuHvHBIc2Y4RsPbh2YcT2fhgwFw= +SIZE (matio-1.5.9.tar.gz) = 8520329 Index: patches/patch-test_test_mat_c =================================================================== RCS file: patches/patch-test_test_mat_c diff -N patches/patch-test_test_mat_c --- patches/patch-test_test_mat_c 2 Dec 2006 00:19:11 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-test_test_mat_c,v 1.2 2006/12/02 00:19:11 steven Exp $ ---- test/test_mat.c.orig Sat Oct 28 21:20:58 2006 -+++ test/test_mat.c Sat Dec 2 00:54:00 2006 -@@ -1590,6 +1590,9 @@ int main (int argc, char *argv[]) - } - - printf("%d of %d tests completed successfully\n",ntests-err,ntests); -+ -+ if (err > 0) -+ return 1; - - return 0; - } Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/math/matio/pkg/PLIST,v retrieving revision 1.2 diff -u -p -w -r1.2 PLIST --- pkg/PLIST 16 Mar 2015 18:07:50 -0000 1.2 +++ pkg/PLIST 17 Dec 2016 20:55:33 -0000 @@ -1,9 +1,28 @@ @comment $OpenBSD: PLIST,v 1.2 2015/03/16 18:07:50 naddy Exp $ +@bin bin/matdump include/matio.h -include/matioConfig.h +include/matio_pubconf.h lib/libmatio.a lib/libmatio.la @lib lib/libmatio.so.${LIBmatio_VERSION} lib/pkgconfig/matio.pc -share/doc/matio/ -share/doc/matio/libmatio.pdf +@man man/man3/Mat_Close.3 +@man man/man3/Mat_CreateVer.3 +@man man/man3/Mat_GetFilename.3 +@man man/man3/Mat_GetLibraryVersion.3 +@man man/man3/Mat_GetVersion.3 +@man man/man3/Mat_Open.3 +@man man/man3/Mat_Rewind.3 +@man man/man3/Mat_VarAddStructField.3 +@man man/man3/Mat_VarCreate.3 +@man man/man3/Mat_VarCreateStruct.3 +@man man/man3/Mat_VarFree.3 +@man man/man3/Mat_VarGetNumberOfFields.3 +@man man/man3/Mat_VarGetStructFieldnames.3 +@man man/man3/Mat_VarGetStructs.3 +@man man/man3/Mat_VarGetStructsLinear.3 +@man man/man3/Mat_VarRead.3 +@man man/man3/Mat_VarReadInfo.3 +@man man/man3/Mat_VarReadNext.3 +@man man/man3/Mat_VarReadNextInfo.3 +@man man/man3/Mat_VarWrite.3
