Date: Sun, 11 Jun 2023 20:52:20 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 86bbcd628c11 - main - math/singular: Add DOCS and GFAN options to enable docs and gfanlib module Message-ID: <202306112052.35BKqKu7015772@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=86bbcd628c119ca7a9d715f71170a8953e0386a7 commit 86bbcd628c119ca7a9d715f71170a8953e0386a7 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2023-06-11 20:49:26 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2023-06-11 20:52:18 +0000 math/singular: Add DOCS and GFAN options to enable docs and gfanlib module PR: 271946 Submitted by: thierry@ (initial patch) --- math/singular/Makefile | 28 +++++++++++++++++++---- math/singular/distinfo | 8 ++++--- math/singular/files/patch-Makefile.am | 18 --------------- math/singular/files/patch-Singular_Makefile.am | 12 ---------- math/singular/files/patch-configure.ac | 31 -------------------------- math/singular/pkg-plist | 8 +++++-- 6 files changed, 35 insertions(+), 70 deletions(-) diff --git a/math/singular/Makefile b/math/singular/Makefile index e81143063cb7..e632406a29c7 100644 --- a/math/singular/Makefile +++ b/math/singular/Makefile @@ -1,9 +1,10 @@ PORTNAME= singular DISTVERSIONPREFIX= Release- DISTVERSION= 4-3-2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math #MASTER_SITES= ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/${PORTVERSION:C/\./-/g}/ +DIST_SUBDIR= ${PORTNAME} MAINTAINER= yuri@FreeBSD.org COMMENT= Computer algebra system for polynomial computations @@ -25,7 +26,8 @@ GH_ACCOUNT= Singular GH_PROJECT= Singular GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gmp=${LOCALBASE} --disable-dependency-tracking --without-python +CONFIGURE_ARGS= --with-gmp=${LOCALBASE} --enable-Singular --enable-factory \ + --with-libparse --disable-dependency-tracking --without-python SHEBANG_FILES= Singular/surfex \ libpolys/libpolys-config.in \ @@ -33,15 +35,24 @@ SHEBANG_FILES= Singular/surfex \ TEST_TARGET= check -OPTIONS_DEFINE= FLINT NTL -OPTIONS_DEFAULT= FLINT NTL +OPTIONS_DEFINE= DOCS FLINT GFAN NTL +OPTIONS_DEFAULT= DOCS FLINT GFAN NTL OPTIONS_SUB= yes +DOCS_MASTER_SITES= ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/${PORTVERSION:C/\./-/g}/:doc +DOCS_DISTFILES= doc.tbz2:doc +DOCS_INFO= ${PORTNAME} +PORTDOCS= * + FLINT_DESC= Use FLINT library FLINT_CONFIGURE_ON= --with-flint=${LOCALBASE} FLINT_CONFIGURE_OFF= --with-flint=no FLINT_LIB_DEPENDS= libflint.so:math/flint2 +GFAN_DESC= Build gfanlib library (bundled) +GFAN_CONFIGURE_ENABLE= gfanlib +GFAN_BUILD_DEPENDS= gfan_tropicalbasis:math/gfan + NTL_DESC= Use NTL library NTL_USES= compiler:c11 NTL_CONFIGURE_ON= --with-ntl=${LOCALBASE} @@ -57,4 +68,13 @@ post-patch: post-install: @${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD} +# Singular tarballs made using "make dist" (without --enable-doc-build) +# do not contain built documentation (from Sagemath). +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${PREFIX}/${INFO_PATH} \ + ${STAGEDIR}${DOCSDIR} + (cd ${STAGEDIR}${DOCSDIR} && ${TAR} xfj ${_DISTDIR}/doc.tbz2) + ${MV} ${STAGEDIR}${DOCSDIR}/singular.info \ + ${STAGEDIR}${PREFIX}/${INFO_PATH} + .include <bsd.port.mk> diff --git a/math/singular/distinfo b/math/singular/distinfo index 34c3686ae0b7..fa93ee77b16a 100644 --- a/math/singular/distinfo +++ b/math/singular/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1677437026 -SHA256 (Singular-Singular-Release-4-3-2_GH0.tar.gz) = d74da6aa27b92ed5e099a15d2959fc9cbc325b989ddacb9096b473c6e8395278 -SIZE (Singular-Singular-Release-4-3-2_GH0.tar.gz) = 13744295 +TIMESTAMP = 1686474908 +SHA256 (singular/doc.tbz2) = 10334afd99fe3a3e91669185ef5c104a25c97f0fd0dd6c53d98b47d5243df939 +SIZE (singular/doc.tbz2) = 3976252 +SHA256 (singular/Singular-Singular-Release-4-3-2_GH0.tar.gz) = d74da6aa27b92ed5e099a15d2959fc9cbc325b989ddacb9096b473c6e8395278 +SIZE (singular/Singular-Singular-Release-4-3-2_GH0.tar.gz) = 13744295 diff --git a/math/singular/files/patch-Makefile.am b/math/singular/files/patch-Makefile.am deleted file mode 100644 index 3fd0bbd9e460..000000000000 --- a/math/singular/files/patch-Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.am.orig 2021-06-09 09:17:54 UTC -+++ Makefile.am -@@ -5,10 +5,11 @@ libpolys gfanlib IntegerProgramming \ - kernel Singular \ - dox emacs redhat desktop - --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 - diff --git a/math/singular/files/patch-Singular_Makefile.am b/math/singular/files/patch-Singular_Makefile.am deleted file mode 100644 index 7a6437ac1317..000000000000 --- a/math/singular/files/patch-Singular_Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index 4f1795ead887..000000000000 --- a/math/singular/files/patch-configure.ac +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 a67526e0f9ed..66e2a9ae90fd 100644 --- a/math/singular/pkg-plist +++ b/math/singular/pkg-plist @@ -1,6 +1,7 @@ bin/ESingular bin/Singular bin/TSingular +bin/libparse bin/libpolys-config bin/libsingular-config include/factory/cf_gmp.h @@ -255,8 +256,8 @@ libexec/singular/MOD/customstd.a libexec/singular/MOD/customstd.so libexec/singular/MOD/freealgebra.a libexec/singular/MOD/freealgebra.so -libexec/singular/MOD/gfanlib.a -libexec/singular/MOD/gfanlib.so +%%GFAN%%libexec/singular/MOD/gfanlib.a +%%GFAN%%libexec/singular/MOD/gfanlib.so libexec/singular/MOD/gitfan.a libexec/singular/MOD/gitfan.so libexec/singular/MOD/interval.a @@ -293,6 +294,9 @@ libexec/singular/MOD/systhreads.so libexec/singular/MOD/syzextra.a libexec/singular/MOD/syzextra.so libexec/singular/MOD/toric_ideal +man/man1/ESingular.1.gz +man/man1/Singular.1.gz +man/man1/TSingular.1.gz share/applications/Singular-manual.desktop share/applications/Singular.desktop share/factory/gftables/10201
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306112052.35BKqKu7015772>