math/nauty: Update 2.7r3 → 2.8.6

PR: 271718 Approved by: moritz@schmi.tt (maintainer's timeout; 17 days)
freebsd · Jun 16, 2023 · 408d376 · 408d376
1 parent b46c89c
commit 408d376
Show file tree

Hide file tree

Showing 18 changed files with 43 additions and 24 deletions.
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors java
 MASTER_SITES=	https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \
 		https://archive.apache.org/dist/openoffice/${PORTVERSION}/source/ \

diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \

diff --git a/math/bonmin/Makefile b/math/bonmin/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bonmin
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.8.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 

diff --git a/math/casadi/Makefile b/math/casadi/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	casadi
 DISTVERSION=	3.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org

diff --git a/math/cbc/Makefile b/math/cbc/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	cbc
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	2.10.10
+PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 

diff --git a/math/coinmp/Makefile b/math/coinmp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	CoinMP
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.8.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org

diff --git a/math/couenne/Makefile b/math/couenne/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	couenne
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	0.5.8
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 

diff --git a/math/disco/Makefile b/math/disco/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	disco
 DISTVERSIONPREFIX=	releases/
 DISTVERSION=	1.0.0-33
-PORTREVISION=	4
+PORTREVISION=	5
 DISTVERSIONSUFFIX=	-g68720be
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-

diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	giacxcas
 DISTVERSION=	1.9.0-21
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \
 		http://cocoa.dima.unige.it/cocoalib/tgz/:cocoa \

diff --git a/math/libnormaliz/Makefile b/math/libnormaliz/Makefile
@@ -1,7 +1,7 @@
 # PORTNAME block
 PORTNAME=	libnormaliz
 DISTVERSION=	3.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/Normaliz/Normaliz/releases/download/v${PORTVERSION}/
 DISTNAME=	normaliz-${PORTVERSION}

diff --git a/math/nauty/Makefile b/math/nauty/Makefile
@@ -1,9 +1,10 @@
 PORTNAME=	nauty
-PORTVERSION=	2.7r3
+PORTVERSION=	2.8.6
 PORTEPOCH=	1
 CATEGORIES=	math
-MASTER_SITES=	https://users.cecs.anu.edu.au/~bdm/nauty/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
+MASTER_SITES=	https://users.cecs.anu.edu.au/~bdm/nauty/ \
+		https://pallini.di.uniroma1.it/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/g}
 
 MAINTAINER=	moritz@schmi.tt
 COMMENT=	Nauty & Traces are programs for computing graph automorphism
@@ -33,7 +34,7 @@ post-build: # build shared libraries: based on how static libraries are created
 		objects=$$(ls *.o) ; \
 		${RM} $${objects} ; \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} FREEBSD_EXTRA_CFLAGS="-fPIC" $${objects}
-	# build libraries
+	# build shared libraries
 	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnauty.so -Wl,-soname,libnauty.so \
 		nauty.o nautil.o nausparse.o naugraph.o schreier.o naurng.o traces.o gtools.o naututil.o \
 		nautinv.o gutil1.o gutil2.o gtnauty.o naugroup.o nautycliquer.o
@@ -52,10 +53,16 @@ post-build: # build shared libraries: based on how static libraries are created
 	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnautyL1.so -Wl,-soname,libnautyL1.so \
 		nautyL1.o nautilL1.o nausparseL.o naugraphL1.o schreierL.o naurng.o traces.o gtoolsL.o naututilL1.o \
 		nautinvL1.o gutil1L1.o gutil2L1.o gtnautyL1.o naugroupL.o nautycliquerL.o
+	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnautyS.so -Wl,-soname,libnautyS.so \
+		nautyS.o nautilS.o nausparseS.o naugraphS.o schreierS.o naurng.o traces.o gtoolsS.o naututilS.o \
+		nautinvS.o gutil1S.o gutil2S.o gtnautyS.o naugroupS.o nautycliquerS.o
+	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnautyS1.so -Wl,-soname,libnautyS.so \
+		nautyS1.o nautilS1.o nausparseS.o naugraphS1.o schreierS.o naurng.o traces.o gtoolsS.o naututilS1.o \
+		nautinvS1.o gutil1S1.o gutil2S1.o gtnautyS1.o naugroupS.o nautycliquerS.o
 
 post-install:
 	# install shared libraries
