git: 8e33ef203ddf - main - math/singular: Update 4.2.0 .> 4.2.1

Yuri Victorovich yuri at FreeBSD.org
Tue Aug 3 06:10:53 UTC 2021 

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8e33ef203ddfc3c1daa6a114faf4a22306b1fb8b

commit 8e33ef203ddfc3c1daa6a114faf4a22306b1fb8b
Author:     Philipp Ost <bsd at philippost.de>
AuthorDate: 2021-08-03 06:03:19 +0000
Commit:     Yuri Victorovich <yuri at FreeBSD.org>
CommitDate: 2021-08-03 06:10:46 +0000

    math/singular: Update 4.2.0 .> 4.2.1
    
    PR:             257523
---
 math/singular/Makefile                         |  4 +-
 math/singular/distinfo                         |  6 +--
 math/singular/files/patch-Makefile.am          | 24 ++++++-----
 math/singular/files/patch-Singular_Makefile.am | 12 ++++++
 math/singular/files/patch-configure.ac         | 31 +++++++++++++++
 math/singular/pkg-plist                        | 55 +++++++-------------------
 6 files changed, 77 insertions(+), 55 deletions(-)

diff --git a/math/singular/Makefile b/math/singular/Makefile
index 3fc41171d68f..1cf336b12acf 100644
--- a/math/singular/Makefile
+++ b/math/singular/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	singular
 DISTVERSIONPREFIX=	Release-
-DISTVERSION=	4-2-0
-PORTREVISION=	1
+DISTVERSION=	4-2-1
 CATEGORIES=	math
 #MASTER_SITES=	ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/${PORTVERSION:C/\./-/g}/
 
@@ -23,7 +22,6 @@ GH_PROJECT=	Singular
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-gmp=${LOCALBASE} --disable-dependency-tracking --without-python
-MAKE_JOBS_UNSAFE=	yes
 SHEBANG_FILES=	Singular/surfex \
 		libpolys/libpolys-config.in \
 		libsingular-config.in
diff --git a/math/singular/distinfo b/math/singular/distinfo
index 0147a2c35cd8..ad501a7a612c 100644
--- a/math/singular/distinfo
+++ b/math/singular/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608880139
-SHA256 (Singular-Singular-Release-4-2-0_GH0.tar.gz) = bdfe6fea1b43adc028f72b93c9590d35308572d59012947ac51ef3e0dc4cbd08
-SIZE (Singular-Singular-Release-4-2-0_GH0.tar.gz) = 12847369
+TIMESTAMP = 1627593707
+SHA256 (Singular-Singular-Release-4-2-1_GH0.tar.gz) = 65990dd7a68d71b622e18f5a7f65c5a7ed859095e1facfc211579f09a4fc0ac4
+SIZE (Singular-Singular-Release-4-2-1_GH0.tar.gz) = 12883061
diff --git a/math/singular/files/patch-Makefile.am b/math/singular/files/patch-Makefile.am
index 94201e273cf7..3fd0bbd9e460 100644
--- a/math/singular/files/patch-Makefile.am
+++ b/math/singular/files/patch-Makefile.am
@@ -1,12 +1,18 @@
---- Makefile.am.orig	2020-01-25 04:04:36 UTC
+--- Makefile.am.orig	2021-06-09 09:17:54 UTC
 +++ Makefile.am
-@@ -27,7 +27,8 @@ configheaderdir = ${includedir}/singular
- nodist_configheader_HEADERS = singularconfig.h
- DISTCLEANFILES = $(nodist_configheader_HEADERS)
+@@ -5,10 +5,11 @@ libpolys gfanlib IntegerProgramming \
+ kernel Singular \
+ dox emacs redhat desktop
  
