10 files changed, 37 insertions, 115 deletions

diff --git a/ukrainian/calligra-l10n/Makefile b/ukrainian/calligra-l10n/Makefile
index c5d5d54cefc3..fbdfe4ad0453 100644
--- a/ukrainian/calligra-l10n/Makefile
+++ b/ukrainian/calligra-l10n/Makefile
@@ -9,23 +9,25 @@ PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	Attic/koffice-${PORTVERSION:S/.0//}/src
 PKGNAMEPREFIX=	uk-
+DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Ukrainian messages and documentation for koffice
 
-IGNORE=		Needs update from vendor.
-
 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 e69de29bb2d1..2b6d64067a0e 100644
--- a/ukrainian/calligra-l10n/distinfo
+++ b/ukrainian/calligra-l10n/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = 3811316bb1edb89da50ece7cb15f5fe6
+SIZE (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = 509501
diff --git a/ukrainian/kde3-i18n/distinfo b/ukrainian/kde3-i18n/distinfo
index 025e1940227e..8edaa4249033 100644
--- a/ukrainian/kde3-i18n/distinfo
+++ b/ukrainian/kde3-i18n/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/kde-i18n-uk-3.4.1.tar.bz2) = 59eef6b0563f4fb31e04f2576213a069
-SIZE (KDE/kde-i18n/kde-i18n-uk-3.4.1.tar.bz2) = 1773117
+MD5 (KDE/kde-i18n/kde-i18n-uk-3.4.2.tar.bz2) = d5893cc238e1a6d5e1a80a9a2a31dee2
+SIZE (KDE/kde-i18n/kde-i18n-uk-3.4.2.tar.bz2) = 1700843
diff --git a/ukrainian/kde3-i18n/pkg-plist b/ukrainian/kde3-i18n/pkg-plist
index e7c5ab8a749b..85fe671cdc52 100644
--- a/ukrainian/kde3-i18n/pkg-plist
+++ b/ukrainian/kde3-i18n/pkg-plist
@@ -52,63 +52,20 @@ share/doc/HTML/uk/common/web-docbottom.png
 share/doc/HTML/uk/common/web-doctop.png
 share/doc/HTML/uk/common/x11-license.html
 share/doc/HTML/uk/common/xml.dcl
-share/doc/HTML/uk/kaddressbook/common
-share/doc/HTML/uk/kaddressbook/index.cache.bz2
-share/doc/HTML/uk/kaddressbook/index.docbook
-share/doc/HTML/uk/khelpcenter/common
-share/doc/HTML/uk/khelpcenter/contact.docbook
+share/doc/HTML/uk/kbabel/catman.docbook
+share/doc/HTML/uk/kbabel/faq.docbook
+share/doc/HTML/uk/kbabel/glossary.docbook
+share/doc/HTML/uk/kbabel/kbabeldict.docbook
 share/doc/HTML/uk/khelpcenter/faq/about.docbook
 share/doc/HTML/uk/khelpcenter/faq/getkde.docbook
-share/doc/HTML/uk/khelpcenter/faq/nonkdeapps.docbook
-share/doc/HTML/uk/khelpcenter/faq/tips.docbook
-share/doc/HTML/uk/khelpcenter/help.docbook
-share/doc/HTML/uk/khelpcenter/index.cache.bz2
-share/doc/HTML/uk/khelpcenter/index.docbook
-share/doc/HTML/uk/khelpcenter/links.docbook
-share/doc/HTML/uk/khelpcenter/support.docbook
-share/doc/HTML/uk/khelpcenter/welcome.docbook
-share/doc/HTML/uk/khelpcenter/whatiskde.docbook
 share/doc/HTML/uk/kinfocenter/protocols/common
 share/doc/HTML/uk/kinfocenter/protocols/index.cache.bz2
 share/doc/HTML/uk/kinfocenter/protocols/index.docbook
-share/doc/HTML/uk/kioslave/audiocd.docbook
 share/doc/HTML/uk/kioslave/bzip.docbook
 share/doc/HTML/uk/kioslave/bzip2.docbook
-share/doc/HTML/uk/kioslave/cgi.docbook
 share/doc/HTML/uk/kioslave/file.docbook
 share/doc/HTML/uk/kioslave/finger.docbook
-share/doc/HTML/uk/kioslave/fish.docbook
 share/doc/HTML/uk/kioslave/floppy.docbook
-share/doc/HTML/uk/kioslave/ftp.docbook
-share/doc/HTML/uk/kioslave/gopher.docbook
-share/doc/HTML/uk/kioslave/gzip.docbook
-share/doc/HTML/uk/kioslave/help.docbook
-share/doc/HTML/uk/kioslave/http.docbook
-share/doc/HTML/uk/kioslave/https.docbook
-share/doc/HTML/uk/kioslave/imap.docbook
-share/doc/HTML/uk/kioslave/imaps.docbook
-share/doc/HTML/uk/kioslave/info.docbook
-share/doc/HTML/uk/kioslave/lan.docbook
-share/doc/HTML/uk/kioslave/ldap.docbook
-share/doc/HTML/uk/kioslave/mac.docbook
-share/doc/HTML/uk/kioslave/mailto.docbook
-share/doc/HTML/uk/kioslave/man.docbook
-share/doc/HTML/uk/kioslave/news.docbook
-share/doc/HTML/uk/kioslave/nfs.docbook
-share/doc/HTML/uk/kioslave/nntp.docbook
-share/doc/HTML/uk/kioslave/pop3.docbook
-share/doc/HTML/uk/kioslave/pop3s.docbook
-share/doc/HTML/uk/kioslave/print.docbook
-share/doc/HTML/uk/kioslave/rlan.docbook
-share/doc/HTML/uk/kioslave/rlogin.docbook
-share/doc/HTML/uk/kioslave/sftp.docbook
-share/doc/HTML/uk/kioslave/smb.docbook
-share/doc/HTML/uk/kioslave/smtp.docbook
-share/doc/HTML/uk/kioslave/tar.docbook
-share/doc/HTML/uk/kioslave/telnet.docbook
-share/doc/HTML/uk/kioslave/thumbnail.docbook
-share/doc/HTML/uk/kioslave/webdav.docbook
-share/doc/HTML/uk/kioslave/webdavs.docbook
 share/doc/HTML/uk/knotes/common
 share/doc/HTML/uk/knotes/index.cache.bz2
 share/doc/HTML/uk/knotes/index.docbook
@@ -397,7 +354,6 @@ share/locale/uk/LC_MESSAGES/khtmlkttsd.mo
 share/locale/uk/LC_MESSAGES/khtmlsettingsplugin.mo
 share/locale/uk/LC_MESSAGES/kicker.mo
 share/locale/uk/LC_MESSAGES/kiconedit.mo
-share/locale/uk/LC_MESSAGES/kig.mo
 share/locale/uk/LC_MESSAGES/kimagemapeditor.mo
 share/locale/uk/LC_MESSAGES/kinetd.mo
 share/locale/uk/LC_MESSAGES/kio.mo
@@ -469,7 +425,6 @@ share/locale/uk/LC_MESSAGES/kmobile.mo
 share/locale/uk/LC_MESSAGES/kmoon.mo
 share/locale/uk/LC_MESSAGES/kmousetool.mo
 share/locale/uk/LC_MESSAGES/kmouth.mo
-share/locale/uk/LC_MESSAGES/kmplot.mo
 share/locale/uk/LC_MESSAGES/kmrml.mo
 share/locale/uk/LC_MESSAGES/knetattach.mo
 share/locale/uk/LC_MESSAGES/knewsticker.mo
@@ -606,7 +561,6 @@ share/locale/uk/LC_MESSAGES/kviewscannerplugin.mo
 share/locale/uk/LC_MESSAGES/kviewshell.mo
 share/locale/uk/LC_MESSAGES/kviewtemplateplugin.mo
 share/locale/uk/LC_MESSAGES/kviewviewer.mo
-share/locale/uk/LC_MESSAGES/kvoctrain.mo
 share/locale/uk/LC_MESSAGES/kwalletmanager.mo
 share/locale/uk/LC_MESSAGES/kwatchgnupg.mo
 share/locale/uk/LC_MESSAGES/kweather.mo
@@ -621,6 +575,7 @@ share/locale/uk/LC_MESSAGES/kwriteconfig.mo
 share/locale/uk/LC_MESSAGES/kxkb.mo
 share/locale/uk/LC_MESSAGES/kxmlrpcd.mo
 share/locale/uk/LC_MESSAGES/kxsconfig.mo
+share/locale/uk/LC_MESSAGES/kxsldbg.mo
 share/locale/uk/LC_MESSAGES/libKTTSD.mo
 share/locale/uk/LC_MESSAGES/libcalendarresources.mo
 share/locale/uk/LC_MESSAGES/libdmctl.mo
@@ -699,5 +654,5 @@ share/locale/uk/flag.png
 @dirrm share/doc/HTML/uk/kinfocenter
 @dirrm share/doc/HTML/uk/khelpcenter/faq
 @dirrm share/doc/HTML/uk/khelpcenter
-@dirrm share/doc/HTML/uk/kaddressbook
+@dirrm share/doc/HTML/uk/kbabel
 @dirrm share/doc/HTML/uk/common
diff --git a/ukrainian/kde4-l10n/distinfo b/ukrainian/kde4-l10n/distinfo
index 025e1940227e..8edaa4249033 100644
--- a/ukrainian/kde4-l10n/distinfo
+++ b/ukrainian/kde4-l10n/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kde-i18n/kde-i18n-uk-3.4.1.tar.bz2) = 59eef6b0563f4fb31e04f2576213a069
-SIZE (KDE/kde-i18n/kde-i18n-uk-3.4.1.tar.bz2) = 1773117
+MD5 (KDE/kde-i18n/kde-i18n-uk-3.4.2.tar.bz2) = d5893cc238e1a6d5e1a80a9a2a31dee2
+SIZE (KDE/kde-i18n/kde-i18n-uk-3.4.2.tar.bz2) = 1700843
diff --git a/ukrainian/kde4-l10n/pkg-plist b/ukrainian/kde4-l10n/pkg-plist
index e7c5ab8a749b..85fe671cdc52 100644
--- a/ukrainian/kde4-l10n/pkg-plist
+++ b/ukrainian/kde4-l10n/pkg-plist
@@ -52,63 +52,20 @@ share/doc/HTML/uk/common/web-docbottom.png
 share/doc/HTML/uk/common/web-doctop.png
 share/doc/HTML/uk/common/x11-license.html
 share/doc/HTML/uk/common/xml.dcl
