From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 18 05:50:02 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8B7C16A4CE for ; Wed, 18 May 2005 05:50:02 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86F8343D83 for ; Wed, 18 May 2005 05:50:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4I5o2J2042219 for ; Wed, 18 May 2005 05:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4I5o2co042204; Wed, 18 May 2005 05:50:02 GMT (envelope-from gnats) Resent-Date: Wed, 18 May 2005 05:50:02 GMT Resent-Message-Id: <200505180550.j4I5o2co042204@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, chinsan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 867A016A4CE; Wed, 18 May 2005 05:47:47 +0000 (GMT) Received: from chinsan.twbbs.org (sw169-31-180.adsl.seed.net.tw [221.169.31.180]) by mx1.FreeBSD.org (Postfix) with ESMTP id D09E543DE2; Wed, 18 May 2005 05:47:46 +0000 (GMT) (envelope-from root@chinsan.twbbs.org) Received: by chinsan.twbbs.org (Postfix, from userid 0) id 0B0197301F; Wed, 18 May 2005 13:48:00 +0800 (CST) Message-Id: <20050518054800.0B0197301F@chinsan.twbbs.org> Date: Wed, 18 May 2005 13:48:00 +0800 (CST) From: chinsan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: statue@freebsd.netlab.cse.yzu.edu.tw cc: vanilla@FreeBSD.org Subject: ports/81182: [PATCH] chinese/gcin: add Boshiamy support & fix some typo X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: chinsan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2005 05:50:03 -0000 >Number: 81182 >Category: ports >Synopsis: [PATCH] chinese/gcin: add Boshiamy support & fix some typo >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed May 18 05:50:01 GMT 2005 >Closed-Date: >Last-Modified: >Originator: chinsan >Release: FreeBSD 5.3-RELEASE i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD chinsan.twbbs.org 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 5 04:19:18 UTC 2004 root@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: - add support for Boshiamy input method The Boshiamy .cin & .gtab table is port from Edward Lee and I make it as an option for gcin poeple. Therefore, there's a new extra patch file(extra-patch-data-Makefile) - option NOPORTDOCS has incorrect package list - remove unused patch (patch-about.c) - port maintainer(statue@freebsd.netlab.cse.yzu.edu.tw) is CC'd >How-To-Repeat: >Fix: --- gcin.patch begins here --- diff -ruN gcin.orig/Makefile gcin/Makefile --- gcin.orig/Makefile Wed May 18 11:08:02 2005 +++ gcin/Makefile Wed May 18 13:31:52 2005 @@ -8,7 +8,12 @@ PORTNAME= gcin PORTVERSION= 0.9.5 CATEGORIES= chinese -MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/ +MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \ + http://edt1023.sayya.org/misc/ +.if defined(WITH_BOSHIAMY) +DISTFILES= ${GCINFILE} ${BOSHIAMYFILE} +EXTRACT_ONLY= ${GCINFILE} +.endif MAINTAINER= statue@freebsd.netlab.cse.yzu.edu.tw COMMENT= A traditional chinese input utility in X @@ -21,8 +26,25 @@ .include +pre-everything:: + @${ECHO_MSG} " " + @${ECHO_MSG} "gcin has the following tunable option:" + @${ECHO_MSG} " WITH_BOSHIAMY - enable Boshiamy support" + @${ECHO_MSG} " " + .if ${OSVERSION} <= 500034 USE_GCC= 3.4 +.endif + +.if defined(WITH_BOSHIAMY) +GCINFILE= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} +BOSHIAMYFILE= noseeing-${BOSHIAMYVER}.tar.gz +BOSHIAMYVER= 3 +post-extract: + @cd ${WRKSRC}/data/ \ + && ${TAR} -zxf ${DISTDIR}/${BOSHIAMYFILE} +post-patch: +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-data-Makefile .endif post-install: diff -ruN gcin.orig/distinfo gcin/distinfo --- gcin.orig/distinfo Wed May 18 11:08:02 2005 +++ gcin/distinfo Wed May 18 12:06:47 2005 @@ -1,2 +1,4 @@ MD5 (gcin-0.9.5.tar.bz2) = b3d5be7313894957fc49b0593197e553 SIZE (gcin-0.9.5.tar.bz2) = 1166960 +MD5 (noseeing-3.tar.gz) = ca699328fc8e280d970498c3c0e9b34b +SIZE (noseeing-3.tar.gz) = 391948 diff -ruN gcin.orig/files/extra-patch-data-Makefile gcin/files/extra-patch-data-Makefile --- gcin.orig/files/extra-patch-data-Makefile Thu Jan 1 08:00:00 1970 +++ gcin/files/extra-patch-data-Makefile Wed May 18 11:50:58 2005 @@ -0,0 +1,11 @@ +--- data/Makefile.orig Wed May 18 11:49:00 2005 ++++ data/Makefile Wed May 18 11:49:00 2005 +@@ -5,7 +5,7 @@ + DATA=pho.tab tsin.idx \ + cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \ + et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \ +- ibm.kbm tsin hsu.kbm pho-huge.tab simplex.gtab ++ ibm.kbm tsin hsu.kbm pho-huge.tab simplex.gtab noseeing.gtab + DATAKEEP=symbol-table gtab.list phrase.table + + all: $(DATA) diff -ruN gcin.orig/files/patch-about.c gcin/files/patch-about.c --- gcin.orig/files/patch-about.c Wed May 18 11:08:02 2005 +++ gcin/files/patch-about.c Thu Jan 1 08:00:00 1970 @@ -1,20 +0,0 @@ ---- about.c.orig Sat Feb 26 21:42:00 2005 -+++ about.c Thu May 12 04:02:17 2005 -@@ -69,10 +69,16 @@ - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3); - - GtkWidget *separator = gtk_hseparator_new (); -+ GtkWidget *vseparator = gtk_vseparator_new (); - gtk_box_pack_start(GTK_BOX(vbox), separator, FALSE, FALSE, 3); - -- GtkWidget *label_sf = gtk_label_new ("http://www.csie.nctu.edu.tw/~cp76/gcin"); -+ GtkWidget *label_sf = gtk_label_new ("gcin WWW:\nhttp://www.csie.nctu.edu.tw/~cp76/gcin"); -+ gtk_misc_set_alignment (GTK_MISC (label_sf), 0, 0); -+ GtkWidget *label_FreeBSD = gtk_label_new ("Feedback:\nhttp://cle.linux.org.tw/gcin/"); -+ gtk_misc_set_alignment (GTK_MISC (label_FreeBSD), 0, 0); - gtk_box_pack_start(GTK_BOX(vbox), label_sf, FALSE, FALSE, 0); -+ gtk_box_pack_start(GTK_BOX(vbox), vseparator, FALSE, FALSE, 3); -+ gtk_box_pack_start(GTK_BOX(vbox), label_FreeBSD, FALSE, FALSE, 0); - - - /* Now on to the image stuff */ diff -ruN gcin.orig/pkg-plist gcin/pkg-plist --- gcin.orig/pkg-plist Wed May 18 11:08:02 2005 +++ gcin/pkg-plist Wed May 18 13:28:26 2005 @@ -25,6 +25,7 @@ %%DATADIR%%/table/hsu.kbm %%DATADIR%%/table/ibm.kbm %%DATADIR%%/table/jyutping.gtab +@exec if [ -f %%DATADIR%%/table/noseeing.gtab ]; then rm -f %%DATADIR%%/table/noseeing.gtab; fi %%DATADIR%%/table/pho-huge.tab %%DATADIR%%/table/pho.tab %%DATADIR%%/table/phrase.table @@ -35,14 +36,14 @@ %%DATADIR%%/table/tsin.idx %%DATADIR%%/table/zo.kbm %%DATADIR%%/table/zo-asdf.kbm -%%DOCSDIR%%/Changelog -%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/Changelog +%%PORTDOCS%%%%DOCSDIR%%/README share/applications/gcin.desktop share/applications/gcin-setup.desktop share/icons/gcin.png share/icons/gcin/pin-fixed24.png share/icons/gcin/pin-float16.png -@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true @unexec rmdir %D/share/icons/gcin 2>/dev/null || true @unexec rmdir %D/share/applications 2>/dev/null || true @unexec rmdir %D/share/icons 2>/dev/null || true --- gcin.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: