Index: head/math/blitz++/Makefile =================================================================== --- head/math/blitz++/Makefile (revision 517138) +++ head/math/blitz++/Makefile (revision 517139) @@ -1,52 +1,68 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= blitz++ -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= math -MAINTAINER= ports@FreeBSD.org +MAINTAINER= phascolarctos@protonmail.ch COMMENT= C++ class library for scientific computing -LICENSE= GPLv3 BSD3CLAUSE -LICENSE_COMB= multi +LICENSE= ART20 BSD3CLAUSE LGPL3+ +LICENSE_COMB= dual +LICENSE_FILE_ART20= ${WRKSRC}/LICENSE +LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYRIGHT +LICENSE_FILE_LGPL3+ = ${WRKSRC}/COPYING.LESSER -USES= gmake libtool pathfix python:2.7 +USES= autoreconf compiler gmake libtool pathfix python:2.7 USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared CXX_OPTIMIZE_FLAGS="${CFLAGS}" -MAKE_JOBS_UNSAFE= yes - USE_GITHUB= yes GH_ACCOUNT= blitzpp GH_PROJECT= blitz +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-shared CXX_OPTIMIZE_FLAGS="${CFLAGS}" \ + COMPILER=${COMPILER_TYPE} + +BINARY_ALIAS= python=${PYTHON_CMD} + PORTDOCS= AUTHORS ChangeLog* LEGAL README NEWS \ - README.binutils TODO doc/*.txt + README.binutils indirect.txt \ + sinsoid.txt slice.txt \ + strideslice.txt tensor1.txt +INSTALL_TARGET= install-strip + OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes -DOCS_INFO= blitz -DOCS_USES= makeinfo -ALL_TARGET= all -DOCS_ALL_TARGET= info - -INSTALL_TARGET= install-strip +DOCS_INFO= blitz +DOCS_USES= makeinfo DOCS_INSTALL_TARGET= install-info +.include + +.if ${COMPILER_TYPE} == clang +PLIST_SUB= COMPILER=llvm +.elif ${COMPILER_TYPE} == gcc +PLIST_SUB= COMPILER=gnu +.else +IGNORE= compiler is not supported +.endif + post-patch: @${REINPLACE_CMD} -e 's|g++|\$${CXX}|g ; \ s|"-ftemplate-depth-30|"\$${CXXFLAGS} -ftemplate-depth-30|g ; \ s|-O3|-O2|g ; s|-funroll-loops||g' ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's,python,${PYTHON_CMD},' ${WRKSRC}/blitz/generate/Makefile.in + cd ${WRKSRC}/m4 && ${RM} libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS:N*.txt} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS:M*.txt} ${STAGEDIR}${DOCSDIR} post-install: - @${RM} -r ${STAGEDIR}${PREFIX}/share/doc/blitz-0.10 + @${RM} -r ${STAGEDIR}${PREFIX}/share/doc/blitz-1.0.2 -.include +.include Index: head/math/blitz++/distinfo =================================================================== --- head/math/blitz++/distinfo (revision 517138) +++ head/math/blitz++/distinfo (revision 517139) @@ -1,3 +1,3 @@ -TIMESTAMP = 1534896128 -SHA256 (blitzpp-blitz-1.0.1_GH0.tar.gz) = b62fc3f07b64b264307b01fec5e4f2793e09a68dcb5378984aedbc2e4b3adcef -SIZE (blitzpp-blitz-1.0.1_GH0.tar.gz) = 4645082 +TIMESTAMP = 1570007223 +SHA256 (blitzpp-blitz-1.0.2_GH0.tar.gz) = 500db9c3b2617e1f03d0e548977aec10d36811ba1c43bb5ef250c0e3853ae1c2 +SIZE (blitzpp-blitz-1.0.2_GH0.tar.gz) = 2941270 Index: head/math/blitz++/files/patch-m4_ac__compiler__specific__header.m4 =================================================================== --- head/math/blitz++/files/patch-m4_ac__compiler__specific__header.m4 (nonexistent) +++ head/math/blitz++/files/patch-m4_ac__compiler__specific__header.m4 (revision 517139) @@ -0,0 +1,31 @@ +--- m4/ac_compiler_specific_header.m4.orig 2019-10-01 22:50:17 UTC ++++ m4/ac_compiler_specific_header.m4 +@@ -9,25 +9,9 @@ See also file blitz/bzconfig.h + + AC_MSG_CHECKING(compiler specific header) + +-AS_CASE([$CXX], +- [*xlc++*], [COMPILER_VENDOR="apple"], +- [*icpc*|*icc*], [COMPILER_VENDOR="intel"], +- [*xlC*], [COMPILER_VENDOR="ibm"], +- [*clang++], [COMPILER_VENDOR="llvm"], +- [*cxx*], [COMPILER_VENDOR="compaq"], +- [*aCC*], [COMPILER_VENDOR="hp"], +- [*g++*|*c++*], [AS_CASE([$target], +- [*apple*], [COMPILER_VENDOR="llvm"], +- [COMPILER_VENDOR="gnu"])], +- [*KCC*], [COMPILER_VENDOR="kai"], +- [*pgCC*], [COMPILER_VENDOR="pgi"], +-dnl [*FCC*], [COMPILER_VENDOR="fujitsu"], +- [*pathCC*], [COMPILER_VENDOR="pathscale"], +- [*CC*], [AS_CASE([$target], +- [*sgi*], [COMPILER_VENDOR="sgi"], +- [*solaris*], [COMPILER_VENDOR="sun"], +- [*cray*], [COMPILER_VENDOR="cray"], +- [*fujitsu*], [COMPILER_VENDOR="fujitsu"])] ++AS_CASE([$COMPILER], ++ [clang], [COMPILER_VENDOR="llvm"], ++ [gcc], [COMPILER_VENDOR="gnu"] + ) + export COMPILER_VENDOR + AX_PREFIX_CONFIG_H([blitz/$COMPILER_VENDOR/bzconfig.h],[BZ]) Property changes on: head/math/blitz++/files/patch-m4_ac__compiler__specific__header.m4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/blitz++/pkg-plist =================================================================== --- head/math/blitz++/pkg-plist (revision 517138) +++ head/math/blitz++/pkg-plist (revision 517139) @@ -1,128 +1,123 @@ include/blitz/array-impl.h include/blitz/array.cc include/blitz/array.h include/blitz/array/asexpr.cc include/blitz/array/asexpr.h include/blitz/array/cartesian.h include/blitz/array/cgsolve.h include/blitz/array/complex.cc include/blitz/array/convolve.cc include/blitz/array/convolve.h include/blitz/array/cycle.cc include/blitz/array/domain.h include/blitz/array/et.h include/blitz/array/expr.cc include/blitz/array/expr.h include/blitz/array/fastiter.h include/blitz/array/funcs.h include/blitz/array/functorExpr.h include/blitz/array/geometry.h include/blitz/array/indirect.h include/blitz/array/interlace.cc include/blitz/array/io.cc include/blitz/array/iter.h include/blitz/array/map.h include/blitz/array/methods.cc include/blitz/array/misc.cc include/blitz/array/multi.h include/blitz/array/newet-macros.h include/blitz/array/newet.h include/blitz/array/ops.cc include/blitz/array/ops.h include/blitz/array/reduce.cc include/blitz/array/reduce.h include/blitz/array/resize.cc include/blitz/array/shape.h include/blitz/array/slice.h include/blitz/array/slicing.cc include/blitz/array/stencil-classes.cc include/blitz/array/stencil-et-macros.h include/blitz/array/stencil-et.h include/blitz/array/stencilops.h include/blitz/array/stencils.cc include/blitz/array/stencils.h include/blitz/array/storage.h include/blitz/array/where.h include/blitz/array/zip.h include/blitz/bench.cc include/blitz/bench.h include/blitz/benchext.cc include/blitz/benchext.h include/blitz/blitz.h include/blitz/bounds.h include/blitz/bzconfig.h include/blitz/bzdebug.h include/blitz/compiler.h include/blitz/constpointerstack.h include/blitz/et-forward.h include/blitz/etbase.h include/blitz/funcs.h include/blitz/globeval.cc -include/blitz/gnu/bzconfig.h include/blitz/indexexpr.h include/blitz/indexmap-forward.h include/blitz/levicivita.h include/blitz/limits-hack.h include/blitz/listinit.h +include/blitz/%%COMPILER%%/bzconfig.h include/blitz/memblock.cc include/blitz/memblock.h include/blitz/meta/dot.h include/blitz/meta/matassign.h include/blitz/meta/matmat.h include/blitz/meta/matvec.h include/blitz/meta/metaprog.h include/blitz/meta/product.h include/blitz/meta/sum.h include/blitz/meta/vecassign.h include/blitz/minmax.h include/blitz/numinquire.h include/blitz/numtrait.h include/blitz/ops.h include/blitz/prettyprint.h include/blitz/promote.h include/blitz/range.cc include/blitz/range.h include/blitz/ranks.h include/blitz/reduce.h include/blitz/shapecheck.h include/blitz/simdtypes.h include/blitz/tau.h include/blitz/timer.h include/blitz/tinymat2.cc include/blitz/tinymat2.h include/blitz/tinymat2io.cc include/blitz/tinyvec2.cc include/blitz/tinyvec2.h include/blitz/tinyvec2io.cc include/blitz/tm2fastiter.h include/blitz/tmevaluate.h include/blitz/traversal.cc include/blitz/traversal.h include/blitz/tuning.h include/blitz/tv2fastiter.h include/blitz/tvcross.h include/blitz/tvecglobs.h include/blitz/tvevaluate.h include/blitz/update.h include/blitz/wrap-climits.h include/random/F.h include/random/beta.h include/random/chisquare.h include/random/default.h include/random/discrete-uniform.h include/random/exponential.h include/random/gamma.h include/random/mt.h include/random/mtparam.cc include/random/normal.h include/random/uniform.h lib/libblitz.a lib/libblitz.so lib/libblitz.so.0 lib/libblitz.so.0.0.0 libdata/pkgconfig/blitz.pc -%%PORTDOCS%%%%DOCSDIR%%/indirect.txt -%%PORTDOCS%%%%DOCSDIR%%/sinsoid.txt -%%PORTDOCS%%%%DOCSDIR%%/slice.txt -%%PORTDOCS%%%%DOCSDIR%%/strideslice.txt -%%PORTDOCS%%%%DOCSDIR%%/tensor1.txt