4 files changed, 120 insertions, 123 deletions

diff --git a/japanese/libskk/Makefile b/japanese/libskk/Makefile
index e6b6ca4489a4..cc663167294e 100644
--- a/japanese/libskk/Makefile
+++ b/japanese/libskk/Makefile
@@ -2,47 +2,40 @@
 # $FreeBSD$
 
 PORTNAME=	libskk
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	japanese
-MASTER_SITES=	http://cloud.github.com/downloads/ueno/libskk/
+MASTER_SITES=	https://bitbucket.org/libskk/libskk/downloads/
 
 MAINTAINER=	hiroto.kagotani@gmail.com
 COMMENT=	Library to deal with Japanese Kana-to-Kanji conversion method
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	gee:${PORTSDIR}/devel/libgee06 \
-		json-glib-1.0:${PORTSDIR}/devel/json-glib
+LICENSE=	GPLv3
 
-USE_LDCONFIG=	yes
-USE_GMAKE=	yes
-USE_GCC=	any
-USE_GNOME=	intltool gnomehack
-USES=		pkgconfig
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	DATADIRNAME=share
-MAN1=		skk.1
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
+		valac:${PORTSDIR}/lang/vala \
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+LIB_DEPENDS=	libgee.so:${PORTSDIR}/devel/libgee06 \
+		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+USES=		gmake pathfix pkgconfig
+USE_GNOME=	intltool introspection:build
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	NLS
+CPPFLAGS+=	-I${LOCALBASE}/include -w
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+PORTDOCS=	ChangeLog NEWS README
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+OPTIONS_DEFINE=	 DOCS NLS
+OPTIONS_SUB=	yes
 
-post-patch:
-	# Disabling Vala version check
-	${REINPLACE_CMD} -e 's/as_fn_error.*Vala.*not found.*;;/;;/' ${WRKSRC}/configure
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
 
 post-install:
-	cd ${WRKSRC}/docs && ${GMAKE} install-man
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libskk.so.0
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/libskk/distinfo b/japanese/libskk/distinfo
index f9015086aad5..c4409e7b24e9 100644
--- a/japanese/libskk/distinfo
+++ b/japanese/libskk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libskk-1.0.0.tar.gz) = 3584cbafd7e5da595c446bfb43dd2fd488788f5fcaee50c6d77d3e9e39dd11ff
-SIZE (libskk-1.0.0.tar.gz) = 858570
+SHA256 (libskk-1.0.1.tar.gz) = 37bb7859deffd038319a8bc7f9c7d3b207d7dce6afea5e3da519381d7a05388c
+SIZE (libskk-1.0.1.tar.gz) = 860453
diff --git a/japanese/libskk/pkg-descr b/japanese/libskk/pkg-descr
index 5ae93f27eaa4..7d5807ea2683 100644
--- a/japanese/libskk/pkg-descr
+++ b/japanese/libskk/pkg-descr
@@ -20,4 +20,4 @@ Documentation:
 * http://du-a.org/docs/libskk/libskk/ for Vala binding reference
 * http://du-a.org/docs/gtk-doc/libskk/html/ for C binding reference
 
-WWW:	http://github.com/ueno/libskk
+WWW: http://github.com/ueno/libskk/
diff --git a/japanese/libskk/pkg-plist b/japanese/libskk/pkg-plist
index dc7f4f665607..d80eb2fd63ce 100644
--- a/japanese/libskk/pkg-plist
+++ b/japanese/libskk/pkg-plist
@@ -1,21 +1,69 @@
 bin/skk
 include/libskk/libskk.h
-lib/libskk.so.0
-lib/libskk.so
-lib/libskk.la
 lib/girepository-1.0/Skk-1.0.typelib
+lib/libskk.la
+lib/libskk.so
+lib/libskk.so.0
 libdata/pkgconfig/libskk.pc
-%%NLS%%share/locale/ja/LC_MESSAGES/libskk.mo
+man/man1/skk.1.gz
 share/gir-1.0/Skk-1.0.gir
