diff --git a/math/lrslib/Makefile b/math/lrslib/Makefile index ff90efd67b17..8e0e4575a7b4 100644 --- a/math/lrslib/Makefile +++ b/math/lrslib/Makefile @@ -1,38 +1,40 @@ PORTNAME= lrslib -PORTVERSION= 7.2 +PORTVERSION= 7.3 PORTEPOCH= 1 CATEGORIES= math MASTER_SITES= http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/ DISTNAME= ${PORTNAME}-0${PORTVERSION:S/.//} MAINTAINER= yuri@FreeBSD.org COMMENT= Reverse search algorithm for vertex enumeration/convex hull problems WWW= http://cgm.cs.mcgill.ca/~avis/C/lrs.html LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_armv6= error: __int128 is not supported on this target BROKEN_armv7= error: __int128 is not supported on this target BROKEN_i386= error: __int128 is not supported on this target BROKEN_powerpc= 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 +CFLAGS+= -I${WRKSRC}/lrsarith-011 + LDFLAGS+= -lthr BINARY_ALIAS= gcc=${CC} post-install: @cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} bin/* lib/*.so .include diff --git a/math/lrslib/distinfo b/math/lrslib/distinfo index f61bda8a52bf..1eb493395c79 100644 --- a/math/lrslib/distinfo +++ b/math/lrslib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692066216 -SHA256 (lrslib-072.tar.gz) = fc48754a1ded1d8445d40ecfbe3546e4f27d53aaee95dc2c8c0c79fb9cd532f0 -SIZE (lrslib-072.tar.gz) = 496411 +TIMESTAMP = 1737006260 +SHA256 (lrslib-073.tar.gz) = c49a4ebd856183473d1d5a62785fcdfe1057d5d671d4b96f3a1250eb1afe4e83 +SIZE (lrslib-073.tar.gz) = 4566562 diff --git a/math/lrslib/files/patch-lrslib.c b/math/lrslib/files/patch-lrslib.c deleted file mode 100644 index fbf12fc76261..000000000000 --- a/math/lrslib/files/patch-lrslib.c +++ /dev/null @@ -1,20 +0,0 @@ ---- lrslib.c.orig 2022-03-10 09:42:46 UTC -+++ lrslib.c -@@ -32,6 +32,8 @@ - #include - #include - -+#include // for basename(3) -+ - #include "lrsrestart.h" - #include "lrslib.h" - -@@ -75,7 +77,7 @@ static void ptimes (void); - static double get_time(void); - #endif - --char *basename(char *path); -+//char *basename(char *path); - - /*******************************/ - /* signals handling */ diff --git a/math/lrslib/files/patch-makefile b/math/lrslib/files/patch-makefile index 5388f8509c94..25cbee446c96 100644 --- a/math/lrslib/files/patch-makefile +++ b/math/lrslib/files/patch-makefile @@ -1,48 +1,41 @@ ---- makefile.orig 2022-03-10 09:42:46 UTC +--- makefile.orig 2024-05-31 03:17:39 UTC +++ makefile -@@ -231,7 +231,7 @@ SHLIBBIN=lrs-shared lrsnash-shared +@@ -246,7 +246,7 @@ ${SHLIB}: ${SHLIBOBJ} # 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} -@@ -244,11 +244,11 @@ ${SHLINK}: ${SONAME} +@@ -259,11 +259,11 @@ lrs-shared: ${SHLINK} lrs-shared.o all-shared: ${SHLIBBIN} lrs-shared: ${SHLINK} lrs-shared.o - $(CC) $^ -o $@ -L . -llrs + $(CC) $^ -o $@ -L . $(LDFLAGS) -llrs lrsnash-shared: ${SHLINK} lrsnash.c - $(CC) ${CFLAGS} -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . -llrs -lgmp + $(CC) ${CFLAGS} -DGMP -DMA lrsnash.c lrsnashlib.c -I${INCLUDEDIR} -o $@ -L . $(LDFLAGS) -llrs -lgmp # driver object files -@@ -282,19 +282,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 lrsrestart.h -+INSTALL_INCLUDES=lrslib.h lrsdriver.h lrsgmp.h lrslong.h lrsmp.h lrsnashlib.h lrsrestart.h mplrs.h - - install: all-shared install-common +@@ -303,13 +303,13 @@ 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 bcfb5091475c..845e88dc296b 100644 --- a/math/lrslib/pkg-plist +++ b/math/lrslib/pkg-plist @@ -1,13 +1,11 @@ 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