11 files changed, 82 insertions, 10 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 5f28299165b3..73a5081098eb 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -58,6 +58,7 @@
     SUBDIR += eterm
     SUBDIR += fcitx-anthy
     SUBDIR += fcitx-mozc
+    SUBDIR += fcitx-skk
     SUBDIR += flower-fpw
     SUBDIR += foldoc-fpw
     SUBDIR += font-ipa
diff --git a/japanese/fcitx-anthy/Makefile b/japanese/fcitx-anthy/Makefile
index 53ae3f7cbbd1..99e3b651eb16 100644
--- a/japanese/fcitx-anthy/Makefile
+++ b/japanese/fcitx-anthy/Makefile
@@ -2,21 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	fcitx-anthy
-PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTVERSION=	0.2.1
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	http://download.fcitx-im.org/${PORTNAME}/
 DIST_SUBDIR=	fcitx
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lichray@gmail.com
 COMMENT=	Anthy support for Fcitx
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
 		libanthy.so:${PORTSDIR}/japanese/anthy
 
 USES=		cmake gettext pkgconfig tar:xz
-USE_GNOME=	intltool
-
-PROJECTHOST=	fcitx
+INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
diff --git a/japanese/fcitx-anthy/distinfo b/japanese/fcitx-anthy/distinfo
index cf848a76496f..1c6988c0956a 100644
--- a/japanese/fcitx-anthy/distinfo
+++ b/japanese/fcitx-anthy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-anthy-0.1.1.tar.xz) = c508068c7c9a56c26ea44b8e6ddb90a2ea75860031f89e171dcda8ec4cd08955
-SIZE (fcitx/fcitx-anthy-0.1.1.tar.xz) = 68604
+SHA256 (fcitx/fcitx-anthy-0.2.1.tar.xz) = fd208474666f09f1c189c10c2c0fa9cfda33948b704410e02878fdd92174d78d
+SIZE (fcitx/fcitx-anthy-0.2.1.tar.xz) = 72196
diff --git a/japanese/fcitx-anthy/pkg-descr b/japanese/fcitx-anthy/pkg-descr
index 54fceb6c73b2..9b576e81bbdc 100644
--- a/japanese/fcitx-anthy/pkg-descr
+++ b/japanese/fcitx-anthy/pkg-descr
@@ -1,4 +1,4 @@
 fcitx-anthy provides Anthy, the most popular Japanese input method
 system, as a back-end to the Fcitx IM framework.
 
-WWW:	http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/japanese/fcitx-anthy/pkg-plist b/japanese/fcitx-anthy/pkg-plist
index 80ecca891fc9..136d1412e989 100644
--- a/japanese/fcitx-anthy/pkg-plist
+++ b/japanese/fcitx-anthy/pkg-plist
@@ -25,6 +25,7 @@ share/icons/hicolor/scalable/status/fcitx-anthy-period-latin.svg
 share/icons/hicolor/scalable/status/fcitx-anthy-period-wide-japanese.svg
 share/icons/hicolor/scalable/status/fcitx-anthy-period-wide-latin.svg
 share/icons/hicolor/scalable/status/fcitx-anthy-symbol.svg
+share/locale/de/LC_MESSAGES/fcitx-anthy.mo
 share/locale/ja/LC_MESSAGES/fcitx-anthy.mo
 share/locale/zh_CN/LC_MESSAGES/fcitx-anthy.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx-anthy.mo
