ports/95354: [PATCH] chinese/gcin: update to 1.1.8
chinsan
chinsan.tw at gmail.com
Wed Apr 5 16:50:18 UTC 2006
>Number: 95354
>Category: ports
>Synopsis: [PATCH] chinese/gcin: update to 1.1.8
>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 Apr 05 16:50:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: chinsan
>Release: FreeBSD 5.5-PRERELEASE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD chinsan.twbbs.org 5.5-PRERELEASE FreeBSD 5.5-PRERELEASE #3: Fri Mar 17 00:55:59 CST 2006
>Description:
- Update to 1.1.8
Removed file(s):
- files/patch-configure
- files/patch-script
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- gcin-1.1.8.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/chinese/gcin/Makefile /usr/home/chinsan/project/gcin/Makefile
--- /usr/ports/chinese/gcin/Makefile Wed Mar 1 08:02:47 2006
+++ /usr/home/chinsan/project/gcin/Makefile Thu Apr 6 00:28:02 2006
@@ -6,7 +6,7 @@
#
PORTNAME= gcin
-PORTVERSION= 1.1.7
+PORTVERSION= 1.1.8
CATEGORIES= chinese textproc gnome
MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/ \
http://edt1023.sayya.org/misc/
@@ -64,6 +64,16 @@
pre-configure:
@${REINPLACE_CMD} -e 's,gcin.png,${PREFIX}/share/icons/gcin.png,' \
${WRKSRC}/menu/gcin-setup.desktop
+ @${REINPLACE_CMD} -e 's/&//; s/bash/sh/; \
+ s/QT_IM_DIR=\/usr/QT_IM_DIR=$$prefix/; \
+ s/mandir=$$datadir/mandir=$$prefix/; \
+ s/\/usr\/share/$$prefix\/share/; \
+ 109,110 s/control-center-2\.0/gnome\/control-center-2\.0/; \
+ s/gcc/$$CC/; s/gcin-$$GCIN_VERSION/gcin/' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's/modify-XIM //; 8,10 d' ${WRKSRC}/scripts/Makefile
+ @${REINPLACE_CMD} -e 's/bash/sh/;' ${WRKSRC}/scripts/gcin-user-setup
+ @${REINPLACE_CMD} -e 's/bash/sh/; s/&//; s/opt\/gnome/usr\/X11R6/;' \
+ ${WRKSRC}/scripts/utf8-edit
post-install:
.if !defined(NOPORTDOCS)
diff -ruN --exclude=CVS /usr/ports/chinese/gcin/distinfo /usr/home/chinsan/project/gcin/distinfo
--- /usr/ports/chinese/gcin/distinfo Wed Mar 1 08:02:47 2006
+++ /usr/home/chinsan/project/gcin/distinfo Thu Apr 6 00:28:02 2006
@@ -1,5 +1,3 @@
-MD5 (gcin-1.1.7.tar.bz2) = a2b08008e17c86d31fbed707c9d156ee
-SHA256 (gcin-1.1.7.tar.bz2) = 8e63077c2d9340492539334f8229893e231158ca192b7a3066a73daa7e5697ea
-SIZE (gcin-1.1.7.tar.bz2) = 1392767
-MD5 (noseeing.tar.gz) = IGNORE
-SHA256 (noseeing.tar.gz) = IGNORE
+MD5 (gcin-1.1.8.tar.bz2) = 9e482f698d27f24aff50e1dfd0bc9a4c
+SHA256 (gcin-1.1.8.tar.bz2) = 319aedc7a2df013d8434e170e397387db235460f3897ba2e5ceb8e9d506c072e
+SIZE (gcin-1.1.8.tar.bz2) = 1392433
diff -ruN --exclude=CVS /usr/ports/chinese/gcin/files/patch-configure /usr/home/chinsan/project/gcin/files/patch-configure
--- /usr/ports/chinese/gcin/files/patch-configure Wed Mar 1 08:02:47 2006
+++ /usr/home/chinsan/project/gcin/files/patch-configure Thu Jan 1 08:00:00 1970
@@ -1,87 +0,0 @@
---- configure.orig Wed Feb 22 21:25:55 2006
-+++ configure Wed Feb 22 21:34:26 2006
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- if [ "$1" = "-h" -o "$1" = "--help" -o "$1" = "-help" ]; then
- echo "** valid options:"
-@@ -9,12 +9,12 @@
- fi
-
- MAKE=make
--which gmake >& /dev/null
-+which gmake > /dev/null
- if [ $? = 0 ]; then
- MAKE=gmake
- fi
-
--uname | grep FreeBSD >& /dev/null
-+uname | grep FreeBSD > /dev/null
- if [ $? = 0 ]; then
- FREEBSD=1
- else
-@@ -74,7 +74,7 @@
- QT_IM='N'
- for i in qt3 qt4
- do
-- QT_IM_DIR=/usr/lib/$i/plugins/$LIB/inputmethods
-+ QT_IM_DIR=$prefix/lib/$i/plugins/$LIB/inputmethods
- echo "testing if you have QT_IM_MODULE dir:$QT_IM_DIR support"
- if [ -d $QT_IM_DIR ]; then
- QT_IM='Y'
-@@ -92,7 +92,7 @@
-
- bindir=$prefix/bin
- datadir=$prefix/share
--mandir=$datadir/man
-+mandir=$prefix/man
- libdir=$prefix/lib
- includedir=$prefix/include
- optdir=/opt
-@@ -105,8 +105,8 @@
- GCIN_SETUP_DESKTOP=/opt/gnome/share/control-center-2.0/capplets
- GCIN_SETUP_DESKTOP_rpm='$(optdir)/gnome/share/control-center-2.0/capplets'
- else
-- GCIN_SETUP_DESKTOP=/usr/share/control-center-2.0/capplets
-- GCIN_SETUP_DESKTOP_rpm='$(datadir)/control-center-2.0/capplets'
-+ GCIN_SETUP_DESKTOP=$prefix/share/gnome/control-center-2.0/capplets
-+ GCIN_SETUP_DESKTOP_rpm='$(datadir)/gnome/control-center-2.0/capplets'
- fi
-
-
-@@ -115,14 +115,6 @@
- grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec
- fi
-
--grep Cooker /etc/mandriva-release 2>&1 | grep 2006 >& /dev/null
--if [ $? = 0 ]; then
-- new_gtk_im='Y'
-- echo "!!!! new gtk-im(im-gcin.so) will be enabled because you are using Cooker 2006."
-- echo "!!!! You have to install the latest libwidget_gtk2.so"
-- echo "http://www.csie.nctu.edu.tw/~cp76/linux/mozilla/mdk-firefox-thunderbird-1.0.6/cooker-new-gtkim-libwidget_gtk2.so.gz"
--fi
--
-
- OPTFLAGS="-g"
- if [ $prefix = /usr ]; then
-@@ -130,7 +122,7 @@
- fi
-
-
--echo "CC=gcc" > config.mak
-+echo "CC=$CC" > config.mak
- echo "MAKE=$MAKE" >> config.mak
- echo "GTKINC=$GTKINC" >> config.mak
- echo "prefix=$prefix" >> config.mak
-@@ -150,8 +142,8 @@
- echo "GCIN_SCRIPT_DIR=\$(datadir_r)/gcin/script" >> config.mak
- echo "GCIN_SCRIPT_DIR_i=\$(datadir)/gcin/script" >> config.mak
- echo "OPTFLAGS=$OPTFLAGS" >> config.mak
--echo "DOC_DIR=\$(datadir_r)/doc/gcin-$GCIN_VERSION" >> config.mak
--echo "DOC_DIR_i=\$(datadir)/doc/gcin-$GCIN_VERSION" >> config.mak
-+echo "DOC_DIR=\$(datadir_r)/doc/gcin" >> config.mak
-+echo "DOC_DIR_i=\$(datadir)/doc/gcin" >> config.mak
- echo "GCIN_ICON_DIR=\$(datadir_r)/icons/gcin" >> config.mak
- echo "SYS_ICON_DIR=\$(datadir_r)/icons" >> config.mak
- echo "GCIN_ICON_DIR_i=\$(datadir)/icons/gcin" >> config.mak
diff -ruN --exclude=CVS /usr/ports/chinese/gcin/files/patch-script /usr/home/chinsan/project/gcin/files/patch-script
--- /usr/ports/chinese/gcin/files/patch-script Wed Mar 1 08:02:47 2006
+++ /usr/home/chinsan/project/gcin/files/patch-script Thu Jan 1 08:00:00 1970
@@ -1,45 +0,0 @@
-diff -ruN scripts.orig/Makefile scripts/Makefile
---- scripts.orig/Makefile Wed Feb 22 21:35:19 2006
-+++ scripts/Makefile Wed Feb 22 21:36:28 2006
-@@ -1,13 +1,10 @@
- include ../config.mak
-
--SCRIPTS=gcin-user-setup modify-XIM utf8-edit
-+SCRIPTS=gcin-user-setup utf8-edit
-
- all: $(SCRIPTS)
-
- install:
-- if [ $(prefix) = /usr/local ]; then \
-- sh modify-XIM; \
-- fi
- install -d $(GCIN_SCRIPT_DIR_i)
- install -m 755 $(SCRIPTS) $(GCIN_SCRIPT_DIR_i)
- clean:
-diff -ruN scripts.orig/gcin-user-setup scripts/gcin-user-setup
---- scripts.orig/gcin-user-setup Wed Feb 22 21:35:19 2006
-+++ scripts/gcin-user-setup Wed Feb 22 21:36:44 2006
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- if [ -z "$1" -o -z "$2" ]; then
- echo "please specify gcin_table_dir gcin_bin_dir"
-diff -ruN scripts.orig/utf8-edit scripts/utf8-edit
---- scripts.orig/utf8-edit Wed Feb 22 21:35:19 2006
-+++ scripts/utf8-edit Wed Feb 22 21:37:58 2006
-@@ -1,10 +1,10 @@
--#!/bin/bash
-+#!/bin/sh
-
--PATH=$PATH:/opt/gnome/bin:/usr/local/bin
-+PATH=$PATH:/usr/X11R6/bin:/usr/local/bin
-
--for i in leafpad gedit madedit kedit kate
-+for i in leafpad gedit gvim madedit kedit kate
- do
-- which $i >& /dev/null
-+ which $i > /dev/null
- if [ $? = 0 ]; then
- UTF8ED=$i
- break
diff -ruN --exclude=CVS /usr/ports/chinese/gcin/pkg-message /usr/home/chinsan/project/gcin/pkg-message
--- /usr/ports/chinese/gcin/pkg-message Thu Feb 2 12:16:36 2006
+++ /usr/home/chinsan/project/gcin/pkg-message Thu Apr 6 00:38:57 2006
@@ -2,8 +2,7 @@
Remember to set environment varible:
(csh/tcsh) (sh/bash)
- setenv XMODIFIERS @im=xcin export XMODIFIERS='@im=xcin'
- setenv GTK_IM_MODULE xim export GTK_IM_MODULE=xim
+ setenv XMODIFIERS @im=gcin export XMODIFIERS='@im=gcin'
Finally, to start the GCIN input method daemon, use command:
--- gcin-1.1.8.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list