Attachment #66914 for bug #98754

View | Details | Raw Unified | Return to bug 98754
Collapse All | Expand All




#

PORTNAME=	zhcon
PORTVERSION=	0.2.5
PORTREVISION=	7
CATEGORIES=	chinese
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

COMMENT=	A fast Console Chinese System which supports framebuffer device

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
ONLY_FOR_ARCHS=	i386
# Don't bother to add ".if !defined(WITHOUT_NLS)", zhcon requires libintl
USE_GETTEXT=	yes

PKGMESSAGE=	${WRKDIR}/pkg-message
SUB_FILES=	pkg-message
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} -Ee 's,endian,sys/endian,g' ${WRKSRC}/src/display/fblinear4.cpp \
		${WRKSRC}/src/display/fblinear8.cpp ${WRKSRC}/src/display/fblinear16.cpp \
		${WRKSRC}/src/display/fblinear24.cpp
	@${REINPLACE_CMD} -e '5 s,#,,; s,/usr/lib,${PREFIX}/lib,'  ${WRKSRC}/src/zhcon.conf
	@${REINPLACE_CMD} -e 's,"/etc,PREFIX"/etc,'  ${WRKSRC}/src/zhcon.cpp
	@${REINPLACE_CMD} -Ee 's,(\s*=\s*)("?)/usr/local([^"]*)("?),\1\2${PREFIX}\3\4,g' \
		-e '/_nl_expand_alias/s,\(0\),\(\),g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.if defined(WITH_BIG5)
	@${REINPLACE_CMD} -e '11 s,gb2312,big5,' ${WRKSRC}/src/zhcon.conf
.endif

post-install:
	@${CAT} ${PKGMESSAGE}

Lines 1-3 Link Here

(-)/usr/home/chinsan/project/zhcon/distinfo (-3 / +3 lines)
1	MD5 (zhcon-0.2.3.tar.gz) = 64b5d6c2d7055b4e45f4eadfd1303e8f	1	MD5 (zhcon-0.2.5.tar.gz) = 79e1c68aab8341e32129f61c1670baeb
2	SHA256 (zhcon-0.2.3.tar.gz) = 60e2f7a3b2a548e043838794b7ab3cb0e84f13508d48b384e9b6598698baacbb	2	SHA256 (zhcon-0.2.5.tar.gz) = 4ce4dc1395b6f6a920d44aac069a284bff76df4019ac4164850d263538465d59
3	SIZE (zhcon-0.2.3.tar.gz) = 5030677	3	SIZE (zhcon-0.2.5.tar.gz) = 5011644

Lines 1-11 Link Here

(-)/usr/home/chinsan/project/zhcon/files/patch-src-Makefile.in (-11 lines)
1	--- src/Makefile.in.orig Thu Apr 17 19:29:48 2003
2	+++ src/Makefile.in Wed Apr 30 21:10:39 2003
3	@@ -478,7 +478,7 @@
4
5	install-data-local:
6	$(mkinstalldirs) $(DESTDIR)/etc
7	- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf
8	+ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/etc/zhcon.conf
9
10	uninstall-local:
11	-rm -f $(DESTDIR)/etc/zhcon.conf




--- 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() {}

Lines 1-16 Link Here

(-)/usr/home/chinsan/project/zhcon/files/patch-src-display-fblinear24.cpp (-16 lines)
1	--- src/display/fblinear24.cpp~ Sun Aug 1 17:22:19 2004
2	+++ src/display/fblinear24.cpp Sun Aug 1 17:27:33 2004
3	@@ -203,11 +203,11 @@
4	d1 = (-(*cdat >> 3 & 1) & eorx) ^ bgx;
5	d2 = (-(*cdat >> 2 & 1) & eorx) ^ bgx;
6	fb_writel(d1 \| (d2<<24), dest32++);
7	- fb_writew(d2>>8, ((__u16*)dest32)++);
8	+ fb_writew(d2>>8, ((__u16*)dest32) + 1);
9	}
10	if (pFont->w & 1) {
11	d3 = (-(*cdat >> 1 & 1) & eorx) ^ bgx;
12	- fb_writew(d3, ((__u16*)dest32)++);
13	+ fb_writew(d3, ((__u16*)dest32) + 1);
14	fb_writeb(d3>>16, (__u8*)dest32);
15	}
16	cdat++;

Lines 1-11 Link Here