-share/doc/HTML/uk/kaddressbook/common
-share/doc/HTML/uk/kaddressbook/index.cache.bz2
-share/doc/HTML/uk/kaddressbook/index.docbook
-share/doc/HTML/uk/khelpcenter/common
-share/doc/HTML/uk/khelpcenter/contact.docbook
+share/doc/HTML/uk/kbabel/catman.docbook
+share/doc/HTML/uk/kbabel/faq.docbook
+share/doc/HTML/uk/kbabel/glossary.docbook
+share/doc/HTML/uk/kbabel/kbabeldict.docbook
 share/doc/HTML/uk/khelpcenter/faq/about.docbook
 share/doc/HTML/uk/khelpcenter/faq/getkde.docbook
-share/doc/HTML/uk/khelpcenter/faq/nonkdeapps.docbook
-share/doc/HTML/uk/khelpcenter/faq/tips.docbook
-share/doc/HTML/uk/khelpcenter/help.docbook
-share/doc/HTML/uk/khelpcenter/index.cache.bz2
-share/doc/HTML/uk/khelpcenter/index.docbook
-share/doc/HTML/uk/khelpcenter/links.docbook
-share/doc/HTML/uk/khelpcenter/support.docbook
-share/doc/HTML/uk/khelpcenter/welcome.docbook
-share/doc/HTML/uk/khelpcenter/whatiskde.docbook
 share/doc/HTML/uk/kinfocenter/protocols/common
 share/doc/HTML/uk/kinfocenter/protocols/index.cache.bz2
 share/doc/HTML/uk/kinfocenter/protocols/index.docbook