--dist_man1_MANS = doc/Singular.man doc/ESingular.man doc/TSingular.man
-+# man pages are broken, see https://github.com/Singular/Sources/issues/975
-+#dist_man1_MANS = doc/Singular.man doc/ESingular.man doc/TSingular.man
+-DIST_SUBDIRS = $(SUBDIRS) doc
+-if ENABLE_DOC_BUILD
+-SUBDIRS += doc
+-endif
++# doc does not exist any longer
++#DIST_SUBDIRS = $(SUBDIRS) doc
++#if ENABLE_DOC_BUILD
++#SUBDIRS += doc
++#endif
+ 
+ EXTRA_DIST = README README.md README.pkg autogen.sh doxy redhat/singular.spec.in GPL2 GPL3
  
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = Singular.pc
diff --git a/math/singular/files/patch-Singular_Makefile.am b/math/singular/files/patch-Singular_Makefile.am
new file mode 100644
index 000000000000..7a6437ac1317
--- /dev/null
+++ b/math/singular/files/patch-Singular_Makefile.am
@@ -0,0 +1,12 @@
+--- Singular/Makefile.am.orig	2021-07-29 21:30:22 UTC
++++ Singular/Makefile.am
+@@ -141,7 +141,8 @@ libSingular_includedir = ${includedir}/singular/Singul
+ nobase_libSingular_include_HEADERS = $(SingularHEADERS)
+ 
+ ########################### Singular* #########################
+-dist_man1_MANS = Singular.man ESingular.man TSingular.man
++# man pages are broken, see https://github.com/Singular/Sources/issues/975
++#dist_man1_MANS = Singular.man ESingular.man TSingular.man
+ 
+ EXTRA_PROGRAMS =  libparse Singulard
+ 
diff --git a/math/singular/files/patch-configure.ac b/math/singular/files/patch-configure.ac
new file mode 100644
index 000000000000..4f1795ead887
--- /dev/null
+++ b/math/singular/files/patch-configure.ac
@@ -0,0 +1,31 @@
+--- configure.ac.orig	2021-06-09 09:17:54 UTC
++++ configure.ac
+@@ -329,16 +329,17 @@ AC_CHECK_PROGS([SURF], [surf])
+ AC_CHECK_PROGS([GFAN_TROPICALBASIS], [gfan_tropicalbasis])  dnl and more gfan_tropical...
+ AC_SUBST([DOC2TEX_EXAMPLE_EXCLUSIONS])
+ 
+-AC_CONFIG_FILES([doc/Makefile])
+-AC_CONFIG_FILES([doc/Makefile-docbuild])
+-AC_CONFIG_FILES([doc/version.texi])
+-AC_CONFIG_LINKS([doc/pyobject.doc:doc/pyobject.${enable_pyobject_module}.doc
+-                 doc/cones.doc:doc/cones.no.doc])
+-AC_ARG_ENABLE([doc-build],
+-              [AS_HELP_STRING([--enable-doc-build],
+-                              [Enable building the Singular documentation])], [
+-  AS_IF([test "$enable_doc_build" = yes], [optional_Singular_programs=libparse])
+-])
+-AM_CONDITIONAL([ENABLE_DOC_BUILD], [test "$enable_doc_build" = yes])
++# doc does not exist any longer
++#AC_CONFIG_FILES([doc/Makefile])
++#AC_CONFIG_FILES([doc/Makefile-docbuild])
++#AC_CONFIG_FILES([doc/version.texi])
++#AC_CONFIG_LINKS([doc/pyobject.doc:doc/pyobject.${enable_pyobject_module}.doc
++#                 doc/cones.doc:doc/cones.no.doc])
++#AC_ARG_ENABLE([doc-build],
++#              [AS_HELP_STRING([--enable-doc-build],
++#                              [Enable building the Singular documentation])], [
++#  AS_IF([test "$enable_doc_build" = yes], [optional_Singular_programs=libparse])
++#])
++#AM_CONDITIONAL([ENABLE_DOC_BUILD], [test "$enable_doc_build" = yes])
+ 
+ AC_OUTPUT
diff --git a/math/singular/pkg-plist b/math/singular/pkg-plist
index 71d5a063272b..73d8436726df 100644
--- a/math/singular/pkg-plist
+++ b/math/singular/pkg-plist
@@ -13,24 +13,6 @@ include/factory/templates/ftmpl_array.h
 include/factory/templates/ftmpl_factor.h
 include/factory/templates/ftmpl_list.h
 include/factory/templates/ftmpl_matrix.h
