Attachment #227652 for bug #258237




# Created by: bremner@unb.ca

PORTNAME=	nauty
PORTVERSION=	27r3
PORTREVISION=	3
CATEGORIES=	math
MASTER_SITES=	https://users.cecs.anu.edu.au/~bdm/nauty/
DISTNAME=	${PORTNAME}${PORTVERSION}

USES=		gmake

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-tls # this makes nauty thread-safe, math/libnormaliz requires nauty with tls

MAKEFILE=	makefile

CFLAGS+=	-pthread

TEST_TARGET=	check

MAKE_ARGS=	includedir=${PREFIX}/include/${PORTNAME} # place headers into a dedicated directory

OPTIONS_DEFINE=	DOCS NATIVE

NATIVE_DESC=		Build with native optimizations (-march=native, etc)
NATIVE_CONFIGURE_ON=	--disable-generic --enable-clz --enable-popcnt
NATIVE_CONFIGURE_OFF=	--enable-generic --disable-clz --disable-popcnt
		naututil.o nauty.o nautycliquer.o schreier.o traces.o

post-build: # build shared libraries: based on how static libraries are created
	# rebuild .o files with -fPIC
	@cd ${WRKSRC} ; \
		objects=$$(ls *.o) ; \
		${RM} *.o ; \
		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} FREEBSD_EXTRA_CFLAGS="-fPIC" $${objects}
	# build 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
	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnauty1.so -Wl,-soname,libnauty1.so \
		nauty1.o nautil1.o nausparse.o naugraph1.o schreier.o naurng.o traces.o gtools.o naututil1.o \
		nautinv1.o gutil1.o gutil2.o gtnauty.o naugroup.o nautycliquer.o
	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnautyW.so -Wl,-soname,libnautyW.so \
		nautyW.o nautilW.o nausparseW.o naugraphW.o schreierW.o naurng.o traces.o gtoolsW.o naututilW.o \
		nautinvW.o gutil1W.o gutil2W.o gtnautyW.o naugroupW.o nautycliquerW.o
	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnautyW1.so -Wl,-soname,libnautyW1.so \
		nautyW1.o nautilW1.o nausparseW.o naugraphW1.o schreierW.o naurng.o traces.o gtoolsW.o naututilW1.o \
		nautinvW1.o gutil1W1.o gutil2W1.o gtnautyW1.o naugroupW.o nautycliquerW.o
	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnautyL.so -Wl,-soname,libnautyL.so \
		nautyL.o nautilL.o nausparseL.o naugraphL.o schreierL.o naurng.o traces.o gtoolsL.o naututilL.o \
		nautinvL.o gutil1L.o gutil2L.o gtnautyL.o naugroupL.o nautycliquerL.o
	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

post-install:
	# install shared libraries
.for l in libnauty.so libnauty1.so libnautyW.so libnautyW1.so libnautyL.so libnautyL1.so
	${INSTALL_LIB} ${WRKSRC}/${l} ${STAGEDIR}${PREFIX}/lib
.endfor
	# strip executables
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*

do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-3 Link Here

(-)b/math/nauty/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1601648114	1	TIMESTAMP = 1630687243
2	SHA256 (nauty27r1.tar.gz) = 76ca5d196e402c83a987f90c28ff706bcc5a333bb4a8fbb979a62d3b99c34e77	2	SHA256 (nauty27r3.tar.gz) = 73d41f4697be50137aa09caa050d245ed2fa834a538befcc631d34652cd89b53
3	SIZE (nauty27r1.tar.gz) = 3428473	3	SIZE (nauty27r3.tar.gz) = 1724704




- allow to add additional CFLAGS to build shared libraries

--- makefile.in.orig	2021-09-03 17:45:35 UTC
+++ makefile.in
@@ -3,7 +3,7 @@
 
 SHELL=@SHELL@
 CC=@CC@
-CFLAGS=@CFLAGS@ @MORECFLAGS@
+CFLAGS=@CFLAGS@ @MORECFLAGS@ ${FREEBSD_EXTRA_CFLAGS}
 SAFECFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@ @LIBS@
 THREADLIB=@threadlib@

Lines 30-35 bin/labelg Link Here

(-)b/math/nauty/pkg-plist (+20 lines)
30	bin/linegraphg	30	bin/linegraphg
31	bin/listg	31	bin/listg
32	bin/multig	32	bin/multig
		33	bin/nbrhoodg
