add math/py-libixion to pkgsrc

py-libixion are python bindings for math/libixion.

8 files changed, 72 insertions, 20 deletions

diff --git a/math/Makefile b/math/Makefile
index 0aaafa8225d..dd7b9b7c673 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.439 2019/12/01 16:17:54 minskim Exp $
+# $NetBSD: Makefile,v 1.440 2019/12/04 13:31:43 nros Exp $
 
 COMMENT=	Mathematics
 
@@ -322,6 +322,7 @@ SUBDIR+=	py-gmpy
 SUBDIR+=	py-infinity
 SUBDIR+=	py-intervals
 SUBDIR+=	py-kiwisolver
+SUBDIR+=	py-libixion
 SUBDIR+=	py-lmfit
 SUBDIR+=	py-mpmath
 SUBDIR+=	py-munkres
diff --git a/math/libixion/Makefile b/math/libixion/Makefile
index a59097a6b9c..25a7ff46525 100644
--- a/math/libixion/Makefile
+++ b/math/libixion/Makefile
@@ -1,29 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2019/08/22 12:23:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2019/12/04 13:31:43 nros Exp $
 
-DISTNAME=	libixion-0.14.1
 PKGREVISION=	2
-CATEGORIES=	math devel
-MASTER_SITES=	http://kohei.us/files/ixion/src/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://gitlab.com/ixion/ixion
-COMMENT=	General purpose formula parser & interpreter
-LICENSE=	mpl-2.0
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++
-
-BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
+.include "Makefile.common"
 
 CONFIGURE_ARGS+=	--disable-python
 
 PKGCONFIG_OVERRIDE+=	libixion.pc.in
 
-PTHREAD_AUTO_VARS=	yes
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/mdds/buildlink3.mk"
diff --git a/math/libixion/distinfo b/math/libixion/distinfo
index d87a62a9f0d..a0ebe6fcb23 100644
--- a/math/libixion/distinfo
+++ b/math/libixion/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2019/02/19 15:55:47 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2019/12/04 13:31:43 nros Exp $
 
 SHA1 (libixion-0.14.1.tar.xz) = 8c8f17550177f11f26343c18c6e18cfa260df0e6
 RMD160 (libixion-0.14.1.tar.xz) = ff80ec9b91c64a89c5ae459f749031304148ee57
 SHA512 (libixion-0.14.1.tar.xz) = e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3
 Size (libixion-0.14.1.tar.xz) = 360568 bytes
+SHA1 (patch-configure.ac) = 47f20ec412c7f8b8ae91b12fea9e211cecdd7d5a
+SHA1 (patch-src_python_Makefile.am) = f67180858a87e6a5af941642d1ffbfbc4610ad2a
diff --git a/math/libixion/patches/patch-configure.ac b/math/libixion/patches/patch-configure.ac
new file mode 100644
index 00000000000..d092c0f543d
--- /dev/null
+++ b/math/libixion/patches/patch-configure.ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-configure.ac,v 1.1 2019/12/04 13:31:43 nros Exp $
+* check for pkgsrc libixion, used by math/py-libixion
+--- configure.ac.orig	2018-09-14 19:32:48.000000000 +0000
++++ configure.ac
+@@ -123,6 +123,7 @@ PKG_CHECK_MODULES([MDDS],[mdds-1.4 >= 1.
+ AS_IF([test "x$enable_python" != "xno"], [
+     AM_PATH_PYTHON(3)
+     PKG_CHECK_MODULES([PYTHON], [python3 >= 3.4])
++    PKG_CHECK_MODULES([DEPLIBIXION], [libixion-$IXION_API_VERSION >= $IXION_API_VERSION])
+ ])
+ 
+ AS_IF([test "x$enable_threads" != "xno"], [
diff --git a/math/libixion/patches/patch-src_python_Makefile.am b/math/libixion/patches/patch-src_python_Makefile.am
new file mode 100644
index 00000000000..990e4a52e4e
--- /dev/null
+++ b/math/libixion/patches/patch-src_python_Makefile.am
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_python_Makefile.am,v 1.1 2019/12/04 13:31:43 nros Exp $
+* use pkgsrc libixion, used by math/py-libixion
+--- src/python/Makefile.am.orig	2018-09-08 01:05:48.000000000 +0000
++++ src/python/Makefile.am
+@@ -11,9 +11,9 @@ ixion_la_SOURCES = \
+ 	sheet.cpp
+ 
+ ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex PyInit_ixion
+-ixion_la_CPPFLAGS = -I$(top_srcdir)/include $(PYTHON_CFLAGS) $(MDDS_CFLAGS)
++ixion_la_CPPFLAGS = -I$(top_srcdir)/include $(PYTHON_CFLAGS) $(MDDS_CFLAGS) $(DEPLIBIXION_CFLAGS)
+ ixion_la_LIBADD = \
+-	../libixion/libixion-@IXION_API_VERSION@.la \
++	$(DEPLIBIXION_LIBS)\
+ 	$(PYTHON_LIBS)
+ 
+ if OSX
diff --git a/math/py-libixion/DESCR b/math/py-libixion/DESCR
new file mode 100644
index 00000000000..0dec18654ab
--- /dev/null
+++ b/math/py-libixion/DESCR
@@ -0,0 +1,14 @@
+Python bindings for Ixion.
+
+Ixion is a general purpose formula parser & interpreter that can
+calculate multiple named targets, or "cells".
+
+The goal of this project is to create a library for calculating
+the results of formula expressions stored in multiple named targets,
+or "cells". The cells can be referenced from each other, and the
+library takes care of resolving their dependencies automatically
+upon calculation. The caller can run the calculation routine either
+in a single-threaded mode, or a multi-threaded mode. The library
+also supports re-calculations where the contents of one or more
+cells have been modified since the last calculation, and a partial
+calculation of only the affected cells need to be calculated.
diff --git a/math/py-libixion/Makefile b/math/py-libixion/Makefile
new file mode 100644
index 00000000000..e5497ce04cf
--- /dev/null
+++ b/math/py-libixion/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2019/12/04 13:31:43 nros Exp $
+
+.include "../../math/libixion/Makefile.common"
+
+PKGNAME= 	${PYPKGPREFIX}-${DISTNAME}
+
+USE_TOOLS+=	aclocal autoconf automake
+BUILD_DIRS=	src/python
+PY_PATCHPLIST=	yes
+
+pre-configure:
+	${LN} -s ${BUILDLINK_DIR}/lib/pkgconfig/python-${PYVERSSUFFIX}.pc \
+		${BUILDLINK_DIR}/lib/pkgconfig/python3.pc
+	set -e; cd ${WRKSRC}; \
+		aclocal; automake -a --foreign -i; autoconf
+
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/mdds/buildlink3.mk"
+.include "../../lang/python/extension.mk"
+.include "../../math/libixion/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/math/py-libixion/PLIST b/math/py-libixion/PLIST
new file mode 100644
index 00000000000..d8427712e39
--- /dev/null
+++ b/math/py-libixion/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2019/12/04 13:31:43 nros Exp $
+${PYSITELIB}/ixion.la