-share/vala/vapi/skk-1.0.deps
-share/vala/vapi/skk-1.0.vapi
-%%DATADIR%%/rules/tcode/keymap/latin.json
-%%DATADIR%%/rules/tcode/keymap/katakana.json
+%%DATADIR%%/rules/README.rules
+%%DATADIR%%/rules/act/keymap/default.json
+%%DATADIR%%/rules/act/keymap/hankaku-katakana.json
+%%DATADIR%%/rules/act/keymap/hiragana.json
+%%DATADIR%%/rules/act/keymap/katakana.json
+%%DATADIR%%/rules/act/keymap/latin.json
+%%DATADIR%%/rules/act/keymap/wide-latin.json
+%%DATADIR%%/rules/act/metadata.json
+%%DATADIR%%/rules/act/rom-kana/default.json
+%%DATADIR%%/rules/azik/keymap/common.json
+%%DATADIR%%/rules/azik/keymap/default.json
+%%DATADIR%%/rules/azik/keymap/hankaku-katakana.json
+%%DATADIR%%/rules/azik/keymap/hiragana.json
+%%DATADIR%%/rules/azik/keymap/katakana.json
+%%DATADIR%%/rules/azik/keymap/latin.json
+%%DATADIR%%/rules/azik/keymap/wide-latin.json
+%%DATADIR%%/rules/azik/metadata.json
+%%DATADIR%%/rules/azik/rom-kana/default.json
+%%DATADIR%%/rules/default/keymap/default.json
+%%DATADIR%%/rules/default/keymap/hankaku-katakana.json
+%%DATADIR%%/rules/default/keymap/hiragana.json
+%%DATADIR%%/rules/default/keymap/katakana.json
+%%DATADIR%%/rules/default/keymap/latin.json
+%%DATADIR%%/rules/default/keymap/wide-latin.json
+%%DATADIR%%/rules/default/metadata.json
+%%DATADIR%%/rules/default/rom-kana/default.json
+%%DATADIR%%/rules/kzik/keymap/default.json
+%%DATADIR%%/rules/kzik/keymap/hankaku-katakana.json
+%%DATADIR%%/rules/kzik/keymap/hiragana.json
+%%DATADIR%%/rules/kzik/keymap/katakana.json
+%%DATADIR%%/rules/kzik/keymap/latin.json
+%%DATADIR%%/rules/kzik/keymap/wide-latin.json
+%%DATADIR%%/rules/kzik/metadata.json
+%%DATADIR%%/rules/kzik/rom-kana/default.json
+%%DATADIR%%/rules/nicola/keymap/default.json
+%%DATADIR%%/rules/nicola/keymap/hankaku-katakana.json
+%%DATADIR%%/rules/nicola/keymap/hiragana.json
+%%DATADIR%%/rules/nicola/keymap/kana.json
+%%DATADIR%%/rules/nicola/keymap/katakana.json
+%%DATADIR%%/rules/nicola/keymap/latin.json
+%%DATADIR%%/rules/nicola/keymap/wide-latin.json
+%%DATADIR%%/rules/nicola/metadata.json
+%%DATADIR%%/rules/nicola/rom-kana/default.json
 %%DATADIR%%/rules/tcode/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/tcode/keymap/wide-latin.json
 %%DATADIR%%/rules/tcode/keymap/hiragana.json
-%%DATADIR%%/rules/tcode/rom-kana/default.json
+%%DATADIR%%/rules/tcode/keymap/katakana.json
+%%DATADIR%%/rules/tcode/keymap/latin.json
+%%DATADIR%%/rules/tcode/keymap/wide-latin.json
 %%DATADIR%%/rules/tcode/metadata.json
+%%DATADIR%%/rules/tcode/rom-kana/default.json
+%%DATADIR%%/rules/trycode/keymap/hankaku-katakana.json
+%%DATADIR%%/rules/trycode/keymap/hiragana.json
+%%DATADIR%%/rules/trycode/keymap/katakana.json
+%%DATADIR%%/rules/trycode/keymap/latin.json
+%%DATADIR%%/rules/trycode/keymap/wide-latin.json
+%%DATADIR%%/rules/trycode/metadata.json
+%%DATADIR%%/rules/trycode/rom-kana/default.json
 %%DATADIR%%/rules/tutcode-touch16x/keymap/hankaku-katakana.json
 %%DATADIR%%/rules/tutcode-touch16x/keymap/hiragana.json
 %%DATADIR%%/rules/tutcode-touch16x/keymap/katakana.json