diff --git a/japanese/fcitx-skk/Makefile b/japanese/fcitx-skk/Makefile
new file mode 100644
index 000000000000..5f466f8a2ce8
--- /dev/null
+++ b/japanese/fcitx-skk/Makefile
@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+PORTNAME=	fcitx-skk
+PORTVERSION=	0.1.1
+CATEGORIES=	japanese
+MASTER_SITES=	http://download.fcitx-im.org/${PORTNAME}/
+DIST_SUBDIR=	fcitx
+
+MAINTAINER=	hiroto.kagotani@gmail.com
+COMMENT=	SKK support for Fcitx
+
+LICENSE=	GPLv3
+
+RUN_DEPENDS=	${LOCALBASE}/share/skk/SKK-JISYO.L:${PORTSDIR}/japanese/skk-jisyo
+LIB_DEPENDS=	libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
+		libskk.so:${PORTSDIR}/japanese/libskk
+
+USES=		tar:xz compiler:c++11-lang cmake gettext pkgconfig
+INSTALLS_ICONS=	yes
+CMAKE_ARGS+=	-DSKK_DEFAULT_PATH=${LOCALBASE}/share/skk/SKK-JISYO.L
+
+OPTIONS_DEFINE=	QT4
+OPTIONS_DEFAULT=QT4
+QT4_DESC=	Enable Qt for GUI configuration
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MQT4}
+USE_QT4=	qmake_build moc_build rcc_build uic_build gui
+USE_LDCONFIG=	${PREFIX}/lib/fcitx/qt
+PLIST_SUB+=	QT4=""
+.else
+CMAKE_ARGS+=	-DENABLE_QT=OFF
+PLIST_SUB+=	 QT4="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/japanese/fcitx-skk/distinfo b/japanese/fcitx-skk/distinfo
new file mode 100644
index 000000000000..97069bef250d
--- /dev/null
+++ b/japanese/fcitx-skk/distinfo
@@ -0,0 +1,2 @@
+SHA256 (fcitx/fcitx-skk-0.1.1.tar.xz) = 023a1d9b075c02c7e394a689e7b2452a1df1e062b2953892aed7c694fb55591c
+SIZE (fcitx/fcitx-skk-0.1.1.tar.xz) = 31136
diff --git a/japanese/fcitx-skk/files/patch-gui__CMakeLists.txt b/japanese/fcitx-skk/files/patch-gui__CMakeLists.txt
new file mode 100644
index 000000000000..66ccbef34728
--- /dev/null
+++ b/japanese/fcitx-skk/files/patch-gui__CMakeLists.txt
@@ -0,0 +1,8 @@
+--- ./gui/CMakeLists.txt.orig	2013-10-28 01:07:26.000000000 +0900
++++ ./gui/CMakeLists.txt	2014-03-20 13:44:23.000000000 +0900
+@@ -47,4 +47,4 @@
+   ${LIBSKK_LIBRARIES}
+   )
+ 
+-install(TARGETS fcitx-skk-config DESTINATION ${FCITX4_ADDON_INSTALL_DIR}/qt)
++install(TARGETS fcitx-skk-config DESTINATION ${FCITX4_ADDON_INSTALL_DESTDIR}/qt)
diff --git a/japanese/fcitx-skk/files/patch-src__CMakeLists.txt b/japanese/fcitx-skk/files/patch-src__CMakeLists.txt
new file mode 100644
index 000000000000..2d74a96758b7
--- /dev/null
+++ b/japanese/fcitx-skk/files/patch-src__CMakeLists.txt
@@ -0,0 +1,8 @@
+--- ./src/CMakeLists.txt.orig	2013-10-28 01:07:26.000000000 +0900
++++ ./src/CMakeLists.txt	2014-03-20 13:45:23.000000000 +0900
+@@ -15,4 +15,4 @@
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dictionary_list.in ${CMAKE_CURRENT_BINARY_DIR}/dictionary_list @ONLY)
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dictionary_list rule DESTINATION "${FCITX4_PREFIX}/share/fcitx/skk")
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dictionary_list rule DESTINATION "share/fcitx/skk")
diff --git a/japanese/fcitx-skk/pkg-descr b/japanese/fcitx-skk/pkg-descr
new file mode 100644
index 000000000000..36c6db9a5d7a
--- /dev/null
+++ b/japanese/fcitx-skk/pkg-descr
@@ -0,0 +1,3 @@
+fcitx-skk provides SKK as a back-end to the Fcitx IM framework.
+
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/japanese/fcitx-skk/pkg-plist b/japanese/fcitx-skk/pkg-plist
new file mode 100644
index 000000000000..64c35b3783b6
--- /dev/null
+++ b/japanese/fcitx-skk/pkg-plist
@@ -0,0 +1,13 @@
+share/fcitx/imicon/skk.png
+share/icons/hicolor/64x64/apps/fcitx-skk.png
+share/locale/de/LC_MESSAGES/fcitx-skk.mo
+share/locale/ja/LC_MESSAGES/fcitx-skk.mo
+share/locale/vi/LC_MESSAGES/fcitx-skk.mo
+share/locale/zh_CN/LC_MESSAGES/fcitx-skk.mo
+lib/fcitx/fcitx-skk.so
+%%QT4%%lib/fcitx/qt/libfcitx-skk-config.so
+share/fcitx/addon/fcitx-skk.conf
+share/fcitx/configdesc/fcitx-skk.desc
+share/fcitx/inputmethod/skk.conf
+share/fcitx/skk/dictionary_list
+share/fcitx/skk/rule