-include/gfanlib/_config.h
-include/gfanlib/config.h
-include/gfanlib/gfanlib.h
-include/gfanlib/gfanlib_circuittableint.h
-include/gfanlib/gfanlib_matrix.h
-include/gfanlib/gfanlib_mixedvolume.h
-include/gfanlib/gfanlib_paralleltraverser.h
-include/gfanlib/gfanlib_polyhedralfan.h
-include/gfanlib/gfanlib_polymakefile.h
-include/gfanlib/gfanlib_q.h
-include/gfanlib/gfanlib_symmetriccomplex.h
-include/gfanlib/gfanlib_symmetry.h
-include/gfanlib/gfanlib_traversal.h
-include/gfanlib/gfanlib_tropicalhomotopy.h
-include/gfanlib/gfanlib_vector.h
-include/gfanlib/gfanlib_z.h
-include/gfanlib/gfanlib_zcone.h
-include/gfanlib/gfanlib_zfan.h
 include/omalloc/omAllocDecl.h
 include/omalloc/omAllocFunc.h
 include/omalloc/omAllocPrivate.h
@@ -246,22 +228,19 @@ include/singular/reporter/reporter.h
 include/singular/reporter/s_buff.h
 include/singular/reporter/si_signals.h
 include/singular/singularconfig.h
-lib/libSingular-4.2.0.so
+lib/libSingular-4.2.1.so
 lib/libSingular.a
 lib/libSingular.so
-lib/libfactory-4.2.0.so
+lib/libfactory-4.2.1.so
 lib/libfactory.a
 lib/libfactory.so
-%%NTL%%lib/libgfan-0.6.so
-%%NTL%%lib/libgfan.a
-%%NTL%%lib/libgfan.so
 lib/libomalloc-0.9.6.so
 lib/libomalloc.a
 lib/libomalloc.so
-lib/libpolys-4.2.0.so
+lib/libpolys-4.2.1.so
 lib/libpolys.a
 lib/libpolys.so
-lib/libsingular_resources-4.2.0.so
+lib/libsingular_resources-4.2.1.so
 lib/libsingular_resources.a
 lib/libsingular_resources.so
 libdata/pkgconfig/Singular.pc
@@ -269,10 +248,6 @@ libdata/pkgconfig/factory.pc
 libdata/pkgconfig/libpolys.pc
 libdata/pkgconfig/omalloc.pc
 libdata/pkgconfig/singular_resources.pc
-libexec/singular/MOD/Order.a
-libexec/singular/MOD/Order.so
-libexec/singular/MOD/bigintm.a
-libexec/singular/MOD/bigintm.so
 libexec/singular/MOD/change_cost
 libexec/singular/MOD/cohomo.a
 libexec/singular/MOD/cohomo.so
@@ -281,8 +256,8 @@ libexec/singular/MOD/customstd.so
 libexec/singular/MOD/freealgebra.a
 libexec/singular/MOD/freealgebra.so
 libexec/singular/MOD/gen_test
-%%NTL%%libexec/singular/MOD/gfanlib.a
-%%NTL%%libexec/singular/MOD/gfanlib.so
+libexec/singular/MOD/gfanlib.a
+libexec/singular/MOD/gfanlib.so
 libexec/singular/MOD/gitfan.a
 libexec/singular/MOD/gitfan.so
 libexec/singular/MOD/interval.a
@@ -297,12 +272,8 @@ libexec/singular/MOD/p_Procs_FieldQ.so
 libexec/singular/MOD/p_Procs_FieldZp.so
 libexec/singular/MOD/partialgb.a
 libexec/singular/MOD/partialgb.so
-libexec/singular/MOD/polymake.a
-libexec/singular/MOD/polymake.so
 libexec/singular/MOD/pyobject.a
 libexec/singular/MOD/pyobject.so
-libexec/singular/MOD/python_module.a
-libexec/singular/MOD/python_module.so
 libexec/singular/MOD/singmathic.a
 libexec/singular/MOD/singmathic.so
 libexec/singular/MOD/singularsurf
@@ -426,6 +397,7 @@ share/ml_singular/extract.lib
 %%DATADIR%%/LIB/JMSConst.lib
 %%DATADIR%%/LIB/KVequiv.lib
 %%DATADIR%%/LIB/SingularityDBM.lib
+%%DATADIR%%/LIB/VecField.lib
 %%DATADIR%%/LIB/absfact.lib
 %%DATADIR%%/LIB/ainvar.lib
 %%DATADIR%%/LIB/aksaka.lib
@@ -442,7 +414,6 @@ share/ml_singular/extract.lib
 %%DATADIR%%/LIB/bimodules.lib
 %%DATADIR%%/LIB/brillnoether.lib
 %%DATADIR%%/LIB/brnoeth.lib
