diff options
| author | dholland <dholland@pkgsrc.org> | 2008-08-02 17:10:13 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2008-08-02 17:10:13 +0000 |
| commit | 3b25dda7da5cb4f0336390770cebc137344bc48a (patch) | |
| tree | 14cb67ad3937d344307147925236680fbcceb4bf /archivers | |
| parent | 72c13548074a3d7ccae4b392e9a6d5511647c8bc (diff) | |
| download | pkgsrc-3b25dda7da5cb4f0336390770cebc137344bc48a.tar.gz | |
Fix broken build on amd64.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/dar/distinfo | 3 | ||||
| -rw-r--r-- | archivers/dar/patches/patch-ag | 32 |
2 files changed, 34 insertions, 1 deletions
diff --git a/archivers/dar/distinfo b/archivers/dar/distinfo index 6cb808c152d..706b64bc459 100644 --- a/archivers/dar/distinfo +++ b/archivers/dar/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2008/06/22 22:33:37 dsainty Exp $ +$NetBSD: distinfo,v 1.24 2008/08/02 17:10:13 dholland Exp $ SHA1 (dar-2.3.8.tar.gz) = d0394ff9dd6a287e3b9b62ebe99e126bb6d8abd0 RMD160 (dar-2.3.8.tar.gz) = 0927b59ba0426634ba5c2ca8b7cad157d6579b13 @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 34ba67a1ae794c1069824347b67a204455d18f2e SHA1 (patch-ad) = a0089fd534a98d5daae87b92b61f869ed146bed3 SHA1 (patch-ae) = 54220384bf2031df64c38f5abea038382ca37e8e SHA1 (patch-af) = c25351dbf2f115b649207f88981710e04a0a038e +SHA1 (patch-ag) = 3873d5dd9e387c90977b169e4532891bcf242e49 diff --git a/archivers/dar/patches/patch-ag b/archivers/dar/patches/patch-ag new file mode 100644 index 00000000000..35f3e2d293b --- /dev/null +++ b/archivers/dar/patches/patch-ag @@ -0,0 +1,32 @@ +$NetBSD: patch-ag,v 1.3 2008/08/02 17:10:13 dholland Exp $ + +--- src/testing/test_libdar.cpp~ 2007-07-22 12:35:01.000000000 -0400 ++++ src/testing/test_libdar.cpp 2008-08-02 13:01:08.000000000 -0400 +@@ -89,7 +89,7 @@ void f1() + + void warning(const string &x, void *context) + { +- printf("[%d]%s\n", (U_I)context, x.c_str()); ++ printf("[%p]%s\n", context, x.c_str()); + } + + bool question(const string & x, void *context) +@@ -97,7 +97,7 @@ bool question(const string & x, void *co + bool rep = false; + char r; + +- printf("[%d]%s\n", (U_I)context, x.c_str()); ++ printf("[%p]%s\n", context, x.c_str()); + scanf("%c", &r); + rep = r == 'y'; + +@@ -120,7 +120,8 @@ void listing(const std::string & flag, + bool has_children, + void *context) + { +- ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (U_I)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children"); ++ /* note: ui.printf isn't printf and can't do %p */ ++ ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (U_I)(uintptr_t)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children"); + } + + void f2() |