33	bin/newedgeg	34	bin/newedgeg
34	bin/pickg	35	bin/pickg
35	bin/planarg	36	bin/planarg
Lines 41-51 bin/twohamg Link Here
41	bin/underlyingg	42	bin/underlyingg
42	bin/vcolg	43	bin/vcolg
43	bin/watercluster2	44	bin/watercluster2
		45	include/nauty/gtools.h
		46	include/nauty/gutils.h
44	include/nauty/naugroup.h	47	include/nauty/naugroup.h
		48	include/nauty/naugstrings.h
		49	include/nauty/naurng.h
45	include/nauty/nausparse.h	50	include/nauty/nausparse.h
		51	include/nauty/nautinv.h
		52	include/nauty/naututil.h
46	include/nauty/nauty.h	53	include/nauty/nauty.h
47	include/nauty/nautycliquer.h	54	include/nauty/nautycliquer.h
		55	include/nauty/planarity.h
		56	include/nauty/quarticirred28.h
		57	include/nauty/schreier.h
48	include/nauty/traces.h	58	include/nauty/traces.h
49	lib/libnauty.a	59	lib/libnauty.a
50	lib/libnauty.so	60	lib/libnauty.so
		61	lib/libnauty1.a
		62	lib/libnauty1.so
		63	lib/libnautyL.a
		64	lib/libnautyL.so
		65	lib/libnautyL1.a
		66	lib/libnautyL1.so
		67	lib/libnautyW.a
		68	lib/libnautyW.so
		69	lib/libnautyW1.a
		70	lib/libnautyW1.so
51	%%PORTDOCS%%%%DOCSDIR%%/nug27.pdf	71	%%PORTDOCS%%%%DOCSDIR%%/nug27.pdf

Return to bug 258237

Lines 1-8 Link Here

(-)b/math/nauty/Makefile (-24 / +42 lines)
1	# Created by: bremner@unb.ca	1	# Created by: bremner@unb.ca
2		2
3	PORTNAME= nauty	3	PORTNAME= nauty
4	PORTVERSION= 27r1	4	PORTVERSION= 27r3
5	PORTREVISION= 3
6	CATEGORIES= math	5	CATEGORIES= math
7	MASTER_SITES= https://users.cecs.anu.edu.au/~bdm/nauty/	6	MASTER_SITES= https://users.cecs.anu.edu.au/~bdm/nauty/
8	DISTNAME= ${PORTNAME}${PORTVERSION}	7	DISTNAME= ${PORTNAME}${PORTVERSION}
Lines 15-51 LICENSE= APACHE20 Link Here
15	USES= gmake	14	USES= gmake
16		15
17	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --enable-tls # math/libnormaliz requires nauty with tls	17	CONFIGURE_ARGS= --enable-tls # this makes nauty thread-safe, math/libnormaliz requires nauty with tls
19		18
20	MAKEFILE= makefile	19	MAKEFILE= makefile
21		20
		21	CFLAGS+= -pthread
		22
