Update to 1.3.2.

Remove our local patches, upstream has started installing zipconf.h into an
architecture-independent directory.

5 files changed, 6 insertions, 44 deletions

diff --git a/archivers/libzip/Makefile b/archivers/libzip/Makefile
index e6627d325e66..ea3563fc31aa 100644
--- a/archivers/libzip/Makefile
+++ b/archivers/libzip/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libzip
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.2
 CATEGORIES=	archivers devel
 MASTER_SITES=	https://libzip.org/download/
 
diff --git a/archivers/libzip/distinfo b/archivers/libzip/distinfo
index 61493d3b4dca..a8da6d2a75ce 100644
--- a/archivers/libzip/distinfo
+++ b/archivers/libzip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506503583
-SHA256 (libzip-1.3.0.tar.xz) = aa936efe34911be7acac2ab07fb5c8efa53ed9bb4d44ad1fe8bff19630e0d373
-SIZE (libzip-1.3.0.tar.xz) = 955876
+TIMESTAMP = 1511266116
+SHA256 (libzip-1.3.2.tar.xz) = 6277845010dbc20e281a77e637c97765c1323d67df4d456fd942f525ea86e185
+SIZE (libzip-1.3.2.tar.xz) = 942756
diff --git a/archivers/libzip/files/patch-lib__Makefile.in b/archivers/libzip/files/patch-lib__Makefile.in
deleted file mode 100644
index b8da36054025..000000000000
--- a/archivers/libzip/files/patch-lib__Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/Makefile.in.orig	2017-09-02 18:10:43.000000000 +0200
-+++ lib/Makefile.in	2017-09-27 11:19:40.288590998 +0200
-@@ -496,8 +496,8 @@ AM_CFLAGS = @CFLAG_VISIBILITY@
- libincludedir = ${libdir}/@PACKAGE@/include
- lib_LTLIBRARIES = libzip.la
- noinst_HEADERS = zipint.h gladman-fcrypt.h
--include_HEADERS = zip.h
--nodist_libinclude_HEADERS = zipconf.h
-+include_HEADERS = zip.h zipconf.h
-+nodist_libinclude_HEADERS =
- 
- # also update CMakeLists.txt when changing version
- libzip_la_LDFLAGS = -no-undefined -version-info 5:0:0
-@@ -1926,8 +1926,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-includeHEADERS \
--	install-nodist_libincludeHEADERS
-+install-data-am: install-includeHEADERS
- 
- install-dvi: install-dvi-recursive
- 
diff --git a/archivers/libzip/files/patch-libzip.pc.in b/archivers/libzip/files/patch-libzip.pc.in
deleted file mode 100644
index 7a9a58210a00..000000000000
--- a/archivers/libzip/files/patch-libzip.pc.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- libzip.pc.in.orig	2014-08-12 12:48:41 UTC
-+++ libzip.pc.in
-@@ -2,7 +2,6 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--libincludedir=@libdir@/@PACKAGE@/include
- 
- zipcmp=@prefix@/bin/zipcmp
- 
-@@ -10,5 +9,5 @@ Name: libzip
- Description: library for handling zip archives
- Version: @VERSION@
- Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip @LIBS@
--Cflags: -I${includedir} -I${libincludedir}
-+Cflags: -I${includedir}
- 
diff --git a/archivers/libzip/pkg-plist b/archivers/libzip/pkg-plist
index ad4eb7819529..553957ee409c 100644
--- a/archivers/libzip/pkg-plist
+++ b/archivers/libzip/pkg-plist
@@ -69,10 +69,12 @@ man/man3/zip_get_file_comment.3.gz
 man/man3/zip_get_name.3.gz
 man/man3/zip_get_num_entries.3.gz
 man/man3/zip_get_num_files.3.gz
+man/man3/zip_libzip_version.3.gz
 man/man3/zip_name_locate.3.gz
 man/man3/zip_open.3.gz
 man/man3/zip_open_from_source.3.gz
 man/man3/zip_register_progress_callback.3.gz
+man/man3/zip_register_progress_callback_with_state.3.gz
 man/man3/zip_rename.3.gz
 man/man3/zip_replace.3.gz
 man/man3/zip_set_archive_comment.3.gz