Attachment #221311 for bug #252456

View | Details | Raw Unified | Return to bug 252456
Collapse All | Expand All

Lines 2-8 Link Here

(-)archivers/libzip/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libzip	4	PORTNAME= libzip
5	PORTVERSION= 1.5.2	5	PORTVERSION= 1.7.3
6	CATEGORIES= archivers devel	6	CATEGORIES= archivers devel
7	MASTER_SITES= https://libzip.org/download/	7	MASTER_SITES= https://libzip.org/download/
8		8

Lines 1-3 Link Here

(-)archivers/libzip/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1552751578	1	TIMESTAMP = 1609865777
2	SHA256 (libzip-1.5.2.tar.xz) = b3de4d4bd49a01e0cab3507fc163f88e1651695b6b9cb25ad174dbe319d4a3b4	2	SHA256 (libzip-1.7.3.tar.xz) = a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132
3	SIZE (libzip-1.5.2.tar.xz) = 725724	3	SIZE (libzip-1.7.3.tar.xz) = 747372




Do not set RPATH on FreeBSD either.
--- CMakeLists.txt.orig	2020-07-15 08:02:19 UTC
+++ CMakeLists.txt
@@ -237,7 +237,7 @@ if(WIN32)
 endif(WIN32)
 
 # rpath handling: use rpath in installed binaries
-if(NOT CMAKE_SYSTEM_NAME MATCHES Linux)
+IF(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD|Linux")
   set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif()




bin/ziptool
include/zip.h
include/zipconf.h
lib/cmake/libzip/libzip-config-version.cmake
lib/cmake/libzip/libzip-config.cmake
lib/cmake/libzip/libzip-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/libzip/libzip-targets.cmake
lib/libzip.so
lib/libzip.so.5
lib/libzip.so.5.3
libdata/pkgconfig/libzip.pc
man/man1/zipcmp.1.gz
man/man1/zipmerge.1.gz

man/man3/libzip.3.gz
man/man3/zip_add.3.gz
man/man3/zip_add_dir.3.gz
man/man3/zip_compression_method_supported.3.gz
man/man3/zip_close.3.gz
man/man3/zip_delete.3.gz
man/man3/zip_dir_add.3.gz
man/man3/zip_discard.3.gz
man/man3/zip_encryption_method_supported.3.gz
man/man3/zip_error_clear.3.gz
man/man3/zip_error_code_system.3.gz
man/man3/zip_error_code_zip.3.gz

man/man3/zip_fclose.3.gz
man/man3/zip_fdopen.3.gz
man/man3/zip_file_add.3.gz
man/man3/zip_file_attributes_init.3.gz
man/man3/zip_file_error_clear.3.gz
man/man3/zip_file_error_get.3.gz
man/man3/zip_file_extra_field_delete.3.gz

man/man3/zip_file_rename.3.gz
man/man3/zip_file_replace.3.gz
man/man3/zip_file_set_comment.3.gz
man/man3/zip_file_set_dostime.3.gz
man/man3/zip_file_set_encryption.3.gz
man/man3/zip_file_set_external_attributes.3.gz
man/man3/zip_file_set_mtime.3.gz

Return to bug 252456

Lines 1-12 Link Here

(-)archivers/libzip/files/patch-CMakeLists.txt (-7 / +7 lines)
1	Do not set RPATH on FreeBSD either.	1	Do not set RPATH on FreeBSD either.
2	--- CMakeLists.txt.orig 2018-06-14 20:07:27 UTC	2	--- CMakeLists.txt.orig 2020-07-15 08:02:19 UTC
3	+++ CMakeLists.txt	3	+++ CMakeLists.txt
4	@@ -224,7 +224,7 @@ endif(WIN32)	4	@@ -237,7 +237,7 @@ if(WIN32)
5	ADD_DEFINITIONS("-DHAVE_CONFIG_H")	5	endif(WIN32)
6		6
7	# rpath handling: use rpath in installed binaries	7	# rpath handling: use rpath in installed binaries
8	-IF(NOT CMAKE_SYSTEM_NAME MATCHES Linux)	8	-if(NOT CMAKE_SYSTEM_NAME MATCHES Linux)
9	+IF(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD\|Linux")	9	+IF(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD\|Linux")
10	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")	10	set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
11	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)	11	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
12	ENDIF()	12	endif()

