From 620713b264a6e2c6aed9d1fd38023b2da457b6a1 Mon Sep 17 00:00:00 2001 From: Herby Gillot Date: Mon, 23 Mar 2026 21:51:58 -0400 Subject: [PATCH] lzlib: update to 1.16 --- archivers/lzlib/Portfile | 13 +++--- .../lzlib/files/patch-darwin-Makefile.in.diff | 45 ++++++++----------- .../lzlib/files/patch-darwin-configure.diff | 16 +++++++ 3 files changed, 43 insertions(+), 31 deletions(-) create mode 100644 archivers/lzlib/files/patch-darwin-configure.diff diff --git a/archivers/lzlib/Portfile b/archivers/lzlib/Portfile index ee3d4a157ea..3246095d39f 100644 --- a/archivers/lzlib/Portfile +++ b/archivers/lzlib/Portfile @@ -3,7 +3,7 @@ PortSystem 1.0 name lzlib -version 1.14 +version 1.16 revision 0 homepage https://www.nongnu.org/lzip/lzlib.html @@ -36,9 +36,9 @@ long_description \ reference implementation is copylefted, which guarantees that it will \ remain free forever. -checksums rmd160 94dce9f39a7f77cdfd95951e2e5f6a8339b67ef1 \ - sha256 e362ecccd82d4dd297df6a51b952c65d2172f9bf41a5c4590d3604d83aa519d3 \ - size 96075 +checksums rmd160 1334de1f342b6ea517ca8ce05d6938d9eeab0197 \ + sha256 cd2a96fbc685f7e3dc32b9f0e5e34046a77e3c10fcfebe62f9951e317d0a8cf4 \ + size 81528 master_sites nongnu:lzip/lzlib use_lzip yes @@ -46,7 +46,8 @@ use_lzip yes variant universal {} platform darwin { - patchfiles-append patch-darwin-Makefile.in.diff + patchfiles-append patch-darwin-configure.diff \ + patch-darwin-Makefile.in.diff } depends_build-append \ @@ -64,3 +65,5 @@ destroot.target install install-bin install-man test.run yes test.target check + +livecheck.url https://download.savannah.nongnu.org/releases/lzip/lzlib/ diff --git a/archivers/lzlib/files/patch-darwin-Makefile.in.diff b/archivers/lzlib/files/patch-darwin-Makefile.in.diff index 29eaf4ce6ee..cbd91940b20 100644 --- a/archivers/lzlib/files/patch-darwin-Makefile.in.diff +++ b/archivers/lzlib/files/patch-darwin-Makefile.in.diff @@ -1,65 +1,58 @@ ---- ./Makefile.in 2024-04-07 17:26:13 -+++ ./Makefile.in 2024-04-07 17:26:29 -@@ -25,14 +25,14 @@ +--- ./Makefile.in 2026-03-23 21:13:32 ++++ ./Makefile.in 2026-03-23 21:14:03 +@@ -28,17 +28,16 @@ lib$(libname).a : lzlib.o $(AR) $(ARFLAGS) $@ $< --lib$(libname).so.$(pkgversion) : lzlib_sh.o -- $(CC) $(CFLAGS) $(LDFLAGS) -fpic -fPIC -shared -Wl,--soname=lib$(libname).so.$(soversion) -o $@ $< -+lib$(libname).$(pkgversion).dylib : lzlib_sh.o +-lib$(libname).so.$(soversion) : lzlib_sh.o +- $(CC) $(CFLAGS) $(LDFLAGS) -fpic -fPIC -shared -Wl,--soname=$@ -o $@ $< || \ +- $(CC) $(CFLAGS) $(LDFLAGS) -fpic -fPIC -shared -o $@ $< ++lib$(libname).$(soversion).dylib : lzlib_sh.o + $(CC) $(CFLAGS) $(LDFLAGS) -fpic -fPIC -dynamiclib -install_name $(prefix)/lib/lib$(libname).$(soversion).dylib -o $@ $< + bin : $(progname_static) $(progname_shared) + $(progname) : $(objs) lib$(libname).a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) lib$(libname).a --$(progname)_shared : $(objs) lib$(libname).so.$(pkgversion) -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) lib$(libname).so.$(pkgversion) -+$(progname)_shared : $(objs) lib$(libname).$(pkgversion).dylib -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) lib$(libname).$(pkgversion).dylib +-$(progname)_shared : $(objs) lib$(libname).so.$(soversion) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) lib$(libname).so.$(soversion) ++$(progname)_shared : $(objs) lib$(libname).$(soversion).dylib ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) lib$(libname).$(soversion).dylib bbexample : bbexample.o lib$(libname).a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ bbexample.o lib$(libname).a -@@ -108,15 +108,12 @@ +@@ -116,15 +115,12 @@ $(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a" ; \ fi - if [ -n "$(progname_shared)" ] ; then \ -- $(INSTALL_PROGRAM) ./lib$(libname).so.$(pkgversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" ; \ + if [ -n "$(libname_shared)" ] ; then \ - if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ - run_ldconfig=no ; \ - else run_ldconfig=yes ; \ - fi ; \ - rm -f "$(DESTDIR)$(libdir)/lib$(libname).so" ; \ - rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ; \ +- $(INSTALL_SO) ./lib$(libname).so.$(soversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" ; \ - cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so ; \ - cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so.$(soversion) ; \ -+ $(INSTALL_PROGRAM) ./lib$(libname).$(pkgversion).dylib "$(DESTDIR)$(libdir)/lib$(libname).$(pkgversion).dylib" ; \ + run_ldconfig=no ; \ + rm -f "$(DESTDIR)$(libdir)/lib$(libname).dylib" ; \ + rm -f "$(DESTDIR)$(libdir)/lib$(libname).$(soversion).dylib" ; \ -+ cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).$(pkgversion).dylib lib$(libname).dylib; \ ++ $(INSTALL_SO) ./lib$(libname).$(soversion).dylib "$(DESTDIR)$(libdir)/lib$(libname).$(pkgversion).dylib" ; \ ++ cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).$(pkgversion).dylib lib$(libname).dylib ; \ + cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).$(pkgversion).dylib lib$(libname).$(soversion).dylib ; \ if [ "${disable_ldconfig}" != yes ] && [ $${run_ldconfig} = yes ] && \ [ -x "$(LDCONFIG)" ] ; then "$(LDCONFIG)" -n "$(DESTDIR)$(libdir)" || true ; fi ; \ fi -@@ -155,9 +152,9 @@ +@@ -163,8 +159,9 @@ uninstall-lib : -rm -f "$(DESTDIR)$(includedir)/$(libname)lib.h" -rm -f "$(DESTDIR)$(libdir)/lib$(libname).a" - -rm -f "$(DESTDIR)$(libdir)/lib$(libname).so" - -rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" -- -rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" + -rm -f "$(DESTDIR)$(libdir)/lib$(libname).dylib" + -rm -f "$(DESTDIR)$(libdir)/lib$(libname).$(soversion).dylib" + -rm -f "$(DESTDIR)$(libdir)/lib$(libname).$(pkgversion).dylib" uninstall-info : -if $(CAN_RUN_INSTALLINFO) ; then \ -@@ -198,7 +195,7 @@ - - clean : - -rm -f $(progname) $(objs) lzlib.o lib$(libname).a -- -rm -f $(progname)_shared lzlib_sh.o lib$(libname).so* -+ -rm -f $(progname)_shared lzlib_sh.o lib$(libname).*dylib - -rm -f bbexample bbexample.o ffexample ffexample.o lzcheck lzcheck.o - - distclean : clean diff --git a/archivers/lzlib/files/patch-darwin-configure.diff b/archivers/lzlib/files/patch-darwin-configure.diff new file mode 100644 index 00000000000..e77c4ae9db3 --- /dev/null +++ b/archivers/lzlib/files/patch-darwin-configure.diff @@ -0,0 +1,16 @@ +--- ./configure 2026-03-23 21:32:51 ++++ ./configure 2026-03-23 21:32:58 +@@ -153,6 +153,13 @@ + fi + done + ++# On Darwin, use dylib naming for the shared library. ++if [ -n "${libname_shared}" ] ; then ++ case `uname -s 2>/dev/null` in ++ Darwin*) libname_shared=lib${libname}.${soversion}.dylib ;; ++ esac ++fi ++ + # Find the source code, if location was not specified. + srcdirtext= + if [ -z "${srcdir}" ] ; then