Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Jun 2018 21:18:55 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r472400 - in head/archivers/libzip: . files
Message-ID:  <201806142118.w5ELIttY017624@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rakuco
Date: Thu Jun 14 21:18:54 2018
New Revision: 472400
URL: https://svnweb.freebsd.org/changeset/ports/472400

Log:
  Update to 1.5.1.
  
  Upstream has switched to CMake, so follow suit here (and explicitly disable
  crypto backends other than OpenSSL for AES support).
  
  The port also depends on Perl for testing, so add the missing dependency.
  
  Based on an initial patch by danfe@.
  
  Submitted by:	danfe (initial version)

Added:
  head/archivers/libzip/files/
  head/archivers/libzip/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/archivers/libzip/Makefile
  head/archivers/libzip/distinfo
  head/archivers/libzip/pkg-plist

Modified: head/archivers/libzip/Makefile
==============================================================================
--- head/archivers/libzip/Makefile	Thu Jun 14 21:09:10 2018	(r472399)
+++ head/archivers/libzip/Makefile	Thu Jun 14 21:18:54 2018	(r472400)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libzip
-PORTVERSION=	1.3.2
+PORTVERSION=	1.5.1
 CATEGORIES=	archivers devel
 MASTER_SITES=	https://libzip.org/download/
 
@@ -14,11 +14,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CPE_VENDOR=	nih
 
-GNU_CONFIGURE=	yes
-USES=		cpe libtool pathfix perl5 tar:xz
-USE_PERL5=	build
+USES=		cmake:outsource cpe perl5 ssl tar:xz
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-TEST_TARGET=	check
+USE_PERL5=	test
+TEST_TARGET=	test
+
+CMAKE_OFF=	ENABLE_COMMONCRYPTO ENABLE_GNUTLS
 
 .include <bsd.port.mk>

Modified: head/archivers/libzip/distinfo
==============================================================================
--- head/archivers/libzip/distinfo	Thu Jun 14 21:09:10 2018	(r472399)
+++ head/archivers/libzip/distinfo	Thu Jun 14 21:18:54 2018	(r472400)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511266116
-SHA256 (libzip-1.3.2.tar.xz) = 6277845010dbc20e281a77e637c97765c1323d67df4d456fd942f525ea86e185
-SIZE (libzip-1.3.2.tar.xz) = 942756
+TIMESTAMP = 1523434126
+SHA256 (libzip-1.5.1.tar.xz) = 04ea35b6956c7b3453f1ed3f3fe40e3ddae1f43931089124579e8384e79ed372
+SIZE (libzip-1.5.1.tar.xz) = 717908

Added: head/archivers/libzip/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/archivers/libzip/files/patch-CMakeLists.txt	Thu Jun 14 21:18:54 2018	(r472400)
@@ -0,0 +1,12 @@
+Do not set RPATH on FreeBSD either.
+--- CMakeLists.txt.orig	2018-06-14 20:07:27 UTC
++++ CMakeLists.txt
+@@ -224,7 +224,7 @@ endif(WIN32)
+ ADD_DEFINITIONS("-DHAVE_CONFIG_H")
+ 
+ # rpath handling: use rpath in installed binaries
+-IF(NOT CMAKE_SYSTEM_NAME MATCHES Linux)
++IF(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD|Linux")
+ 	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+ 	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ ENDIF()

Modified: head/archivers/libzip/pkg-plist
==============================================================================
--- head/archivers/libzip/pkg-plist	Thu Jun 14 21:09:10 2018	(r472399)
+++ head/archivers/libzip/pkg-plist	Thu Jun 14 21:18:54 2018	(r472400)
@@ -3,10 +3,9 @@ bin/zipmerge
 bin/ziptool
 include/zip.h
 include/zipconf.h
-lib/libzip.a
 lib/libzip.so
 lib/libzip.so.5
-lib/libzip.so.5.0.0
+lib/libzip.so.5.0
 libdata/pkgconfig/libzip.pc
 man/man1/zipcmp.1.gz
 man/man1/zipmerge.1.gz
@@ -84,12 +83,18 @@ man/man3/zip_set_file_comment.3.gz
 man/man3/zip_set_file_compression.3.gz
 man/man3/zip_source.3.gz
 man/man3/zip_source_begin_write.3.gz
+man/man3/zip_source_begin_write_cloning.3.gz
 man/man3/zip_source_buffer.3.gz
+man/man3/zip_source_buffer_create.3.gz
+man/man3/zip_source_buffer_fragment.3.gz
+man/man3/zip_source_buffer_fragment_create.3.gz
 man/man3/zip_source_close.3.gz
 man/man3/zip_source_commit_write.3.gz
 man/man3/zip_source_error.3.gz
 man/man3/zip_source_file.3.gz
+man/man3/zip_source_file_create.3.gz
 man/man3/zip_source_filep.3.gz
+man/man3/zip_source_filep_create.3.gz
 man/man3/zip_source_free.3.gz
 man/man3/zip_source_function.3.gz
 man/man3/zip_source_function_create.3.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806142118.w5ELIttY017624>