5 files changed, 53 insertions, 5 deletions

diff --git a/archivers/libzip/Makefile b/archivers/libzip/Makefile
index 831e462603f0..0c0159f4437c 100644
--- a/archivers/libzip/Makefile
+++ b/archivers/libzip/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libzip
-PORTVERSION=	0.9.3
+PORTVERSION=	0.10
 CATEGORIES=	archivers devel
 MASTER_SITES=	http://www.nih.at/libzip/
 
@@ -15,8 +15,9 @@ COMMENT=	A C library for reading, creating, and modifying zip archives
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
 
 MAN1=		zipcmp.1 \
 		zipmerge.1 \
@@ -33,16 +34,21 @@ MAN3=		libzip.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 \
@@ -50,7 +56,9 @@ MAN3=		libzip.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 \
diff --git a/archivers/libzip/distinfo b/archivers/libzip/distinfo
index a8c07729c453..8a9a83dfc847 100644
--- a/archivers/libzip/distinfo
+++ b/archivers/libzip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libzip-0.9.3.tar.bz2) = e63f5dc1b33fd1c02a881d5a819620634a69d1e4ce8637261ca0cb0fbc9f9dca
-SIZE (libzip-0.9.3.tar.bz2) = 304965
+SHA256 (libzip-0.10.tar.bz2) = ed76ef7f37a0754645015747a71e6399fd68b660c6c9b8e3c5bdcbd1ed36fadc
+SIZE (libzip-0.10.tar.bz2) = 608535
diff --git a/archivers/libzip/files/patch-lib__Makefile.in b/archivers/libzip/files/patch-lib__Makefile.in
new file mode 100644
index 000000000000..b027fa296197
--- /dev/null
+++ b/archivers/libzip/files/patch-lib__Makefile.in
@@ -0,0 +1,22 @@
+--- ./lib/Makefile.in.orig	2011-03-18 15:51:26.000000000 +0300
++++ ./lib/Makefile.in	2011-04-24 23:34:37.521556385 +0400
+@@ -240,8 +240,8 @@
+ libincludedir = ${libdir}/@PACKAGE@/include
+ lib_LTLIBRARIES = libzip.la
+ noinst_HEADERS = zipint.h
+-include_HEADERS = zip.h
+-libinclude_HEADERS = zipconf.h
++include_HEADERS = zip.h zipconf.h
++libinclude_HEADERS =
+ 
+ # also update CMakeLists.txt when changing version
+ libzip_la_LDFLAGS = -no-undefined -version-info 3:0:1
+@@ -683,7 +683,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-includeHEADERS install-libincludeHEADERS
++install-data-am: install-includeHEADERS
+ 
+ install-dvi: install-dvi-am
+ 
diff --git a/archivers/libzip/files/patch-libzip.pc.in b/archivers/libzip/files/patch-libzip.pc.in
new file mode 100644
index 000000000000..8102e5691581
--- /dev/null
+++ b/archivers/libzip/files/patch-libzip.pc.in
@@ -0,0 +1,17 @@
+--- ./libzip.pc.in.orig	2010-03-08 15:27:48.000000000 +0300
++++ ./libzip.pc.in	2011-04-24 23:19:07.996595003 +0400
+@@ -2,7 +2,6 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-libincludedir=@libdir@/libzip/include
+ 
+ zipcmp=@prefix@/bin/zipcmp
+ 
+@@ -10,5 +9,4 @@
+ Description: library for handling zip archives
+ Version: @VERSION@
+ Libs: -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 7dc949ed9dbc..9f1ffda8fb04 100644
--- a/archivers/libzip/pkg-plist
+++ b/archivers/libzip/pkg-plist
@@ -2,8 +2,9 @@ bin/zipcmp
 bin/zipmerge
 bin/ziptorrent
 include/zip.h
+include/zipconf.h
 lib/libzip.a
 lib/libzip.la
 lib/libzip.so
-lib/libzip.so.1
+lib/libzip.so.3
 libdata/pkgconfig/libzip.pc