diff --git a/math/lrslib/Makefile b/math/lrslib/Makefile index aa64bf79e04a..fb527225bbec 100644 --- a/math/lrslib/Makefile +++ b/math/lrslib/Makefile @@ -1,31 +1,30 @@ PORTNAME= lrslib -DISTVERSION= 071 -PORTREVISION= 1 +PORTVERSION= 071a CATEGORIES= math MASTER_SITES= http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/ MAINTAINER= yuri@FreeBSD.org COMMENT= Reverse search algorithm for vertex enumeration/convex hull problems LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_i386= error: __int128 is not supported on this target LIB_DEPENDS= libgmp.so:math/gmp USES= compiler:c11 gmake libtool localbase:ldflags USE_LDCONFIG= yes MAKEFILE= makefile ALL_TARGET= all-shared MAKE_ARGS= CFLAGS="${CFLAGS}" INCLUDEDIR=${LOCALBASE}/include LIBDIR=${LOCALBASE}/lib LDFLAGS+= -lthr post-install: @cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} bin/* lib/*.so .include diff --git a/math/lrslib/distinfo b/math/lrslib/distinfo index dbf503ce3e68..8e1f12b6a6d2 100644 --- a/math/lrslib/distinfo +++ b/math/lrslib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1600061470 -SHA256 (lrslib-071.tar.gz) = d3ea5636bfde3011d43c835773fabe131d9251197b6cc666a52d8caa3e1c7816 -SIZE (lrslib-071.tar.gz) = 460165 +TIMESTAMP = 1621638167 +SHA256 (lrslib-071a.tar.gz) = 926636ea68de46625f141f6e025dce967cc7e68cf4bf4a597375c063f5c11673 +SIZE (lrslib-071a.tar.gz) = 458590 diff --git a/math/lrslib/files/patch-makefile b/math/lrslib/files/patch-makefile index 86ec5689a28a..258feba116c9 100644 --- a/math/lrslib/files/patch-makefile +++ b/math/lrslib/files/patch-makefile @@ -1,41 +1,48 @@ ---- makefile.orig 2020-05-27 03:16:28 UTC +--- makefile.orig 2021-05-21 23:54:11 UTC +++ makefile @@ -194,7 +194,7 @@ SHLIBBIN=lrs-shared lrsnash-shared # Building (linking) the shared library, and relevant symlinks. ${SHLIB}: ${SHLIBOBJ} - $(CC) -shared -Wl,-soname=$(SONAME) $(SHLIBFLAGS) -o $@ ${SHLIBOBJ} -lgmp + $(CC) -shared -Wl,-soname=$(SONAME) $(SHLIBFLAGS) -o $@ ${SHLIBOBJ} $(LDFLAGS) -lgmp ${SONAME}: ${SHLIB} ln -sf ${SHLIB} ${SONAME} @@ -207,11 +207,11 @@ ${SHLINK}: ${SONAME} all-shared: ${SHLIBBIN} lrs-shared: ${SHLINK} lrs.o - $(CC) lrs.o -o $@ -L . -llrs + $(CC) lrs.o -o $@ -L . $(LDFLAGS) -llrs lrsnash-shared: ${SHLINK} lrsnash.c - $(CC) -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp + $(CC) -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs $(LDFLAGS) -lgmp # build object files for the shared library -@@ -246,13 +246,13 @@ install: all-shared install-common +@@ -240,19 +240,19 @@ lrslib2-shr.o: lrslib.c lrslib.h + # install targets + # where to install binaries, libraries, include files + prefix ?= /usr/local +-INSTALL_INCLUDES=lrslib.h lrsdriver.h lrsgmp.h lrslong.h lrsmp.h ++INSTALL_INCLUDES=lrslib.h lrsdriver.h lrsgmp.h lrslong.h lrsmp.h lrsnashlib.h lrsrestart.h mplrs.h + + install: all-shared install-common mkdir -p $(DESTDIR)${prefix}/bin for file in ${SHLIBBIN}; do cp $${file} $(DESTDIR)${prefix}/bin/$$(basename $$file -shared); done mkdir -p $(DESTDIR)${prefix}/lib - install -t $(DESTDIR)${prefix}/lib $(SHLIB) + install $(SHLIB) $(DESTDIR)${prefix}/lib cd $(DESTDIR)${prefix}/lib && ln -sf $(SHLIB) $(SHLINK) cd $(DESTDIR)${prefix}/lib && ln -sf $(SHLIB) $(SONAME) install-common: mkdir -p $(DESTDIR)${prefix}/include/lrslib - install -t $(DESTDIR)${prefix}/include/lrslib ${INSTALL_INCLUDES} + install ${INSTALL_INCLUDES} $(DESTDIR)${prefix}/include/lrslib ###################################################################### clean: diff --git a/math/lrslib/pkg-plist b/math/lrslib/pkg-plist index 021c7855eeed..bcfb5091475c 100644 --- a/math/lrslib/pkg-plist +++ b/math/lrslib/pkg-plist @@ -1,10 +1,13 @@ bin/lrs bin/lrsnash include/lrslib/lrsdriver.h include/lrslib/lrsgmp.h include/lrslib/lrslib.h include/lrslib/lrslong.h include/lrslib/lrsmp.h +include/lrslib/lrsnashlib.h +include/lrslib/lrsrestart.h +include/lrslib/mplrs.h lib/liblrs.so lib/liblrs.so.1 lib/liblrs.so.1.0.0