1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00

- Update to 1.3.2

PR:		ports/107461
Submitted by:	chinsan (maintainer)
This commit is contained in:
Rong-En Fan 2007-01-04 03:56:41 +00:00
parent be2ff4ae7c
commit 39d8e34be2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=181385
8 changed files with 24 additions and 72 deletions

View File

@ -6,10 +6,10 @@
#
PORTNAME= gcin
PORTVERSION= 1.3.1
PORTREVISION= 1
PORTVERSION= 1.3.2
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
@ -44,21 +44,23 @@ post-extract:
.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,; 161 s,/gcin,,; \
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
${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/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
@ -67,8 +69,6 @@ pre-patch:
${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:

View File

@ -1,6 +1,6 @@
MD5 (gcin-1.3.1.tar.bz2) = 3467166a035141c42f4d5f4efaca711e
SHA256 (gcin-1.3.1.tar.bz2) = 1b1d8c59b92ade16723b8187290005e177da7c81e0d72229099309ca55890139
SIZE (gcin-1.3.1.tar.bz2) = 1610772
MD5 (gcin-1.3.2.tar.bz2) = 9de142b3c491ee446b9234a35a878159
SHA256 (gcin-1.3.2.tar.bz2) = 99ac8a9d6edc2c5090c0fd941e53f318188809578de96a8948a03e983c210dbf
SIZE (gcin-1.3.2.tar.bz2) = 1621176
MD5 (noseeing-6.tar.gz) = c67e5c85b2805f12bb2f092dfa1814b7
SHA256 (noseeing-6.tar.gz) = 2f240c8dbb15c2249dff74102842bbccfe307a721cf2c092c75dc6234e470f9b
SIZE (noseeing-6.tar.gz) = 400429

View File

@ -1,26 +0,0 @@
--- gcin2tab.c.orig Sun Dec 3 11:05:26 2006
+++ gcin2tab.c Sun Dec 3 11:08:36 2006
@@ -129,7 +129,10 @@
int d;
if ((d = a->key - b->key)) return d;
- return memcmp(a->ch ,b->ch, CH_SZ);
+ d = memcmp(a->ch ,b->ch, CH_SZ);
+ if (d) return d;
+
+ return a->oseq - b->oseq;
}
int qcmp2_64(const void *aa, const void *bb)
@@ -139,7 +142,10 @@
if (a->key > b->key) return 1;
if (a->key < b->key) return -1;
- return memcmp(a->ch ,b->ch, CH_SZ);
+ int d = memcmp(a->ch ,b->ch, CH_SZ);
+ if (d) return d;
+
+ return a->oseq - b->oseq;
}
int qcmp(const void *aa, const void *bb)

View File

@ -3,6 +3,7 @@ bin/gcin-gb-toggle
bin/gcin-message
bin/gcin-setup
bin/gcin2tab
bin/gtab-merge
bin/juyin-learn
bin/phoa2d
bin/phod2a
@ -19,6 +20,7 @@ lib/libgcin-im-client.so
lib/libgcin-im-client.so.1.0.1
lib/libgcin-im-client.so.1
%%DATADIR%%/script/gcin-user-setup
%%DATADIR%%/script/gtab.append_prepare
%%DATADIR%%/script/noseeing-inst
%%DATADIR%%/script/utf8-edit
%%DATADIR%%/table/ar30.gtab

View File

@ -6,10 +6,10 @@
#
PORTNAME= gcin
PORTVERSION= 1.3.1
PORTREVISION= 1
PORTVERSION= 1.3.2
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
@ -44,21 +44,23 @@ post-extract:
.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,; 161 s,/gcin,,; \
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
${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/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
@ -67,8 +69,6 @@ pre-patch:
${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:

View File

@ -1,6 +1,6 @@
MD5 (gcin-1.3.1.tar.bz2) = 3467166a035141c42f4d5f4efaca711e
SHA256 (gcin-1.3.1.tar.bz2) = 1b1d8c59b92ade16723b8187290005e177da7c81e0d72229099309ca55890139
SIZE (gcin-1.3.1.tar.bz2) = 1610772
MD5 (gcin-1.3.2.tar.bz2) = 9de142b3c491ee446b9234a35a878159
SHA256 (gcin-1.3.2.tar.bz2) = 99ac8a9d6edc2c5090c0fd941e53f318188809578de96a8948a03e983c210dbf
SIZE (gcin-1.3.2.tar.bz2) = 1621176
MD5 (noseeing-6.tar.gz) = c67e5c85b2805f12bb2f092dfa1814b7
SHA256 (noseeing-6.tar.gz) = 2f240c8dbb15c2249dff74102842bbccfe307a721cf2c092c75dc6234e470f9b
SIZE (noseeing-6.tar.gz) = 400429

View File

@ -1,26 +0,0 @@
--- gcin2tab.c.orig Sun Dec 3 11:05:26 2006
+++ gcin2tab.c Sun Dec 3 11:08:36 2006
@@ -129,7 +129,10 @@
int d;
if ((d = a->key - b->key)) return d;
- return memcmp(a->ch ,b->ch, CH_SZ);
+ d = memcmp(a->ch ,b->ch, CH_SZ);
+ if (d) return d;
+
+ return a->oseq - b->oseq;
}
int qcmp2_64(const void *aa, const void *bb)
@@ -139,7 +142,10 @@
if (a->key > b->key) return 1;
if (a->key < b->key) return -1;
- return memcmp(a->ch ,b->ch, CH_SZ);
+ int d = memcmp(a->ch ,b->ch, CH_SZ);
+ if (d) return d;
+
+ return a->oseq - b->oseq;
}
int qcmp(const void *aa, const void *bb)

View File

@ -3,6 +3,7 @@ bin/gcin-gb-toggle
bin/gcin-message
bin/gcin-setup
bin/gcin2tab
bin/gtab-merge
bin/juyin-learn
bin/phoa2d
bin/phod2a
@ -19,6 +20,7 @@ lib/libgcin-im-client.so
lib/libgcin-im-client.so.1.0.1
lib/libgcin-im-client.so.1
%%DATADIR%%/script/gcin-user-setup
%%DATADIR%%/script/gtab.append_prepare
%%DATADIR%%/script/noseeing-inst
%%DATADIR%%/script/utf8-edit
%%DATADIR%%/table/ar30.gtab