Attachment 135536 Details for Bug 180454 – file.diff

[patch] file.diff

file.diff (text/plain), 5.41 KB, created by Oleg Ginzburg on 2013-07-11 10:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Ginzburg

Created: 2013-07-11 10:10:00 UTC

Size: 5.41 KB

patch

obsolete

>diff -ruN libzip.bak/Makefile libzip/Makefile
>--- libzip.bak/Makefile	2013-07-09 15:29:47.000000000 +0400
>+++ libzip/Makefile	2013-07-11 13:00:56.000000000 +0400
>@@ -2,14 +2,13 @@
> # $FreeBSD: head/archivers/libzip/Makefile 309150 2012-12-18 07:57:31Z danfe $
> 
> 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
> GNU_CONFIGURE=	yes
> MAKE_ENV=	LC_ALL="C"
> USE_AUTOTOOLS=	libtool
>@@ -20,54 +19,67 @@
> 		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
>+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_strerror.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_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_file_compression.3 \
>+                zip_set_default_password.3 \
>+                zip_set_file_comment.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 <bsd.port.mk>
>diff -ruN libzip.bak/distinfo libzip/distinfo
>--- libzip.bak/distinfo	2013-07-09 15:29:47.000000000 +0400
>+++ libzip/distinfo	2013-07-11 12:38:26.000000000 +0400
>@@ -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.gz) = de1f9c27bbcfd9df97d54cdaec0e4a15cbfc842793ab42def56052f12cd3dc95
>+SIZE (libzip-0.11.1.tar.gz) = 564950
>diff -ruN libzip.bak/files/patch-libzip.pc.in libzip/files/patch-libzip.pc.in
>--- libzip.bak/files/patch-libzip.pc.in	2013-07-09 15:29:47.000000000 +0400
>+++ libzip/files/patch-libzip.pc.in	2013-07-11 12:41:14.000000000 +0400
>@@ -1,17 +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
>+--- ./libzip.pc.in.orig	2013-03-19 14:09:51.000000000 +0400
>++++ ./libzip.pc.in	2013-07-11 12:40:21.000000000 +0400
> @@ -2,7 +2,6 @@
>  exec_prefix=@exec_prefix@
>  libdir=@libdir@
>  includedir=@includedir@
>--libincludedir=@libdir@/libzip/include
>+-libincludedir=@libdir@/@PACKAGE@/include
>  
>  zipcmp=@prefix@/bin/zipcmp
>  
>-@@ -10,5 +9,4 @@
>+@@ -10,5 +9,5 @@
>  Description: library for handling zip archives
>  Version: @VERSION@
>  Libs: -L${libdir} -lzip @LIBS@
> -Cflags: -I${includedir} -I${libincludedir}
>--
> +Cflags: -I${includedir}
>+

Actions: View | Diff

Attachments on bug 180454: 135536