7 files changed, 14 insertions, 24 deletions

diff --git a/japanese/kde4-l10n/Makefile b/japanese/kde4-l10n/Makefile
index 3dc263707b7d..3f8edd5f798f 100644
--- a/japanese/kde4-l10n/Makefile
+++ b/japanese/kde4-l10n/Makefile
@@ -10,6 +10,5 @@ COMMENT=	Japanese messages and documentation for KDE SC 4
 
 KDE4_L10N=	ja
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
diff --git a/japanese/kde4-l10n/distinfo b/japanese/kde4-l10n/distinfo
index f02499423a05..c3dbc532d062 100644
--- a/japanese/kde4-l10n/distinfo
+++ b/japanese/kde4-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kde-l10n/kde-l10n-ja-4.10.5.tar.xz) = 6355557c616fc21a352c3ff058c9acb5d1893ab22d51d5fe5e4365c26f7c20af
-SIZE (KDE/4.10.5/kde-l10n/kde-l10n-ja-4.10.5.tar.xz) = 2318728
+SHA256 (KDE/4.12.2/kde-l10n/kde-l10n-ja-4.12.2.tar.xz) = f167e6c973486c5c0b27a6565bdfa538c4bdcd3f8f863cf06b50a2b59bdc034e
+SIZE (KDE/4.12.2/kde-l10n/kde-l10n-ja-4.12.2.tar.xz) = 2295812
diff --git a/japanese/kde4-l10n/pkg-message b/japanese/kde4-l10n/pkg-message
new file mode 100644
index 000000000000..58195467d466
--- /dev/null
+++ b/japanese/kde4-l10n/pkg-message
@@ -0,0 +1,2 @@
+Documents written in Japanese often use text encodings which require a Qt
+plugin available as japanese/qt4-codecs-jp in the ports collection.
diff --git a/japanese/kde4-l10n/pkg-plist b/japanese/kde4-l10n/pkg-plist
index 28ba4f783df3..d74ed95d99e4 100644
--- a/japanese/kde4-l10n/pkg-plist
+++ b/japanese/kde4-l10n/pkg-plist
@@ -35,6 +35,7 @@ share/locale/ja/LC_MESSAGES/akonadi-filestore.mo
 share/locale/ja/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/ja/LC_MESSAGES/akonadi_facebook_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_imap_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_invitations_agent.mo
@@ -55,6 +56,7 @@ share/locale/ja/LC_MESSAGES/akonadi_microblog_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_mixedmaildir_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_nepomuk_feeder.mo
 share/locale/ja/LC_MESSAGES/akonadi_nepomuktag_resource.mo
+share/locale/ja/LC_MESSAGES/akonadi_newmailnotifier_agent.mo
 share/locale/ja/LC_MESSAGES/akonadi_next.mo
 share/locale/ja/LC_MESSAGES/akonadi_nntp_resource.mo
 share/locale/ja/LC_MESSAGES/akonadi_openxchange_resource.mo
@@ -144,7 +146,6 @@ share/locale/ja/LC_MESSAGES/katemailfilesplugin.mo
 share/locale/ja/LC_MESSAGES/kateopenheader.mo
 share/locale/ja/LC_MESSAGES/katepart4.mo
 share/locale/ja/LC_MESSAGES/katesearch.mo
-share/locale/ja/LC_MESSAGES/katesnippets_tng.mo
 share/locale/ja/LC_MESSAGES/katesql.mo
 share/locale/ja/LC_MESSAGES/katesymbolviewer.mo
 share/locale/ja/LC_MESSAGES/katetabbarextension.mo
@@ -153,7 +154,6 @@ share/locale/ja/LC_MESSAGES/katetextfilter.mo
 share/locale/ja/LC_MESSAGES/katexmlcheck.mo
 share/locale/ja/LC_MESSAGES/katexmltools.mo
 share/locale/ja/LC_MESSAGES/katomic.mo
-share/locale/ja/LC_MESSAGES/kbattleship.mo
 share/locale/ja/LC_MESSAGES/kblackbox.mo
 share/locale/ja/LC_MESSAGES/kblankscrn.mo
 share/locale/ja/LC_MESSAGES/kblocks.mo
