update mcl to 14-137 and add -fcommon to fix the build

math/mcl/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2019/07/12 20:47:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2021/02/14 03:19:26 daniel Exp $
 
 COMMENT=	clustering algorithm for graphs
 
-V=		09-308
+V=		14-137
 DISTNAME=	mcl-${V}
 PKGNAME=	mcl-${V:S,-,_,}
 CATEGORIES=	math
@@ -12,7 +12,7 @@ HOMEPAGE=	http://micans.org/mcl/
 # GPLv2
 PERMIT_PACKAGE=	Yes
 
-MASTER_SITES=	${HOMEPAGE}/src/
+MASTER_SITES=	http://micans.org/mcl/src/
 
 WANTLIB=	c m pthread
 
@@ -21,4 +21,7 @@ USE_GROFF =	Yes
 
 FAKE_FLAGS=	exampledir=${PREFIX}/share/examples/mcl/
 
+# 20+ duplicate symbols
+CFLAGS+=	-fcommon
+
 .include <bsd.port.mk>

math/mcl/distinfo

@@ -1,2 +1,2 @@
-SHA256 (mcl-09-308.tar.gz) = gNV73uAtWFWsIf7ql6ko/z1DLRXtKv8CubvohVHUBxI=
-SIZE (mcl-09-308.tar.gz) = 2785872
+SHA256 (mcl-14-137.tar.gz) = tXhol6ioyhGes1WlYwgGpNpy6oQkPbqFsZqG8UdXtJc=
+SIZE (mcl-14-137.tar.gz) = 3035491

math/mcl/patches/patch-src_impala_matrix_c

@@ -1,39 +0,0 @@
-$OpenBSD: patch-src_impala_matrix_c,v 1.1 2017/05/11 16:40:58 espie Exp $
-restrict is a keyword in C99
-
-Index: src/impala/matrix.c
---- src/impala/matrix.c.orig
-+++ src/impala/matrix.c
-@@ -1510,18 +1510,18 @@ dim mclxUnaryList
- mclv* mclgUnionv
- (  mclx* mx
- ,  const mclv* coldom
--,  const mclv* restrict
-+,  const mclv* restricted
- ,  mcxenum scratch_STATUS
- ,  mclv* dst
- )
--   {  return mclgUnionv2(mx, coldom, restrict, scratch_STATUS, dst, mx->dom_rows)
-+   {  return mclgUnionv2(mx, coldom, restricted, scratch_STATUS, dst, mx->dom_rows)
- ;  }
- 
- 
- mclv* mclgUnionv2
- (  const mclx* mx
- ,  const mclv* coldom
--,  const mclv* restrict
-+,  const mclv* restricted
- ,  mcxenum scratch_STATUS
- ,  mclv* dst
- ,  mclv* scratch
-@@ -1566,8 +1566,8 @@ mclv* mclgUnionv2
-                )
-                continue               /* SNH if coldom is subset of mx->dom_cols */
-             ;  if
--               (  restrict
--               && 0 > (o_restrict = mclvGetIvpOffset(restrict, idx, o_restrict))
-+               (  restricted
-+               && 0 > (o_restrict = mclvGetIvpOffset(restricted, idx, o_restrict))
-                )
-                continue               /* not found in restriction domain */
- 

math/mcl/pkg/PLIST

@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.8 2009/12/23 22:08:58 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.9 2021/02/14 03:19:26 daniel Exp $
 @bin bin/clm
 @bin bin/clmformat
+bin/clxdo
 @bin bin/mcl
 @bin bin/mclcm
 bin/mclpipeline
@@ -19,8 +20,10 @@ bin/mclpipeline
 @man man/man1/clmformat.1
 @man man/man1/clmimac.1
 @man man/man1/clminfo.1
+@man man/man1/clminfo2.1
 @man man/man1/clmmate.1
 @man man/man1/clmmeet.1
+@man man/man1/clmoptics.1
 @man man/man1/clmorder.1
 @man man/man1/clmresidue.1
 @man man/man1/clmvol.1
@@ -36,6 +39,7 @@ bin/mclpipeline
 @man man/man1/mcxctty.1
 @man man/man1/mcxdiameter.1
 @man man/man1/mcxdump.1
+@man man/man1/mcxerdos.1
 @man man/man1/mcxi.1
 @man man/man1/mcxload.1
 @man man/man1/mcxmap.1
@@ -43,6 +47,7 @@ bin/mclpipeline
 @man man/man1/mcxrand.1
 @man man/man1/mcxsubs.1
 @man man/man5/clmprotocols.5
+@man man/man5/clmprotocols2.5
 @man man/man5/mcxio.5
 @man man/man7/mclfamily.7
 @man man/man7/mclfaq.7
@@ -61,14 +66,20 @@ share/doc/mcl/clmimac.html
 share/doc/mcl/clmimac.ps
 share/doc/mcl/clminfo.html
 share/doc/mcl/clminfo.ps
+share/doc/mcl/clminfo2.html
+share/doc/mcl/clminfo2.ps
 share/doc/mcl/clmmate.html
 share/doc/mcl/clmmate.ps
 share/doc/mcl/clmmeet.html
 share/doc/mcl/clmmeet.ps
+share/doc/mcl/clmoptics.html
+share/doc/mcl/clmoptics.ps
 share/doc/mcl/clmorder.html
 share/doc/mcl/clmorder.ps
 share/doc/mcl/clmprotocols.html
 share/doc/mcl/clmprotocols.ps
+share/doc/mcl/clmprotocols2.html
+share/doc/mcl/clmprotocols2.ps
 share/doc/mcl/clmresidue.html
 share/doc/mcl/clmresidue.ps
 share/doc/mcl/clmvol.html
@@ -107,6 +118,8 @@ share/doc/mcl/mcxdiameter.html
 share/doc/mcl/mcxdiameter.ps
 share/doc/mcl/mcxdump.html
 share/doc/mcl/mcxdump.ps
+share/doc/mcl/mcxerdos.html
+share/doc/mcl/mcxerdos.ps
 share/doc/mcl/mcxi.html
 share/doc/mcl/mcxi.ps
 share/doc/mcl/mcxio.html
@@ -149,6 +162,7 @@ share/examples/mcl/friends
 share/examples/mcl/fznyy.mci
 share/examples/mcl/fznyy.tab
 share/examples/mcl/honey.mci
+share/examples/mcl/infinity.mci
 share/examples/mcl/lattice.mci
 share/examples/mcl/make-falkner.pl
 share/examples/mcl/matula.mci