6 files changed, 68 insertions, 76 deletions

diff --git a/polish/calligra-l10n/Makefile b/polish/calligra-l10n/Makefile
index 913fd34f591f..00e94ca6fe88 100644
--- a/polish/calligra-l10n/Makefile
+++ b/polish/calligra-l10n/Makefile
@@ -1,30 +1,18 @@
-# New ports collection makefile for:	koffice-i18n-pl
-# Date created:                         27 April 2003
-# Whom:                                 Michael Nottebrock <michaelnottebrock@gmx.net>
+# New ports collection makefile for:    koffice-kde4-l10n-pl
+# Date created:                         28 November 2009
+# Whom:                                 Dima Panov <fluffy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	koffice-i18n
-PORTVERSION=	1.6.3
-PORTREVISION=	1
-CATEGORIES?=	polish kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
-PKGNAMEPREFIX=	pl-
-DIST_SUBDIR=	KDE
+PORTNAME=	koffice-l10n
+PORTVERSION=	${KOFFICE2_VERSION}
+CATEGORIES?=	polish editors kde
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Polish messages and documentation for koffice
+COMMENT=	Polish messages and documentation for KOffice2
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
-USE_KDELIBS_VER=3
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-KDE_I18N=	yes
-
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+KOFFICE2_L10N=	pl
 
+.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
diff --git a/polish/calligra-l10n/distinfo b/polish/calligra-l10n/distinfo
index 5be7ac70ea77..de5df8200dcf 100644
--- a/polish/calligra-l10n/distinfo
+++ b/polish/calligra-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-i18n/koffice-l10n-pl-1.6.3.tar.bz2) = a174b73f3e2c0e579bf3775e481958dd
-SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.6.3.tar.bz2) = 41f7130d9b54b2db290eb37f44b7d563042a536a9a06f780308e7425ac5c9d47
-SIZE (KDE/kde-i18n/koffice-l10n-pl-1.6.3.tar.bz2) = 386526
+MD5 (KDE/kde-l10n/koffice-l10n-pl-2.1.0.tar.bz2) = 5e994dafc6f096932498ee0f99e762d6
+SHA256 (KDE/kde-l10n/koffice-l10n-pl-2.1.0.tar.bz2) = d7a2f5ae576394bf9a81c091677e1c1611e92a7866770c4a753b7ddfbb66e64f
+SIZE (KDE/kde-l10n/koffice-l10n-pl-2.1.0.tar.bz2) = 284607
diff --git a/polish/calligra-l10n/pkg-plist b/polish/calligra-l10n/pkg-plist
index a9161205f0d6..c4b30e1440dd 100644
--- a/polish/calligra-l10n/pkg-plist
+++ b/polish/calligra-l10n/pkg-plist
@@ -1,30 +1,38 @@
+share/locale/pl/LC_MESSAGES/ArtisticTextShape.mo
+share/locale/pl/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/pl/LC_MESSAGES/CalendarTool.mo
+share/locale/pl/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/pl/LC_MESSAGES/ChartShape.mo
+share/locale/pl/LC_MESSAGES/KarbonDockersPlugin.mo
+share/locale/pl/LC_MESSAGES/KarbonTools.mo
+share/locale/pl/LC_MESSAGES/MusicShape.mo
+share/locale/pl/LC_MESSAGES/ParagraphTool.mo
+share/locale/pl/LC_MESSAGES/PathShapes.mo
+share/locale/pl/LC_MESSAGES/PictureShape.mo
+share/locale/pl/LC_MESSAGES/SpellCheckPlugin.mo
+share/locale/pl/LC_MESSAGES/TextShape.mo
 share/locale/pl/LC_MESSAGES/desktop_koffice.mo
-share/locale/pl/LC_MESSAGES/example.mo
 share/locale/pl/LC_MESSAGES/karbon.mo
 share/locale/pl/LC_MESSAGES/kchart.mo
-share/locale/pl/LC_MESSAGES/kexi.mo
-share/locale/pl/LC_MESSAGES/kfile_abiword.mo
-share/locale/pl/LC_MESSAGES/kfile_gnumeric.mo
-share/locale/pl/LC_MESSAGES/kfile_koffice.mo
-share/locale/pl/LC_MESSAGES/kfile_ooo.mo
-share/locale/pl/LC_MESSAGES/kformdesigner.mo
 share/locale/pl/LC_MESSAGES/kformula.mo