@@ -184,7 +184,6 @@ share/locale/ja/LC_MESSAGES/kcm_pci.mo
 share/locale/ja/LC_MESSAGES/kcm_phonon.mo
 share/locale/ja/LC_MESSAGES/kcm_platform.mo
 share/locale/ja/LC_MESSAGES/kcm_remotecontrol.mo
-share/locale/ja/LC_MESSAGES/kcm_solid.mo
 share/locale/ja/LC_MESSAGES/kcm_solid_actions.mo
 share/locale/ja/LC_MESSAGES/kcm_standard_actions.mo
 share/locale/ja/LC_MESSAGES/kcmaccess.mo
@@ -355,6 +354,7 @@ share/locale/ja/LC_MESSAGES/kmix.mo
 share/locale/ja/LC_MESSAGES/kmousetool.mo
 share/locale/ja/LC_MESSAGES/kmouth.mo
 share/locale/ja/LC_MESSAGES/kmplot.mo
+share/locale/ja/LC_MESSAGES/knavalbattle.mo
 share/locale/ja/LC_MESSAGES/knetattach.mo
 share/locale/ja/LC_MESSAGES/knetwalk.mo
 share/locale/ja/LC_MESSAGES/knode.mo
@@ -420,8 +420,6 @@ share/locale/ja/LC_MESSAGES/ksysguardlsofwidgets.mo
 share/locale/ja/LC_MESSAGES/ksystemlog.mo
 share/locale/ja/LC_MESSAGES/ksystraycmd.mo
 share/locale/ja/LC_MESSAGES/kteatime.mo
-share/locale/ja/LC_MESSAGES/ktesnippets_editor.mo
-share/locale/ja/LC_MESSAGES/ktexteditor_codesnippets_core.mo
 share/locale/ja/LC_MESSAGES/ktexteditor_plugins.mo
 share/locale/ja/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
 share/locale/ja/LC_MESSAGES/ktimer.mo
@@ -478,6 +476,7 @@ share/locale/ja/LC_MESSAGES/libkldap.mo
 share/locale/ja/LC_MESSAGES/libkleopatra.mo
 share/locale/ja/LC_MESSAGES/libkmahjongg.mo
 share/locale/ja/LC_MESSAGES/libkmime.mo
+share/locale/ja/LC_MESSAGES/libkomparediff2.mo
 share/locale/ja/LC_MESSAGES/libkonq.mo
 share/locale/ja/LC_MESSAGES/libkpgp.mo
 share/locale/ja/LC_MESSAGES/libkpimidentities.mo
@@ -524,13 +523,10 @@ share/locale/ja/LC_MESSAGES/minitoolsplugin.mo
 share/locale/ja/LC_MESSAGES/mplayerthumbs.mo
 share/locale/ja/LC_MESSAGES/mplayerthumbsconfig.mo
 share/locale/ja/LC_MESSAGES/nepomukbackup.mo
-share/locale/ja/LC_MESSAGES/nepomukcontroller.mo
 share/locale/ja/LC_MESSAGES/nepomukfileindexer.mo
-share/locale/ja/LC_MESSAGES/nepomukqueryservice.mo
 share/locale/ja/LC_MESSAGES/nepomukserver.mo
 share/locale/ja/LC_MESSAGES/nepomukservicestub.mo
 share/locale/ja/LC_MESSAGES/nepomukstorage.mo
-share/locale/ja/LC_MESSAGES/newmailnotifieragent.mo
 share/locale/ja/LC_MESSAGES/notes-mobile.mo
 share/locale/ja/LC_MESSAGES/nsplugin.mo
 share/locale/ja/LC_MESSAGES/okteta-mobile.mo
@@ -587,7 +583,7 @@ share/locale/ja/LC_MESSAGES/plasma_applet_groupingpanel.mo
 share/locale/ja/LC_MESSAGES/plasma_applet_icon.mo
 share/locale/ja/LC_MESSAGES/plasma_applet_icontasks.mo
 share/locale/ja/LC_MESSAGES/plasma_applet_incomingmsg.mo
