aboutsummaryrefslogtreecommitdiff
path: root/chinese
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>2014-04-11 02:38:41 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>2014-04-11 02:38:41 +0000
commitb4ebf09338fb955f2085be266def576568af395e (patch)
tree68d755075ef036dc4a407cb1efcd72b305a7e249 /chinese
parent8a2b755c609cfecdd5a20d832704a17920497e7d (diff)
downloadports-b4ebf09338fb955f2085be266def576568af395e.tar.gz
ports-b4ebf09338fb955f2085be266def576568af395e.zip
Notes
Diffstat (limited to 'chinese')
-rw-r--r--chinese/gcin/Makefile1
-rw-r--r--chinese/gcin/files/patch-Makefile54
-rw-r--r--chinese/gcin/files/patch-modules__Makefile (renamed from chinese/gcin/files/patch-modules_Makefile)8
-rw-r--r--chinese/gcin/files/patch-qt4-im__Makefile (renamed from chinese/gcin/files/patch-qt4-im-Makefile)8
4 files changed, 58 insertions, 13 deletions
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index fea6ade2ea42..d32d67eb590e 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -22,7 +22,6 @@ USES= gmake pkgconfig
USE_XORG= x11 xtst xext
INSTALLS_ICONS= YES
USE_LDCONFIG= YES
-MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= ANTHY QT_IM_MODULE
ANTHY_DESC= Japanese anthy IM module
QT_IM_MODULE_DESC= QT IM module
diff --git a/chinese/gcin/files/patch-Makefile b/chinese/gcin/files/patch-Makefile
index c8720190f1eb..26dee0ed7206 100644
--- a/chinese/gcin/files/patch-Makefile
+++ b/chinese/gcin/files/patch-Makefile
@@ -1,5 +1,5 @@
---- ./Makefile.orig 2012-12-08 00:32:13.000000000 +0000
-+++ ./Makefile 2014-01-04 22:34:02.000000000 +0000
+--- ./Makefile.orig 2012-12-08 08:32:13.000000000 +0800
++++ ./Makefile 2014-03-28 20:46:01.000000000 +0800
@@ -94,7 +94,7 @@
all: $(PROGS) trad2sim $(GCIN_SO) $(DATA) $(PROGS_CV) gcin.spec gcin-fedora.spec
$(MAKE) -C data
@@ -9,7 +9,51 @@
if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po; fi
if [ $(GTK3_IM) = 'Y' ]; then $(MAKE) -C gtk3-im; fi
if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
-@@ -215,11 +215,11 @@
+@@ -103,18 +103,18 @@
+ #gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path)
+
+ gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
+- $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
++ $(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB)
+ rm -f core.* vgcore.*
+ ln -sf $@ $@.test
+
+ gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
+- $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
++ $(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB)
+ rm -f core.*
+
+-tslearn: $(OBJS_TSLEARN)
++tslearn: $(OBJS_TSLEARN) im-client/libgcin-im-client.so
+ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TSLEARN) -L./im-client -lgcin-im-client $(LDFLAGS)
+
+-ts-edit: $(OBJS_TS_EDIT)
++ts-edit: $(OBJS_TS_EDIT) im-client/libgcin-im-client.so
+ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TS_EDIT) -L./im-client -lgcin-im-client $(LDFLAGS)
+
+ ts-contribute: ts-edit
+@@ -158,16 +158,16 @@
+ kbmcv: $(OBJS_kbmcv)
+ $(CCLD) -o $@ $(OBJS_kbmcv) $(LDFLAGS)
+
+-gcin-gb-toggle: $(OBJS_gcin_gb_toggle)
++gcin-gb-toggle: $(OBJS_gcin_gb_toggle) im-client/libgcin-im-client.so
+ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_gb_toggle) -L./im-client -lgcin-im-client $(LDFLAGS)
+
+-gcin-kbm-toggle: $(OBJS_gcin_kbm_toggle)
++gcin-kbm-toggle: $(OBJS_gcin_kbm_toggle) im-client/libgcin-im-client.so
+ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_kbm_toggle) -L./im-client -lgcin-im-client $(LDFLAGS)
+
+-gcin-exit: $(OBJS_gcin_exit)
++gcin-exit: $(OBJS_gcin_exit) im-client/libgcin-im-client.so
+ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_exit) -L./im-client -lgcin-im-client $(LDFLAGS)
+
+-gcin-message: $(OBJS_gcin_message)
++gcin-message: $(OBJS_gcin_message) im-client/libgcin-im-client.so
+ $(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS)
+
+ pin-juyin: $(OBJS_pin_juyin)
+@@ -215,12 +215,12 @@
$(MAKE) -C data install
$(MAKE) -C im-client install
$(MAKE) -C gtk-im install
@@ -19,10 +63,12 @@
if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi
if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi
- if [ $(prefix) = /usr/local ]; then \
+- install -m 644 gcin.png /usr/share/icons; \
+ if [ $(prefix) = /nonstaged ]; then \
- install -m 644 gcin.png /usr/share/icons; \
++ install -m 644 gcin.png $(prefix)/share/icons; \
install -d $(DOC_DIR); \
install -m 644 README.html Changelog.html $(DOC_DIR); \
+ install $(PROGS) $(bindir); \
@@ -234,6 +234,7 @@
rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
fi
diff --git a/chinese/gcin/files/patch-modules_Makefile b/chinese/gcin/files/patch-modules__Makefile
index 6055b0ed5a25..a74a825b1138 100644
--- a/chinese/gcin/files/patch-modules_Makefile
+++ b/chinese/gcin/files/patch-modules__Makefile
@@ -1,6 +1,6 @@
---- modules/Makefile.orig 2012-09-05 15:46:26.000000000 +0800
-+++ modules/Makefile 2012-09-05 15:49:16.000000000 +0800
-@@ -3,15 +3,18 @@ include ../suffixes-rule
+--- ./modules/Makefile.orig 2012-04-10 13:50:44.000000000 +0800
++++ ./modules/Makefile 2014-03-28 20:45:33.000000000 +0800
+@@ -3,15 +3,18 @@
CFLAGS+=-I.. -I../IMdkit/include
GCIN_MODULE=intcode-module.so
@@ -19,7 +19,7 @@
endif
all: $(GCIN_MODULE)
-@@ -35,6 +38,6 @@ install:
+@@ -35,6 +38,6 @@
clean:
rm -f *.pico *.so *.o .depend
.depend:
diff --git a/chinese/gcin/files/patch-qt4-im-Makefile b/chinese/gcin/files/patch-qt4-im__Makefile
index d02fcf3ee912..364ed1104383 100644
--- a/chinese/gcin/files/patch-qt4-im-Makefile
+++ b/chinese/gcin/files/patch-qt4-im__Makefile
@@ -1,8 +1,8 @@
---- qt4-im/Makefile.orig 2012-01-08 01:45:14.000000000 +0800
-+++ qt4-im/Makefile 2012-01-08 01:47:10.000000000 +0800
-@@ -3,7 +3,7 @@ QT=qt4
+--- ./qt4-im/Makefile.orig 2012-03-05 20:26:54.000000000 +0800
++++ ./qt4-im/Makefile 2014-03-28 20:45:33.000000000 +0800
+@@ -3,7 +3,7 @@
QTIM=$(QT)/plugins/inputmethods
- IMMODULES=$(libdir)/$(QTIM)
+ IMMODULES=$(libdir)/$(DEB_BUILD_MULTIARCH)/$(QTIM)
-INCS=-I../im-client -I/usr/include/X11 `pkg-config QtCore QtGui --cflags`
+INCS=-I../im-client -I$(prefix)/include/X11 -I$(prefix)/include `pkg-config QtCore QtGui --cflags`