22	TEST_TARGET= check	23	TEST_TARGET= check
23		24
24	CFLAGS+= -fPIC	25	MAKE_ARGS= includedir=${PREFIX}/include/${PORTNAME} # place headers into a dedicated directory
25		26
26	OPTIONS_DEFINE= DOCS	27	OPTIONS_DEFINE= DOCS NATIVE
27		28
28	post-build:	29	NATIVE_DESC= Build with native optimizations (-march=native, etc)
29	@cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnauty.so \	30	NATIVE_CONFIGURE_ON= --disable-generic --enable-clz --enable-popcnt
30	gtnauty.o gtools.o gutil1.o gutil2.o naugraph.o naugroup.o naurng.o nausparse.o nautil.o nautinv.o \	31	NATIVE_CONFIGURE_OFF= --enable-generic --disable-clz --disable-popcnt
31	naututil.o nauty.o nautycliquer.o schreier.o traces.o
32		32
33	do-install:	33	post-build: # build shared libraries: based on how static libraries are created
34	${MKDIR} ${STAGEDIR}${PREFIX}/include/nauty	34	# rebuild .o files with -fPIC
35	.for h in nauty.h nautycliquer.h nausparse.h traces.h naugroup.h	35	@cd ${WRKSRC} ; \
36	${INSTALL_DATA} ${WRKSRC}/${h} ${STAGEDIR}${PREFIX}/include/nauty	36	objects=$$(ls *.o) ; \
37	.endfor	37	${RM} *.o ; \
38	# Do not use ${INSTALL_LIB} to strip the library!	38	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} FREEBSD_EXTRA_CFLAGS="-fPIC" $${objects}
39	${INSTALL_DATA} ${WRKSRC}/nauty.a ${STAGEDIR}${PREFIX}/lib/libnauty.a	39	# build libraries
40	${INSTALL_LIB} ${WRKSRC}/libnauty.so ${STAGEDIR}${PREFIX}/lib	40	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnauty.so -Wl,-soname,libnauty.so \
41	.for e in \	41	nauty.o nautil.o nausparse.o naugraph.o schreier.o naurng.o traces.o gtools.o naututil.o \
42	NRswitchg addedgeg amtog assembleg biplabg catg complg converseg copyg countg \	42	nautinv.o gutil1.o gutil2.o gtnauty.o naugroup.o \
43	cubhamg deledgeg delptg directg dreadnaut dretodot dretog edgetransg genbg genbgL \	43	nautycliquer.o
44	geng gengL genquarticg genrang genspecialg gentourng gentreeg hamheuristic labelg linegraphg \	44	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnauty1.so -Wl,-soname,libnauty1.so \
45	listg multig newedgeg pickg planarg ranlabg shortg showg subdivideg twohamg \	45	nauty1.o nautil1.o nausparse.o naugraph1.o schreier.o naurng.o traces.o gtools.o naututil1.o \
46	underlyingg vcolg watercluster2	46	nautinv1.o gutil1.o gutil2.o gtnauty.o naugroup.o nautycliquer.o
47	${INSTALL_PROGRAM} ${WRKSRC}/${e} ${STAGEDIR}${PREFIX}/bin	47	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnautyW.so -Wl,-soname,libnautyW.so \
		48	nautyW.o nautilW.o nausparseW.o naugraphW.o schreierW.o naurng.o traces.o gtoolsW.o naututilW.o \
		49	nautinvW.o gutil1W.o gutil2W.o gtnautyW.o naugroupW.o nautycliquerW.o
		50	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnautyW1.so -Wl,-soname,libnautyW1.so \
		51	nautyW1.o nautilW1.o nausparseW.o naugraphW1.o schreierW.o naurng.o traces.o gtoolsW.o naututilW1.o \
		52	nautinvW1.o gutil1W1.o gutil2W1.o gtnautyW1.o naugroupW.o nautycliquerW.o
		53	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnautyL.so -Wl,-soname,libnautyL.so \
		54	nautyL.o nautilL.o nausparseL.o naugraphL.o schreierL.o naurng.o traces.o gtoolsL.o naututilL.o \
		55	nautinvL.o gutil1L.o gutil2L.o gtnautyL.o naugroupL.o nautycliquerL.o
		56	cd ${WRKSRC} && ${CC} ${LDFLAGS} -shared -o libnautyL1.so -Wl,-soname,libnautyL1.so \
		57	nautyL1.o nautilL1.o nausparseL.o naugraphL1.o schreierL.o naurng.o traces.o gtoolsL.o naututilL1.o \
		58	nautinvL1.o gutil1L1.o gutil2L1.o gtnautyL1.o naugroupL.o nautycliquerL.o
		59
		60	post-install:
		61	# install shared libraries
		62	.for l in libnauty.so libnauty1.so libnautyW.so libnautyW1.so libnautyL.so libnautyL1.so
		63	${INSTALL_LIB} ${WRKSRC}/${l} ${STAGEDIR}${PREFIX}/lib
48	.endfor	64	.endfor
		65	# strip executables
		66	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
49		67
50	do-install-DOCS-on:	68	do-install-DOCS-on:
51	@${MKDIR} ${STAGEDIR}${DOCSDIR}	69	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Added Link Here

(-)b/math/nauty/files/patch-makefile.in (+13 lines)
1	- allow to add additional CFLAGS to build shared libraries
2
3	--- makefile.in.orig 2021-09-03 17:45:35 UTC
4	+++ makefile.in
5	@@ -3,7 +3,7 @@
6
7	SHELL=@SHELL@
8	CC=@CC@
9	-CFLAGS=@CFLAGS@ @MORECFLAGS@
10	+CFLAGS=@CFLAGS@ @MORECFLAGS@ ${FREEBSD_EXTRA_CFLAGS}
11	SAFECFLAGS=@CFLAGS@
12	LDFLAGS=@LDFLAGS@ @LIBS@
13	THREADLIB=@threadlib@