Attachment #74254 for bug #107461

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




#

PORTNAME=	gcin
PORTVERSION=	1.3.2
PORTREVISION=	1
CATEGORIES=	chinese textproc gnome
MASTER_SITES=	http://cle.linux.org.tw/gcin/download/:main \
		http://ftp.twaren.net/local-distfiles/gcin/:main \
		http://yilan.twbbs.org/chinsan/gcin/:main \
		LOCAL/chinsan:main
DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main

.endif

pre-patch:
	${MV} ${WRKSRC}/icons/3/pingin.png ${WRKSRC}/icons/3/pinyin.png
	@${REINPLACE_CMD} -e 's,&,,; 1 s,bash,sh,; \
		s,QT_IM_DIR=/usr,QT_IM_DIR=$$prefix,; \
		s,mandir=$$datadir,mandir=$$prefix,; \
		s,/usr/share,$$prefix/share,; 164 s,/gcin,,; \
		133,134 s,control-center-2\.0,gnome\/control-center-2\.0,g; \
		s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,' ${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \
		${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile
	@${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib,g; \
		s,/usr/include,${X11BASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \
		${WRKSRC}/qt-im/Makefile
	@${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' ${WRKSRC}/scripts/Makefile
	@${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${X11BASE},;' \
		${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \
		${WRKSRC}/scripts/gtab.append_prepare
	@${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst
	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,' \
		${WRKSRC}/gtk-im/gtkimcontextgcin.c

		${WRKSRC}/IMdkit/Xi18n_sample/Makefile ${WRKSRC}/Makefile \
		${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \
		${WRKSRC}/scripts/utf8-edit
	@${REINPLACE_CMD} -e 's,BIG_ENDIAN\(.*\)1,BIG_ENDIAN\1\0,' \
		${WRKSRC}/gtab.h

.if defined(WITH_BOSHIAMY)
post-patch:

Lines 1-6 Link Here

(-)/usr/home/chinsan/project/gcin/distinfo (-3 / +3 lines)
1	MD5 (gcin-1.3.1.tar.bz2) = 3467166a035141c42f4d5f4efaca711e	1	MD5 (gcin-1.3.2.tar.bz2) = 9de142b3c491ee446b9234a35a878159
2	SHA256 (gcin-1.3.1.tar.bz2) = 1b1d8c59b92ade16723b8187290005e177da7c81e0d72229099309ca55890139	2	SHA256 (gcin-1.3.2.tar.bz2) = 99ac8a9d6edc2c5090c0fd941e53f318188809578de96a8948a03e983c210dbf
3	SIZE (gcin-1.3.1.tar.bz2) = 1610772	3	SIZE (gcin-1.3.2.tar.bz2) = 1621176
4	MD5 (noseeing-6.tar.gz) = c67e5c85b2805f12bb2f092dfa1814b7	4	MD5 (noseeing-6.tar.gz) = c67e5c85b2805f12bb2f092dfa1814b7
5	SHA256 (noseeing-6.tar.gz) = 2f240c8dbb15c2249dff74102842bbccfe307a721cf2c092c75dc6234e470f9b	5	SHA256 (noseeing-6.tar.gz) = 2f240c8dbb15c2249dff74102842bbccfe307a721cf2c092c75dc6234e470f9b
6	SIZE (noseeing-6.tar.gz) = 400429	6	SIZE (noseeing-6.tar.gz) = 400429

Lines 1-26 Link Here

(-)/usr/home/chinsan/project/gcin/files/patch-gcin2tab.c (-26 lines)
1	--- gcin2tab.c.orig Sun Dec 3 11:05:26 2006
2	+++ gcin2tab.c Sun Dec 3 11:08:36 2006
3	@@ -129,7 +129,10 @@
4	int d;
5	if ((d = a->key - b->key)) return d;
6
7	- return memcmp(a->ch ,b->ch, CH_SZ);
8	+ d = memcmp(a->ch ,b->ch, CH_SZ);
9	+ if (d) return d;
10	+
11	+ return a->oseq - b->oseq;
12	}
13
14	int qcmp2_64(const void aa, const void bb)
15	@@ -139,7 +142,10 @@
16	if (a->key > b->key) return 1;
17	if (a->key < b->key) return -1;
18
19	- return memcmp(a->ch ,b->ch, CH_SZ);
20	+ int d = memcmp(a->ch ,b->ch, CH_SZ);
21	+ if (d) return d;
22	+
23	+ return a->oseq - b->oseq;
24	}
25
26	int qcmp(const void aa, const void bb)

Lines 3-8 Link Here

(-)/usr/home/chinsan/project/gcin/pkg-plist (+2 lines)
3	bin/gcin-message	3	bin/gcin-message
4	bin/gcin-setup	4	bin/gcin-setup
5	bin/gcin2tab	5	bin/gcin2tab
		6	bin/gtab-merge
6	bin/juyin-learn	7	bin/juyin-learn
7	bin/phoa2d	8	bin/phoa2d
8	bin/phod2a	9	bin/phod2a
Lines 19-24 Link Here
19	lib/libgcin-im-client.so.1.0.1	20	lib/libgcin-im-client.so.1.0.1
20	lib/libgcin-im-client.so.1	21	lib/libgcin-im-client.so.1
21	%%DATADIR%%/script/gcin-user-setup	22	%%DATADIR%%/script/gcin-user-setup
		23	%%DATADIR%%/script/gtab.append_prepare
22	%%DATADIR%%/script/noseeing-inst	24	%%DATADIR%%/script/noseeing-inst
23	%%DATADIR%%/script/utf8-edit	25	%%DATADIR%%/script/utf8-edit
24	%%DATADIR%%/table/ar30.gtab	26	%%DATADIR%%/table/ar30.gtab

Return to bug 107461

Lines 6-15 Link Here

(-)/usr/home/chinsan/project/gcin/Makefile (-7 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= gcin	8	PORTNAME= gcin
9	PORTVERSION= 1.3.1	9	PORTVERSION= 1.3.2
10	PORTREVISION= 1
11	CATEGORIES= chinese textproc gnome	10	CATEGORIES= chinese textproc gnome
12	MASTER_SITES= http://cle.linux.org.tw/gcin/download/:main \	11	MASTER_SITES= http://cle.linux.org.tw/gcin/download/:main \
		12	http://ftp.twaren.net/local-distfiles/gcin/:main \
13	http://yilan.twbbs.org/chinsan/gcin/:main \	13	http://yilan.twbbs.org/chinsan/gcin/:main \
14	LOCAL/chinsan:main	14	LOCAL/chinsan:main
15	DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main	15	DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:main
Lines 44-64 Link Here
44	.endif	44	.endif
45		45
46	pre-patch:	46	pre-patch:
		47	${MV} ${WRKSRC}/icons/3/pingin.png ${WRKSRC}/icons/3/pinyin.png
47	@${REINPLACE_CMD} -e 's,&,,; 1 s,bash,sh,; \	48	@${REINPLACE_CMD} -e 's,&,,; 1 s,bash,sh,; \
48	s,QT_IM_DIR=/usr,QT_IM_DIR=$$prefix,; \	49	s,QT_IM_DIR=/usr,QT_IM_DIR=$$prefix,; \
49	s,mandir=$$datadir,mandir=$$prefix,; \	50	s,mandir=$$datadir,mandir=$$prefix,; \
50	s,/usr/share,$$prefix/share,; 161 s,/gcin,,; \	51	s,/usr/share,$$prefix/share,; 164 s,/gcin,,; \
51	133,134 s,control-center-2\.0,gnome\/control-center-2\.0,g; \	52	133,134 s,control-center-2\.0,gnome\/control-center-2\.0,g; \
52	s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,' ${WRKSRC}/configure	53	s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,' ${WRKSRC}/configure
53	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,' ${WRKSRC}/Makefile	54	@${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,' ${WRKSRC}/Makefile
54	@${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \	55	@${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \
55	${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile	56	${WRKSRC}/gtk-im/Makefile ${WRKSRC}/menu/Makefile
56	@${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib,g; \	57	@${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib,g; \
57	s,/usr/include,${X11BASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \	58	s,/usr/include,${X11BASE}/include,g; s,Xft2/X11/Xft,X11/Xft,' \
58	${WRKSRC}/qt-im/Makefile	59	${WRKSRC}/qt-im/Makefile
59	@${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' ${WRKSRC}/scripts/Makefile	60	@${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' ${WRKSRC}/scripts/Makefile
60	@${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${X11BASE},;' \	61	@${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${X11BASE},;' \
61	${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup	62	${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \
		63	${WRKSRC}/scripts/gtab.append_prepare
62	@${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst	64	@${REINPLACE_CMD} -e 's,wget,fetch,' ${WRKSRC}/scripts/noseeing-inst
63	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,' \	65	@${REINPLACE_CMD} -e 's,gcin-im-client.h,im-client/gcin-im-client.h,' \
64	${WRKSRC}/gtk-im/gtkimcontextgcin.c	66	${WRKSRC}/gtk-im/gtkimcontextgcin.c
Lines 67-74 Link Here
67	${WRKSRC}/IMdkit/Xi18n_sample/Makefile ${WRKSRC}/Makefile \	69	${WRKSRC}/IMdkit/Xi18n_sample/Makefile ${WRKSRC}/Makefile \
68	${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \	70	${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \
69	${WRKSRC}/scripts/utf8-edit	71	${WRKSRC}/scripts/utf8-edit
70	@${REINPLACE_CMD} -e 's,BIG_ENDIAN\(.*\)1,BIG_ENDIAN\1\0,' \
71	${WRKSRC}/gtab.h
72		72
73	.if defined(WITH_BOSHIAMY)	73	.if defined(WITH_BOSHIAMY)
74	post-patch:	74	post-patch: