4 files changed, 72 insertions, 60 deletions

diff --git a/archivers/libzip/Makefile b/archivers/libzip/Makefile
index 596e18a3dea3..9cec823ed6ce 100644
--- a/archivers/libzip/Makefile
+++ b/archivers/libzip/Makefile
@@ -2,72 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	libzip
-PORTVERSION=	0.10.1
+PORTVERSION=	0.11.1
 CATEGORIES=	archivers devel
 MASTER_SITES=	http://www.nih.at/libzip/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	C library for reading, creating, and modifying ZIP archives
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 GNU_CONFIGURE=	yes
 MAKE_ENV=	LC_ALL="C"
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix
 USE_LDCONFIG=	yes
 
-MAN1=		zipcmp.1 \
-		zipmerge.1 \
-		ziptorrent.1
-
-MAN3=		libzip.3 \
-		zip_add.3 \
-		zip_add_dir.3 \
-		zip_close.3 \
-		zip_delete.3 \
-		zip_error_clear.3 \
-		zip_error_get.3 \
-		zip_error_get_sys_type.3 \
-		zip_error_to_str.3 \
-		zip_errors.3 \
-		zip_fclose.3 \
-		zip_fdopen.3 \
-		zip_file_error_clear.3 \
-		zip_file_error_get.3 \
-		zip_file_strerror.3 \
-		zip_fopen.3 \
-		zip_fopen_encrypted.3 \
-		zip_fopen_index.3 \
-		zip_fopen_index_encrypted.3 \
-		zip_fread.3 \
-		zip_get_archive_comment.3 \
-		zip_get_archive_flag.3 \
-		zip_get_file_comment.3 \
-		zip_get_file_extra.3 \
-		zip_get_name.3 \
-		zip_get_num_entries.3 \
-		zip_get_num_files.3 \
-		zip_name_locate.3 \
-		zip_open.3 \
-		zip_rename.3 \
-		zip_replace.3 \
-		zip_set_archive_comment.3 \
-		zip_set_archive_flag.3 \
-		zip_set_default_password.3 \
-		zip_set_file_comment.3 \
-		zip_set_file_extra.3 \
-		zip_source_buffer.3 \
-		zip_source_file.3 \
-		zip_source_filep.3 \
-		zip_source_free.3 \
-		zip_source_function.3 \
-		zip_source_zip.3 \
-		zip_stat.3 \
-		zip_stat_index.3 \
-		zip_stat_init.3 \
-		zip_strerror.3 \
-		zip_unchange.3 \
-		zip_unchange_all.3 \
-		zip_unchange_archive.3
-
+.include <${.CURDIR}/Makefile.man>
 .include <bsd.port.mk>
diff --git a/archivers/libzip/Makefile.man b/archivers/libzip/Makefile.man
new file mode 100644
index 000000000000..90a9327fb605
--- /dev/null
+++ b/archivers/libzip/Makefile.man
@@ -0,0 +1,65 @@
+MAN1=		zipcmp.1 \
+		zipmerge.1 \
+		ziptorrent.1
+MAN3=		libzip.3 \
+		zip_add.3 \
+		zip_add_dir.3 \
+		zip_close.3 \
+		zip_delete.3 \
+		zip_dir_add.3 \
+		zip_discard.3 \
+		zip_error_clear.3 \
+		zip_error_get.3 \
+		zip_error_get_sys_type.3 \
+		zip_error_to_str.3 \
+		zip_errors.3 \
+		zip_fclose.3 \
+		zip_fdopen.3 \
+		zip_file_add.3 \
+		zip_file_error_clear.3 \
+		zip_file_error_get.3 \
+		zip_file_extra_field_delete.3 \
+		zip_file_extra_field_delete_by_id.3 \
+		zip_file_extra_field_get.3 \
+		zip_file_extra_field_get_by_id.3 \
+		zip_file_extra_field_set.3 \
+		zip_file_extra_fields_count.3 \
+		zip_file_extra_fields_count_by_id.3 \
+		zip_file_get_comment.3 \
+		zip_file_rename.3 \
+		zip_file_replace.3 \
+		zip_file_set_comment.3 \
+		zip_file_strerror.3 \
+		zip_fopen.3 \
+		zip_fopen_encrypted.3 \
+		zip_fopen_index.3 \
+		zip_fopen_index_encrypted.3 \
+		zip_fread.3 \
+		zip_get_archive_comment.3 \
+		zip_get_archive_flag.3 \
+		zip_get_file_comment.3 \
+		zip_get_name.3 \
+		zip_get_num_entries.3 \
+		zip_get_num_files.3 \
+		zip_name_locate.3 \
+		zip_open.3 \
+		zip_rename.3 \
+		zip_replace.3 \
+		zip_set_archive_comment.3 \
+		zip_set_archive_flag.3 \
+		zip_set_default_password.3 \
+		zip_set_file_comment.3 \
+		zip_set_file_compression.3 \
+		zip_source_buffer.3 \
+		zip_source_file.3 \
+		zip_source_filep.3 \
+		zip_source_free.3 \
+		zip_source_function.3 \
+		zip_source_zip.3 \
+		zip_stat.3 \
+		zip_stat_index.3 \
+		zip_stat_init.3 \
+		zip_strerror.3 \
+		zip_unchange.3 \
+		zip_unchange_all.3 \
+		zip_unchange_archive.3
diff --git a/archivers/libzip/distinfo b/archivers/libzip/distinfo
index d74276a832d0..00e6bf9fee00 100644
--- a/archivers/libzip/distinfo
+++ b/archivers/libzip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libzip-0.10.1.tar.bz2) = 5b1eaf60968cb22df49d73bcaa759961fb27451917ac76b275374c2ed260ce92
-SIZE (libzip-0.10.1.tar.bz2) = 610860
+SHA256 (libzip-0.11.1.tar.xz) = 65338688f157784c80824d222f779505416d066c701409f6aef6b886bcd856a4
+SIZE (libzip-0.11.1.tar.xz) = 395104
diff --git a/archivers/libzip/files/patch-libzip.pc.in b/archivers/libzip/files/patch-libzip.pc.in
index 8102e5691581..dab8ad1ac423 100644
--- a/archivers/libzip/files/patch-libzip.pc.in
+++ b/archivers/libzip/files/patch-libzip.pc.in
@@ -4,7 +4,7 @@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
  includedir=@includedir@
--libincludedir=@libdir@/libzip/include
+-libincludedir=@libdir@/@PACKAGE@/include
  
  zipcmp=@prefix@/bin/zipcmp