From fd2c384d2ca6f8a22d762364f11eceda39f28c0e Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Thu, 9 Jul 2020 04:18:59 +0000 Subject: [PATCH] math/symmetrica: Update 2.0 -> 3.0.1 Switch to the modern fork from the SageMath team. --- math/symmetrica/Makefile | 35 ++++++++-------- math/symmetrica/distinfo | 6 +-- math/symmetrica/files/patch-bar.c | 35 ---------------- math/symmetrica/files/patch-bruch.c | 44 ------------------- math/symmetrica/files/patch-de.c | 17 -------- math/symmetrica/files/patch-def.h | 27 ------------ math/symmetrica/files/patch-di.c | 29 ------------- math/symmetrica/files/patch-ga.c | 27 ------------ math/symmetrica/files/patch-galois.c | 17 -------- math/symmetrica/files/patch-macro.h | 11 ----- math/symmetrica/files/patch-makefile | 35 ---------------- math/symmetrica/files/patch-nc.c | 53 ----------------------- math/symmetrica/files/patch-nu.c | 63 ---------------------------- math/symmetrica/files/patch-part.c | 38 ----------------- math/symmetrica/files/patch-perm.c | 47 --------------------- math/symmetrica/files/patch-rest.c | 17 -------- math/symmetrica/files/patch-ta.c | 26 ------------ math/symmetrica/files/patch-zyk.c | 28 ------------- math/symmetrica/pkg-descr | 9 ++-- 19 files changed, 24 insertions(+), 540 deletions(-) delete mode 100644 math/symmetrica/files/patch-bar.c delete mode 100644 math/symmetrica/files/patch-bruch.c delete mode 100644 math/symmetrica/files/patch-de.c delete mode 100644 math/symmetrica/files/patch-def.h delete mode 100644 math/symmetrica/files/patch-di.c delete mode 100644 math/symmetrica/files/patch-ga.c delete mode 100644 math/symmetrica/files/patch-galois.c delete mode 100644 math/symmetrica/files/patch-macro.h delete mode 100644 math/symmetrica/files/patch-makefile delete mode 100644 math/symmetrica/files/patch-nc.c delete mode 100644 math/symmetrica/files/patch-nu.c delete mode 100644 math/symmetrica/files/patch-part.c delete mode 100644 math/symmetrica/files/patch-perm.c delete mode 100644 math/symmetrica/files/patch-rest.c delete mode 100644 math/symmetrica/files/patch-ta.c delete mode 100644 math/symmetrica/files/patch-zyk.c diff --git a/math/symmetrica/Makefile b/math/symmetrica/Makefile index 8763b459ba21..d2a120a45369 100644 --- a/math/symmetrica/Makefile +++ b/math/symmetrica/Makefile @@ -1,33 +1,32 @@ # $FreeBSD$ PORTNAME= symmetrica -DISTVERSION= 2.0 -PORTREVISION= 1 +DISTVERSION= 3.0.1 CATEGORIES= math -MASTER_SITES= http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/ -DISTFILES= SYM2_0_tar.gz MAINTAINER= yuri@FreeBSD.org -COMMENT= Collection of routines for combinatorial mathematics +COMMENT= Library with a collection of routines for combinatorial mathematics LICENSE= PD +LICENSE_FILE= ${WRKSRC}/LICENSE -MAKEFILE= makefile -NO_WRKSUBDIR= yes +USES= autoreconf gmake libtool +USE_GITLAB= yes +GL_ACCOUNT= sagemath +GL_COMMIT= e29c85915f368d6fb2f89d703b6695ff29ab9eae +USE_LDCONFIG= yes -PLIST_FILES= bin/${PORTNAME} \ +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static + +INSTALL_TARGET= install-strip +TEST_TARGET= check + +PLIST_FILES= include/symmetrica.h \ include/${PORTNAME}/def.h \ include/${PORTNAME}/macro.h \ - lib/libsymmetrica.a \ lib/libsymmetrica.so \ - lib/libsymmetrica.so.0 - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/test ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${STAGEDIR}${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/libsymmetrica.a ${STAGEDIR}${PREFIX}/lib - ${INSTALL_LIB} ${WRKSRC}/libsymmetrica.so ${STAGEDIR}${PREFIX}/lib/libsymmetrica.so.0 - ${LN} -sf libsymmetrica.so.0 ${STAGEDIR}${PREFIX}/lib/libsymmetrica.so + lib/libsymmetrica.so.2 \ + lib/libsymmetrica.so.2.0.0 .include diff --git a/math/symmetrica/distinfo b/math/symmetrica/distinfo index 37f192c73030..545f37c3fbb1 100644 --- a/math/symmetrica/distinfo +++ b/math/symmetrica/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514705794 -SHA256 (SYM2_0_tar.gz) = bf52788dedc14c482e89f5e7efe8c60864a633314ddd446dd4602d5fdaca0ee2 -SIZE (SYM2_0_tar.gz) = 720154 +TIMESTAMP = 1594261048 +SHA256 (sagemath-symmetrica-e29c85915f368d6fb2f89d703b6695ff29ab9eae_GL0.tar.gz) = 0e826487375bbe3bdb29ed58bd5d486aaf9b6b0243bdfc2fb51c3fc092c88cf2 +SIZE (sagemath-symmetrica-e29c85915f368d6fb2f89d703b6695ff29ab9eae_GL0.tar.gz) = 734897 diff --git a/math/symmetrica/files/patch-bar.c b/math/symmetrica/files/patch-bar.c deleted file mode 100644 index 589d2d7d51d9..000000000000 --- a/math/symmetrica/files/patch-bar.c +++ /dev/null @@ -1,35 +0,0 @@ ---- bar.c.orig 2007-12-06 16:29:59 UTC -+++ bar.c -@@ -1,4 +1,5 @@ - /* file bar.c symmetrica */ -+/* Patch from SageMath */ - #include "def.h" - #include "macro.h" - -@@ -237,7 +238,7 @@ INT rz_lehmercode_bar(a,b) OP a,b; - g = callocobject(); - e = S_V_I(a,0L); - f = S_V_I(a,1L); -- erg += sum(f,g); -+ erg += sym_sum(f,g); - j=0L; - for (i=0L;i=0;j--) -@@ -1767,8 +1768,8 @@ static int rec01(INT ni, OP vec) - /* to compute number of partitions */ - { - INT erg = OK; -- if (ni<0) return; -- if (not EMPTYP(S_V_I(vec,ni))) return; -+ if (ni<0) return NULL; -+ if (not EMPTYP(S_V_I(vec,ni))) return NULL; - else if (ni<=1) M_I_I(1,S_V_I(vec,ni)); - else { - diff --git a/math/symmetrica/files/patch-perm.c b/math/symmetrica/files/patch-perm.c deleted file mode 100644 index 5ae2bee37d36..000000000000 --- a/math/symmetrica/files/patch-perm.c +++ /dev/null @@ -1,47 +0,0 @@ ---- perm.c.orig 2007-12-06 16:30:19 UTC -+++ perm.c -@@ -1,4 +1,5 @@ - /* SYMMETRICA perm.c */ -+/* Patch from SageMath */ - #include "def.h" - #include "macro.h" - -@@ -833,9 +834,9 @@ komponeten. */ - /* s = Anzahl der spalten */ - - s = S_V_LI(S_V_I(a,0L)); -- sum(S_V_I(a,0L),summe);/* composition ist vector */ -+ sym_sum(S_V_I(a,0L),summe);/* composition ist vector */ - z = S_I_I(summe); -- FREEALL(summe); -+ FREEALL(summe); - m_ilih_nm(s,z,b); - C_O_K(b,KRANZTYPUS); - for (i=0L;i