svn commit: r322958 - in head/archivers/libzip: . files

Sat Jul 13 18:01:05 UTC 2013

Author: makc
Date: Sat Jul 13 18:01:04 2013
New Revision: 322958
URL: http://svnweb.freebsd.org/changeset/ports/322958

Log:
  - Update to 0.11.1 [1]
  - Move MANx records to a separate makefile
  - switch to xz compressed tarball
  - Convert to USES, remove needless pkgconfig dependency
  
  PR:		based on ports/180454 [1]
  Submitted by:	Oleg Ginzburg <olevole at olevole.ru>

Added:
  head/archivers/libzip/Makefile.man   (contents, props changed)
     - copied, changed from r322800, head/archivers/libzip/Makefile
Modified:
  head/archivers/libzip/Makefile   (contents, props changed)
  head/archivers/libzip/distinfo   (contents, props changed)
  head/archivers/libzip/files/patch-libzip.pc.in   (contents, props changed)

Modified: head/archivers/libzip/Makefile
==============================================================================

--- head/archivers/libzip/Makefile	Sat Jul 13 17:54:09 2013	(r322957)
+++ head/archivers/libzip/Makefile	Sat Jul 13 18:01:04 2013	(r322958)
@@ -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 at 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>

Copied and modified: head/archivers/libzip/Makefile.man (from r322800, head/archivers/libzip/Makefile)
==============================================================================
--- head/archivers/libzip/Makefile	Thu Jul 11 22:14:13 2013	(r322800, copy source)
+++ head/archivers/libzip/Makefile.man	Sat Jul 13 18:01:04 2013	(r322958)
@@ -1,30 +1,13 @@
-# Created by: Alexander Zhuravlev <zaa at zaa.pp.ru>
-# $FreeBSD$
-
-PORTNAME=	libzip
-PORTVERSION=	0.10.1
-CATEGORIES=	archivers devel
-MASTER_SITES=	http://www.nih.at/libzip/
-
-MAINTAINER=	makc at FreeBSD.org
-COMMENT=	C library for reading, creating, and modifying ZIP archives
-
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-MAKE_ENV=	LC_ALL="C"
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack pkgconfig
-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_dir_add.3 \
+		zip_discard.3 \
 		zip_error_clear.3 \
 		zip_error_get.3 \
 		zip_error_get_sys_type.3 \
@@ -32,8 +15,20 @@ MAN3=		libzip.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 \
@@ -43,7 +38,6 @@ MAN3=		libzip.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 \
@@ -55,7 +49,7 @@ MAN3=		libzip.3 \
 		zip_set_archive_flag.3 \
 		zip_set_default_password.3 \
 		zip_set_file_comment.3 \
-		zip_set_file_extra.3 \
+		zip_set_file_compression.3 \
 		zip_source_buffer.3 \
 		zip_source_file.3 \
 		zip_source_filep.3 \
@@ -69,5 +63,3 @@ MAN3=		libzip.3 \
 		zip_unchange.3 \
 		zip_unchange_all.3 \
 		zip_unchange_archive.3
-
-.include <bsd.port.mk>

Modified: head/archivers/libzip/distinfo
==============================================================================
--- head/archivers/libzip/distinfo	Sat Jul 13 17:54:09 2013	(r322957)
+++ head/archivers/libzip/distinfo	Sat Jul 13 18:01:04 2013	(r322958)
@@ -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

Modified: head/archivers/libzip/files/patch-libzip.pc.in
==============================================================================
--- head/archivers/libzip/files/patch-libzip.pc.in	Sat Jul 13 17:54:09 2013	(r322957)
+++ head/archivers/libzip/files/patch-libzip.pc.in	Sat Jul 13 18:01:04 2013	(r322958)
@@ -4,7 +4,7 @@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
  includedir=@includedir@
--libincludedir=@libdir@/libzip/include
+-libincludedir=@libdir@/@PACKAGE@/include
  
  zipcmp=@prefix@/bin/zipcmp
  