-.for l in libnauty.so libnauty1.so libnautyW.so libnautyW1.so libnautyL.so libnautyL1.so
+.for l in libnauty.so libnauty1.so libnautyW.so libnautyW1.so libnautyL.so libnautyL1.so libnautyS.so libnautyS1.so
 	${INSTALL_LIB} ${WRKSRC}/${l} ${STAGEDIR}${PREFIX}/lib
 .endfor
 	# correct the include path in .pc files
@@ -65,6 +72,6 @@ post-install:
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/nug27.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/nug28.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/nauty/distinfo b/math/nauty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630783130
-SHA256 (nauty27r3.tar.gz) = 4f0665b716a53f7a14ea2ae30059f23d064ce3fe4c12c013404ef6e1ee0b88c2
-SIZE (nauty27r3.tar.gz) = 1721200
+TIMESTAMP = 1685407327
+SHA256 (nauty2_8_6.tar.gz) = f2ce98225ca8330f5bce35f7d707b629247e09dda15fc479dc00e726fee5e6fa
+SIZE (nauty2_8_6.tar.gz) = 1546765
diff --git a/math/nauty/pkg-plist b/math/nauty/pkg-plist
@@ -1,6 +1,8 @@
 bin/NRswitchg
 bin/addedgeg
+bin/addptg
 bin/amtog
+bin/ancestorg
 bin/assembleg
 bin/biplabg
 bin/catg
@@ -11,6 +13,7 @@ bin/countg
 bin/cubhamg
 bin/deledgeg
 bin/delptg
+bin/dimacs2g
 bin/directg
 bin/dreadnaut
 bin/dretodot
@@ -20,6 +23,7 @@ bin/genbg
 bin/genbgL
 bin/geng
 bin/gengL
+bin/genposetg
 bin/genquarticg
 bin/genrang
 bin/genspecialg
@@ -34,6 +38,7 @@ bin/nbrhoodg
 bin/newedgeg
 bin/pickg
 bin/planarg
+bin/productg
 bin/ranlabg
 bin/shortg
 bin/showg
@@ -64,6 +69,10 @@ lib/libnautyL.a
 lib/libnautyL.so
 lib/libnautyL1.a
 lib/libnautyL1.so
+lib/libnautyS.a
+lib/libnautyS.so
+lib/libnautyS1.a
+lib/libnautyS1.so
 lib/libnautyW.a
 lib/libnautyW.so
 lib/libnautyW1.a
@@ -72,6 +81,8 @@ libdata/pkgconfig/nauty.pc
 libdata/pkgconfig/nauty1.pc
 libdata/pkgconfig/nautyL.pc
 libdata/pkgconfig/nautyL1.pc
+libdata/pkgconfig/nautyS.pc
+libdata/pkgconfig/nautyS1.pc
 libdata/pkgconfig/nautyW.pc
 libdata/pkgconfig/nautyW1.pc
-%%PORTDOCS%%%%DOCSDIR%%/nug27.pdf
+%%PORTDOCS%%%%DOCSDIR%%/nug28.pdf
diff --git a/math/openturns/Makefile b/math/openturns/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openturns
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.20
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org

diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	or-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org

diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	or-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

diff --git a/math/sage/Makefile b/math/sage/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sage
 PORTVERSION=	9.2
-PORTREVISION=	39
+PORTREVISION=	40
 CATEGORIES=	math
 MASTER_SITES=	https://mirrors.xmission.com/sage/src/		\
 		http://mirrors.xmission.com/sage/src/		\

diff --git a/misc/openmvg/Makefile b/misc/openmvg/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openmvg
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	misc science
 
 MAINTAINER=	yuri@FreeBSD.org