Merge from area51 repository:

- Update to 2.5.5
- Convert to new options framework
- minor cleanups

Courtesy of:	avilla

5 files changed, 6 insertions, 10 deletions

diff --git a/portuguese/calligra-l10n-pt_BR/Makefile b/portuguese/calligra-l10n-pt_BR/Makefile
index 6cb9a8f30b95..098070a0280c 100644
--- a/portuguese/calligra-l10n-pt_BR/Makefile
+++ b/portuguese/calligra-l10n-pt_BR/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	portuguese editors kde
+CATEGORIES=	portuguese editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Brazilian messages and documentation for Calligra
diff --git a/portuguese/calligra-l10n-pt_BR/distinfo b/portuguese/calligra-l10n-pt_BR/distinfo
index 2b73eb163398..1f8347318f07 100644
--- a/portuguese/calligra-l10n-pt_BR/distinfo
+++ b/portuguese/calligra-l10n-pt_BR/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-pt_BR-2.5.2.tar.bz2) = b7891800d4f39bc72c52bca437c6e2e386ee33fd2bd0e28330d8d019b7c6460f
-SIZE (KDE/calligra-l10n/calligra-l10n-pt_BR-2.5.2.tar.bz2) = 671309
+SHA256 (KDE/calligra-l10n/calligra-l10n-pt_BR-2.5.5.tar.bz2) = 96828afe9d5d289fadfca35afe50961c1a402392ef79f6ead8bf05d488b8929d
+SIZE (KDE/calligra-l10n/calligra-l10n-pt_BR-2.5.5.tar.bz2) = 669483
diff --git a/portuguese/calligra-l10n/Makefile b/portuguese/calligra-l10n/Makefile
index 8d683a0f4634..44c050d723fc 100644
--- a/portuguese/calligra-l10n/Makefile
+++ b/portuguese/calligra-l10n/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	portuguese editors kde
+CATEGORIES=	portuguese editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Portuguese messages and documentation for Calligra
diff --git a/portuguese/calligra-l10n/distinfo b/portuguese/calligra-l10n/distinfo
index fedb0a71646c..8722448156d5 100644
--- a/portuguese/calligra-l10n/distinfo
+++ b/portuguese/calligra-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-pt-2.5.2.tar.bz2) = 8f85259643f14efe7541eac9f0d6352ac9f1b8b1343439621e58516535feafcf
-SIZE (KDE/calligra-l10n/calligra-l10n-pt-2.5.2.tar.bz2) = 623931
+SHA256 (KDE/calligra-l10n/calligra-l10n-pt-2.5.5.tar.bz2) = 363fbf4c0709efc204e5cebbe8ded76852b8c35f1b27c9da4f821f838e760c11
+SIZE (KDE/calligra-l10n/calligra-l10n-pt-2.5.5.tar.bz2) = 621067
diff --git a/portuguese/calligra-l10n/pkg-plist b/portuguese/calligra-l10n/pkg-plist
index 436fab4d3a10..0814102977aa 100644
--- a/portuguese/calligra-l10n/pkg-plist
+++ b/portuguese/calligra-l10n/pkg-plist
@@ -28,9 +28,6 @@ share/doc/HTML/pt/stage/menus.docbook
 share/doc/HTML/pt/stage/options.docbook
 share/doc/HTML/pt/stage/screen.docbook
 share/doc/HTML/pt/stage/tutorial.docbook
-share/doc/HTML/pt/thesaurus/common
-share/doc/HTML/pt/thesaurus/index.cache.bz2
-share/doc/HTML/pt/thesaurus/index.docbook
 share/locale/pt/LC_MESSAGES/ArtisticTextShape.mo
 share/locale/pt/LC_MESSAGES/AutocorrectPlugin.mo
 share/locale/pt/LC_MESSAGES/CalendarTool.mo
@@ -86,7 +83,6 @@ share/locale/pt/LC_MESSAGES/stage.mo
 share/locale/pt/LC_MESSAGES/tablessolver.mo
 share/locale/pt/LC_MESSAGES/thesaurus_tool.mo
 share/locale/pt/LC_MESSAGES/words.mo
-@dirrm share/doc/HTML/pt/thesaurus
 @dirrm share/doc/HTML/pt/stage
 @dirrm share/doc/HTML/pt/sheets
 @dirrm share/doc/HTML/pt/kexi