Lines 3-11 Link Here

(-)archivers/libzip/pkg-plist (-1 / +9 lines)
3	bin/ziptool	3	bin/ziptool
4	include/zip.h	4	include/zip.h
5	include/zipconf.h	5	include/zipconf.h
		6	lib/cmake/libzip/libzip-config-version.cmake
		7	lib/cmake/libzip/libzip-config.cmake
		8	lib/cmake/libzip/libzip-targets-%%CMAKE_BUILD_TYPE%%.cmake
		9	lib/cmake/libzip/libzip-targets.cmake
6	lib/libzip.so	10	lib/libzip.so
7	lib/libzip.so.5	11	lib/libzip.so.5
8	lib/libzip.so.5.0	12	lib/libzip.so.5.3
9	libdata/pkgconfig/libzip.pc	13	libdata/pkgconfig/libzip.pc
10	man/man1/zipcmp.1.gz	14	man/man1/zipcmp.1.gz
11	man/man1/zipmerge.1.gz	15	man/man1/zipmerge.1.gz
Lines 14-23 Link Here
14	man/man3/libzip.3.gz	18	man/man3/libzip.3.gz
15	man/man3/zip_add.3.gz	19	man/man3/zip_add.3.gz
16	man/man3/zip_add_dir.3.gz	20	man/man3/zip_add_dir.3.gz
		21	man/man3/zip_compression_method_supported.3.gz
17	man/man3/zip_close.3.gz	22	man/man3/zip_close.3.gz
18	man/man3/zip_delete.3.gz	23	man/man3/zip_delete.3.gz
19	man/man3/zip_dir_add.3.gz	24	man/man3/zip_dir_add.3.gz
20	man/man3/zip_discard.3.gz	25	man/man3/zip_discard.3.gz
		26	man/man3/zip_encryption_method_supported.3.gz
21	man/man3/zip_error_clear.3.gz	27	man/man3/zip_error_clear.3.gz
22	man/man3/zip_error_code_system.3.gz	28	man/man3/zip_error_code_system.3.gz
23	man/man3/zip_error_code_zip.3.gz	29	man/man3/zip_error_code_zip.3.gz
Lines 35-40 Link Here
35	man/man3/zip_fclose.3.gz	41	man/man3/zip_fclose.3.gz
36	man/man3/zip_fdopen.3.gz	42	man/man3/zip_fdopen.3.gz
37	man/man3/zip_file_add.3.gz	43	man/man3/zip_file_add.3.gz
		44	man/man3/zip_file_attributes_init.3.gz
38	man/man3/zip_file_error_clear.3.gz	45	man/man3/zip_file_error_clear.3.gz
39	man/man3/zip_file_error_get.3.gz	46	man/man3/zip_file_error_get.3.gz
40	man/man3/zip_file_extra_field_delete.3.gz	47	man/man3/zip_file_extra_field_delete.3.gz
Lines 50-55 Link Here
50	man/man3/zip_file_rename.3.gz	57	man/man3/zip_file_rename.3.gz
51	man/man3/zip_file_replace.3.gz	58	man/man3/zip_file_replace.3.gz
52	man/man3/zip_file_set_comment.3.gz	59	man/man3/zip_file_set_comment.3.gz
		60	man/man3/zip_file_set_dostime.3.gz
53	man/man3/zip_file_set_encryption.3.gz	61	man/man3/zip_file_set_encryption.3.gz
54	man/man3/zip_file_set_external_attributes.3.gz	62	man/man3/zip_file_set_external_attributes.3.gz
55	man/man3/zip_file_set_mtime.3.gz	63	man/man3/zip_file_set_mtime.3.gz