diff options
| -rw-r--r-- | archivers/p7zip/Makefile | 6 | ||||
| -rw-r--r-- | archivers/p7zip/distinfo | 11 | ||||
| -rw-r--r-- | archivers/p7zip/patches/patch-CPP_Common_DynamicBuffer.h | 13 | ||||
| -rw-r--r-- | archivers/p7zip/patches/patch-ab | 4 |
4 files changed, 10 insertions, 24 deletions
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile index 99ba7232a27..c652ce6d7f5 100644 --- a/archivers/p7zip/Makefile +++ b/archivers/p7zip/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.47 2010/06/16 08:30:09 adam Exp $ +# $NetBSD: Makefile,v 1.48 2011/03/14 12:36:42 adam Exp $ -DISTNAME= p7zip_9.13_src_all -PKGNAME= p7zip-9.13 +DISTNAME= p7zip_9.20_src_all +PKGNAME= p7zip-9.20 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/} EXTRACT_SUFX= .tar.bz2 diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo index 0bfa79f8579..a52c1e54493 100644 --- a/archivers/p7zip/distinfo +++ b/archivers/p7zip/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.38 2011/02/04 22:46:33 wiz Exp $ +$NetBSD: distinfo,v 1.39 2011/03/14 12:36:42 adam Exp $ -SHA1 (p7zip_9.13_src_all.tar.bz2) = 81da0729561ce123c0a82656ec96a04ad5bfa522 -RMD160 (p7zip_9.13_src_all.tar.bz2) = beb9181330f4dfa75aa4f473c68a462c76b7ab19 -Size (p7zip_9.13_src_all.tar.bz2) = 3753579 bytes -SHA1 (patch-CPP_Common_DynamicBuffer.h) = 6f3696c39e418503975041019409850105192687 +SHA1 (p7zip_9.20_src_all.tar.bz2) = c976df4543ea946a65bc3f5e3d4e9baa417e5f12 +RMD160 (p7zip_9.20_src_all.tar.bz2) = ab7675c4ca87ce855acc05855328081c1b365d1c +Size (p7zip_9.20_src_all.tar.bz2) = 3836127 bytes SHA1 (patch-aa) = 6df31ad2f391b7f1b5220f05ff0142ee258a92e7 -SHA1 (patch-ab) = fedaf15990d9c01bdefcd2a0bd9a740f965247b0 +SHA1 (patch-ab) = a9bd9ab50f6c2d5964de9b2c4e5d9d75e3c29b79 SHA1 (patch-ac) = f5f0acd488a7c524b692b5660042baa79f9937ce diff --git a/archivers/p7zip/patches/patch-CPP_Common_DynamicBuffer.h b/archivers/p7zip/patches/patch-CPP_Common_DynamicBuffer.h deleted file mode 100644 index 034dd29f763..00000000000 --- a/archivers/p7zip/patches/patch-CPP_Common_DynamicBuffer.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-CPP_Common_DynamicBuffer.h,v 1.2 2011/02/04 22:46:33 wiz Exp $ - ---- CPP/Common/DynamicBuffer.h.orig 2011-02-04 21:00:13.000000000 +0000 -+++ CPP/Common/DynamicBuffer.h -@@ -17,7 +17,7 @@ template <class T> class CDynamicBuffer: - else - delta = 4; - delta = MyMax(delta, size); -- SetCapacity(this->_capacity + delta); -+ this->SetCapacity(this->_capacity + delta); - } - public: - CDynamicBuffer(): CBuffer<T>() {}; diff --git a/archivers/p7zip/patches/patch-ab b/archivers/p7zip/patches/patch-ab index 608e9c3f644..a637ae9efe4 100644 --- a/archivers/p7zip/patches/patch-ab +++ b/archivers/p7zip/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.10 2009/06/08 05:54:51 adam Exp $ +$NetBSD: patch-ab,v 1.11 2011/03/14 12:36:43 adam Exp $ --- CPP/Windows/FileFind.cpp.orig 2009-06-03 19:40:16.000000000 +0200 +++ CPP/Windows/FileFind.cpp -@@ -314,7 +314,8 @@ bool CFindFile::FindFirst(LPCSTR wildcar +@@ -311,7 +311,8 @@ bool CFindFile::FindFirst(LPCSTR wildcar } TRACEN((printf("CFindFile::FindFirst : closedir-2(dirp=%p)\n",_dirp))) |