From chinsan@chinsan.twbbs.org  Wed Jan  3 12:10:04 2007
Return-Path: <chinsan@chinsan.twbbs.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8B30416A417
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  3 Jan 2007 12:10:04 +0000 (UTC)
	(envelope-from chinsan@chinsan.twbbs.org)
Received: from chinsan.twbbs.org (220-132-119-51.HINET-IP.hinet.net [220.132.119.51])
	by mx1.freebsd.org (Postfix) with ESMTP id 32A1413C45B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  3 Jan 2007 12:10:01 +0000 (UTC)
	(envelope-from chinsan@chinsan.twbbs.org)
Received: by chinsan.twbbs.org (Postfix, from userid 1001)
	id 98B4B11418; Wed,  3 Jan 2007 20:09:52 +0800 (CST)
Message-Id: <20070103120952.98B4B11418@chinsan.twbbs.org>
Date: Wed,  3 Jan 2007 20:09:52 +0800 (CST)
From: chinsan <chinsan@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] chinese/gcin: update to 1.3.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         107461
>Category:       ports
>Synopsis:       [MAINTAINER] chinese/gcin: update to 1.3.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 03 12:10:15 GMT 2007
>Closed-Date:    Thu Jan 04 03:57:20 GMT 2007
>Last-Modified:  Thu Jan  4 04:00:38 GMT 2007
>Originator:     chinsan
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
Taiwan
>Environment:
System: FreeBSD chinsan.twbbs.org 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #3: Mon Dec  4 02:04:40 CST
>Description:
- Update to 1.3.2

Added file(s):
- gcin-1.3.2.tbz

Removed file(s):
- files/patch-gcin2tab.c

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- gcin-1.3.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/chinese/gcin/Makefile /usr/home/chinsan/project/gcin/Makefile
--- /usr/ports/chinese/gcin/Makefile	Mon Dec  4 16:00:53 2006
+++ /usr/home/chinsan/project/gcin/Makefile	Wed Jan  3 20:09:10 2007
@@ -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 @@
 .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 @@
 		${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:
diff -ruN --exclude=CVS /usr/ports/chinese/gcin/distinfo /usr/home/chinsan/project/gcin/distinfo
--- /usr/ports/chinese/gcin/distinfo	Sun Dec  3 22:57:37 2006
+++ /usr/home/chinsan/project/gcin/distinfo	Wed Jan  3 10:27:12 2007
@@ -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
diff -ruN --exclude=CVS /usr/ports/chinese/gcin/files/patch-gcin2tab.c /usr/home/chinsan/project/gcin/files/patch-gcin2tab.c
--- /usr/ports/chinese/gcin/files/patch-gcin2tab.c	Mon Dec  4 12:21:39 2006
+++ /usr/home/chinsan/project/gcin/files/patch-gcin2tab.c	Thu Jan  1 08:00:00 1970
@@ -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)
Binary files /usr/ports/chinese/gcin/gcin-1.3.2.tbz and /usr/home/chinsan/project/gcin/gcin-1.3.2.tbz differ
diff -ruN --exclude=CVS /usr/ports/chinese/gcin/pkg-plist /usr/home/chinsan/project/gcin/pkg-plist
--- /usr/ports/chinese/gcin/pkg-plist	Sun Dec  3 22:57:37 2006
+++ /usr/home/chinsan/project/gcin/pkg-plist	Wed Jan  3 20:09:22 2007
@@ -3,6 +3,7 @@
 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.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
--- gcin-1.3.2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Jan 3 12:10:40 UTC 2007 
Responsible-Changed-Why:  
rafan@ wants this PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107461 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Thu Jan 4 03:57:19 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107461 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/107461: commit references a PR
Date: Thu,  4 Jan 2007 03:56:46 +0000 (UTC)

 rafan       2007-01-04 03:56:41 UTC
 
   FreeBSD ports repository
 
   Modified files:
     chinese/gcin         Makefile distinfo pkg-plist 
   Removed files:
     chinese/gcin/files   patch-gcin2tab.c 
   Log:
   - Update to 1.3.2
   
   PR:             ports/107461
   Submitted by:   chinsan (maintainer)
   
   Revision  Changes    Path
   1.72      +7 -7      ports/chinese/gcin/Makefile
   1.51      +3 -3      ports/chinese/gcin/distinfo
   1.4       +0 -26     ports/chinese/gcin/files/patch-gcin2tab.c (dead)
   1.40      +2 -0      ports/chinese/gcin/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