-share/locale/ja/LC_MESSAGES/plasma_applet_kalgebra.mo
+share/locale/ja/LC_MESSAGES/plasma_applet_kalgebraplasmoid.mo
 share/locale/ja/LC_MESSAGES/plasma_applet_kalzium.mo
 share/locale/ja/LC_MESSAGES/plasma_applet_katesession.mo
 share/locale/ja/LC_MESSAGES/plasma_applet_kdeobservatory.mo
@@ -650,7 +646,6 @@ share/locale/ja/LC_MESSAGES/plasma_containmentactions_contextmenu.mo
 share/locale/ja/LC_MESSAGES/plasma_containmentactions_switchactivity.mo
 share/locale/ja/LC_MESSAGES/plasma_containmentactions_switchdesktop.mo
 share/locale/ja/LC_MESSAGES/plasma_containmentactions_switchwindow.mo
-share/locale/ja/LC_MESSAGES/plasma_engine_calendar.mo
 share/locale/ja/LC_MESSAGES/plasma_engine_kalzium.mo
 share/locale/ja/LC_MESSAGES/plasma_engine_kdeobservatory.mo
 share/locale/ja/LC_MESSAGES/plasma_engine_keystate.mo
@@ -723,9 +718,7 @@ share/locale/ja/LC_MESSAGES/rocscore.mo
 share/locale/ja/LC_MESSAGES/rocsvisualeditor.mo
 share/locale/ja/LC_MESSAGES/searchbarplugin.mo
 share/locale/ja/LC_MESSAGES/solid-hardware.mo
-share/locale/ja/LC_MESSAGES/solid-network.mo
 share/locale/ja/LC_MESSAGES/solid_qt.mo
-share/locale/ja/LC_MESSAGES/solidcontrol.mo
 share/locale/ja/LC_MESSAGES/soliduiserver.mo
 share/locale/ja/LC_MESSAGES/step.mo
 share/locale/ja/LC_MESSAGES/step_qt.mo
diff --git a/japanese/kiten/Makefile b/japanese/kiten/Makefile
index 613fcde6459b..77efb382469c 100644
--- a/japanese/kiten/Makefile
+++ b/japanese/kiten/Makefile
@@ -3,20 +3,16 @@
 PORTNAME=	kiten
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	japanese kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Japanese reference/study tool for KDE 4
 
-CONFLICTS=	kdeedu-4.[0-6].*
-
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USES=		cmake:outsource
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/japanese/kiten/distinfo b/japanese/kiten/distinfo
index ae1452314133..fd7a7eff5d4f 100644
--- a/japanese/kiten/distinfo
+++ b/japanese/kiten/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kiten-4.10.5.tar.xz) = 691d1d74d89d3654f46ad0d653eeb483664b2f698f686d45d9a8fcb50b9d2284
-SIZE (KDE/4.10.5/kiten-4.10.5.tar.xz) = 11742820
+SHA256 (KDE/4.12.2/kiten-4.12.2.tar.xz) = 466ae1038ff1d3bd7af8858fbe0d402da0cb94d0196df9871ac814876816bf1f
+SIZE (KDE/4.12.2/kiten-4.12.2.tar.xz) = 11677732
diff --git a/japanese/kiten/pkg-plist b/japanese/kiten/pkg-plist
index 465c0b749c38..50928473c66c 100644
--- a/japanese/kiten/pkg-plist
+++ b/japanese/kiten/pkg-plist
@@ -15,8 +15,8 @@ include/libkiten/historyptrlist.h
 include/libkiten/kromajiedit.h
 include/libkiten/libkitenexport.h
 lib/libkiten.so
-lib/libkiten.so.5
-lib/libkiten.so.5.0.1
+lib/libkiten.so.4
+lib/libkiten.so.%%KDE4_GENERIC_LIB_VERSION%%
 share/applications/kde4/kiten.desktop
 share/applications/kde4/kitenkanjibrowser.desktop
 share/applications/kde4/kitenradselect.desktop