-%%DATADIR%%/LIB/cart.py
 %%DATADIR%%/LIB/central.lib
 %%DATADIR%%/LIB/chern.lib
 %%DATADIR%%/LIB/cimonom.lib
@@ -469,8 +440,10 @@ share/ml_singular/extract.lib
 %%DATADIR%%/LIB/divisors.lib
 %%DATADIR%%/LIB/dmod.lib
 %%DATADIR%%/LIB/dmodapp.lib
+%%DATADIR%%/LIB/dmodideal.lib
 %%DATADIR%%/LIB/dmodloc.lib
 %%DATADIR%%/LIB/dmodvar.lib
+%%DATADIR%%/LIB/dummy.lib
 %%DATADIR%%/LIB/elim.lib
 %%DATADIR%%/LIB/ellipticcovers.lib
 %%DATADIR%%/LIB/equising.lib
@@ -500,11 +473,12 @@ share/ml_singular/extract.lib
 %%DATADIR%%/LIB/help.cnf
 %%DATADIR%%/LIB/hess.lib
 %%DATADIR%%/LIB/hnoether.lib
+%%DATADIR%%/LIB/hodge.lib
 %%DATADIR%%/LIB/homolog.lib
 %%DATADIR%%/LIB/hyperel.lib
 %%DATADIR%%/LIB/inout.lib
 %%DATADIR%%/LIB/integralbasis.lib
-%%DATADIR%%/LIB/interpreter.py
+%%DATADIR%%/LIB/interval.lib
 %%DATADIR%%/LIB/intprog.lib
 %%DATADIR%%/LIB/invar.lib
 %%DATADIR%%/LIB/involut.lib
@@ -514,6 +488,7 @@ share/ml_singular/extract.lib
 %%DATADIR%%/LIB/lejeune.lib
 %%DATADIR%%/LIB/linalg.lib
 %%DATADIR%%/LIB/locnormal.lib
+%%DATADIR%%/LIB/lrcalc.lib
 %%DATADIR%%/LIB/makedbm.lib
 %%DATADIR%%/LIB/mathml.lib
 %%DATADIR%%/LIB/matrix.lib
@@ -537,6 +512,7 @@ share/ml_singular/extract.lib
 %%DATADIR%%/LIB/ncdecomp.lib
 %%DATADIR%%/LIB/ncfactor.lib
 %%DATADIR%%/LIB/ncfrac.lib
+%%DATADIR%%/LIB/nchilbert.lib
 %%DATADIR%%/LIB/nchomolog.lib
 %%DATADIR%%/LIB/ncloc.lib
 %%DATADIR%%/LIB/ncpreim.lib
@@ -555,7 +531,6 @@ share/ml_singular/extract.lib
 %%DATADIR%%/LIB/orbitparam.lib
 %%DATADIR%%/LIB/parallel.lib
 %%DATADIR%%/LIB/paraplanecurves.lib
-%%DATADIR%%/LIB/perf.py
 %%DATADIR%%/LIB/perron.lib
 %%DATADIR%%/LIB/pfd.lib
 %%DATADIR%%/LIB/phindex.lib
@@ -612,9 +587,10 @@ share/ml_singular/extract.lib
 %%DATADIR%%/LIB/surfacesignature.lib
 %%DATADIR%%/LIB/surfex.lib
 %%DATADIR%%/LIB/swalk.lib
-%%DATADIR%%/LIB/symm.py
 %%DATADIR%%/LIB/symodstd.lib
+%%DATADIR%%/LIB/systhreads.lib
 %%DATADIR%%/LIB/tasks.lib
+%%DATADIR%%/LIB/tateProdCplxNegGrad.lib
 %%DATADIR%%/LIB/teachstd.lib
 %%DATADIR%%/LIB/template.lib
 %%DATADIR%%/LIB/toric.lib
@@ -622,7 +598,6 @@ share/ml_singular/extract.lib
 %%DATADIR%%/LIB/tropical.lib
 %%DATADIR%%/LIB/tropicalNewton.lib
 %%DATADIR%%/LIB/tst.lib
-%%DATADIR%%/LIB/util.py
 %%DATADIR%%/LIB/weierstr.lib
 %%DATADIR%%/LIB/zeroset.lib
 %%DATADIR%%/emacs/.emacs-general

More information about the dev-commits-ports-main mailing list