-share/doc/HTML/uk/kioslave/audiocd.docbook
 share/doc/HTML/uk/kioslave/bzip.docbook
 share/doc/HTML/uk/kioslave/bzip2.docbook
-share/doc/HTML/uk/kioslave/cgi.docbook
 share/doc/HTML/uk/kioslave/file.docbook
 share/doc/HTML/uk/kioslave/finger.docbook
-share/doc/HTML/uk/kioslave/fish.docbook
 share/doc/HTML/uk/kioslave/floppy.docbook
-share/doc/HTML/uk/kioslave/ftp.docbook
-share/doc/HTML/uk/kioslave/gopher.docbook
-share/doc/HTML/uk/kioslave/gzip.docbook
-share/doc/HTML/uk/kioslave/help.docbook
-share/doc/HTML/uk/kioslave/http.docbook
-share/doc/HTML/uk/kioslave/https.docbook
-share/doc/HTML/uk/kioslave/imap.docbook
-share/doc/HTML/uk/kioslave/imaps.docbook
-share/doc/HTML/uk/kioslave/info.docbook
-share/doc/HTML/uk/kioslave/lan.docbook
-share/doc/HTML/uk/kioslave/ldap.docbook
-share/doc/HTML/uk/kioslave/mac.docbook
-share/doc/HTML/uk/kioslave/mailto.docbook
-share/doc/HTML/uk/kioslave/man.docbook
-share/doc/HTML/uk/kioslave/news.docbook
-share/doc/HTML/uk/kioslave/nfs.docbook
-share/doc/HTML/uk/kioslave/nntp.docbook
-share/doc/HTML/uk/kioslave/pop3.docbook
-share/doc/HTML/uk/kioslave/pop3s.docbook
-share/doc/HTML/uk/kioslave/print.docbook
-share/doc/HTML/uk/kioslave/rlan.docbook
-share/doc/HTML/uk/kioslave/rlogin.docbook
-share/doc/HTML/uk/kioslave/sftp.docbook
-share/doc/HTML/uk/kioslave/smb.docbook
-share/doc/HTML/uk/kioslave/smtp.docbook
-share/doc/HTML/uk/kioslave/tar.docbook
-share/doc/HTML/uk/kioslave/telnet.docbook
-share/doc/HTML/uk/kioslave/thumbnail.docbook
-share/doc/HTML/uk/kioslave/webdav.docbook
-share/doc/HTML/uk/kioslave/webdavs.docbook
 share/doc/HTML/uk/knotes/common
 share/doc/HTML/uk/knotes/index.cache.bz2
 share/doc/HTML/uk/knotes/index.docbook
