ports/98125: [MAINTAINER] chinese/zhcon: Fix doc bug & Make portlint more happy
chinsan
chinsan.tw at gmail.com
Tue May 30 05:40:16 UTC 2006
>Number: 98125
>Category: ports
>Synopsis: [MAINTAINER] chinese/zhcon: Fix doc bug & Make portlint more happy
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue May 30 05:40:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: chinsan
>Release: FreeBSD 6.1-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD chinsan2.twbbs.org 6.1-STABLE FreeBSD 6.1-STABLE #0: Thu May 18 09:48:03 CST 2006
>Description:
- Fix doc bug
- Make portlint more happy
Added file(s):
- files/patch-src-Makefile.in
- files/patch-src-configfile.cpp
- files/patch-src-display-fblinear24.cpp
- files/patch-src-display-fblinear8.cpp
- files/patch-src-global.h
- files/patch-src-inputclient.h
- files/patch-src-mouse.cpp
- files/patch-src-zhcon.cpp
Removed file(s):
- files/patch-src::Makefile.in
- files/patch-src::configfile.cpp
- files/patch-src::display::fblinear24.cpp
- files/patch-src::display::fblinear8.cpp
- files/patch-src::global.h
- files/patch-src::inputclient.h
- files/patch-src::mouse.cpp
- files/patch-src::zhcon.cpp
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- zhcon-0.2.3_7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/chinese/zhcon/Makefile /usr/home/chinsan/project/zhcon/Makefile
--- /usr/ports/chinese/zhcon/Makefile Sat May 6 01:39:39 2006
+++ /usr/home/chinsan/project/zhcon/Makefile Tue May 30 13:34:38 2006
@@ -7,7 +7,7 @@
PORTNAME= zhcon
PORTVERSION= 0.2.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= chinese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -26,6 +26,7 @@
MAN1= zhcon.1
post-patch:
+ @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' ${WRKSRC}/doc/zhcon.1.in
@${REINPLACE_CMD} -Ee 's,/dev/vga,/dev/ttyv0,g' ${WRKSRC}/src/display/fbdev.cpp
@${REINPLACE_CMD} -e '5 s|#||;' ${WRKSRC}/src/zhcon.conf
@${REINPLACE_CMD} -Ee 's,(\s*=\s*)("?)/usr/local([^"]*)("?),\1\2${PREFIX}\3\4,g' \
diff -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src-Makefile.in /usr/home/chinsan/project/zhcon/files/patch-src-Makefile.in
--- /usr/ports/chinese/zhcon/files/patch-src-Makefile.in Thu Jan 1 08:00:00 1970
+++ /usr/home/chinsan/project/zhcon/files/patch-src-Makefile.in Tue May 30 13:34:38 2006
@@ -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 -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src-configfile.cpp /usr/home/chinsan/project/zhcon/files/patch-src-configfile.cpp
--- /usr/ports/chinese/zhcon/files/patch-src-configfile.cpp Thu Jan 1 08:00:00 1970
+++ /usr/home/chinsan/project/zhcon/files/patch-src-configfile.cpp Tue May 30 13:34:38 2006
@@ -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 <stdexcept>
+ #include <fstream>
+ #include <cstdlib>
++#include <sys/types.h>
++#include <unistd.h>
+ #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 -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src-display-fblinear24.cpp /usr/home/chinsan/project/zhcon/files/patch-src-display-fblinear24.cpp
--- /usr/ports/chinese/zhcon/files/patch-src-display-fblinear24.cpp Thu Jan 1 08:00:00 1970
+++ /usr/home/chinsan/project/zhcon/files/patch-src-display-fblinear24.cpp Tue May 30 13:34:38 2006
@@ -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 -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src-display-fblinear8.cpp /usr/home/chinsan/project/zhcon/files/patch-src-display-fblinear8.cpp
--- /usr/ports/chinese/zhcon/files/patch-src-display-fblinear8.cpp Thu Jan 1 08:00:00 1970
+++ /usr/home/chinsan/project/zhcon/files/patch-src-display-fblinear8.cpp Tue May 30 13:34:38 2006
@@ -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 -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src-global.h /usr/home/chinsan/project/zhcon/files/patch-src-global.h
--- /usr/ports/chinese/zhcon/files/patch-src-global.h Thu Jan 1 08:00:00 1970
+++ /usr/home/chinsan/project/zhcon/files/patch-src-global.h Tue May 30 13:34:38 2006
@@ -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 <assert.h>
+ #include "graphdev.h"
+ #include "hzdecoder.h"
+ //class Console;
diff -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src-inputclient.h /usr/home/chinsan/project/zhcon/files/patch-src-inputclient.h
--- /usr/ports/chinese/zhcon/files/patch-src-inputclient.h Thu Jan 1 08:00:00 1970
+++ /usr/home/chinsan/project/zhcon/files/patch-src-inputclient.h Tue May 30 13:34:38 2006
@@ -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 <cassert>
+ #include <string>
+ #include "console.h"
+
diff -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src-mouse.cpp /usr/home/chinsan/project/zhcon/files/patch-src-mouse.cpp
--- /usr/ports/chinese/zhcon/files/patch-src-mouse.cpp Thu Jan 1 08:00:00 1970
+++ /usr/home/chinsan/project/zhcon/files/patch-src-mouse.cpp Tue May 30 13:34:38 2006
@@ -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 <cassert>
+ #include <sys/signal.h>
+
+ #if defined(__FreeBSD__)
diff -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src-zhcon.cpp /usr/home/chinsan/project/zhcon/files/patch-src-zhcon.cpp
--- /usr/ports/chinese/zhcon/files/patch-src-zhcon.cpp Thu Jan 1 08:00:00 1970
+++ /usr/home/chinsan/project/zhcon/files/patch-src-zhcon.cpp Tue May 30 13:34:38 2006
@@ -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 -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src::Makefile.in /usr/home/chinsan/project/zhcon/files/patch-src::Makefile.in
--- /usr/ports/chinese/zhcon/files/patch-src::Makefile.in Fri May 2 12:11:38 2003
+++ /usr/home/chinsan/project/zhcon/files/patch-src::Makefile.in Thu Jan 1 08:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src::configfile.cpp /usr/home/chinsan/project/zhcon/files/patch-src::configfile.cpp
--- /usr/ports/chinese/zhcon/files/patch-src::configfile.cpp Tue Jan 25 22:54:41 2005
+++ /usr/home/chinsan/project/zhcon/files/patch-src::configfile.cpp Thu Jan 1 08:00:00 1970
@@ -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 <stdexcept>
- #include <fstream>
- #include <cstdlib>
-+#include <sys/types.h>
-+#include <unistd.h>
- #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 -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src::display::fblinear24.cpp /usr/home/chinsan/project/zhcon/files/patch-src::display::fblinear24.cpp
--- /usr/ports/chinese/zhcon/files/patch-src::display::fblinear24.cpp Sun Aug 1 17:42:43 2004
+++ /usr/home/chinsan/project/zhcon/files/patch-src::display::fblinear24.cpp Thu Jan 1 08:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src::display::fblinear8.cpp /usr/home/chinsan/project/zhcon/files/patch-src::display::fblinear8.cpp
--- /usr/ports/chinese/zhcon/files/patch-src::display::fblinear8.cpp Sun Aug 1 17:42:43 2004
+++ /usr/home/chinsan/project/zhcon/files/patch-src::display::fblinear8.cpp Thu Jan 1 08:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src::global.h /usr/home/chinsan/project/zhcon/files/patch-src::global.h
--- /usr/ports/chinese/zhcon/files/patch-src::global.h Tue Aug 19 13:41:39 2003
+++ /usr/home/chinsan/project/zhcon/files/patch-src::global.h Thu Jan 1 08:00:00 1970
@@ -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 <assert.h>
- #include "graphdev.h"
- #include "hzdecoder.h"
- //class Console;
diff -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src::inputclient.h /usr/home/chinsan/project/zhcon/files/patch-src::inputclient.h
--- /usr/ports/chinese/zhcon/files/patch-src::inputclient.h Sun Aug 17 07:37:25 2003
+++ /usr/home/chinsan/project/zhcon/files/patch-src::inputclient.h Thu Jan 1 08:00:00 1970
@@ -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 <cassert>
- #include <string>
- #include "console.h"
-
diff -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src::mouse.cpp /usr/home/chinsan/project/zhcon/files/patch-src::mouse.cpp
--- /usr/ports/chinese/zhcon/files/patch-src::mouse.cpp Sun Aug 17 07:37:25 2003
+++ /usr/home/chinsan/project/zhcon/files/patch-src::mouse.cpp Thu Jan 1 08:00:00 1970
@@ -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 <cassert>
- #include <sys/signal.h>
-
- #if defined(__FreeBSD__)
diff -ruN --exclude=CVS /usr/ports/chinese/zhcon/files/patch-src::zhcon.cpp /usr/home/chinsan/project/zhcon/files/patch-src::zhcon.cpp
--- /usr/ports/chinese/zhcon/files/patch-src::zhcon.cpp Thu Nov 28 10:25:03 2002
+++ /usr/home/chinsan/project/zhcon/files/patch-src::zhcon.cpp Thu Jan 1 08:00:00 1970
@@ -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;
--- zhcon-0.2.3_7.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list