diff --git a/math/bliss/Makefile b/math/bliss/Makefile index d975c7618a9d..4800948e6bf6 100644 --- a/math/bliss/Makefile +++ b/math/bliss/Makefile @@ -1,24 +1,25 @@ PORTNAME= bliss DISTVERSION= 0.73 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.tcs.hut.fi/Software/bliss/ PKGNAMESUFFIX= -graph-tool MAINTAINER= yuri@FreeBSD.org COMMENT= Tool for computing automorphism groups and canonical forms of graphs WWW= http://www.tcs.hut.fi/Software/bliss/index.html LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake zip MAKE_ARGS= CC=${CXX} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/libbliss.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/libbliss.so ${STAGEDIR}${PREFIX}/lib ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${CP} ${WRKSRC}/*.hh ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME} .include diff --git a/math/bliss/files/patch-Makefile b/math/bliss/files/patch-Makefile index c7f1b6191347..8d167b219a34 100644 --- a/math/bliss/files/patch-Makefile +++ b/math/bliss/files/patch-Makefile @@ -1,15 +1,34 @@ --- Makefile.orig 2015-09-01 07:23:10 UTC +++ Makefile @@ -1,9 +1,9 @@ -CFLAGS = -I. -CFLAGS += -g +CFLAGS += -I. +#CFLAGS += -g #CFLAGS += -pg CFLAGS += -Wall CFLAGS += --pedantic -CFLAGS += -O9 +#CFLAGS += -O9 #CFLAGS += -DBLISS_DEBUG CFLAGS += -fPIC +@@ -20,7 +20,7 @@ AR = ar + CC = g++ + RANLIB = ranlib + AR = ar +-BLISSLIB = libbliss.a ++BLISSLIB = libbliss.so + + gmp: LIB += -lgmp + gmp: CFLAGS += -DBLISS_USE_GMP +@@ -36,8 +36,7 @@ lib: $(OBJS) + + lib: $(OBJS) + rm -f $(BLISSLIB) +- $(AR) cr $(BLISSLIB) $(OBJS) +- $(RANLIB) $(BLISSLIB) ++ $(CC) -shared $(LDFLAGS) -o $(BLISSLIB) $(OBJS) + + lib_gmp: $(GMPOBJS) + rm -f $(BLISSLIB) diff --git a/math/bliss/pkg-plist b/math/bliss/pkg-plist index 11d8c8c9a877..67c7120168c9 100644 --- a/math/bliss/pkg-plist +++ b/math/bliss/pkg-plist @@ -1,14 +1,14 @@ bin/bliss include/bliss/bignum.hh include/bliss/bliss_C.h include/bliss/defs.hh include/bliss/graph.hh include/bliss/heap.hh include/bliss/kqueue.hh include/bliss/kstack.hh include/bliss/orbit.hh include/bliss/partition.hh include/bliss/timer.hh include/bliss/uintseqhash.hh include/bliss/utils.hh -lib/libbliss.a +lib/libbliss.so diff --git a/math/polymake/Makefile b/math/polymake/Makefile index 193dc3bf8ab4..b0a90401376f 100644 --- a/math/polymake/Makefile +++ b/math/polymake/Makefile @@ -1,205 +1,205 @@ PORTNAME= polymake DISTVERSION= 4.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/V${DISTVERSION}/ \ https://polymake.org/lib/exe/fetch.php/download/ DISTNAME= ${PORTNAME}-${DISTVERSION}-minimal MAINTAINER= bsd@philippost.de COMMENT= Software package for research in polyhedral geometry WWW= https://www.polymake.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= boost-libs>=1.72:devel/boost-libs \ ninja:devel/ninja \ permlib>=0.2.9:math/permlib \ p5-XML-SAX>=1.02:textproc/p5-XML-SAX \ p5-XML-Writer>=0.900:textproc/p5-XML-Writer \ p5-Term-ReadLine-Gnu>=1.37:devel/p5-Term-ReadLine-Gnu \ p5-Term-ReadKey>=2.38:devel/p5-Term-ReadKey \ p5-JSON>=2.97:converters/p5-JSON LIB_DEPENDS= libcddgmp.so:math/cddlib \ libflint.so:math/flint2 \ libgmpxx.so:math/gmp \ libmpfr.so:math/mpfr RUN_DEPENDS= bash>=5.0:shells/bash \ boost-libs>=1.72:devel/boost-libs \ permlib>=0.2.9:math/permlib \ p5-XML-SAX>=1.02:textproc/p5-XML-SAX \ p5-XML-Writer>=0.900:textproc/p5-XML-Writer \ p5-Term-ReadLine-Gnu>=1.37:devel/p5-Term-ReadLine-Gnu \ p5-Term-ReadKey>=2.38:devel/p5-Term-ReadKey \ p5-JSON>=2.97:converters/p5-JSON USES= compiler:c++14-lang gmake gnome perl5 readline shebangfix \ tar:bzip2 USE_GNOME= libxml2 libxslt USE_LDCONFIG= ${PREFIX}/lib USE_PERL5= build run SHEBANG_FILES= resources/host-agent/bin/env resources/host-agent/bin/polymake SHEBANG_GLOB= *.pl *.sh # polymake's configure script expects options to be disabled by --without-option # and most options to be enabled by --with-option=DIR HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --exec-prefix=${PREFIX} \ --bindir=${PREFIX}/bin \ --includedir=${PREFIX}/include \ --libdir=${PREFIX}/lib \ --libexecdir=${PREFIX}/libexec/polymake \ --datadir=${PREFIX}/share/polymake \ --docdir=${DOCSDIR} \ --without-prereq \ --with-libcxx \ --with-cdd=${LOCALBASE} \ --with-flint=${LOCALBASE} \ --with-permlib=${LOCALBASE}/lib \ --without-java \ --without-javaview \ --without-native \ --without-sympol CONFIGURE_LOG= build/bundled.log # Optional features; SoPlex defaults to off due to licencsing and SCIP defaults # to off due to a dependency on libsoplex.so. OPTIONS_DEFINE= LRS NORMALIZ OPENMP OPTIMIZED_CFLAGS PPL SCIP SINGULAR SOPLEX TESTS OPTIONS_DEFAULT= BLISS LRS NORMALIZ OPENMP OPTIMIZED_CFLAGS PPL SINGULAR # Exlude lrslib on i386 and powerpc because it is marked BROKEN for those # architectures OPTIONS_EXCLUDE_i386= LRS OPTIONS_EXCLUDE_powerpc= LRS OPTIONS_SUB= yes # polymake needs either math/bliss or math/nauty to compute graph automorphism # groups OPTIONS_SINGLE= GRAPH OPTIONS_SINGLE_GRAPH= BLISS NAUTY BLISS_DESC= Compute graph automorphism groups using bliss GRAPH_DESC= Graph automorphism groups LRS_DESC= Convex hull computation and vertex enumeration NAUTY_DESC= Compute graph automorphism groups using nauty NORMALIZ_DESC= Computations in affine monoids and lattice polytopes PPL_DESC= Manipulation of convex polyhedra SCIP_DESC= Solver for mixed integer linear and nonlinear problems SINGULAR_DESC= Computation of Groebner bases SOPLEX_DESC= Solver for linear programming problems TESTS_DESC= Run bundled self tests after build BLISS_CONFIGURE_ON= --with-bliss=${LOCALBASE} BLISS_CONFIGURE_OFF= --without-bliss -BLISS_BUILD_DEPENDS= bliss-graph-tool>=0.73:math/bliss +BLISS_BUILD_DEPENDS= bliss-graph-tool>=0.73:math/bliss # does it need the tool or the library? LIB_DEPENDS should be used in the latter case. BLISS_RUN_DEPENDS= bliss-graph-tool>=0.73:math/bliss NAUTY_CONFIGURE_ON= --with-nauty=${LOCALBASE} NAUTY_CONFIGURE_OFF= --without-nauty NAUTY_LIB_DEPENDS= libnauty.so:math/nauty LRS_CONFIGURE_ON= --with-lrs=${LOCALBASE} \ --with-lrs-include=${LOCALBASE}/include/lrslib LRS_CONFIGURE_OFF= --without-lrs LRS_LIB_DEPENDS= liblrs.so:math/lrslib NORMALIZ_CONFIGURE_ON= --with-libnormaliz=${LOCALBASE} NORMALIZ_CONFIGURE_OFF= --without-libnormaliz NORMALIZ_LIB_DEPENDS= libnormaliz.so:math/libnormaliz OPENMP_CONFIGURE_OFF= --without-openmp OPTIMIZED_CFLAGS_CFLAGS= -O3 PPL_CONFIGURE_ON= --with-ppl=${LOCALBASE} PPL_CONFIGURE_OFF= --without-ppl PPL_LIB_DEPENDS= libppl.so:devel/ppl SCIP_CONFIGURE_ON= --with-scip=${LOCALBASE} SCIP_CONFIGURE_OFF= --without-scip SCIP_LIB_DEPENDS= libscip.so:math/SCIP SINGULAR_CONFIGURE_ON= --with-singular=${LOCALBASE} SINGULAR_CONFIGURE_OFF= --without-singular SINGULAR_LIB_DEPENDS= libSingular.so:math/singular SOPLEX_CONFIGURE_ON= --with-soplex=${LOCALBASE} SOPLEX_CONFIGURE_OFF= --without-soplex SOPLEX_LIB_DEPENDS= libsoplex-pic.so:math/SoPlex TESTS_VARS= USE_PERL5+=test # The port uses the minimal distribution tarball without bundled libraries. # Set WRKSRC accordingly. WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} .include # Deal with site specific installation directory # polymake installs a perlxs module which depends on the perl configuration PERL_ARCHNAME= ${:!${PERL} -E 'use Config; print "\$Config::Config{archname}";'!} PLIST_FILES= libexec/polymake/perlx/${PERL_VERSION}/${PERL_ARCHNAME}/auto/Polymake/Ext/Ext.so # Keep track of the major version DISTVERSION_MAJ= ${:!expr ${DISTVERSION} : '\([0-9]*\).*'!} post-install: ${RLN} ${STAGEDIR}${PREFIX}/lib/libpolymake.so.${DISTVERSION} \ ${STAGEDIR}${PREFIX}/lib/libpolymake.so.${DISTVERSION_MAJ} ${RLN} ${STAGEDIR}${PREFIX}/lib/libpolymake.so.${DISTVERSION} \ ${STAGEDIR}${PREFIX}/lib/libpolymake.so ${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/lib/libpolymake.so.${DISTVERSION} \ .for _lp in libpolymake-apps libpolymake-apps-rt ${RLN} ${STAGEDIR}${PREFIX}/lib/${_lp}.so.${DISTVERSION} \ ${STAGEDIR}${PREFIX}/lib/${_lp}.so.${DISTVERSION_MAJ} ${RLN} ${STAGEDIR}${PREFIX}/lib/${_lp}.so.${DISTVERSION} \ ${STAGEDIR}${PREFIX}/lib/${_lp}.so ${RLN} ${STAGEDIR}${PREFIX}/lib/${_lp}.so.${DISTVERSION} \ ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so.${DISTVERSION_MAJ} ${RLN} ${STAGEDIR}${PREFIX}/lib/${_lp}.so.${DISTVERSION} \ ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so ${RLN} ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so.${DISTVERSION} \ ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so.${DISTVERSION_MAJ} ${RLN} ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so.${DISTVERSION} \ ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so # strip the libraries ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${_lp}.so.${DISTVERSION} .endfor ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/polymake/perlx/${PERL_VERSION}/${PERL_ARCHNAME}/auto/Polymake/Ext/Ext.so .for l in common fan fulton graph group matroid polytope topaz tropical ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${l}.so .endfor # only strip libexec/polymake/lib/ideal.so iff SINGULAR=on, if SINGULAR=off it # is an empty file and stripping fails .if ${PORT_OPTIONS:MSINGULAR} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/polymake/lib/ideal.so .endif .for lp in libpolymake-apps libpolymake-apps-rt ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/polymake/lib/${lp}.so.${DISTVERSION} .endfor post-install-TESTS-on: test # Set HOME=${WRKDIR} to prevent polymake writing its .polymake directory outside # WRKDIR. test: @cd ${WRKSRC} && HOME=${WRKDIR} perl/polymake --script run_testcases .include .if ${PERL_LEVEL} >= 504200 BROKEN= polymake has not been checked for compatibility with perl 5.42 or newer .endif .include diff --git a/math/sympol/Makefile b/math/sympol/Makefile index 4bc3c85b1174..c7fc1bbe9199 100644 --- a/math/sympol/Makefile +++ b/math/sympol/Makefile @@ -1,44 +1,44 @@ PORTNAME= sympol DISTVERSIONPREFIX= v DISTVERSION= 0.1.9 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= C++ library and tool to work with symmetric polyhedra WWW= https://www.math.uni-rostock.de/~rehn/software/sympol.html LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/lib/libbliss.a:math/bliss \ - permlib>0:math/permlib -LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ +BUILD_DEPENDS= permlib>0:math/permlib +LIB_DEPENDS= libbliss.so:math/bliss \ + libboost_program_options.so:devel/boost-libs \ libcddgmp.so:math/cddlib \ libgmp.so:math/gmp USES= cmake:testing compiler:c++11-lang eigen:3 localbase:ldflags perl5 shebangfix USE_CXXSTD= c++14 USE_PERL5= test USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= tremlin GH_PROJECT= SymPol SHEBANG_GLOB= *.pl CMAKE_ARGS= -DBLISS_INCLUDE_DIR=${LOCALBASE}/include/bliss CMAKE_TESTING_ON= BUILD_TESTS # test 'perltest' fails with 'output format mismatch', see https://github.com/tremlin/SymPol/issues/1 post-install: @${RM} ${STAGEDIR}${PREFIX}/lib/libcddgmp.so # fix incorrect subdirectories in #include statements, see https://github.com/tremlin/SymPol/issues/2 @${REINPLACE_CMD} -i '' -e 's|#include "yal/|#include "|' ${STAGEDIR}${PREFIX}/include/sympol/*.h @${REINPLACE_CMD} -i '' -e 's|#include "\.\./matrix/|#include "|' ${STAGEDIR}${PREFIX}/include/sympol/*.h @${REINPLACE_CMD} -i '' -e 's|#include "\.\./|#include "|' ${STAGEDIR}${PREFIX}/include/sympol/*.h pre-test: # correct the build directory path @${REINPLACE_CMD} -e "s|'\\.\\./build/release'|'${BUILD_WRKSRC}'|" ${WRKSRC}/contrib/test-sympol.pl .include