Repost of: http://marc.info/?l=openbsd-ports&m=145972542015059&w=2
-----
Update: 15.09 -> 15.14.1
While here removes some trailing whitespace in pkg/DESCR-main noted
by portcheck(1).
Index: Makefile
===================================================================
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile 16 Mar 2016 16:46:31 -0000 1.32
+++ Makefile 3 Apr 2016 22:53:43 -0000
@@ -3,8 +3,7 @@
COMMENT-main= file archiver with high compression ratio
COMMENT-rar= rar modules for p7zip
-V= 15.09
-REVISION= 4
+V= 15.14.1
DISTNAME= p7zip_${V}_src_all
PKGNAME= p7zip-${V}
PKGNAME-main= p7zip-${V}
Index: distinfo
===================================================================
RCS file: /systems/cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 21 Oct 2015 10:45:08 -0000 1.15
+++ distinfo 3 Apr 2016 22:54:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (p7zip_15.09_src_all.tar.bz2) =
h4Os90fiEOABUPcxHMBsTNjs97DCe0rfIZQoTMSbTW8=
-SIZE (p7zip_15.09_src_all.tar.bz2) = 4048481
+SHA256 (p7zip_15.14.1_src_all.tar.bz2) =
aZ202jYhkEET4EBwMiCrsRSN/vR3tVMF4vFKTx+PJdQ=
+SIZE (p7zip_15.14.1_src_all.tar.bz2) = 4147911
Index: patches/patch-CPP_7zip_UI_Common_Bench_cpp
===================================================================
RCS file: patches/patch-CPP_7zip_UI_Common_Bench_cpp
diff -N patches/patch-CPP_7zip_UI_Common_Bench_cpp
--- patches/patch-CPP_7zip_UI_Common_Bench_cpp 25 Jan 2016 19:42:46 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-CPP_7zip_UI_Common_Bench_cpp,v 1.1 2016/01/25 19:42:46 jasper
Exp $
-
-Unbreak build on 'mips64' where 'mips' is a CPP define.
-../../../../CPP/7zip/UI/Common/Bench.cpp:2378: error: expected unqualified-id
before numeric constant
-
---- CPP/7zip/UI/Common/Bench.cpp.orig Mon Jan 25 11:46:00 2016
-+++ CPP/7zip/UI/Common/Bench.cpp Mon Jan 25 11:48:27 2016
-@@ -2375,18 +2375,18 @@ HRESULT Bench(
- if (start == 0)
- start = 1;
- UInt64 freq = GetFreq();
-- UInt64 mips = numMilCommands * freq / start;
-+ UInt64 mipsvalue = numMilCommands * freq / start;
- if (printCallback)
-- PrintNumber(*printCallback, mips, 5 + ((sum == 0xF1541213) ? 1 : 0));
-+ PrintNumber(*printCallback, mipsvalue, 5 + ((sum == 0xF1541213) ? 1 :
0));
-
- /*
- if (benchCallback)
-- benchCallback->AddCpuFreq(mips);
-+ benchCallback->AddCpuFreq(mipsvalue);
- */
-
- if (jj >= 3)
- {
-- SetComplexCommands(testTime, mips * 1000000, complexInCommands);
-+ SetComplexCommands(testTime, mipsvalue * 1000000, complexInCommands);
- if (jj >= 8 || start >= freq)
- break;
- // break; // change it
Index: patches/patch-C_CpuArch_h
===================================================================
RCS file: /systems/cvs/ports/archivers/p7zip/patches/patch-C_CpuArch_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-C_CpuArch_h
--- patches/patch-C_CpuArch_h 16 Nov 2015 22:52:08 -0000 1.1
+++ patches/patch-C_CpuArch_h 3 Apr 2016 23:06:00 -0000
@@ -2,30 +2,24 @@ $OpenBSD: patch-C_CpuArch_h,v 1.1 2015/1
Add support for more OpenBSD architectures.
---- C/CpuArch.h.orig Sun Sep 27 21:31:20 2015
-+++ C/CpuArch.h Thu Nov 12 00:28:15 2015
-@@ -65,7 +65,10 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know abo
- || defined(__AARCH64EL__) \
+--- C/CpuArch.h.orig Wed Feb 17 01:27:16 2016
++++ C/CpuArch.h Sun Apr 3 19:05:55 2016
+@@ -66,6 +66,8 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and
|| defined(__MIPSEL__) \
|| defined(__MIPSEL) \
-- || defined(_MIPSEL)
-+ || defined(_MIPSEL) \
+ || defined(_MIPSEL) \
+ || defined(__alpha__) \
+ || defined(__sh__) \
-+ || defined(__vax__)
+ || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ ==
__ORDER_LITTLE_ENDIAN__))
#define MY_CPU_LE
#endif
-
-@@ -77,7 +80,11 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know abo
- || defined(__MIPSEB) \
- || defined(_MIPSEB) \
- || defined(__m68k__) \
-- || defined(__s390x__)
-+ || defined(__m88k__) \
-+ || defined(__s390x__) \
+@@ -82,6 +84,9 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and
+ || defined(__s390x__) \
+ || defined(__zarch__) \
+ || defined(__sparc) \
++ || defined(__sparc__) \
+ || defined(__hppa__) \
+ || defined(__mips64__) \
-+ || defined(__sparc__)
+ || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
#define MY_CPU_BE
#endif
-
Index: pkg/DESCR-main
===================================================================
RCS file: /systems/cvs/ports/archivers/p7zip/pkg/DESCR-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-main
--- pkg/DESCR-main 20 Apr 2007 17:50:05 -0000 1.1.1.1
+++ pkg/DESCR-main 3 Apr 2016 23:12:45 -0000
@@ -1,10 +1,10 @@
p7zip is a port of 7-zip for *nix platforms.
-7-zip is a file archiver with a high compression ratio.
+7-zip is a file archiver with a high compression ratio.
7z uses plugins to handle archives, excepting rar archives.
unRar is available as a subpackage due to licensing.
7za is a stand-alone executable, and handles less archive
formats than 7z.
-7zr is a light stand-alone executable that supports only
+7zr is a light stand-alone executable that supports only
7z/LZMA/BCJ/BCJ2.
Index: pkg/PLIST-main
===================================================================
RCS file: /systems/cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- pkg/PLIST-main 21 Oct 2015 10:45:08 -0000 1.9
+++ pkg/PLIST-main 3 Apr 2016 23:10:42 -0000
@@ -39,6 +39,8 @@ share/doc/p7zip/DOC/MANUAL/cmdline/switc
share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_exclude.htm
share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_include.htm
share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_no.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/bb.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/bs.htm
share/doc/p7zip/DOC/MANUAL/cmdline/switches/charset.htm
share/doc/p7zip/DOC/MANUAL/cmdline/switches/email.htm
share/doc/p7zip/DOC/MANUAL/cmdline/switches/exclude.htm
@@ -65,6 +67,7 @@ share/doc/p7zip/DOC/MANUAL/cmdline/switc
share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdout.htm
share/doc/p7zip/DOC/MANUAL/cmdline/switches/stl.htm
share/doc/p7zip/DOC/MANUAL/cmdline/switches/stop_switch.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/stx.htm
share/doc/p7zip/DOC/MANUAL/cmdline/switches/style.css
share/doc/p7zip/DOC/MANUAL/cmdline/switches/type.htm
share/doc/p7zip/DOC/MANUAL/cmdline/switches/update.htm
