9 files changed, 51 insertions, 78 deletions

diff --git a/ukrainian/calligra-l10n/Makefile b/ukrainian/calligra-l10n/Makefile
index fbdfe4ad0453..f6270c99444c 100644
--- a/ukrainian/calligra-l10n/Makefile
+++ b/ukrainian/calligra-l10n/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:    koffice-i18n-uk
+# New ports collection makefile for:	koffice-i18n-uk
 # Date created:                         27 April 2003
 # Whom:                                 Michael Nottebrock <michaelnottebrock@gmx.net>
 #
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.2.1
+PORTVERSION=	1.5.0
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	Attic/koffice-${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
 PKGNAMEPREFIX=	uk-
-DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -19,15 +18,12 @@ COMMENT=	Ukrainian messages and documentation for koffice
 
 BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
 
-DISTNAME_OVERRIDE=yes
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PKGNAMEPREFIX:S/-//}
-
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 
 .include <bsd.port.mk>
diff --git a/ukrainian/calligra-l10n/distinfo b/ukrainian/calligra-l10n/distinfo
index 728fd05e94ca..f0c470f656e1 100644
--- a/ukrainian/calligra-l10n/distinfo
+++ b/ukrainian/calligra-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = 3811316bb1edb89da50ece7cb15f5fe6
-SHA256 (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = e4f6c109262526645741870af4321c8c7051e00b38c6eae2d8b96c2bc8703b8f
-SIZE (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = 509501
+MD5 (KDE/kde-i18n/koffice-l10n-uk-1.5.0.tar.bz2) = 8e3294a78b9beab5122703d61d2e9a2c
+SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.5.0.tar.bz2) = a6c8668005bb86d4436409e17e30ef58b575a3a41020bda200b480fa9212acd7
+SIZE (KDE/kde-i18n/koffice-l10n-uk-1.5.0.tar.bz2) = 353040
diff --git a/ukrainian/calligra-l10n/pkg-plist b/ukrainian/calligra-l10n/pkg-plist
index 657028a08a30..9e7a5cb201d0 100644
--- a/ukrainian/calligra-l10n/pkg-plist
+++ b/ukrainian/calligra-l10n/pkg-plist
@@ -1,35 +1,30 @@
-share/locale/uk/LC_MESSAGES/csvfilter.mo
 share/locale/uk/LC_MESSAGES/desktop_koffice.mo
 share/locale/uk/LC_MESSAGES/example.mo
-share/locale/uk/LC_MESSAGES/graphite.mo
+share/locale/uk/LC_MESSAGES/karbon.mo
 share/locale/uk/LC_MESSAGES/kchart.mo
+share/locale/uk/LC_MESSAGES/kexi.mo
+share/locale/uk/LC_MESSAGES/kfile_abiword.mo
+share/locale/uk/LC_MESSAGES/kfile_gnumeric.mo
 share/locale/uk/LC_MESSAGES/kfile_koffice.mo
+share/locale/uk/LC_MESSAGES/kfile_ooo.mo
+share/locale/uk/LC_MESSAGES/kformdesigner.mo
 share/locale/uk/LC_MESSAGES/kformula.mo
-share/locale/uk/LC_MESSAGES/kformulalatexfilter.mo
-share/locale/uk/LC_MESSAGES/kformulapngfilter.mo
 share/locale/uk/LC_MESSAGES/kivio.mo
 share/locale/uk/LC_MESSAGES/koconverter.mo
-share/locale/uk/LC_MESSAGES/kocryptfilter.mo
 share/locale/uk/LC_MESSAGES/koffice.mo
-share/locale/uk/LC_MESSAGES/kontour.mo
+share/locale/uk/LC_MESSAGES/kofficefilters.mo
+share/locale/uk/LC_MESSAGES/koproperty.mo
 share/locale/uk/LC_MESSAGES/koshell.mo
 share/locale/uk/LC_MESSAGES/kounavail.mo
+share/locale/uk/LC_MESSAGES/kplato.mo
 share/locale/uk/LC_MESSAGES/kpresenter.mo
-share/locale/uk/LC_MESSAGES/kpresenterkwordfilter.mo
 share/locale/uk/LC_MESSAGES/krita.mo
 share/locale/uk/LC_MESSAGES/kscan_plugin.mo
+share/locale/uk/LC_MESSAGES/kscreenshot_plugin.mo
 share/locale/uk/LC_MESSAGES/kspread.mo
 share/locale/uk/LC_MESSAGES/kspreadcalc_calc.mo
-share/locale/uk/LC_MESSAGES/kspreadqprofilter.mo
+share/locale/uk/LC_MESSAGES/kspreadinsertcalendar.mo
 share/locale/uk/LC_MESSAGES/kthesaurus.mo
 share/locale/uk/LC_MESSAGES/kugar.mo
 share/locale/uk/LC_MESSAGES/kword.mo
-share/locale/uk/LC_MESSAGES/kwordasciifilter.mo
-share/locale/uk/LC_MESSAGES/kwordhtmlexportfilter.mo
-share/locale/uk/LC_MESSAGES/kwordhtmlimportfilter.mo
-share/locale/uk/LC_MESSAGES/kwordlatexfilter.mo
-share/locale/uk/LC_MESSAGES/kwordmswritefilter.mo
-share/locale/uk/LC_MESSAGES/olefilterswinword97filter.mo
 share/locale/uk/LC_MESSAGES/thesaurus_tool.mo
-share/locale/uk/LC_MESSAGES/xsltexportfilter.mo
-share/locale/uk/LC_MESSAGES/xsltimportfilter.mo
diff --git a/ukrainian/koffice-i18n/Makefile b/ukrainian/koffice-i18n/Makefile
index fbdfe4ad0453..f6270c99444c 100644
--- a/ukrainian/koffice-i18n/Makefile
+++ b/ukrainian/koffice-i18n/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:    koffice-i18n-uk
+# New ports collection makefile for:	koffice-i18n-uk
 # Date created:                         27 April 2003
 # Whom:                                 Michael Nottebrock <michaelnottebrock@gmx.net>
 #
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.2.1
+PORTVERSION=	1.5.0
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	Attic/koffice-${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
 PKGNAMEPREFIX=	uk-
-DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -19,15 +18,12 @@ COMMENT=	Ukrainian messages and documentation for koffice
 
 BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
 
-DISTNAME_OVERRIDE=yes
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PKGNAMEPREFIX:S/-//}
-
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 
 .include <bsd.port.mk>
diff --git a/ukrainian/koffice-i18n/distinfo b/ukrainian/koffice-i18n/distinfo
index 728fd05e94ca..f0c470f656e1 100644
--- a/ukrainian/koffice-i18n/distinfo
+++ b/ukrainian/koffice-i18n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = 3811316bb1edb89da50ece7cb15f5fe6
-SHA256 (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = e4f6c109262526645741870af4321c8c7051e00b38c6eae2d8b96c2bc8703b8f
-SIZE (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = 509501
+MD5 (KDE/kde-i18n/koffice-l10n-uk-1.5.0.tar.bz2) = 8e3294a78b9beab5122703d61d2e9a2c
+SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.5.0.tar.bz2) = a6c8668005bb86d4436409e17e30ef58b575a3a41020bda200b480fa9212acd7
+SIZE (KDE/kde-i18n/koffice-l10n-uk-1.5.0.tar.bz2) = 353040
diff --git a/ukrainian/koffice-i18n/pkg-plist b/ukrainian/koffice-i18n/pkg-plist
index 657028a08a30..9e7a5cb201d0 100644
--- a/ukrainian/koffice-i18n/pkg-plist
+++ b/ukrainian/koffice-i18n/pkg-plist
@@ -1,35 +1,30 @@
-share/locale/uk/LC_MESSAGES/csvfilter.mo
 share/locale/uk/LC_MESSAGES/desktop_koffice.mo
 share/locale/uk/LC_MESSAGES/example.mo
-share/locale/uk/LC_MESSAGES/graphite.mo
+share/locale/uk/LC_MESSAGES/karbon.mo
 share/locale/uk/LC_MESSAGES/kchart.mo
+share/locale/uk/LC_MESSAGES/kexi.mo
+share/locale/uk/LC_MESSAGES/kfile_abiword.mo
+share/locale/uk/LC_MESSAGES/kfile_gnumeric.mo
 share/locale/uk/LC_MESSAGES/kfile_koffice.mo
+share/locale/uk/LC_MESSAGES/kfile_ooo.mo
+share/locale/uk/LC_MESSAGES/kformdesigner.mo
 share/locale/uk/LC_MESSAGES/kformula.mo
-share/locale/uk/LC_MESSAGES/kformulalatexfilter.mo
-share/locale/uk/LC_MESSAGES/kformulapngfilter.mo
 share/locale/uk/LC_MESSAGES/kivio.mo
 share/locale/uk/LC_MESSAGES/koconverter.mo
-share/locale/uk/LC_MESSAGES/kocryptfilter.mo
 share/locale/uk/LC_MESSAGES/koffice.mo
-share/locale/uk/LC_MESSAGES/kontour.mo
+share/locale/uk/LC_MESSAGES/kofficefilters.mo
+share/locale/uk/LC_MESSAGES/koproperty.mo
 share/locale/uk/LC_MESSAGES/koshell.mo
 share/locale/uk/LC_MESSAGES/kounavail.mo
+share/locale/uk/LC_MESSAGES/kplato.mo
 share/locale/uk/LC_MESSAGES/kpresenter.mo
-share/locale/uk/LC_MESSAGES/kpresenterkwordfilter.mo
 share/locale/uk/LC_MESSAGES/krita.mo
 share/locale/uk/LC_MESSAGES/kscan_plugin.mo
+share/locale/uk/LC_MESSAGES/kscreenshot_plugin.mo
 share/locale/uk/LC_MESSAGES/kspread.mo
 share/locale/uk/LC_MESSAGES/kspreadcalc_calc.mo
-share/locale/uk/LC_MESSAGES/kspreadqprofilter.mo
+share/locale/uk/LC_MESSAGES/kspreadinsertcalendar.mo
 share/locale/uk/LC_MESSAGES/kthesaurus.mo
 share/locale/uk/LC_MESSAGES/kugar.mo
 share/locale/uk/LC_MESSAGES/kword.mo
-share/locale/uk/LC_MESSAGES/kwordasciifilter.mo
-share/locale/uk/LC_MESSAGES/kwordhtmlexportfilter.mo
-share/locale/uk/LC_MESSAGES/kwordhtmlimportfilter.mo
-share/locale/uk/LC_MESSAGES/kwordlatexfilter.mo
-share/locale/uk/LC_MESSAGES/kwordmswritefilter.mo
-share/locale/uk/LC_MESSAGES/olefilterswinword97filter.mo
 share/locale/uk/LC_MESSAGES/thesaurus_tool.mo
-share/locale/uk/LC_MESSAGES/xsltexportfilter.mo
-share/locale/uk/LC_MESSAGES/xsltimportfilter.mo
diff --git a/ukrainian/koffice-kde4-l10n/Makefile b/ukrainian/koffice-kde4-l10n/Makefile
index fbdfe4ad0453..f6270c99444c 100644
--- a/ukrainian/koffice-kde4-l10n/Makefile
+++ b/ukrainian/koffice-kde4-l10n/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:    koffice-i18n-uk
+# New ports collection makefile for:	koffice-i18n-uk
 # Date created:                         27 April 2003
 # Whom:                                 Michael Nottebrock <michaelnottebrock@gmx.net>
 #
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	koffice-i18n
-PORTVERSION=	1.2.1
+PORTVERSION=	1.5.0
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	Attic/koffice-${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
 PKGNAMEPREFIX=	uk-
-DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -19,15 +18,12 @@ COMMENT=	Ukrainian messages and documentation for koffice
 
 BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
 
-DISTNAME_OVERRIDE=yes
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 KDE_I18N=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PKGNAMEPREFIX:S/-//}
-
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 
 .include <bsd.port.mk>
diff --git a/ukrainian/koffice-kde4-l10n/distinfo b/ukrainian/koffice-kde4-l10n/distinfo
index 728fd05e94ca..f0c470f656e1 100644
--- a/ukrainian/koffice-kde4-l10n/distinfo
+++ b/ukrainian/koffice-kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = 3811316bb1edb89da50ece7cb15f5fe6
-SHA256 (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = e4f6c109262526645741870af4321c8c7051e00b38c6eae2d8b96c2bc8703b8f
-SIZE (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = 509501
+MD5 (KDE/kde-i18n/koffice-l10n-uk-1.5.0.tar.bz2) = 8e3294a78b9beab5122703d61d2e9a2c
+SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.5.0.tar.bz2) = a6c8668005bb86d4436409e17e30ef58b575a3a41020bda200b480fa9212acd7
+SIZE (KDE/kde-i18n/koffice-l10n-uk-1.5.0.tar.bz2) = 353040
diff --git a/ukrainian/koffice-kde4-l10n/pkg-plist b/ukrainian/koffice-kde4-l10n/pkg-plist
index 657028a08a30..9e7a5cb201d0 100644
--- a/ukrainian/koffice-kde4-l10n/pkg-plist
+++ b/ukrainian/koffice-kde4-l10n/pkg-plist
@@ -1,35 +1,30 @@
-share/locale/uk/LC_MESSAGES/csvfilter.mo
 share/locale/uk/LC_MESSAGES/desktop_koffice.mo
 share/locale/uk/LC_MESSAGES/example.mo
-share/locale/uk/LC_MESSAGES/graphite.mo
+share/locale/uk/LC_MESSAGES/karbon.mo
 share/locale/uk/LC_MESSAGES/kchart.mo
+share/locale/uk/LC_MESSAGES/kexi.mo
+share/locale/uk/LC_MESSAGES/kfile_abiword.mo
+share/locale/uk/LC_MESSAGES/kfile_gnumeric.mo
 share/locale/uk/LC_MESSAGES/kfile_koffice.mo
+share/locale/uk/LC_MESSAGES/kfile_ooo.mo
+share/locale/uk/LC_MESSAGES/kformdesigner.mo
 share/locale/uk/LC_MESSAGES/kformula.mo
-share/locale/uk/LC_MESSAGES/kformulalatexfilter.mo
-share/locale/uk/LC_MESSAGES/kformulapngfilter.mo
 share/locale/uk/LC_MESSAGES/kivio.mo
 share/locale/uk/LC_MESSAGES/koconverter.mo
-share/locale/uk/LC_MESSAGES/kocryptfilter.mo
 share/locale/uk/LC_MESSAGES/koffice.mo
-share/locale/uk/LC_MESSAGES/kontour.mo
+share/locale/uk/LC_MESSAGES/kofficefilters.mo
+share/locale/uk/LC_MESSAGES/koproperty.mo
 share/locale/uk/LC_MESSAGES/koshell.mo
 share/locale/uk/LC_MESSAGES/kounavail.mo
+share/locale/uk/LC_MESSAGES/kplato.mo
 share/locale/uk/LC_MESSAGES/kpresenter.mo
-share/locale/uk/LC_MESSAGES/kpresenterkwordfilter.mo
 share/locale/uk/LC_MESSAGES/krita.mo
 share/locale/uk/LC_MESSAGES/kscan_plugin.mo
+share/locale/uk/LC_MESSAGES/kscreenshot_plugin.mo
 share/locale/uk/LC_MESSAGES/kspread.mo
 share/locale/uk/LC_MESSAGES/kspreadcalc_calc.mo
-share/locale/uk/LC_MESSAGES/kspreadqprofilter.mo
+share/locale/uk/LC_MESSAGES/kspreadinsertcalendar.mo
 share/locale/uk/LC_MESSAGES/kthesaurus.mo
 share/locale/uk/LC_MESSAGES/kugar.mo
 share/locale/uk/LC_MESSAGES/kword.mo
-share/locale/uk/LC_MESSAGES/kwordasciifilter.mo
-share/locale/uk/LC_MESSAGES/kwordhtmlexportfilter.mo
-share/locale/uk/LC_MESSAGES/kwordhtmlimportfilter.mo
-share/locale/uk/LC_MESSAGES/kwordlatexfilter.mo
-share/locale/uk/LC_MESSAGES/kwordmswritefilter.mo
-share/locale/uk/LC_MESSAGES/olefilterswinword97filter.mo
 share/locale/uk/LC_MESSAGES/thesaurus_tool.mo
-share/locale/uk/LC_MESSAGES/xsltexportfilter.mo
-share/locale/uk/LC_MESSAGES/xsltimportfilter.mo