Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Jun 2021 08:15:32 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: 1ee9232fb527 - main - math/nauty: Build and install shared library; Shorten do-install; Remove LICENSE_FILE; Improve pkg-descr; Update WWW
Message-ID:  <202106120815.15C8FWJH060539@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=1ee9232fb527925dceb33f05e5c1408613eb17dc

commit 1ee9232fb527925dceb33f05e5c1408613eb17dc
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-06-12 08:13:09 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-06-12 08:15:26 +0000

    math/nauty: Build and install shared library; Shorten do-install; Remove LICENSE_FILE; Improve pkg-descr; Update WWW
    
    PR:             256516
    Approved by:    moritz@schmi.tt (maintainer)
---
 math/nauty/Makefile  | 59 +++++++++++++---------------------------------------
 math/nauty/pkg-descr |  6 +++---
 math/nauty/pkg-plist |  1 +
 3 files changed, 19 insertions(+), 47 deletions(-)

diff --git a/math/nauty/Makefile b/math/nauty/Makefile
index 7f1aa7541ea6..63e19cc7bb0b 100644
--- a/math/nauty/Makefile
+++ b/math/nauty/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	nauty
 PORTVERSION=	27r1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://users.cecs.anu.edu.au/~bdm/nauty/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -10,7 +11,6 @@ MAINTAINER=	moritz@schmi.tt
 COMMENT=	Nauty & Traces are programs for computing graph automorphisms
 
 LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USES=		gmake
 
@@ -22,54 +22,25 @@ CFLAGS+=	-fPIC
 
 OPTIONS_DEFINE=	DOCS
 
+post-build:
+	@cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnauty.so \
+		gtnauty.o gtools.o gutil1.o gutil2.o naugraph.o naugroup.o naurng.o nausparse.o nautil.o nautinv.o \
+		naututil.o nauty.o nautycliquer.o schreier.o traces.o
+
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/nauty
 	${INSTALL_DATA} ${WRKSRC}/nauty.h ${STAGEDIR}${PREFIX}/include/nauty
 	# Do not use ${INSTALL_LIB} to strip the library!
 	${INSTALL_DATA} ${WRKSRC}/nauty.a ${STAGEDIR}${PREFIX}/lib/libnauty.a
-	${INSTALL_PROGRAM} ${WRKSRC}/addedgeg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/amtog ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/assembleg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/biplabg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/catg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/complg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/converseg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/copyg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/countg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/cubhamg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/deledgeg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/delptg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/directg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/dreadnaut ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/dretodot ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/dretog ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/edgetransg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/genbg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/genbgL ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/geng ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/gengL ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/genquarticg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/genrang ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/genspecialg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/gentourng ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/gentreeg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/hamheuristic ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/labelg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/linegraphg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/listg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/multig ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/newedgeg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/NRswitchg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/pickg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/planarg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/ranlabg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/shortg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/showg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/subdivideg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/twohamg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/underlyingg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/vcolg ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/watercluster2 ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/libnauty.so ${STAGEDIR}${PREFIX}/lib
+.for e in \
+	NRswitchg addedgeg amtog assembleg biplabg catg complg converseg copyg countg \
+	cubhamg deledgeg delptg directg dreadnaut dretodot dretog edgetransg genbg genbgL \
+	geng gengL genquarticg genrang genspecialg gentourng gentreeg hamheuristic labelg linegraphg \
+	listg multig newedgeg pickg planarg ranlabg shortg showg subdivideg twohamg \
+	underlyingg vcolg watercluster2
+	${INSTALL_PROGRAM} ${WRKSRC}/${e} ${STAGEDIR}${PREFIX}/bin
+.endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/math/nauty/pkg-descr b/math/nauty/pkg-descr
index 7589ced86d59..495a2e14c5a3 100644
--- a/math/nauty/pkg-descr
+++ b/math/nauty/pkg-descr
@@ -1,4 +1,4 @@
-nauty is a program for computing automorphism groups of graphs and digraphs.
-It can also produce a canonical labelling.
+nauty and Traces are programs for computing automorphism groups of graphs and
+digraphs. They can also produce a canonical label.
 
-WWW: https://users.cecs.anu.edu.au/~bdm/nauty/
+WWW: https://pallini.di.uniroma1.it/
diff --git a/math/nauty/pkg-plist b/math/nauty/pkg-plist
index c375527ed868..9b326e8881b7 100644
--- a/math/nauty/pkg-plist
+++ b/math/nauty/pkg-plist
@@ -44,3 +44,4 @@ bin/vcolg
 bin/watercluster2
 include/nauty/nauty.h
 lib/libnauty.a
+lib/libnauty.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106120815.15C8FWJH060539>