-share/locale/pl/LC_MESSAGES/kivio.mo
 share/locale/pl/LC_MESSAGES/koconverter.mo
+share/locale/pl/LC_MESSAGES/koffice-defaulttools.mo
+share/locale/pl/LC_MESSAGES/koffice-dockers.mo
+share/locale/pl/LC_MESSAGES/koffice-simpletextedit.mo
 share/locale/pl/LC_MESSAGES/koffice.mo
 share/locale/pl/LC_MESSAGES/kofficefilters.mo
-share/locale/pl/LC_MESSAGES/koproperty.mo
-share/locale/pl/LC_MESSAGES/koshell.mo
 share/locale/pl/LC_MESSAGES/kounavail.mo
 share/locale/pl/LC_MESSAGES/kplato.mo
+share/locale/pl/LC_MESSAGES/kplatolibs.mo
+share/locale/pl/LC_MESSAGES/kplatowork.mo
 share/locale/pl/LC_MESSAGES/kpresenter.mo
 share/locale/pl/LC_MESSAGES/krita.mo
+share/locale/pl/LC_MESSAGES/krossmodulekplato.mo
+share/locale/pl/LC_MESSAGES/krossmodulekspread.mo
+share/locale/pl/LC_MESSAGES/krossmodulekword.mo
 share/locale/pl/LC_MESSAGES/kscan_plugin.mo
-share/locale/pl/LC_MESSAGES/kscreenshot_plugin.mo
 share/locale/pl/LC_MESSAGES/kspread.mo
-share/locale/pl/LC_MESSAGES/kspreadcalc_calc.mo
-share/locale/pl/LC_MESSAGES/kspreadinsertcalendar.mo
+share/locale/pl/LC_MESSAGES/kspreadsolver.mo
 share/locale/pl/LC_MESSAGES/kthesaurus.mo
-share/locale/pl/LC_MESSAGES/kugar.mo
 share/locale/pl/LC_MESSAGES/kword.mo
 share/locale/pl/LC_MESSAGES/thesaurus_tool.mo
diff --git a/polish/koffice-kde4-l10n/Makefile b/polish/koffice-kde4-l10n/Makefile
index 913fd34f591f..00e94ca6fe88 100644
--- a/polish/koffice-kde4-l10n/Makefile
+++ b/polish/koffice-kde4-l10n/Makefile
@@ -1,30 +1,18 @@
-# New ports collection makefile for:	koffice-i18n-pl
-# Date created:                         27 April 2003
-# Whom:                                 Michael Nottebrock <michaelnottebrock@gmx.net>
+# New ports collection makefile for:    koffice-kde4-l10n-pl
+# Date created:                         28 November 2009
+# Whom:                                 Dima Panov <fluffy@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	koffice-i18n
-PORTVERSION=	1.6.3
-PORTREVISION=	1
-CATEGORIES?=	polish kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/koffice-${PORTVERSION}/src/koffice-l10n
-PKGNAMEPREFIX=	pl-
-DIST_SUBDIR=	KDE
+PORTNAME=	koffice-l10n
+PORTVERSION=	${KOFFICE2_VERSION}
+CATEGORIES?=	polish editors kde
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Polish messages and documentation for koffice
+COMMENT=	Polish messages and documentation for KOffice2
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
-USE_KDELIBS_VER=3
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-KDE_I18N=	yes
-
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+KOFFICE2_L10N=	pl
 