@@ -397,7 +354,6 @@ share/locale/uk/LC_MESSAGES/khtmlkttsd.mo
 share/locale/uk/LC_MESSAGES/khtmlsettingsplugin.mo
 share/locale/uk/LC_MESSAGES/kicker.mo
 share/locale/uk/LC_MESSAGES/kiconedit.mo
-share/locale/uk/LC_MESSAGES/kig.mo
 share/locale/uk/LC_MESSAGES/kimagemapeditor.mo
 share/locale/uk/LC_MESSAGES/kinetd.mo
 share/locale/uk/LC_MESSAGES/kio.mo
@@ -469,7 +425,6 @@ share/locale/uk/LC_MESSAGES/kmobile.mo
 share/locale/uk/LC_MESSAGES/kmoon.mo
 share/locale/uk/LC_MESSAGES/kmousetool.mo
 share/locale/uk/LC_MESSAGES/kmouth.mo
-share/locale/uk/LC_MESSAGES/kmplot.mo
 share/locale/uk/LC_MESSAGES/kmrml.mo
 share/locale/uk/LC_MESSAGES/knetattach.mo
 share/locale/uk/LC_MESSAGES/knewsticker.mo
@@ -606,7 +561,6 @@ share/locale/uk/LC_MESSAGES/kviewscannerplugin.mo
 share/locale/uk/LC_MESSAGES/kviewshell.mo
 share/locale/uk/LC_MESSAGES/kviewtemplateplugin.mo
 share/locale/uk/LC_MESSAGES/kviewviewer.mo
