Fri Aug 25 07:12:41 2023 UTC ()
libzip: fix testing on Darwin


(adam)
diff -r1.66 -r1.67 pkgsrc/archivers/libzip/Makefile
diff -r1.45 -r1.46 pkgsrc/archivers/libzip/distinfo
diff -r1.2 -r1.3 pkgsrc/archivers/libzip/patches/patch-regress_nihtest.conf.in
cvs diff -r1.66 -r1.67 pkgsrc/archivers/libzip/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/libzip/Makefile 2023/08/24 07:12:34 1.66
+++ pkgsrc/archivers/libzip/Makefile 2023/08/25 07:12:41 1.67
@@ -1,32 +1,34 @@ @@ -1,32 +1,34 @@
1# $NetBSD: Makefile,v 1.66 2023/08/24 07:12:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.67 2023/08/25 07:12:41 adam Exp $
2 2
3DISTNAME= libzip-1.10.1 3DISTNAME= libzip-1.10.1
4CATEGORIES= archivers devel 4CATEGORIES= archivers devel
5MASTER_SITES= https://libzip.org/download/ 5MASTER_SITES= https://libzip.org/download/
6MASTER_SITES+= ${MASTER_SITE_GITHUB:=nih-at/} 6MASTER_SITES+= ${MASTER_SITE_GITHUB:=nih-at/}
7GITHUB_RELEASE= v${PKGVERSION_NOREV} 7GITHUB_RELEASE= v${PKGVERSION_NOREV}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= https://www.libzip.org/ 11HOMEPAGE= https://www.libzip.org/
12COMMENT= C library to manipulate zip archives 12COMMENT= C library to manipulate zip archives
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15TEST_DEPENDS+= ${PYPKGPREFIX}-nihtest-[0-9]*:../../devel/py-nihtest 15TEST_DEPENDS+= ${PYPKGPREFIX}-nihtest-[0-9]*:../../devel/py-nihtest
16 16
17TEST_TARGET= test 17TEST_TARGET= test
18# for tests 18# for tests
19CMAKE_ARGS+= -DNIHTEST=${PREFIX}/bin/nihtest-${PYVERSSUFFIX} 19CMAKE_ARGS+= -DNIHTEST=${PREFIX}/bin/nihtest-${PYVERSSUFFIX}
20MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib 20MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
 21# for Darwin
 22MAKE_ENV+= DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/lib
21 23
22PYTHON_VERSIONS_INCOMPATIBLE= 27 24PYTHON_VERSIONS_INCOMPATIBLE= 27
23 25
24.include "options.mk" 26.include "options.mk"
25 27
26.include "../../devel/cmake/build.mk" 28.include "../../devel/cmake/build.mk"
27.include "../../lang/python/pyversion.mk" 29.include "../../lang/python/pyversion.mk"
28.include "../../devel/zlib/buildlink3.mk" 30.include "../../devel/zlib/buildlink3.mk"
29.include "../../archivers/bzip2/buildlink3.mk" 31.include "../../archivers/bzip2/buildlink3.mk"
30.include "../../archivers/xz/buildlink3.mk" 32.include "../../archivers/xz/buildlink3.mk"
31.include "../../archivers/zstd/buildlink3.mk" 33.include "../../archivers/zstd/buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.45 -r1.46 pkgsrc/archivers/libzip/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/libzip/distinfo 2023/08/24 07:12:34 1.45
+++ pkgsrc/archivers/libzip/distinfo 2023/08/25 07:12:41 1.46
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.45 2023/08/24 07:12:34 wiz Exp $ 1$NetBSD: distinfo,v 1.46 2023/08/25 07:12:41 adam Exp $
2 2
3BLAKE2s (libzip-1.10.1.tar.xz) = 50440c37f0e3deaa55846c5d3dc122563ebfc79ca1ad96cc8648f9e7480aad68 3BLAKE2s (libzip-1.10.1.tar.xz) = 50440c37f0e3deaa55846c5d3dc122563ebfc79ca1ad96cc8648f9e7480aad68
4SHA512 (libzip-1.10.1.tar.xz) = d24670ca3fa5def0345d6c531045683f11a124af7975dd724eae3bf3128a62fb8185a3d4df029c7c8232c7584e5ac55d18c431dc53b91e992fbbc8d119442930 4SHA512 (libzip-1.10.1.tar.xz) = d24670ca3fa5def0345d6c531045683f11a124af7975dd724eae3bf3128a62fb8185a3d4df029c7c8232c7584e5ac55d18c431dc53b91e992fbbc8d119442930
5Size (libzip-1.10.1.tar.xz) = 774144 bytes 5Size (libzip-1.10.1.tar.xz) = 774144 bytes
6SHA1 (patch-regress_nihtest.conf.in) = 5437e9c11f87cfb8e7c9a391d5a57fd95bd31fca 6SHA1 (patch-regress_nihtest.conf.in) = 4ba110f2acef8ded4956c1931ee6f7c6e0618cd0
cvs diff -r1.2 -r1.3 pkgsrc/archivers/libzip/patches/patch-regress_nihtest.conf.in (expand / switch to unified diff)

--- pkgsrc/archivers/libzip/patches/patch-regress_nihtest.conf.in 2023/08/24 07:12:34 1.2
+++ pkgsrc/archivers/libzip/patches/patch-regress_nihtest.conf.in 2023/08/25 07:12:41 1.3
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: patch-regress_nihtest.conf.in,v 1.2 2023/08/24 07:12:34 wiz Exp $ 1$NetBSD: patch-regress_nihtest.conf.in,v 1.3 2023/08/25 07:12:41 adam Exp $
2 2
3To allow testing in uninstalled state. 3To allow testing in uninstalled state.
4 4
5--- regress/nihtest.conf.in.orig 2023-08-23 10:55:23.000000000 +0000 5--- regress/nihtest.conf.in.orig 2023-08-23 10:55:23.000000000 +0000
6+++ regress/nihtest.conf.in 6+++ regress/nihtest.conf.in
7@@ -9,6 +9,7 @@ program-directories = @PROJECT_BINARY_DI 7@@ -9,6 +9,8 @@ program-directories = @PROJECT_BINARY_DI
8 @PROJECT_BINARY_DIR@/src/Debug 8 @PROJECT_BINARY_DIR@/src/Debug
9 default-program = ziptool_regress 9 default-program = ziptool_regress
10 default-stderr-replace = "^([A-Z]:)?[^ :]*: " "" 10 default-stderr-replace = "^([A-Z]:)?[^ :]*: " ""
11+environment-passthrough = LD_LIBRARY_PATH 11+environment-passthrough = LD_LIBRARY_PATH
 12+ DYLD_LIBRARY_PATH
12  13
13 [comparators] 14 [comparators]
14 zip.zip = zipcmp -pv 15 zip.zip = zipcmp -pv