+.include "${.CURDIR}/../../editors/koffice-kde4-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
diff --git a/polish/koffice-kde4-l10n/distinfo b/polish/koffice-kde4-l10n/distinfo
index 5be7ac70ea77..de5df8200dcf 100644
--- a/polish/koffice-kde4-l10n/distinfo
+++ b/polish/koffice-kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-i18n/koffice-l10n-pl-1.6.3.tar.bz2) = a174b73f3e2c0e579bf3775e481958dd
-SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.6.3.tar.bz2) = 41f7130d9b54b2db290eb37f44b7d563042a536a9a06f780308e7425ac5c9d47
-SIZE (KDE/kde-i18n/koffice-l10n-pl-1.6.3.tar.bz2) = 386526
+MD5 (KDE/kde-l10n/koffice-l10n-pl-2.1.0.tar.bz2) = 5e994dafc6f096932498ee0f99e762d6
+SHA256 (KDE/kde-l10n/koffice-l10n-pl-2.1.0.tar.bz2) = d7a2f5ae576394bf9a81c091677e1c1611e92a7866770c4a753b7ddfbb66e64f
+SIZE (KDE/kde-l10n/koffice-l10n-pl-2.1.0.tar.bz2) = 284607
diff --git a/polish/koffice-kde4-l10n/pkg-plist b/polish/koffice-kde4-l10n/pkg-plist
index a9161205f0d6..c4b30e1440dd 100644
--- a/polish/koffice-kde4-l10n/pkg-plist
+++ b/polish/koffice-kde4-l10n/pkg-plist
@@ -1,30 +1,38 @@
+share/locale/pl/LC_MESSAGES/ArtisticTextShape.mo
+share/locale/pl/LC_MESSAGES/AutocorrectPlugin.mo
+share/locale/pl/LC_MESSAGES/CalendarTool.mo
+share/locale/pl/LC_MESSAGES/ChangecasePlugin.mo
+share/locale/pl/LC_MESSAGES/ChartShape.mo
+share/locale/pl/LC_MESSAGES/KarbonDockersPlugin.mo
+share/locale/pl/LC_MESSAGES/KarbonTools.mo
+share/locale/pl/LC_MESSAGES/MusicShape.mo
+share/locale/pl/LC_MESSAGES/ParagraphTool.mo
+share/locale/pl/LC_MESSAGES/PathShapes.mo
+share/locale/pl/LC_MESSAGES/PictureShape.mo
+share/locale/pl/LC_MESSAGES/SpellCheckPlugin.mo
+share/locale/pl/LC_MESSAGES/TextShape.mo
 share/locale/pl/LC_MESSAGES/desktop_koffice.mo
-share/locale/pl/LC_MESSAGES/example.mo
 share/locale/pl/LC_MESSAGES/karbon.mo
 share/locale/pl/LC_MESSAGES/kchart.mo
-share/locale/pl/LC_MESSAGES/kexi.mo
-share/locale/pl/LC_MESSAGES/kfile_abiword.mo
-share/locale/pl/LC_MESSAGES/kfile_gnumeric.mo
-share/locale/pl/LC_MESSAGES/kfile_koffice.mo
-share/locale/pl/LC_MESSAGES/kfile_ooo.mo
-share/locale/pl/LC_MESSAGES/kformdesigner.mo
 share/locale/pl/LC_MESSAGES/kformula.mo
-share/locale/pl/LC_MESSAGES/kivio.mo
 share/locale/pl/LC_MESSAGES/koconverter.mo
+share/locale/pl/LC_MESSAGES/koffice-defaulttools.mo
+share/locale/pl/LC_MESSAGES/koffice-dockers.mo
+share/locale/pl/LC_MESSAGES/koffice-simpletextedit.mo
 share/locale/pl/LC_MESSAGES/koffice.mo
 share/locale/pl/LC_MESSAGES/kofficefilters.mo
-share/locale/pl/LC_MESSAGES/koproperty.mo
-share/locale/pl/LC_MESSAGES/koshell.mo
 share/locale/pl/LC_MESSAGES/kounavail.mo
 share/locale/pl/LC_MESSAGES/kplato.mo
+share/locale/pl/LC_MESSAGES/kplatolibs.mo
+share/locale/pl/LC_MESSAGES/kplatowork.mo
 share/locale/pl/LC_MESSAGES/kpresenter.mo
 share/locale/pl/LC_MESSAGES/krita.mo
+share/locale/pl/LC_MESSAGES/krossmodulekplato.mo
+share/locale/pl/LC_MESSAGES/krossmodulekspread.mo
+share/locale/pl/LC_MESSAGES/krossmodulekword.mo
 share/locale/pl/LC_MESSAGES/kscan_plugin.mo
-share/locale/pl/LC_MESSAGES/kscreenshot_plugin.mo
 share/locale/pl/LC_MESSAGES/kspread.mo
-share/locale/pl/LC_MESSAGES/kspreadcalc_calc.mo
-share/locale/pl/LC_MESSAGES/kspreadinsertcalendar.mo
+share/locale/pl/LC_MESSAGES/kspreadsolver.mo
 share/locale/pl/LC_MESSAGES/kthesaurus.mo
-share/locale/pl/LC_MESSAGES/kugar.mo
 share/locale/pl/LC_MESSAGES/kword.mo
 share/locale/pl/LC_MESSAGES/thesaurus_tool.mo