aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortcberner <tcberner@FreeBSD.org>2019-11-10 02:16:33 +0800
committertcberner <tcberner@FreeBSD.org>2019-11-10 02:16:33 +0800
commite3fb3abdd26e9ef7612d9cb0d72ec1996939b52f (patch)
tree473e4a3092936ffa7962ad6680c7f8cc9914c4e5
parent6bfd9286d8bd4edb0f8df25e137301549985998d (diff)
downloadfreebsd-ports-gnome-e3fb3abdd26e9ef7612d9cb0d72ec1996939b52f.tar.gz
freebsd-ports-gnome-e3fb3abdd26e9ef7612d9cb0d72ec1996939b52f.tar.zst
freebsd-ports-gnome-e3fb3abdd26e9ef7612d9cb0d72ec1996939b52f.zip
math/blitz++: update to 1.0.2
- Give maintainership to Lorenzo Salvadore <phascolarctos@protonmail.ch> PR: 241290 Submitted by: Lorenzo Salvadore <phascolarctos@protonmail.ch>
-rw-r--r--math/blitz++/Makefile56
-rw-r--r--math/blitz++/distinfo6
-rw-r--r--math/blitz++/files/patch-m4_ac__compiler__specific__header.m431
-rw-r--r--math/blitz++/pkg-plist7
4 files changed, 71 insertions, 29 deletions
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index 467f113ae541..360e82d8c5ab 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -2,51 +2,67 @@
# $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 <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/blitz++/distinfo b/math/blitz++/distinfo
index 2d429db58d47..c56237d9e9f5 100644
--- a/math/blitz++/distinfo
+++ b/math/blitz++/distinfo
@@ -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
diff --git a/math/blitz++/files/patch-m4_ac__compiler__specific__header.m4 b/math/blitz++/files/patch-m4_ac__compiler__specific__header.m4
new file mode 100644
index 000000000000..bbe6816fdbba
--- /dev/null
+++ b/math/blitz++/files/patch-m4_ac__compiler__specific__header.m4
@@ -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])
diff --git a/math/blitz++/pkg-plist b/math/blitz++/pkg-plist
index 759786719df8..c37ad11aa05e 100644
--- a/math/blitz++/pkg-plist
+++ b/math/blitz++/pkg-plist
@@ -58,12 +58,12 @@ 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
@@ -121,8 +121,3 @@ 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