3 files changed, 62 insertions, 17 deletions

diff --git a/math/cocoalib/Makefile b/math/cocoalib/Makefile
index 430973fb45c9..f0bee9c3e64e 100644
--- a/math/cocoalib/Makefile
+++ b/math/cocoalib/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	cocoalib
-DISTVERSION=	0.99600
-PORTREVISION=	2
+DISTVERSION=	0.99601
 CATEGORIES=	math
 MASTER_SITES=	http://cocoa.dima.unige.it/cocoalib/tgz/
-DISTNAME=	CoCoALib-0.99600
+DISTNAME=	CoCoALib-${DISTVERSION}
 
 MAINTAINER=	phascolarctos@protonmail.ch
 COMMENT=	C++ library for doing Computations in Commutative Algebra
@@ -34,28 +33,27 @@ BUILD_WRKSRC=	${WRKSRC}/src/AlgebraicCore
 TEST_TARGET=	all
 TEST_WRKSRC=	${WRKSRC}/src/tests
 
-OPTIONS_DEFINE=		DOCS EXAMPLES FROBBY GFAN \
+PREPROCESSOR_DEFNS=	${WRKSRC}/include/CoCoA/PREPROCESSOR_DEFNS.H
+
+OPTIONS_DEFINE=		BOOST DOCS EXAMPLES FROBBY GFAN \
 			GSL NORMALIZ SMALLDEG TEST
+
 FROBBY_DESC=		Link with libfrobby.a
 GFAN_DESC=		Link with libgfan.a
 GSL_DESC=		Link with libgsl.a
 NORMALIZ_DESC=		Link with libnormaliz.a (might cause circular dependency)
 SMALLDEG_DESC=		Optimization for small degree polynomials
+
+BOOST_BUILD_DEPENDS=	${LOCALBASE}/include/boost/thread.hpp:devel/boost-libs
+BOOST_CXXFLAGS=		-pthread
 FROBBY_BUILD_DEPENDS=	${LOCALBASE}/lib/libfrobby.a:math/frobby
-FROBBY_CXXFLAGS=	-DCoCoA_WITH_FROBBY
-FROBBY_LDFLAGS=		-lfrobby
 GFAN_BUILD_DEPENDS=	${LOCALBASE}/lib/libgfan.a:math/gfanlib
-GFAN_CXXFLAGS=		-DCoCoA_WITH_GFAN
-GFAN_LDFLAGS=		-lgfan
 GSL_BUILD_DEPENDS=	${LOCALBASE}/lib/libgsl.a:math/gsl
-GSL_CXXFLAGS=		-DCoCoA_WITH_GSL
-GSL_LDFLAGS=		-lgsl -lgslcblas
 NORMALIZ_BUILD_DEPENDS=	${LOCALBASE}/lib/libnormaliz.a:math/libnormaliz
-NORMALIZ_CXXFLAGS=	-DCoCoA_WITH_NORMALIZ
-NORMALIZ_LDFLAGS=	-lnormaliz
 
 post-patch:
 	${CP} ${FILESDIR}/Makefile.AlgebraicCore ${BUILD_WRKSRC}/Makefile
+	${CP} ${FILESDIR}/${PREPROCESSOR_DEFNS:T} ${PREPROCESSOR_DEFNS}
 
 post-patch-SMALLDEG-on:
 	${REINPLACE_CMD} 's,int SmallExponent_t,short SmallExponent_t,' ${WRKSRC}/include/CoCoA/config.H
@@ -63,6 +61,39 @@ post-patch-SMALLDEG-on:
 post-patch-TEST-on:
 	${CP} ${FILESDIR}/Makefile.tests ${TEST_WRKSRC}/Makefile
 
