CVS commit: pkgsrc/math

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/math
From: "Niclas Rosenvik" <nros%netbsd.org@localhost>
Date: Wed, 4 Dec 2019 13:31:43 +0000

Module Name:    pkgsrc
Committed By:   nros
Date:           Wed Dec  4 13:31:43 UTC 2019

Modified Files:
        pkgsrc/math: Makefile
        pkgsrc/math/libixion: Makefile distinfo
Added Files:
        pkgsrc/math/libixion/patches: patch-configure.ac
            patch-src_python_Makefile.am
        pkgsrc/math/py-libixion: DESCR Makefile PLIST

Log Message:
add math/py-libixion to pkgsrc

py-libixion are python bindings for math/libixion.


To generate a diff of this commit:
cvs rdiff -u -r1.439 -r1.440 pkgsrc/math/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/math/libixion/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/libixion/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/math/libixion/patches/patch-configure.ac \
    pkgsrc/math/libixion/patches/patch-src_python_Makefile.am
cvs rdiff -u -r0 -r1.1 pkgsrc/math/py-libixion/DESCR \
    pkgsrc/math/py-libixion/Makefile pkgsrc/math/py-libixion/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/Makefile
diff -u pkgsrc/math/Makefile:1.439 pkgsrc/math/Makefile:1.440
--- pkgsrc/math/Makefile:1.439  Sun Dec  1 16:17:54 2019
+++ pkgsrc/math/Makefile        Wed Dec  4 13:31:43 2019
@@ -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

Index: pkgsrc/math/libixion/Makefile
diff -u pkgsrc/math/libixion/Makefile:1.14 pkgsrc/math/libixion/Makefile:1.15
--- pkgsrc/math/libixion/Makefile:1.14  Thu Aug 22 12:23:30 2019
+++ pkgsrc/math/libixion/Makefile       Wed Dec  4 13:31:43 2019
@@ -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@localhost
-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"

Index: pkgsrc/math/libixion/distinfo
diff -u pkgsrc/math/libixion/distinfo:1.4 pkgsrc/math/libixion/distinfo:1.5
--- pkgsrc/math/libixion/distinfo:1.4   Tue Feb 19 15:55:47 2019
+++ pkgsrc/math/libixion/distinfo       Wed Dec  4 13:31:43 2019
@@ -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

Added files:

Index: pkgsrc/math/libixion/patches/patch-configure.ac
diff -u /dev/null pkgsrc/math/libixion/patches/patch-configure.ac:1.1
--- /dev/null   Wed Dec  4 13:31:43 2019
+++ pkgsrc/math/libixion/patches/patch-configure.ac     Wed Dec  4 13:31:43 2019
@@ -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"], [
Index: pkgsrc/math/libixion/patches/patch-src_python_Makefile.am
diff -u /dev/null pkgsrc/math/libixion/patches/patch-src_python_Makefile.am:1.1
--- /dev/null   Wed Dec  4 13:31:43 2019
+++ pkgsrc/math/libixion/patches/patch-src_python_Makefile.am   Wed Dec  4 13:31:43 2019
@@ -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

Index: pkgsrc/math/py-libixion/DESCR
diff -u /dev/null pkgsrc/math/py-libixion/DESCR:1.1
--- /dev/null   Wed Dec  4 13:31:43 2019
+++ pkgsrc/math/py-libixion/DESCR       Wed Dec  4 13:31:43 2019
@@ -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.
Index: pkgsrc/math/py-libixion/Makefile
diff -u /dev/null pkgsrc/math/py-libixion/Makefile:1.1
--- /dev/null   Wed Dec  4 13:31:43 2019
+++ pkgsrc/math/py-libixion/Makefile    Wed Dec  4 13:31:43 2019
@@ -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"
Index: pkgsrc/math/py-libixion/PLIST
diff -u /dev/null pkgsrc/math/py-libixion/PLIST:1.1
--- /dev/null   Wed Dec  4 13:31:43 2019
+++ pkgsrc/math/py-libixion/PLIST       Wed Dec  4 13:31:43 2019
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2019/12/04 13:31:43 nros Exp $
+${PYSITELIB}/ixion.la

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/math/libixion
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/math/libixion
Indexes:

Home | Main Index | Thread Index | Old Index