On 01/09/18 07:05, Stuart Henderson wrote:
On 2018/01/08 23:35, Rafael Sadowski wrote:
On Sat Dec 30, 2017 at 10:28:25AM -0500, Brian Callahan wrote:
Hi ports --
Attached is an update to libzip. Notable changes are a
minor lib bump, the removal of autoconf in favor of cmake,
and no longer building the static libraries.
Passes the building its dependents test.
OK?
~Brian
Could you try the following option to disable Bzip2:
-DCMAKE_DISABLE_FIND_PACKAGE_BZip2:Bool=Yes
Cheers,
Rafael
Why does it need to disable bzip2 anyway?
That's just how it was when I inherited it. Enabling bzip2 does make it
easier to maintain in this new CMake world.
Diff attached. All tests pass on amd64.
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/archivers/libzip/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile 20 Nov 2017 19:13:23 -0000 1.17
+++ Makefile 9 Jan 2018 22:11:49 -0000
@@ -2,9 +2,9 @@
COMMENT= library for reading, creating and modifying zip archives
-DISTNAME= libzip-1.3.2
+DISTNAME= libzip-1.4.0
CATEGORIES= archivers
-SHARED_LIBS += zip 2.2 # 5.0
+SHARED_LIBS += zip 2.3 # 5.0
HOMEPAGE= https://www.nih.at/libzip/
MAINTAINER= Brian Callahan <bcal...@openbsd.org>
@@ -12,11 +12,12 @@ MAINTAINER= Brian Callahan <bcallah@ope
# BSD-3
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c z
+WANTLIB += bz2 c z
MASTER_SITES= ${HOMEPAGE}
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= --without-bzip2
+MODULES = devel/cmake
+
+LIB_DEPENDS = archivers/bzip2
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/archivers/libzip/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 20 Nov 2017 19:13:23 -0000 1.11
+++ distinfo 9 Jan 2018 22:11:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (libzip-1.3.2.tar.gz) = q0w062w6CLZ4zQ8kUKbFehPpYYsbo07kXQDrUycxZFc=
-SIZE (libzip-1.3.2.tar.gz) = 1523449
+SHA256 (libzip-1.4.0.tar.gz) = dZqJaQ4VXKUiR2OLn5fhbkj7tgd6u3zi2SHdW4ElmUA=
+SIZE (libzip-1.4.0.tar.gz) = 1179961
Index: patches/patch-src_ziptool_c
===================================================================
RCS file: /cvs/ports/archivers/libzip/patches/patch-src_ziptool_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_ziptool_c
--- patches/patch-src_ziptool_c 20 Nov 2017 19:13:23 -0000 1.2
+++ patches/patch-src_ziptool_c 9 Jan 2018 22:11:49 -0000
@@ -5,7 +5,7 @@ time_t == %lld
Index: src/ziptool.c
--- src/ziptool.c.orig
+++ src/ziptool.c
-@@ -522,7 +522,7 @@ set_file_mtime(int argc, char *argv[]) {
+@@ -500,7 +500,7 @@ set_file_mtime(int argc, char *argv[]) {
idx = strtoull(argv[0], NULL, 10);
mtime = (time_t)strtoull(argv[1], NULL, 10);
if (zip_file_set_mtime(za, idx, mtime, 0) < 0) {
@@ -14,7 +14,7 @@ Index: src/ziptool.c
return -1;
}
return 0;
-@@ -542,7 +542,7 @@ set_file_mtime_all(int argc, char *argv[]) {
+@@ -520,7 +520,7 @@ set_file_mtime_all(int argc, char *argv[]) {
}
for (idx = 0; idx < (zip_uint64_t)num_entries; idx++) {
if (zip_file_set_mtime(za, idx, mtime, 0) < 0) {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/archivers/libzip/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST 20 Nov 2017 19:13:23 -0000 1.9
+++ pkg/PLIST 9 Jan 2018 22:11:49 -0000
@@ -4,8 +4,6 @@
@bin bin/ziptool
include/zip.h
include/zipconf.h
-lib/libzip.a
-lib/libzip.la
@lib lib/libzip.so.${LIBzip_VERSION}
lib/pkgconfig/libzip.pc
@man man/man1/zipcmp.1
@@ -84,12 +82,18 @@ lib/pkgconfig/libzip.pc
@man man/man3/zip_set_file_compression.3
@man man/man3/zip_source.3
@man man/man3/zip_source_begin_write.3
+@man man/man3/zip_source_begin_write_cloning.3
@man man/man3/zip_source_buffer.3
+@man man/man3/zip_source_buffer_create.3
+@man man/man3/zip_source_buffer_fragment.3
+@man man/man3/zip_source_buffer_fragment_create.3
@man man/man3/zip_source_close.3
@man man/man3/zip_source_commit_write.3
@man man/man3/zip_source_error.3
@man man/man3/zip_source_file.3
+@man man/man3/zip_source_file_create.3
@man man/man3/zip_source_filep.3
+@man man/man3/zip_source_filep_create.3
@man man/man3/zip_source_free.3
@man man/man3/zip_source_function.3
@man man/man3/zip_source_function_create.3