+do-configure-BOOST-on:
+	${ECHO_CMD} "#define COCOA_WITH_BOOST" >> ${PREPROCESSOR_DEFNS}
+
+do-configure-BOOST-off:
+	${ECHO_CMD} "#undef COCOA_WITH_BOOST" >> ${PREPROCESSOR_DEFNS}
+
+do-configure-FROBBY-on:
+	${ECHO_CMD} "#define COCOA_WITH_FROBBY" >> ${PREPROCESSOR_DEFNS}
+
+do-configure-FROBBY-off:
+	${ECHO_CMD} "#undef COCOA_WITH_FROBBY" >> ${PREPROCESSOR_DEFNS}
+
+do-configure-GFAN-on:
+	${ECHO_CMD} "#define COCOA_WITH_GFAN" >> ${PREPROCESSOR_DEFNS}
+
+do-configure-GFAN-off:
+	${ECHO_CMD} "#undef COCOA_WITH_GFAN" >> ${PREPROCESSOR_DEFNS}
+
+do-configure-GSL-on:
+	${ECHO_CMD} "#define COCOA_WITH_GSL" >> ${PREPROCESSOR_DEFNS}
+
+do-configure-GSL-off:
+	${ECHO_CMD} "#undef COCOA_WITH_GSL" >> ${PREPROCESSOR_DEFNS}
+
+do-configure-NORMALIZ-on:
+	${ECHO_CMD} "#define COCOA_WITH_NORMALIZ" >> ${PREPROCESSOR_DEFNS}
+
+do-configure-NORMALIZ-off:
+	${ECHO_CMD} "#undef COCOA_WITH_NORMALIZ" >> ${PREPROCESSOR_DEFNS}
+
+post-configure:
+	${ECHO_CMD} "#endif" >> ${PREPROCESSOR_DEFNS}
+
 pre-build:
 	cd ${WRKSRC}/include/CoCoA && ./MakeUnifiedHeader.sh --check
 
@@ -71,13 +102,13 @@ post-build-TEST-on: do-test
 do-install:
 	${INSTALL_DATA} ${BUILD_WRKSRC}/libcocoa.a ${STAGEDIR}${PREFIX}/lib
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/CoCoA
-	cd ${WRKSRC}/include/CoCoA && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/CoCoA '-name *\.H'
+	cd ${WRKSRC}/include/CoCoA && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/CoCoA '-name *\.H -a ! -name \._*'
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_MAN} ${WRKSRC}/doc/CoCoALib.pdf ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html
+	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html '! -name \._*'
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/math/cocoalib/distinfo b/math/cocoalib/distinfo
index e2d8f970435c..7536234ab8ef 100644
--- a/math/cocoalib/distinfo
+++ b/math/cocoalib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535050914
-SHA256 (CoCoALib-0.99600.tgz) = 9ba8c9ea45b55d8c553969193c8d7c4c9b311db89fb4ecda3986f442d7c24750
-SIZE (CoCoALib-0.99600.tgz) = 5346129
+TIMESTAMP = 1571752917
+SHA256 (CoCoALib-0.99601.tgz) = caf37f71398b9715be262e434f04a218db05cfa58e08bce954626d7f4ffd6b75
+SIZE (CoCoALib-0.99601.tgz) = 5432276
diff --git a/math/cocoalib/files/PREPROCESSOR_DEFNS.H b/math/cocoalib/files/PREPROCESSOR_DEFNS.H
new file mode 100644
index 000000000000..aa1919b36a8a
--- /dev/null
+++ b/math/cocoalib/files/PREPROCESSOR_DEFNS.H
@@ -0,0 +1,14 @@
+#ifndef CoCoA_PREPROCESSOR_DEFNS_H
+#define CoCoA_PREPROCESSOR_DEFNS_H
+
+// To enable debugging, reconfigure with option "--debug"
+#undef CoCoA_DEBUG
+
+// define CoCoA_MEMPOOL_DEBUG if you have memory problems
+#undef CoCoA_MEMPOOL_DEBUG
+
+
+#undef CoCoA_THREADSAFE_HACK
+#undef CoCoA_WITH_MATHSAT
+
+#define CoCoA_ULONG2LONG 1