@@ -23,89 +71,45 @@ share/vala/vapi/skk-1.0.vapi
 %%DATADIR%%/rules/tutcode-touch16x/keymap/wide-latin.json
 %%DATADIR%%/rules/tutcode-touch16x/metadata.json
 %%DATADIR%%/rules/tutcode-touch16x/rom-kana/default.json
-%%DATADIR%%/rules/tutcode/metadata.json
-%%DATADIR%%/rules/tutcode/rom-kana/default.json
 %%DATADIR%%/rules/tutcode/keymap/hankaku-katakana.json
 %%DATADIR%%/rules/tutcode/keymap/hiragana.json
 %%DATADIR%%/rules/tutcode/keymap/katakana.json
 %%DATADIR%%/rules/tutcode/keymap/latin.json
 %%DATADIR%%/rules/tutcode/keymap/wide-latin.json
-%%DATADIR%%/rules/trycode/metadata.json
-%%DATADIR%%/rules/trycode/keymap/latin.json
-%%DATADIR%%/rules/trycode/keymap/katakana.json
-%%DATADIR%%/rules/trycode/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/trycode/keymap/wide-latin.json
-%%DATADIR%%/rules/trycode/keymap/hiragana.json
-%%DATADIR%%/rules/trycode/rom-kana/default.json
-%%DATADIR%%/rules/nicola/metadata.json
-%%DATADIR%%/rules/nicola/rom-kana/default.json
-%%DATADIR%%/rules/nicola/keymap/default.json
-%%DATADIR%%/rules/nicola/keymap/kana.json
-%%DATADIR%%/rules/nicola/keymap/latin.json
-%%DATADIR%%/rules/nicola/keymap/katakana.json
-%%DATADIR%%/rules/nicola/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/nicola/keymap/wide-latin.json
-%%DATADIR%%/rules/nicola/keymap/hiragana.json
-%%DATADIR%%/rules/kzik/rom-kana/default.json
-%%DATADIR%%/rules/kzik/keymap/default.json
-%%DATADIR%%/rules/kzik/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/kzik/keymap/hiragana.json
-%%DATADIR%%/rules/kzik/keymap/katakana.json
-%%DATADIR%%/rules/kzik/keymap/latin.json
-%%DATADIR%%/rules/kzik/keymap/wide-latin.json
-%%DATADIR%%/rules/kzik/metadata.json
-%%DATADIR%%/rules/azik/keymap/default.json
-%%DATADIR%%/rules/azik/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/azik/keymap/hiragana.json
-%%DATADIR%%/rules/azik/keymap/katakana.json
-%%DATADIR%%/rules/azik/keymap/latin.json
-%%DATADIR%%/rules/azik/keymap/wide-latin.json
-%%DATADIR%%/rules/azik/rom-kana/default.json
-%%DATADIR%%/rules/azik/metadata.json
-%%DATADIR%%/rules/default/rom-kana/default.json
-%%DATADIR%%/rules/default/metadata.json
-%%DATADIR%%/rules/default/keymap/default.json
-%%DATADIR%%/rules/default/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/default/keymap/hiragana.json
-%%DATADIR%%/rules/default/keymap/katakana.json
-%%DATADIR%%/rules/default/keymap/latin.json
-%%DATADIR%%/rules/default/keymap/wide-latin.json
-%%DATADIR%%/rules/README.rules
-%%DATADIR%%/rules/act/rom-kana/default.json
-%%DATADIR%%/rules/act/metadata.json
-%%DATADIR%%/rules/act/keymap/default.json
-%%DATADIR%%/rules/act/keymap/hankaku-katakana.json
-%%DATADIR%%/rules/act/keymap/hiragana.json
-%%DATADIR%%/rules/act/keymap/katakana.json
-%%DATADIR%%/rules/act/keymap/latin.json
-%%DATADIR%%/rules/act/keymap/wide-latin.json
-@dirrmtry %%DATADIR%%/rules/tutcode/rom-kana
-@dirrmtry %%DATADIR%%/rules/tutcode/keymap
-@dirrmtry %%DATADIR%%/rules/tutcode-touch16x/rom-kana
-@dirrmtry %%DATADIR%%/rules/tutcode-touch16x/keymap
-@dirrmtry %%DATADIR%%/rules/tutcode-touch16x
-@dirrmtry %%DATADIR%%/rules/tutcode
-@dirrmtry %%DATADIR%%/rules/trycode/rom-kana
-@dirrmtry %%DATADIR%%/rules/trycode/keymap
-@dirrmtry %%DATADIR%%/rules/trycode
-@dirrmtry %%DATADIR%%/rules/tcode/rom-kana
-@dirrmtry %%DATADIR%%/rules/tcode/keymap
-@dirrmtry %%DATADIR%%/rules/tcode
-@dirrmtry %%DATADIR%%/rules/nicola/rom-kana
-@dirrmtry %%DATADIR%%/rules/nicola/keymap
-@dirrmtry %%DATADIR%%/rules/nicola
-@dirrmtry %%DATADIR%%/rules/kzik/rom-kana
-@dirrmtry %%DATADIR%%/rules/kzik/keymap
-@dirrmtry %%DATADIR%%/rules/kzik
-@dirrmtry %%DATADIR%%/rules/default/rom-kana
-@dirrmtry %%DATADIR%%/rules/default/keymap
-@dirrmtry %%DATADIR%%/rules/default
-@dirrmtry %%DATADIR%%/rules/azik/rom-kana
-@dirrmtry %%DATADIR%%/rules/azik/keymap
-@dirrmtry %%DATADIR%%/rules/azik
-@dirrmtry %%DATADIR%%/rules/act/rom-kana
-@dirrmtry %%DATADIR%%/rules/act/keymap
-@dirrmtry %%DATADIR%%/rules/act
-@dirrmtry %%DATADIR%%/rules
-@dirrmtry %%DATADIR%%
-@dirrmtry include/libskk
+%%DATADIR%%/rules/tutcode/metadata.json
+%%DATADIR%%/rules/tutcode/rom-kana/default.json
+%%NLS%%share/locale/ja/LC_MESSAGES/libskk.mo
+share/vala/vapi/skk-1.0.deps
+share/vala/vapi/skk-1.0.vapi
+@dirrm %%DATADIR%%/rules/tutcode/rom-kana
+@dirrm %%DATADIR%%/rules/tutcode/keymap
+@dirrm %%DATADIR%%/rules/tutcode-touch16x/rom-kana
+@dirrm %%DATADIR%%/rules/tutcode-touch16x/keymap
+@dirrm %%DATADIR%%/rules/tutcode-touch16x
+@dirrm %%DATADIR%%/rules/tutcode
+@dirrm %%DATADIR%%/rules/trycode/rom-kana
+@dirrm %%DATADIR%%/rules/trycode/keymap
+@dirrm %%DATADIR%%/rules/trycode
+@dirrm %%DATADIR%%/rules/tcode/rom-kana
+@dirrm %%DATADIR%%/rules/tcode/keymap
+@dirrm %%DATADIR%%/rules/tcode
+@dirrm %%DATADIR%%/rules/nicola/rom-kana
+@dirrm %%DATADIR%%/rules/nicola/keymap
+@dirrm %%DATADIR%%/rules/nicola
+@dirrm %%DATADIR%%/rules/kzik/rom-kana
+@dirrm %%DATADIR%%/rules/kzik/keymap
+@dirrm %%DATADIR%%/rules/kzik
+@dirrm %%DATADIR%%/rules/default/rom-kana
+@dirrm %%DATADIR%%/rules/default/keymap
+@dirrm %%DATADIR%%/rules/default
+@dirrm %%DATADIR%%/rules/azik/rom-kana
+@dirrm %%DATADIR%%/rules/azik/keymap
+@dirrm %%DATADIR%%/rules/azik
+@dirrm %%DATADIR%%/rules/act/rom-kana
+@dirrm %%DATADIR%%/rules/act/keymap
+@dirrm %%DATADIR%%/rules/act
+@dirrm %%DATADIR%%/rules
+@dirrm %%DATADIR%%
+@dirrmtry share/gir-1.0
+@dirrmtry lib/girepository-1.0
+@dirrm include/libskk