diff --git a/archivers/xar/Portfile b/archivers/xar/Portfile
index 918e4a29cd8..c8253469217 100644
a
|
b
|
PortSystem 1.0 |
4 | 4 | PortGroup clang_dependency 1.0 |
5 | 5 | PortGroup github 1.0 |
6 | 6 | |
7 | | platform darwin { |
8 | | if {${os.major} <= 22} { |
9 | | set apple_version 498 |
10 | | } else { |
11 | | set apple_version 501 |
12 | | } |
13 | | } |
14 | | |
15 | | github.setup apple-oss-distributions xar ${apple_version} xar- |
16 | | version 1.8.0.${apple_version} |
17 | | revision 0 |
| 7 | github.setup apple-oss-distributions xar 501 xar- |
| 8 | version 1.8.0.${github.version} |
| 9 | revision 1 |
| 10 | checksums rmd160 9a30fb4730de5bb8d70ff2692d7276d7f586ef50 \ |
| 11 | sha256 6a9257017243c78d37e3788717259e53ffd33d93c740c12754e8527943fe892d \ |
| 12 | size 224936 |
18 | 13 | |
19 | 14 | categories archivers sysutils |
20 | 15 | license BSD |
… |
… |
description xar is the eXtensible ARchiver |
22 | 17 | long_description {*}${description} |
23 | 18 | maintainers {mps @Schamschula} openmaintainer |
24 | 19 | |
25 | | distname ${name}-${apple_version} |
26 | | |
27 | 20 | worksrcdir ${distname}/xar |
28 | 21 | |
29 | | platform darwin { |
30 | | if {${os.major} <= 22} { |
31 | | checksums rmd160 0471deb9e01c91658feb4ea120772f7478f5c350 \ |
32 | | sha256 34f2e97c6786d2994af30fd72447ff1ac53f4052391a1030424da291f26c44f4 \ |
33 | | size 224456 |
34 | | |
35 | | # see: https://trac.macports.org/ticket/64837 |
36 | | patchfiles patch-src-xar_internal.h.old.diff |
37 | | } else { |
38 | | checksums rmd160 9a30fb4730de5bb8d70ff2692d7276d7f586ef50 \ |
39 | | sha256 6a9257017243c78d37e3788717259e53ffd33d93c740c12754e8527943fe892d \ |
40 | | size 224936 |
41 | | |
42 | | # see: https://trac.macports.org/ticket/64837 |
43 | | patchfiles patch-src-xar_internal.h.diff |
44 | | } |
45 | | } |
46 | | |
47 | | depends_build port:pkgconfig \ |
48 | | port:automake |
| 22 | depends_build port:automake \ |
| 23 | path:bin/pkg-config:pkgconfig |
49 | 24 | |
50 | 25 | depends_lib path:lib/libssl.dylib:openssl \ |
51 | 26 | port:bzip2 \ |
… |
… |
patchfiles-append patch-stdout.diff |
71 | 46 | # see: https://trac.macports.org/ticket/64826 |
72 | 47 | patchfiles-append patch-include-xar.h.in.diff |
73 | 48 | |
| 49 | # see: https://trac.macports.org/ticket/64837 |
| 50 | patchfiles patch-src-xar_internal.h.diff |
| 51 | |
74 | 52 | # see: https://trac.macports.org/ticket/65128 |
75 | 53 | patchfiles-append patch-lib-filetree.c.diff |
76 | 54 | |
… |
… |
post-patch { |
85 | 63 | } |
86 | 64 | |
87 | 65 | use_autoconf yes |
| 66 | |
| 67 | # https://trac.macports.org/ticket/71162 |
| 68 | configure.cppflags-append \ |
| 69 | -DXARSIG_BUILDING_WITH_XAR |
diff --git a/archivers/xar/files/patch-lib-filetree.c.diff b/archivers/xar/files/patch-lib-filetree.c.diff
index 6c528b8feae..7eee71d849c 100644
a
|
b
|
|
1 | | --- lib/filetree.c.orig 2022-05-03 23:39:20.000000000 -0500 |
2 | | +++ lib/filetree.c 2022-05-08 06:01:32.000000000 -0500 |
3 | | @@ -740,7 +740,8 @@ |
| 1 | --- lib/filetree.c.orig 2024-09-24 15:39:21.000000000 -0500 |
| 2 | +++ lib/filetree.c 2024-10-23 20:06:12.000000000 -0500 |
| 3 | @@ -752,7 +752,8 @@ |
4 | 4 | size_t fspath1_size = 0, fspath2_size = 0; |
5 | 5 | size_t ns1_size = 0, ns2_size = 0; |
6 | 6 | const struct __xar_file_t * child1 = NULL, * child2 = NULL; |
diff --git a/archivers/xar/files/patch-stdout.diff b/archivers/xar/files/patch-stdout.diff
index ec211bed758..37f92f96e31 100644
a
|
b
|
https://github.com/mackyle/xar/commit/ddea2e4b53b6b2cfdd0d13c6beaac0978330c2a2 2 |
106 | 106 | |
107 | 107 | --- src/xar.c.orig 2022-03-10 05:12:27.000000000 -0600 |
108 | 108 | +++ src/xar.c 2022-03-10 05:39:41.000000000 -0600 |
109 | | @@ -53,8 +53,10 @@ |
110 | | #include "config.h" |
111 | | #include "../lib/filetree.h" |
| 109 | @@ -55,6 +55,7 @@ |
112 | 110 | #include "util.h" |
113 | | +#include "xar.h" |
114 | 111 | #define SYMBOLIC 1 |
115 | 112 | #define NUMERIC 2 |
116 | 113 | +#define XAR_OPT_EXTRACTSTDOUT "extract-stdout" /* Extract data to stdout instead of file (true/false) */ |