On Tue Jul 05, 2022 at 03:34:28PM +0200, Stuart Henderson wrote: > On 2022/07/05 09:23, Rafael Sadowski wrote: > > Update zziplib to 0.13.72 and switch to GitHub. All consumers are happy > > with this update. OK? > > > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/archivers/zziplib/Makefile,v > > retrieving revision 1.21 > > diff -u -p -u -p -r1.21 Makefile > > --- Makefile 11 Mar 2022 18:16:26 -0000 1.21 > > +++ Makefile 5 Jul 2022 07:22:39 -0000 > > @@ -1,32 +1,32 @@ > > COMMENT= lightweight library for extracting data from zip files > > > > -DISTNAME= zziplib-0.13.62 > > CATEGORIES= archivers > > -REVISION= 1 > > > > -SHARED_LIBS += zzip 15.52 \ > > - zzipfseeko 13.52 \ > > - zzipmmapped 13.52 \ > > - zzipwrap 13.52 > > +GH_ACCOUNT = gdraheim > > +GH_PROJECT = zziplib > > +GH_TAGNAME = v0.13.72 > > + > > +SHARED_LIBS += zzip 16.0 # 0.0 > > +SHARED_LIBS += zzipfseeko 16.0 # 0.0 > > +SHARED_LIBS += zzipmmapped 16.0 # 0.0 > > +SHARED_LIBS += zzipwrap 16.0 # 0.0 > > not 14.0 for the last three?
Ops, fixed. > > > > > -HOMEPAGE= http://zziplib.sourceforge.net/ > > +WANTLIB += c z > > > > # LGPL/MPL license > > PERMIT_PACKAGE= Yes > > > > -WANTLIB= c z > > WANTLIB normally goes below PERMIT_PACKAGE > ACK, new diff below. Index: Makefile =================================================================== RCS file: /cvs/ports/archivers/zziplib/Makefile,v retrieving revision 1.21 diff -u -p -u -p -r1.21 Makefile --- Makefile 11 Mar 2022 18:16:26 -0000 1.21 +++ Makefile 5 Jul 2022 19:19:42 -0000 @@ -1,32 +1,31 @@ COMMENT= lightweight library for extracting data from zip files -DISTNAME= zziplib-0.13.62 CATEGORIES= archivers -REVISION= 1 -SHARED_LIBS += zzip 15.52 \ - zzipfseeko 13.52 \ - zzipmmapped 13.52 \ - zzipwrap 13.52 - -HOMEPAGE= http://zziplib.sourceforge.net/ +GH_ACCOUNT = gdraheim +GH_PROJECT = zziplib +GH_TAGNAME = v0.13.72 + +SHARED_LIBS += zzip 16.0 # 0.0 +SHARED_LIBS += zzipfseeko 14.0 # 0.0 +SHARED_LIBS += zzipmmapped 14.0 # 0.0 +SHARED_LIBS += zzipwrap 14.0 # 0.0 # LGPL/MPL license PERMIT_PACKAGE= Yes -WANTLIB= c z +WANTLIB += c z -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zziplib/} -EXTRACT_SUFX= .tar.bz2 +BUILD_DEPENDS= archivers/zip \ + devel/sdl2 -CONFIGURE_STYLE= gnu +MODULES = devel/cmake \ + lang/python -BUILD_DEPENDS= archivers/zip +MODPY_RUNDEP = No -post-extract: - cd ${WRKDIST}/docs && tar xf ${WRKDIST}/docs/zziplib-manpages.tar +MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib -post-install: - ${INSTALL_MAN} ${WRKDIST}/docs/man3/*.3 ${PREFIX}/man/man3/ +TEST_TARGET = tests .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/archivers/zziplib/distinfo,v retrieving revision 1.7 diff -u -p -u -p -r1.7 distinfo --- distinfo 10 Jan 2014 16:12:52 -0000 1.7 +++ distinfo 5 Jul 2022 19:19:42 -0000 @@ -1,2 +1,2 @@ -SHA256 (zziplib-0.13.62.tar.bz2) = obgDPxof1jhfSCCwHuMtjsqBhAkjXSLK9RGeAHjHUls= -SIZE (zziplib-0.13.62.tar.bz2) = 685770 +SHA256 (zziplib-0.13.72.tar.gz) = k+9Evx8eok/GYIBCakad+C+mMdE8o7Lkq66riVOFGNw= +SIZE (zziplib-0.13.72.tar.gz) = 1162175 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- patches/patch-Makefile_in 11 Mar 2022 18:16:26 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ ---- Makefile.in.orig Wed Dec 29 17:07:18 2010 -+++ Makefile.in Mon Jan 10 11:57:59 2011 -@@ -281,8 +281,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign dist-bzip2 - ACLOCAL_AMFLAGS = -I m4 - WANT_AUTOMAKE = 1.7 - WANT_AUTOCONF = 2.57 --DIST_SUBDIRS = zzip zzipwrap bins test docs SDL --SUBDIRS = zzip zzipwrap bins test docs @SDL@ -+DIST_SUBDIRS = zzip zzipwrap bins test SDL -+SUBDIRS = zzip zzipwrap bins test @SDL@ - OSC_ROOT = /my/own/osc - OSC_SRCDIR = $(OSC_ROOT) - OSC_PROJECT = home:guidod:zziplib-13 Index: patches/patch-zzip_CMakeLists_txt =================================================================== RCS file: patches/patch-zzip_CMakeLists_txt diff -N patches/patch-zzip_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-zzip_CMakeLists_txt 5 Jul 2022 19:19:42 -0000 @@ -0,0 +1,23 @@ +Index: zzip/CMakeLists.txt +--- zzip/CMakeLists.txt.orig ++++ zzip/CMakeLists.txt +@@ -189,16 +189,16 @@ target_link_libraries(libzzipmmapped ZLIB::ZLIB ) + target_include_directories (libzzipmmapped PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) + endif() + +-set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip" RELEASE_POSTFIX "-${RELNUM}") ++set_target_properties(libzzip PROPERTIES OUTPUT_NAME "zzip") + SET_TARGET_PROPERTIES(libzzip PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM}) + + if(ZZIPFSEEKO) +-set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko" RELEASE_POSTFIX "-${RELNUM}") ++set_target_properties(libzzipfseeko PROPERTIES OUTPUT_NAME "zzipfseeko") + SET_TARGET_PROPERTIES(libzzipfseeko PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM}) + endif() + + if(ZZIPMMAPPED) +-set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped" RELEASE_POSTFIX "-${RELNUM}") ++set_target_properties(libzzipmmapped PROPERTIES OUTPUT_NAME "zzipmmapped") + SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM}) + endif() + Index: patches/patch-zzip_Makefile_in =================================================================== RCS file: patches/patch-zzip_Makefile_in diff -N patches/patch-zzip_Makefile_in --- patches/patch-zzip_Makefile_in 11 Mar 2022 18:16:26 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ ---- zzip/Makefile.in.orig Wed Dec 29 17:07:18 2010 -+++ zzip/Makefile.in Mon Jan 10 11:59:18 2011 -@@ -205,7 +205,7 @@ PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ - PYTHON = @PYTHON@ - RANLIB = @RANLIB@ --RELEASE_INFO = @RELEASE_INFO@ -+RELEASE_INFO = - RESOLVES = @RESOLVES@ - SDL = @SDL@ - SDL_GENERATE = @SDL_GENERATE@ -@@ -777,16 +777,6 @@ install-data-hook : install-zzipHEADERS - $(DESTDIR)$(includedir)/zzip.h >$(DESTDIR)$(includedir)/zzip-io.h - - install-exec-hook: -- @ for i in . $(DESTDIR)$(libdir)/libzzip*.so.13 \ -- ; do test -d $$i && continue ; test -f $$i || continue \ -- ; lib=`basename "$$i" .so.13` \ -- ; echo "$(DESTDIR)$(libdir): ln -s $$lib.so.13 $$lib.so.10" \ -- ; (cd $(DESTDIR)$(libdir) && ln -s $$lib.so.13 $$lib.so.10) \ -- ; echo "$(DESTDIR)$(libdir): ln -s $$lib.so.13 $$lib.so.11" \ -- ; (cd $(DESTDIR)$(libdir) && ln -s $$lib.so.13 $$lib.so.11) \ -- ; echo "$(DESTDIR)$(libdir): ln -s $$lib.so.13 $$lib.so.12" \ -- ; (cd $(DESTDIR)$(libdir) && ln -s $$lib.so.13 $$lib.so.12) \ -- ; done ; true - - uninstall-local : - (cd $(DESTDIR)$(includedir) && rm zziplib.h zzip.h zzip-io.h) Index: patches/patch-zzip_plugin_h =================================================================== RCS file: patches/patch-zzip_plugin_h diff -N patches/patch-zzip_plugin_h --- patches/patch-zzip_plugin_h 11 Mar 2022 18:16:26 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- zzip/plugin.h.orig Sat May 26 20:26:36 2012 -+++ zzip/plugin.h Sat May 26 20:26:44 2012 -@@ -93,7 +93,7 @@ int zzip_init_io(zzip_plugin_io_handlers_t io, int fla - # define ZZIP_IO_USE_MMAP 1 - - #ifdef __cplusplus --}; -+} - #endif - - #endif Index: patches/patch-zzip_zzip_h =================================================================== RCS file: patches/patch-zzip_zzip_h diff -N patches/patch-zzip_zzip_h --- patches/patch-zzip_zzip_h 11 Mar 2022 18:16:26 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- zzip/zzip.h.orig Sat May 26 20:26:17 2012 -+++ zzip/zzip.h Sat May 26 20:26:31 2012 -@@ -256,7 +256,7 @@ ZZIP_DIR * zzip_dir_open_ext_io(zzip_char_t* filename - /* zzip_file_open_ext_io => zzip_dir_open_ext_io + zzip_file_open */ - - #ifdef __cplusplus --}; -+} - #endif - - #endif /* _ZZIPLIB_H */ Index: patches/patch-zzipwrap_CMakeLists_txt =================================================================== RCS file: patches/patch-zzipwrap_CMakeLists_txt diff -N patches/patch-zzipwrap_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-zzipwrap_CMakeLists_txt 5 Jul 2022 19:19:42 -0000 @@ -0,0 +1,12 @@ +Index: zzipwrap/CMakeLists.txt +--- zzipwrap/CMakeLists.txt.orig ++++ zzipwrap/CMakeLists.txt +@@ -48,7 +48,7 @@ add_library(libzzipwrap ${libzzipwrap_SRCS} ) + target_link_libraries(libzzipwrap libzzip ZLIB::ZLIB ) + target_include_directories(libzzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") + +-set_target_properties(libzzipwrap PROPERTIES OUTPUT_NAME "zzipwrap" RELEASE_POSTFIX "-${RELNUM}") ++set_target_properties(libzzipwrap PROPERTIES OUTPUT_NAME "zzipwrap") + SET_TARGET_PROPERTIES(libzzipwrap PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVERSION ${VERNUM}) + set_target_properties(libzzipwrap PROPERTIES DEFINE_SYMBOL "libzzip_EXPORTS") + Index: patches/patch-zzipwrap_Makefile_in =================================================================== RCS file: patches/patch-zzipwrap_Makefile_in diff -N patches/patch-zzipwrap_Makefile_in --- patches/patch-zzipwrap_Makefile_in 11 Mar 2022 18:16:26 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- zzipwrap/Makefile.in.orig Wed Dec 29 17:07:18 2010 -+++ zzipwrap/Makefile.in Mon Jan 10 11:58:00 2011 -@@ -200,7 +200,7 @@ PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ - PYTHON = @PYTHON@ - RANLIB = @RANLIB@ --RELEASE_INFO = @RELEASE_INFO@ -+RELEASE_INFO = - RESOLVES = @RESOLVES@ - SDL = @SDL@ - SDL_GENERATE = @SDL_GENERATE@ Index: patches/patch-zzipwrap_wrap_h =================================================================== RCS file: patches/patch-zzipwrap_wrap_h diff -N patches/patch-zzipwrap_wrap_h --- patches/patch-zzipwrap_wrap_h 11 Mar 2022 18:16:26 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- zzipwrap/wrap.h.orig Sat May 26 20:50:01 2012 -+++ zzipwrap/wrap.h Sat May 26 20:50:15 2012 -@@ -29,7 +29,7 @@ zzipwrap_use_memory_io(int blocksize, zzipwrap_pfn_t c - - - #ifdef __cplusplus --}; -+} - #endif - - #endif /* _ZZIPWRAP_H */ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/archivers/zziplib/pkg/PLIST,v retrieving revision 1.8 diff -u -p -u -p -r1.8 PLIST --- pkg/PLIST 11 Mar 2022 18:16:26 -0000 1.8 +++ pkg/PLIST 5 Jul 2022 19:19:42 -0000 @@ -1,15 +1,16 @@ @bin bin/unzip-mem @bin bin/unzzip -@bin bin/unzzipcat -@bin bin/unzzipcat-mem -@bin bin/unzzipcat-seeko -@bin bin/unzzipdir -@bin bin/unzzipdir-mem +@bin bin/unzzip-big +@bin bin/unzzip-mem +@bin bin/unzzip-mix @bin bin/zzcat @bin bin/zzdir @bin bin/zzxorcat @bin bin/zzxorcopy @bin bin/zzxordir +include/SDL_rwops_zzip/ +include/SDL_rwops_zzip/SDL_rwops_zzip.c +include/SDL_rwops_zzip/SDL_rwops_zzip.h include/zzip/ include/zzip-io.h include/zzip.h @@ -33,19 +34,11 @@ include/zzip/write.h include/zzip/zzip.h include/zzip/zzip32.h include/zziplib.h -lib/libzzip.a -lib/libzzip.la @lib lib/libzzip.so.${LIBzzip_VERSION} -lib/libzzipfseeko.a -lib/libzzipfseeko.la @lib lib/libzzipfseeko.so.${LIBzzipfseeko_VERSION} -lib/libzzipmmapped.a -lib/libzzipmmapped.la @lib lib/libzzipmmapped.so.${LIBzzipmmapped_VERSION} -lib/libzzipwrap.a -lib/libzzipwrap.la @lib lib/libzzipwrap.so.${LIBzzipwrap_VERSION} -lib/pkgconfig/zzip-zlib-config.pc +lib/pkgconfig/SDL_rwops_zzip.pc lib/pkgconfig/zzipfseeko.pc lib/pkgconfig/zziplib.pc lib/pkgconfig/zzipmmapped.pc @@ -110,6 +103,7 @@ lib/pkgconfig/zzipwrap.pc @man man/man3/zzip_file_read.3 @man man/man3/zzip_file_real.3 @man man/man3/zzip_file_stat.3 +@man man/man3/zzip_filesize.3 @man man/man3/zzip_fopen.3 @man man/man3/zzip_fread.3 @man man/man3/zzip_freopen.3