Fix man pages generation with Perl 5.24+

While there, run make makepatch.

PR:		213810
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2016-11-03 13:30:20 +00:00
parent b050012ec2
commit 43d4db24b0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=425208
6 changed files with 30 additions and 19 deletions

View file

@ -1,5 +1,5 @@
--- SConstruct.orig 2014-11-14 09:17:48.000000000 -0500 --- SConstruct.orig 2014-11-14 14:17:48 UTC
+++ SConstruct 2015-04-01 16:11:27.540297600 -0400 +++ SConstruct
@@ -215,10 +215,11 @@ def CreateEnvironment(): @@ -215,10 +215,11 @@ def CreateEnvironment():
make = 'gmake' make = 'gmake'
tar = 'gtar' tar = 'gtar'

View file

@ -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')

View file

@ -1,6 +1,6 @@
--- ./src/ime-core/imi_winHandler.cpp~ 2011-02-17 21:39:52.000000000 -0600 --- src/ime-core/imi_winHandler.cpp.orig 2014-11-14 14:17:48 UTC
+++ ./src/ime-core/imi_winHandler.cpp 2011-11-11 02:29:45.163309361 -0600 +++ src/ime-core/imi_winHandler.cpp
@@ -85,6 +85,7 @@ CIMIWinHandler::throwBackKey(unsigned ke @@ -87,6 +87,7 @@ CIMIWinHandler::throwBackKey(unsigned ke
void void
CIMIWinHandler::updateStatus(int key, int value) CIMIWinHandler::updateStatus(int key, int value)
{ {
@ -8,9 +8,11 @@
switch (key) { switch (key) {
case STATUS_ID_CN: case STATUS_ID_CN:
printf("CN status is "); break; 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); printf("%d\n", value);
fflush(stdout); fflush(stdout);
+#endif +#endif
} }
// -*- indent-tabs-mode: nil -*- vim:et:ts=4

View file

@ -1,5 +1,5 @@
--- src/portability.h.orig 2014-08-19 21:12:42.000000000 -0400 --- src/portability.h.orig 2014-11-14 14:17:48 UTC
+++ src/portability.h 2014-08-19 21:12:51.000000000 -0400 +++ src/portability.h
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>

View file

@ -1,5 +1,5 @@
--- src/sunpinyin-dictgen.mk.in.orig 2014-11-14 09:17:48.000000000 -0500 --- src/sunpinyin-dictgen.mk.in.orig 2014-11-14 14:17:48 UTC
+++ src/sunpinyin-dictgen.mk.in 2015-04-01 14:42:35.541184598 -0400 +++ src/sunpinyin-dictgen.mk.in
@@ -42,22 +42,7 @@ DL_ROOT = ${DL_HOST}/open-gram @@ -42,22 +42,7 @@ DL_ROOT = ${DL_HOST}/open-gram
DICT_PAT = 'dict\.utf8-[0-9]\+.tar.bz2' DICT_PAT = 'dict\.utf8-[0-9]\+.tar.bz2'
SLM_PAT = 'lm_sc\.3gm\.arpa-[0-9]\+.tar.bz2' SLM_PAT = 'lm_sc\.3gm\.arpa-[0-9]\+.tar.bz2'

View file

@ -1,5 +1,5 @@
--- src/ime-core/imi_options.cpp~ 2012-05-13 22:55:19.000000000 -0500 --- src/ime-core/imi_options.cpp.orig 2014-11-14 14:17:48 UTC
+++ src/ime-core/imi_options.cpp 2012-05-13 23:08:27.566965023 -0500 +++ src/ime-core/imi_options.cpp
@@ -73,12 +73,15 @@ CSimplifiedChinesePolicy::loadResources( @@ -73,12 +73,15 @@ CSimplifiedChinesePolicy::loadResources(
if (!m_user_data_dir.size()) { if (!m_user_data_dir.size()) {
@ -22,16 +22,14 @@
m_user_data_dir = path; 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.orig 2014-11-14 14:17:48 UTC
--- src/ime-core/imi_options.h 2010-09-22 13:14:35.883000000 +0800 +++ src/ime-core/imi_options.h
+++ src/ime-core/imi_options.h 2010-09-22 13:15:20.760000002 +0800 @@ -52,7 +52,7 @@
@@ -50,7 +50,7 @@ #include "pinyin/hunpin_seg.h"
#include "pinyin/shuangpin_seg.h"
#ifndef SUNPINYIN_USERDATA_DIR_PREFIX #ifndef SUNPINYIN_USERDATA_DIR_PREFIX
-#define SUNPINYIN_USERDATA_DIR_PREFIX ".sunpinyin" -#define SUNPINYIN_USERDATA_DIR_PREFIX ".sunpinyin"
+#define SUNPINYIN_USERDATA_DIR_PREFIX "sunpinyin" +#define SUNPINYIN_USERDATA_DIR_PREFIX "sunpinyin"
#endif #endif
struct CSimplifiedChinesePolicy : public IConfigurable struct CSimplifiedChinesePolicy : public IConfigurable {