-share/locale/uk/LC_MESSAGES/kvoctrain.mo
 share/locale/uk/LC_MESSAGES/kwalletmanager.mo
 share/locale/uk/LC_MESSAGES/kwatchgnupg.mo
 share/locale/uk/LC_MESSAGES/kweather.mo
@@ -621,6 +575,7 @@ share/locale/uk/LC_MESSAGES/kwriteconfig.mo
 share/locale/uk/LC_MESSAGES/kxkb.mo
 share/locale/uk/LC_MESSAGES/kxmlrpcd.mo
 share/locale/uk/LC_MESSAGES/kxsconfig.mo
+share/locale/uk/LC_MESSAGES/kxsldbg.mo
 share/locale/uk/LC_MESSAGES/libKTTSD.mo
 share/locale/uk/LC_MESSAGES/libcalendarresources.mo
 share/locale/uk/LC_MESSAGES/libdmctl.mo
@@ -699,5 +654,5 @@ share/locale/uk/flag.png
 @dirrm share/doc/HTML/uk/kinfocenter
 @dirrm share/doc/HTML/uk/khelpcenter/faq
 @dirrm share/doc/HTML/uk/khelpcenter
-@dirrm share/doc/HTML/uk/kaddressbook
+@dirrm share/doc/HTML/uk/kbabel
 @dirrm share/doc/HTML/uk/common
diff --git a/ukrainian/koffice-i18n/Makefile b/ukrainian/koffice-i18n/Makefile
index c5d5d54cefc3..fbdfe4ad0453 100644
--- a/ukrainian/koffice-i18n/Makefile
+++ b/ukrainian/koffice-i18n/Makefile
@@ -9,23 +9,25 @@ PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	Attic/koffice-${PORTVERSION:S/.0//}/src
 PKGNAMEPREFIX=	uk-
+DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Ukrainian messages and documentation for koffice
 
-IGNORE=		Needs update from vendor.
-
 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 e69de29bb2d1..2b6d64067a0e 100644
--- a/ukrainian/koffice-i18n/distinfo
+++ b/ukrainian/koffice-i18n/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = 3811316bb1edb89da50ece7cb15f5fe6
+SIZE (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = 509501
diff --git a/ukrainian/koffice-kde4-l10n/Makefile b/ukrainian/koffice-kde4-l10n/Makefile
index c5d5d54cefc3..fbdfe4ad0453 100644
--- a/ukrainian/koffice-kde4-l10n/Makefile
+++ b/ukrainian/koffice-kde4-l10n/Makefile
@@ -9,23 +9,25 @@ PORTNAME=	koffice-i18n
 PORTVERSION=	1.2.1
 CATEGORIES?=	ukrainian kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	Attic/koffice-${PORTVERSION:S/.0//}/src
 PKGNAMEPREFIX=	uk-
+DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Ukrainian messages and documentation for koffice
 
-IGNORE=		Needs update from vendor.
-
 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 e69de29bb2d1..2b6d64067a0e 100644
--- a/ukrainian/koffice-kde4-l10n/distinfo
+++ b/ukrainian/koffice-kde4-l10n/distinfo
@@ -0,0 +1,2 @@
+MD5 (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = 3811316bb1edb89da50ece7cb15f5fe6
+SIZE (KDE/kde-i18n/koffice-i18n-uk-1.2.1.tar.bz2) = 509501