(-)/usr/home/chinsan/project/zhcon/files/patch-src-display-fblinear8.cpp (-11 lines)
1	--- src/display/fblinear8.cpp~ Sun Aug 1 17:29:43 2004
2	+++ src/display/fblinear8.cpp Sun Aug 1 17:39:12 2004
3	@@ -102,7 +102,7 @@
4	fb_writel((nibbletab_cfb8[*cdat >> 4] & eorx) ^ bgx, dest32++);
5	}
6	if (pFont->w & 2) {
7	- fb_writew((nibbletab_cfb8[cdat & 0xc] & eorx) ^ bgx, ((__u16)dest32)++);
8	+ fb_writew((nibbletab_cfb8[cdat & 0xc] & eorx) ^ bgx, ((__u16)dest32) + 1);
9	}
10	if (pFont->w & 1) {
11	fb_writeb((cdat & 2) ? fg : bg, (__u8)dest32);

Lines 1-10 Link Here

(-)/usr/home/chinsan/project/zhcon/files/patch-src-inputclient.h (-10 lines)
1	--- src/inputclient.h.orig Sat Aug 16 16:34:06 2003
2	+++ src/inputclient.h Sat Aug 16 16:34:15 2003
3	@@ -19,6 +19,7 @@
4	#ifndef INPUTCLIENT_H
5	#define INPUTCLIENT_H
6
7	+#include <cassert>
8	#include <string>
9	#include "console.h"
10

Lines 1-11 Link Here

(-)/usr/home/chinsan/project/zhcon/files/patch-src-zhcon.cpp (-11 lines)
1	--- src/zhcon.cpp.orig Tue Nov 26 01:35:04 2002
2	+++ src/zhcon.cpp Tue Nov 26 01:35:25 2002
3	@@ -131,7 +131,7 @@
4	string cfgfile = getenv("HOME");
5	cfgfile += "/.zhconrc";
6	if (access(cfgfile.c_str(), R_OK) != 0)
7	- cfgfile = "/etc/zhcon.conf";
8	+ cfgfile = PREFIX"/etc/zhcon.conf";
9
10	//for debug,a pause enable us to attach zhcon's pid in gdb
11	//char c;cin>>c;

Lines 1-7 Link Here

(-)/usr/home/chinsan/project/zhcon/pkg-descr (-1 / +2 lines)
1	Zhcon is a fast Linux Console Chinese System which supports	1	Zhcon is a fast Linux Console Chinese System which supports
2	framebuffer device.It can display Chinese,Japanese or Korean	2	framebuffer device.It can display Chinese,Japanese or Korean
3	double byte characters.Supported language encodings include:	3	double byte characters.Supported language encodings include:
4	GB2312,GBK,BIG5,JIS and KSCM.	4	GB2312,GBK,BIG5,JIS and KSC. UTF-8 is also supported.
		5
5	It can also use input methods(table based) from M$pwin98 and	6	It can also use input methods(table based) from M$pwin98 and
6	UCDOS for M$-DOG.	7	UCDOS for M$-DOG.
7		8




lib/zhcon/input/winpy.mb
lib/zhcon/input/winsp.mb
lib/zhcon/input/winzm.mb
share/locale/ja/LC_MESSAGES/zhcon.mo
share/locale/ko/LC_MESSAGES/zhcon.mo
share/locale/zh_CN.EUC/LC_MESSAGES/zhcon.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo
share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo
share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.mo
@dirrmtry share/locale/zh_CN.GBK/LC_MESSAGES
@dirrmtry share/locale/zh_CN.GBK
@dirrmtry share/locale/zh_CN.EUC/LC_MESSAGES
@dirrmtry share/locale/zh_CN.EUC
@dirrm lib/zhcon/input
@dirrm lib/zhcon/font
@dirrm lib/zhcon

Return to bug 98754

Lines 6-13 Link Here

(-)/usr/home/chinsan/project/zhcon/Makefile (-7 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= zhcon	8	PORTNAME= zhcon
9	PORTVERSION= 0.2.3	9	PORTVERSION= 0.2.5
10	PORTREVISION= 7
11	CATEGORIES= chinese	10	CATEGORIES= chinese
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 16-36 Link Here
16	COMMENT= A fast Console Chinese System which supports framebuffer device	15	COMMENT= A fast Console Chinese System which supports framebuffer device
17		16
18	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
19	CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}
20	ONLY_FOR_ARCHS= i386	18	ONLY_FOR_ARCHS= i386
21	# Don't bother to add ".if !defined(WITHOUT_NLS)", zhcon requires libintl
22	USE_GETTEXT= yes
23		19
24	PKGMESSAGE= ${WRKDIR}/pkg-message	20	PKGMESSAGE= ${WRKDIR}/pkg-message
25	SUB_FILES= pkg-message	21	SUB_FILES= pkg-message
26	MAN1= zhcon.1	22	MAN1= zhcon.1
27		23
28	post-patch:	24	post-patch:
29	@${REINPLACE_CMD} -e 's\|/etc\|${PREFIX}/etc\|' ${WRKSRC}/doc/zhcon.1.in	25	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,' ${WRKSRC}/doc/zhcon.1.in
30	@${REINPLACE_CMD} -Ee 's,/dev/vga,/dev/ttyv0,g' ${WRKSRC}/src/display/fbdev.cpp	26	@${REINPLACE_CMD} -Ee 's,/dev/vga,/dev/ttyv0,g' ${WRKSRC}/src/display/fbdev.cpp
31	@${REINPLACE_CMD} -e '5 s\|#\|\|;' ${WRKSRC}/src/zhcon.conf	27	@${REINPLACE_CMD} -Ee 's,endian,sys/endian,g' ${WRKSRC}/src/display/fblinear4.cpp \
		28	${WRKSRC}/src/display/fblinear8.cpp ${WRKSRC}/src/display/fblinear16.cpp \
		29	${WRKSRC}/src/display/fblinear24.cpp
		30	@${REINPLACE_CMD} -e '5 s,#,,; s,/usr/lib,${PREFIX}/lib,' ${WRKSRC}/src/zhcon.conf
		31	@${REINPLACE_CMD} -e 's,"/etc,PREFIX"/etc,' ${WRKSRC}/src/zhcon.cpp
32	@${REINPLACE_CMD} -Ee 's,(\s=\s)("?)/usr/local([^"]*)("?),\1\2${PREFIX}\3\4,g' \	32	@${REINPLACE_CMD} -Ee 's,(\s=\s)("?)/usr/local([^"]*)("?),\1\2${PREFIX}\3\4,g' \
33	-e '/_nl_expand_alias/s,\(0\),\(\),g' ${WRKSRC}/${CONFIGURE_SCRIPT}	33	-e '/_nl_expand_alias/s,\(0\),\(\),g' ${WRKSRC}/${CONFIGURE_SCRIPT}
		34	.if defined(WITH_BIG5)
		35	@${REINPLACE_CMD} -e '11 s,gb2312,big5,' ${WRKSRC}/src/zhcon.conf
		36	.endif
34		37
35	post-install:	38	post-install:
36	@${CAT} ${PKGMESSAGE}	39	@${CAT} ${PKGMESSAGE}

Lines 1-21 Link Here

(-)/usr/home/chinsan/project/zhcon/files/patch-src-configfile.cpp (-21 lines)
1	--- src/configfile.cpp.orig Tue Jan 25 07:38:59 2005
2	+++ src/configfile.cpp Tue Jan 25 07:41:19 2005
3	@@ -19,13 +19,18 @@
4	#include <stdexcept>
5	#include <fstream>
6	#include <cstdlib>
7	+#include <sys/types.h>
8	+#include <unistd.h>
9	#include "configfile.h"
10
11	ConfigFile::ConfigFile(const char *fn) {
12	+ uid_t euid = geteuid();
13	+ seteuid(getuid());
14	ifstream in(fn);
15	if (!in)
16	throw runtime_error("Could not open config file!");
17	ParseFile(in);
18	+ seteuid(euid);
19	}
20
21	ConfigFile::~ConfigFile() {}

Lines 34-49 Link Here

(-)/usr/home/chinsan/project/zhcon/pkg-plist (-10 lines)
34	lib/zhcon/input/winpy.mb	34	lib/zhcon/input/winpy.mb
35	lib/zhcon/input/winsp.mb	35	lib/zhcon/input/winsp.mb
36	lib/zhcon/input/winzm.mb	36	lib/zhcon/input/winzm.mb
37	share/locale/ja/LC_MESSAGES/zhcon.mo
38	share/locale/ko/LC_MESSAGES/zhcon.mo
39	share/locale/zh_CN.EUC/LC_MESSAGES/zhcon.mo
40	share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo
41	share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo
42	share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.mo
43	@dirrmtry share/locale/zh_CN.GBK/LC_MESSAGES
44	@dirrmtry share/locale/zh_CN.GBK
45	@dirrmtry share/locale/zh_CN.EUC/LC_MESSAGES
46	@dirrmtry share/locale/zh_CN.EUC
47	@dirrm lib/zhcon/input	37	@dirrm lib/zhcon/input
48	@dirrm lib/zhcon/font	38	@dirrm lib/zhcon/font
49	@dirrm lib/zhcon	39	@dirrm lib/zhcon