From f8dafac42cb4869c3a04eed13e621551465bca3a Mon Sep 17 00:00:00 2001 From: clsung Date: Thu, 8 Jun 2006 07:43:24 +0000 Subject: - Fix doc bug - Make portlint more happy PR: ports/98125 Submitted by: maintainer (chinsan) --- chinese/zhcon/files/patch-src-Makefile.in | 11 +++++++++++ chinese/zhcon/files/patch-src-configfile.cpp | 21 +++++++++++++++++++++ .../zhcon/files/patch-src-display-fblinear24.cpp | 16 ++++++++++++++++ chinese/zhcon/files/patch-src-display-fblinear8.cpp | 11 +++++++++++ chinese/zhcon/files/patch-src-global.h | 11 +++++++++++ chinese/zhcon/files/patch-src-inputclient.h | 10 ++++++++++ chinese/zhcon/files/patch-src-mouse.cpp | 10 ++++++++++ chinese/zhcon/files/patch-src-zhcon.cpp | 11 +++++++++++ chinese/zhcon/files/patch-src::Makefile.in | 11 ----------- chinese/zhcon/files/patch-src::configfile.cpp | 21 --------------------- .../zhcon/files/patch-src::display::fblinear24.cpp | 16 ---------------- .../zhcon/files/patch-src::display::fblinear8.cpp | 11 ----------- chinese/zhcon/files/patch-src::global.h | 11 ----------- chinese/zhcon/files/patch-src::inputclient.h | 10 ---------- chinese/zhcon/files/patch-src::mouse.cpp | 10 ---------- chinese/zhcon/files/patch-src::zhcon.cpp | 11 ----------- 16 files changed, 101 insertions(+), 101 deletions(-) create mode 100644 chinese/zhcon/files/patch-src-Makefile.in create mode 100644 chinese/zhcon/files/patch-src-configfile.cpp create mode 100644 chinese/zhcon/files/patch-src-display-fblinear24.cpp create mode 100644 chinese/zhcon/files/patch-src-display-fblinear8.cpp create mode 100644 chinese/zhcon/files/patch-src-global.h create mode 100644 chinese/zhcon/files/patch-src-inputclient.h create mode 100644 chinese/zhcon/files/patch-src-mouse.cpp create mode 100644 chinese/zhcon/files/patch-src-zhcon.cpp delete mode 100644 chinese/zhcon/files/patch-src::Makefile.in delete mode 100644 chinese/zhcon/files/patch-src::configfile.cpp delete mode 100644 chinese/zhcon/files/patch-src::display::fblinear24.cpp delete mode 100644 chinese/zhcon/files/patch-src::display::fblinear8.cpp delete mode 100644 chinese/zhcon/files/patch-src::global.h delete mode 100644 chinese/zhcon/files/patch-src::inputclient.h delete mode 100644 chinese/zhcon/files/patch-src::mouse.cpp delete mode 100644 chinese/zhcon/files/patch-src::zhcon.cpp (limited to 'chinese/zhcon/files') diff --git a/chinese/zhcon/files/patch-src-Makefile.in b/chinese/zhcon/files/patch-src-Makefile.in new file mode 100644 index 000000000000..2de06833be7b --- /dev/null +++ b/chinese/zhcon/files/patch-src-Makefile.in @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig Thu Apr 17 19:29:48 2003 ++++ src/Makefile.in Wed Apr 30 21:10:39 2003 +@@ -478,7 +478,7 @@ + + install-data-local: + $(mkinstalldirs) $(DESTDIR)/etc +- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf ++ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/etc/zhcon.conf + + uninstall-local: + -rm -f $(DESTDIR)/etc/zhcon.conf diff --git a/chinese/zhcon/files/patch-src-configfile.cpp b/chinese/zhcon/files/patch-src-configfile.cpp new file mode 100644 index 000000000000..1955508f56ee --- /dev/null +++ b/chinese/zhcon/files/patch-src-configfile.cpp @@ -0,0 +1,21 @@ +--- src/configfile.cpp.orig Tue Jan 25 07:38:59 2005 ++++ src/configfile.cpp Tue Jan 25 07:41:19 2005 +@@ -19,13 +19,18 @@ + #include + #include + #include ++#include ++#include + #include "configfile.h" + + ConfigFile::ConfigFile(const char *fn) { ++ uid_t euid = geteuid(); ++ seteuid(getuid()); + ifstream in(fn); + if (!in) + throw runtime_error("Could not open config file!"); + ParseFile(in); ++ seteuid(euid); + } + + ConfigFile::~ConfigFile() {} diff --git a/chinese/zhcon/files/patch-src-display-fblinear24.cpp b/chinese/zhcon/files/patch-src-display-fblinear24.cpp new file mode 100644 index 000000000000..abab0e40c044 --- /dev/null +++ b/chinese/zhcon/files/patch-src-display-fblinear24.cpp @@ -0,0 +1,16 @@ +--- src/display/fblinear24.cpp~ Sun Aug 1 17:22:19 2004 ++++ src/display/fblinear24.cpp Sun Aug 1 17:27:33 2004 +@@ -203,11 +203,11 @@ + d1 = (-(*cdat >> 3 & 1) & eorx) ^ bgx; + d2 = (-(*cdat >> 2 & 1) & eorx) ^ bgx; + fb_writel(d1 | (d2<<24), dest32++); +- fb_writew(d2>>8, ((__u16*)dest32)++); ++ fb_writew(d2>>8, ((__u16*)dest32) + 1); + } + if (pFont->w & 1) { + d3 = (-(*cdat >> 1 & 1) & eorx) ^ bgx; +- fb_writew(d3, ((__u16*)dest32)++); ++ fb_writew(d3, ((__u16*)dest32) + 1); + fb_writeb(d3>>16, (__u8*)dest32); + } + cdat++; diff --git a/chinese/zhcon/files/patch-src-display-fblinear8.cpp b/chinese/zhcon/files/patch-src-display-fblinear8.cpp new file mode 100644 index 000000000000..3cdf72ff7748 --- /dev/null +++ b/chinese/zhcon/files/patch-src-display-fblinear8.cpp @@ -0,0 +1,11 @@ +--- src/display/fblinear8.cpp~ Sun Aug 1 17:29:43 2004 ++++ src/display/fblinear8.cpp Sun Aug 1 17:39:12 2004 +@@ -102,7 +102,7 @@ + fb_writel((nibbletab_cfb8[*cdat >> 4] & eorx) ^ bgx, dest32++); + } + if (pFont->w & 2) { +- fb_writew((nibbletab_cfb8[*cdat & 0xc] & eorx) ^ bgx, ((__u16*)dest32)++); ++ fb_writew((nibbletab_cfb8[*cdat & 0xc] & eorx) ^ bgx, ((__u16*)dest32) + 1); + } + if (pFont->w & 1) { + fb_writeb((*cdat & 2) ? fg : bg, (__u8*)dest32); diff --git a/chinese/zhcon/files/patch-src-global.h b/chinese/zhcon/files/patch-src-global.h new file mode 100644 index 000000000000..9f49708c4a44 --- /dev/null +++ b/chinese/zhcon/files/patch-src-global.h @@ -0,0 +1,11 @@ +--- src/global.h.orig Thu Aug 7 12:54:31 2003 ++++ src/global.h Thu Aug 7 12:54:46 2003 +@@ -26,7 +26,7 @@ + //#endif + #define _(String) gettext (String) + #define gettext_noop(String) (String) +- ++#include + #include "graphdev.h" + #include "hzdecoder.h" + //class Console; diff --git a/chinese/zhcon/files/patch-src-inputclient.h b/chinese/zhcon/files/patch-src-inputclient.h new file mode 100644 index 000000000000..df3d1107a125 --- /dev/null +++ b/chinese/zhcon/files/patch-src-inputclient.h @@ -0,0 +1,10 @@ +--- src/inputclient.h.orig Sat Aug 16 16:34:06 2003 ++++ src/inputclient.h Sat Aug 16 16:34:15 2003 +@@ -19,6 +19,7 @@ + #ifndef INPUTCLIENT_H + #define INPUTCLIENT_H + ++#include + #include + #include "console.h" + diff --git a/chinese/zhcon/files/patch-src-mouse.cpp b/chinese/zhcon/files/patch-src-mouse.cpp new file mode 100644 index 000000000000..7b39f069ab8c --- /dev/null +++ b/chinese/zhcon/files/patch-src-mouse.cpp @@ -0,0 +1,10 @@ +--- src/mouse.cpp.orig Sat Aug 16 16:36:28 2003 ++++ src/mouse.cpp Sat Aug 16 16:36:39 2003 +@@ -18,6 +18,7 @@ + + #include "debug.h" + #include "mouse.h" ++#include + #include + + #if defined(__FreeBSD__) diff --git a/chinese/zhcon/files/patch-src-zhcon.cpp b/chinese/zhcon/files/patch-src-zhcon.cpp new file mode 100644 index 000000000000..21df71193387 --- /dev/null +++ b/chinese/zhcon/files/patch-src-zhcon.cpp @@ -0,0 +1,11 @@ +--- src/zhcon.cpp.orig Tue Nov 26 01:35:04 2002 ++++ src/zhcon.cpp Tue Nov 26 01:35:25 2002 +@@ -131,7 +131,7 @@ + string cfgfile = getenv("HOME"); + cfgfile += "/.zhconrc"; + if (access(cfgfile.c_str(), R_OK) != 0) +- cfgfile = "/etc/zhcon.conf"; ++ cfgfile = PREFIX"/etc/zhcon.conf"; + + //for debug,a pause enable us to attach zhcon's pid in gdb + //char c;cin>>c; diff --git a/chinese/zhcon/files/patch-src::Makefile.in b/chinese/zhcon/files/patch-src::Makefile.in deleted file mode 100644 index 2de06833be7b..000000000000 --- a/chinese/zhcon/files/patch-src::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Thu Apr 17 19:29:48 2003 -+++ src/Makefile.in Wed Apr 30 21:10:39 2003 -@@ -478,7 +478,7 @@ - - install-data-local: - $(mkinstalldirs) $(DESTDIR)/etc -- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf -+ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/etc/zhcon.conf - - uninstall-local: - -rm -f $(DESTDIR)/etc/zhcon.conf diff --git a/chinese/zhcon/files/patch-src::configfile.cpp b/chinese/zhcon/files/patch-src::configfile.cpp deleted file mode 100644 index 1955508f56ee..000000000000 --- a/chinese/zhcon/files/patch-src::configfile.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- src/configfile.cpp.orig Tue Jan 25 07:38:59 2005 -+++ src/configfile.cpp Tue Jan 25 07:41:19 2005 -@@ -19,13 +19,18 @@ - #include - #include - #include -+#include -+#include - #include "configfile.h" - - ConfigFile::ConfigFile(const char *fn) { -+ uid_t euid = geteuid(); -+ seteuid(getuid()); - ifstream in(fn); - if (!in) - throw runtime_error("Could not open config file!"); - ParseFile(in); -+ seteuid(euid); - } - - ConfigFile::~ConfigFile() {} diff --git a/chinese/zhcon/files/patch-src::display::fblinear24.cpp b/chinese/zhcon/files/patch-src::display::fblinear24.cpp deleted file mode 100644 index abab0e40c044..000000000000 --- a/chinese/zhcon/files/patch-src::display::fblinear24.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- src/display/fblinear24.cpp~ Sun Aug 1 17:22:19 2004 -+++ src/display/fblinear24.cpp Sun Aug 1 17:27:33 2004 -@@ -203,11 +203,11 @@ - d1 = (-(*cdat >> 3 & 1) & eorx) ^ bgx; - d2 = (-(*cdat >> 2 & 1) & eorx) ^ bgx; - fb_writel(d1 | (d2<<24), dest32++); -- fb_writew(d2>>8, ((__u16*)dest32)++); -+ fb_writew(d2>>8, ((__u16*)dest32) + 1); - } - if (pFont->w & 1) { - d3 = (-(*cdat >> 1 & 1) & eorx) ^ bgx; -- fb_writew(d3, ((__u16*)dest32)++); -+ fb_writew(d3, ((__u16*)dest32) + 1); - fb_writeb(d3>>16, (__u8*)dest32); - } - cdat++; diff --git a/chinese/zhcon/files/patch-src::display::fblinear8.cpp b/chinese/zhcon/files/patch-src::display::fblinear8.cpp deleted file mode 100644 index 3cdf72ff7748..000000000000 --- a/chinese/zhcon/files/patch-src::display::fblinear8.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/display/fblinear8.cpp~ Sun Aug 1 17:29:43 2004 -+++ src/display/fblinear8.cpp Sun Aug 1 17:39:12 2004 -@@ -102,7 +102,7 @@ - fb_writel((nibbletab_cfb8[*cdat >> 4] & eorx) ^ bgx, dest32++); - } - if (pFont->w & 2) { -- fb_writew((nibbletab_cfb8[*cdat & 0xc] & eorx) ^ bgx, ((__u16*)dest32)++); -+ fb_writew((nibbletab_cfb8[*cdat & 0xc] & eorx) ^ bgx, ((__u16*)dest32) + 1); - } - if (pFont->w & 1) { - fb_writeb((*cdat & 2) ? fg : bg, (__u8*)dest32); diff --git a/chinese/zhcon/files/patch-src::global.h b/chinese/zhcon/files/patch-src::global.h deleted file mode 100644 index 9f49708c4a44..000000000000 --- a/chinese/zhcon/files/patch-src::global.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/global.h.orig Thu Aug 7 12:54:31 2003 -+++ src/global.h Thu Aug 7 12:54:46 2003 -@@ -26,7 +26,7 @@ - //#endif - #define _(String) gettext (String) - #define gettext_noop(String) (String) -- -+#include - #include "graphdev.h" - #include "hzdecoder.h" - //class Console; diff --git a/chinese/zhcon/files/patch-src::inputclient.h b/chinese/zhcon/files/patch-src::inputclient.h deleted file mode 100644 index df3d1107a125..000000000000 --- a/chinese/zhcon/files/patch-src::inputclient.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/inputclient.h.orig Sat Aug 16 16:34:06 2003 -+++ src/inputclient.h Sat Aug 16 16:34:15 2003 -@@ -19,6 +19,7 @@ - #ifndef INPUTCLIENT_H - #define INPUTCLIENT_H - -+#include - #include - #include "console.h" - diff --git a/chinese/zhcon/files/patch-src::mouse.cpp b/chinese/zhcon/files/patch-src::mouse.cpp deleted file mode 100644 index 7b39f069ab8c..000000000000 --- a/chinese/zhcon/files/patch-src::mouse.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/mouse.cpp.orig Sat Aug 16 16:36:28 2003 -+++ src/mouse.cpp Sat Aug 16 16:36:39 2003 -@@ -18,6 +18,7 @@ - - #include "debug.h" - #include "mouse.h" -+#include - #include - - #if defined(__FreeBSD__) diff --git a/chinese/zhcon/files/patch-src::zhcon.cpp b/chinese/zhcon/files/patch-src::zhcon.cpp deleted file mode 100644 index 21df71193387..000000000000 --- a/chinese/zhcon/files/patch-src::zhcon.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/zhcon.cpp.orig Tue Nov 26 01:35:04 2002 -+++ src/zhcon.cpp Tue Nov 26 01:35:25 2002 -@@ -131,7 +131,7 @@ - string cfgfile = getenv("HOME"); - cfgfile += "/.zhconrc"; - if (access(cfgfile.c_str(), R_OK) != 0) -- cfgfile = "/etc/zhcon.conf"; -+ cfgfile = PREFIX"/etc/zhcon.conf"; - - //for debug,a pause enable us to attach zhcon's pid in gdb - //char c;cin>>c; -- cgit