Fix man pages generation with Perl 5.24+

While there, run make makepatch.

PR:		213810
Sponsored by:	Absolight

6 files changed, 30 insertions, 19 deletions

diff --git a/chinese/sunpinyin/files/patch-SConstruct b/chinese/sunpinyin/files/patch-SConstruct
index a631a54cacf4..ffd859c026ff 100644
--- a/chinese/sunpinyin/files/patch-SConstruct
+++ b/chinese/sunpinyin/files/patch-SConstruct
@@ -1,5 +1,5 @@
---- SConstruct.orig	2014-11-14 09:17:48.000000000 -0500
-+++ SConstruct	2015-04-01 16:11:27.540297600 -0400
+--- SConstruct.orig	2014-11-14 14:17:48 UTC
++++ SConstruct
 @@ -215,10 +215,11 @@ def CreateEnvironment():
          make = 'gmake'
          tar = 'gtar'
diff --git a/chinese/sunpinyin/files/patch-man_SConscript b/chinese/sunpinyin/files/patch-man_SConscript
new file mode 100644
index 000000000000..e04f8c8623af
--- /dev/null
+++ b/chinese/sunpinyin/files/patch-man_SConscript
@@ -0,0 +1,11 @@
+--- man/SConscript.orig	2014-11-14 14:17:48 UTC
++++ man/SConscript
+@@ -1,7 +1,7 @@
+ import os
+ Import('env')
+ 
+-pod2man = Builder(action = 'pod2man < $SOURCE > $TARGET')
++pod2man = Builder(action = 'pod2man $SOURCE $TARGET')
+ env.Append(BUILDERS = {'Man': pod2man})
+ 
+ env.Man('mmseg.1', 'mmseg.pod')
diff --git a/chinese/sunpinyin/files/patch-src_ime-core_imi__winHandler.cpp b/chinese/sunpinyin/files/patch-src_ime-core_imi__winHandler.cpp
index 1cd423900bc4..74fdf4f2fa59 100644
--- a/chinese/sunpinyin/files/patch-src_ime-core_imi__winHandler.cpp
+++ b/chinese/sunpinyin/files/patch-src_ime-core_imi__winHandler.cpp
@@ -1,6 +1,6 @@
---- ./src/ime-core/imi_winHandler.cpp~	2011-02-17 21:39:52.000000000 -0600
-+++ ./src/ime-core/imi_winHandler.cpp	2011-11-11 02:29:45.163309361 -0600
-@@ -85,6 +85,7 @@ CIMIWinHandler::throwBackKey(unsigned ke
+--- src/ime-core/imi_winHandler.cpp.orig	2014-11-14 14:17:48 UTC
++++ src/ime-core/imi_winHandler.cpp
+@@ -87,6 +87,7 @@ CIMIWinHandler::throwBackKey(unsigned ke
  void
  CIMIWinHandler::updateStatus(int key, int value)
  {
@@ -8,9 +8,11 @@
      switch (key) {
      case STATUS_ID_CN:
          printf("CN status is "); break;
-@@ -99,4 +100,5 @@ CIMIWinHandler::updateStatus(int key, in
+@@ -101,6 +102,7 @@ CIMIWinHandler::updateStatus(int key, in
  
      printf("%d\n", value);
      fflush(stdout);
 +#endif
  }
+ 
+ // -*- indent-tabs-mode: nil -*- vim:et:ts=4
diff --git a/chinese/sunpinyin/files/patch-src_portability.h b/chinese/sunpinyin/files/patch-src_portability.h
index a352ab8de012..93c117af2c66 100644
--- a/chinese/sunpinyin/files/patch-src_portability.h
+++ b/chinese/sunpinyin/files/patch-src_portability.h
@@ -1,5 +1,5 @@
---- src/portability.h.orig	2014-08-19 21:12:42.000000000 -0400
-+++ src/portability.h	2014-08-19 21:12:51.000000000 -0400
+--- src/portability.h.orig	2014-11-14 14:17:48 UTC
++++ src/portability.h
 @@ -42,6 +42,7 @@
  #include <stdio.h>
  #include <math.h>
diff --git a/chinese/sunpinyin/files/patch-src_sunpinyin-dictgen.mk.in b/chinese/sunpinyin/files/patch-src_sunpinyin-dictgen.mk.in
index 926457694627..4372c17738ef 100644
--- a/chinese/sunpinyin/files/patch-src_sunpinyin-dictgen.mk.in
+++ b/chinese/sunpinyin/files/patch-src_sunpinyin-dictgen.mk.in
@@ -1,5 +1,5 @@
---- src/sunpinyin-dictgen.mk.in.orig	2014-11-14 09:17:48.000000000 -0500
-+++ src/sunpinyin-dictgen.mk.in	2015-04-01 14:42:35.541184598 -0400
+--- src/sunpinyin-dictgen.mk.in.orig	2014-11-14 14:17:48 UTC
++++ src/sunpinyin-dictgen.mk.in
 @@ -42,22 +42,7 @@ DL_ROOT = ${DL_HOST}/open-gram
  DICT_PAT = 'dict\.utf8-[0-9]\+.tar.bz2'
  SLM_PAT = 'lm_sc\.3gm\.arpa-[0-9]\+.tar.bz2'
diff --git a/chinese/sunpinyin/files/patch-xdg b/chinese/sunpinyin/files/patch-xdg
index 40f4ffd6a355..452c3aacb46f 100644
--- a/chinese/sunpinyin/files/patch-xdg
+++ b/chinese/sunpinyin/files/patch-xdg
@@ -1,5 +1,5 @@
---- src/ime-core/imi_options.cpp~	2012-05-13 22:55:19.000000000 -0500
-+++ src/ime-core/imi_options.cpp	2012-05-13 23:08:27.566965023 -0500
+--- src/ime-core/imi_options.cpp.orig	2014-11-14 14:17:48 UTC
++++ src/ime-core/imi_options.cpp
 @@ -73,12 +73,15 @@ CSimplifiedChinesePolicy::loadResources(
  
      if (!m_user_data_dir.size()) {
@@ -22,16 +22,14 @@
          m_user_data_dir = path;
      }
  
-diff -uNr src/ime-core/imi_options.h src/ime-core/imi_options.h
---- src/ime-core/imi_options.h	2010-09-22 13:14:35.883000000 +0800
-+++ src/ime-core/imi_options.h	2010-09-22 13:15:20.760000002 +0800
-@@ -50,7 +50,7 @@
- #include "pinyin/shuangpin_seg.h"
+--- src/ime-core/imi_options.h.orig	2014-11-14 14:17:48 UTC
++++ src/ime-core/imi_options.h
+@@ -52,7 +52,7 @@
+ #include "pinyin/hunpin_seg.h"
  
  #ifndef SUNPINYIN_USERDATA_DIR_PREFIX
 -#define SUNPINYIN_USERDATA_DIR_PREFIX ".sunpinyin"
 +#define SUNPINYIN_USERDATA_DIR_PREFIX "sunpinyin"
  #endif
  
- struct CSimplifiedChinesePolicy : public IConfigurable
-
+ struct CSimplifiedChinesePolicy : public IConfigurable {