Merge from area51 repository:

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

Courtesy of:	avilla

41 files changed, 164 insertions, 107 deletions

diff --git a/editors/calligra-l10n-ca/Makefile b/editors/calligra-l10n-ca/Makefile
index 7eeb15e44f0a..dea26eb8d707 100644
--- a/editors/calligra-l10n-ca/Makefile
+++ b/editors/calligra-l10n-ca/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Catalan messages and documentation for Calligra
diff --git a/editors/calligra-l10n-ca/distinfo b/editors/calligra-l10n-ca/distinfo
index 7536436767ea..46ec1b3a8fac 100644
--- a/editors/calligra-l10n-ca/distinfo
+++ b/editors/calligra-l10n-ca/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-ca-2.5.2.tar.bz2) = 604b2954d739036b9c8bc851dbe465ae549939eae2edd4bee0e675a013c38172
-SIZE (KDE/calligra-l10n/calligra-l10n-ca-2.5.2.tar.bz2) = 414124
+SHA256 (KDE/calligra-l10n/calligra-l10n-ca-2.5.5.tar.bz2) = 0dff07974896a9f676695c7c3555b33ecd76ab1245078c265e4bd46034eb4732
+SIZE (KDE/calligra-l10n/calligra-l10n-ca-2.5.5.tar.bz2) = 408169
diff --git a/editors/calligra-l10n-ca/pkg-plist b/editors/calligra-l10n-ca/pkg-plist
index 615fd2916310..d7c3811eb35b 100644
--- a/editors/calligra-l10n-ca/pkg-plist
+++ b/editors/calligra-l10n-ca/pkg-plist
@@ -17,6 +17,7 @@ share/locale/ca/LC_MESSAGES/PictureShape.mo
 share/locale/ca/LC_MESSAGES/PluginShape.mo
 share/locale/ca/LC_MESSAGES/SpellCheckPlugin.mo
 share/locale/ca/LC_MESSAGES/TableShape.mo
+share/locale/ca/LC_MESSAGES/TemplateShape.mo
 share/locale/ca/LC_MESSAGES/TextShape.mo
 share/locale/ca/LC_MESSAGES/VariablesPlugin.mo
 share/locale/ca/LC_MESSAGES/VectorShape.mo
diff --git a/editors/calligra-l10n-ca_valencia/Makefile b/editors/calligra-l10n-ca_valencia/Makefile
index 243ad8c897e5..91707a63ff61 100644
--- a/editors/calligra-l10n-ca_valencia/Makefile
+++ b/editors/calligra-l10n-ca_valencia/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	calligra-l10n
-PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+PORTVERSION=	2.5.2
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Valencian (southern Catalan) messages and documentation for Calligra
diff --git a/editors/calligra-l10n-cs/Makefile b/editors/calligra-l10n-cs/Makefile
index ff5db67ce6cf..924ab7a40da3 100644
--- a/editors/calligra-l10n-cs/Makefile
+++ b/editors/calligra-l10n-cs/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	2.4.3
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Czech messages and documentation for Calligra
diff --git a/editors/calligra-l10n-da/Makefile b/editors/calligra-l10n-da/Makefile
index 6765be489539..a48ac74f5144 100644
--- a/editors/calligra-l10n-da/Makefile
+++ b/editors/calligra-l10n-da/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Danish messages and documentation for Calligra
diff --git a/editors/calligra-l10n-da/distinfo b/editors/calligra-l10n-da/distinfo
index f3cd43676b52..2aa828f88f17 100644
--- a/editors/calligra-l10n-da/distinfo
+++ b/editors/calligra-l10n-da/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-da-2.5.2.tar.bz2) = 4f28a3b579964724958d274cc4bcdda630d5ab7a9d815e8f12aebf4e8f49de21
-SIZE (KDE/calligra-l10n/calligra-l10n-da-2.5.2.tar.bz2) = 402118
+SHA256 (KDE/calligra-l10n/calligra-l10n-da-2.5.5.tar.bz2) = c3be7e06ddb92d8ce408960baa961e9fa94f72e68e4167402ac4ef735a82f5c1
+SIZE (KDE/calligra-l10n/calligra-l10n-da-2.5.5.tar.bz2) = 404276
diff --git a/editors/calligra-l10n-el/Makefile b/editors/calligra-l10n-el/Makefile
index fcd37faf4b6b..8e146f8c55e4 100644
--- a/editors/calligra-l10n-el/Makefile
+++ b/editors/calligra-l10n-el/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Modern Greek messages and documentation for Calligra
diff --git a/editors/calligra-l10n-el/distinfo b/editors/calligra-l10n-el/distinfo
index 44b30cd371fa..f9305e92bd8f 100644
--- a/editors/calligra-l10n-el/distinfo
+++ b/editors/calligra-l10n-el/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-el-2.5.2.tar.bz2) = a40aa76d1e2b17a4caa5c7d915ffee30e0aa74d56c0b47f040daf5c134a3c057
-SIZE (KDE/calligra-l10n/calligra-l10n-el-2.5.2.tar.bz2) = 395021
+SHA256 (KDE/calligra-l10n/calligra-l10n-el-2.5.5.tar.bz2) = 45d071e5c72042f618c9ce6f7d33a72840ed03932c89455e87f414f0e42d32d6
+SIZE (KDE/calligra-l10n/calligra-l10n-el-2.5.5.tar.bz2) = 397837
diff --git a/editors/calligra-l10n-en_GB/Makefile b/editors/calligra-l10n-en_GB/Makefile
index bb5b69a049f0..ffb439ce9e7a 100644
--- a/editors/calligra-l10n-en_GB/Makefile
+++ b/editors/calligra-l10n-en_GB/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	British messages and documentation for Calligra
diff --git a/editors/calligra-l10n-en_GB/distinfo b/editors/calligra-l10n-en_GB/distinfo
index 874347fb5769..231e99001f2f 100644
--- a/editors/calligra-l10n-en_GB/distinfo
+++ b/editors/calligra-l10n-en_GB/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-en_GB-2.5.2.tar.bz2) = 345191d943bdac242cbc3095a02649678a951c24924fe17037e065e3058c817a
-SIZE (KDE/calligra-l10n/calligra-l10n-en_GB-2.5.2.tar.bz2) = 368868
+SHA256 (KDE/calligra-l10n/calligra-l10n-en_GB-2.5.5.tar.bz2) = 1066f74ca67afa0f2cc6fc418b7247709ab857c1ae313227a8dd437ba2171545
+SIZE (KDE/calligra-l10n/calligra-l10n-en_GB-2.5.5.tar.bz2) = 372723
diff --git a/editors/calligra-l10n-es/Makefile b/editors/calligra-l10n-es/Makefile
index 0fd99335a103..fdd5b0982d90 100644
--- a/editors/calligra-l10n-es/Makefile
+++ b/editors/calligra-l10n-es/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Spanish messages and documentation for Calligra
diff --git a/editors/calligra-l10n-es/distinfo b/editors/calligra-l10n-es/distinfo
index 19f4f0156154..201b2b183d85 100644
--- a/editors/calligra-l10n-es/distinfo
+++ b/editors/calligra-l10n-es/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-es-2.5.2.tar.bz2) = d31dc53fbe9abe5a42d9116b7b88d4a64db752d832daab57b88b8a722eb11d49
-SIZE (KDE/calligra-l10n/calligra-l10n-es-2.5.2.tar.bz2) = 1027738
+SHA256 (KDE/calligra-l10n/calligra-l10n-es-2.5.5.tar.bz2) = f7245c4d15a3504243422317918de923a1eff2d5f6a5441f9f4124837a265b50
+SIZE (KDE/calligra-l10n/calligra-l10n-es-2.5.5.tar.bz2) = 1033594
diff --git a/editors/calligra-l10n-et/Makefile b/editors/calligra-l10n-et/Makefile
index 7dff99b798cc..ab16922e91bb 100644
--- a/editors/calligra-l10n-et/Makefile
+++ b/editors/calligra-l10n-et/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Estonian messages and documentation for Calligra
diff --git a/editors/calligra-l10n-et/distinfo b/editors/calligra-l10n-et/distinfo
index a5b94f56ad10..45ad6da7ccc9 100644
--- a/editors/calligra-l10n-et/distinfo
+++ b/editors/calligra-l10n-et/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-et-2.5.2.tar.bz2) = 7a61ccf808de0720e404a6f38fbb11d26c3ea23156a43509e39a55480c4811e8
-SIZE (KDE/calligra-l10n/calligra-l10n-et-2.5.2.tar.bz2) = 758903
+SHA256 (KDE/calligra-l10n/calligra-l10n-et-2.5.5.tar.bz2) = 040012d677086e74340d6a29fbf827967694c4c913ee9027c2e0ed04eea3de1b
+SIZE (KDE/calligra-l10n/calligra-l10n-et-2.5.5.tar.bz2) = 759669
diff --git a/editors/calligra-l10n-fi/Makefile b/editors/calligra-l10n-fi/Makefile
index be4923389cba..923539423904 100644
--- a/editors/calligra-l10n-fi/Makefile
+++ b/editors/calligra-l10n-fi/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Finnish messages and documentation for Calligra
diff --git a/editors/calligra-l10n-fi/distinfo b/editors/calligra-l10n-fi/distinfo
index 816405c32173..138c8772e123 100644
--- a/editors/calligra-l10n-fi/distinfo
+++ b/editors/calligra-l10n-fi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-fi-2.5.2.tar.bz2) = d877147ba3b99cc92baf8959b080f7a4d11015ffa325ceba3b11b73164238837
-SIZE (KDE/calligra-l10n/calligra-l10n-fi-2.5.2.tar.bz2) = 383058
+SHA256 (KDE/calligra-l10n/calligra-l10n-fi-2.5.5.tar.bz2) = a35e52844e403974343e14b4ede8057772d96226c2c27a7ce4fbeffc451a257d
+SIZE (KDE/calligra-l10n/calligra-l10n-fi-2.5.5.tar.bz2) = 385087
diff --git a/editors/calligra-l10n-gl/Makefile b/editors/calligra-l10n-gl/Makefile
index 0961560bfa2d..d55e8ef45625 100644
--- a/editors/calligra-l10n-gl/Makefile
+++ b/editors/calligra-l10n-gl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Gallegan messages and documentation for Calligra
diff --git a/editors/calligra-l10n-gl/distinfo b/editors/calligra-l10n-gl/distinfo
index 4ae5cb5b5591..39d08ea6d5a1 100644
--- a/editors/calligra-l10n-gl/distinfo
+++ b/editors/calligra-l10n-gl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-gl-2.5.2.tar.bz2) = a035e6beaaa4e551dd2909cfc6fb506c120cee3684c7a683219c45f2a397bcfc
-SIZE (KDE/calligra-l10n/calligra-l10n-gl-2.5.2.tar.bz2) = 372347
+SHA256 (KDE/calligra-l10n/calligra-l10n-gl-2.5.5.tar.bz2) = 5cd09649440a0b4bc2e5f5eb981f104e8467b166512fde90664daf5d85383c47
+SIZE (KDE/calligra-l10n/calligra-l10n-gl-2.5.5.tar.bz2) = 352322
diff --git a/editors/calligra-l10n-gl/pkg-plist b/editors/calligra-l10n-gl/pkg-plist
index b7fd1b7571e1..ba9b413a2f33 100644
--- a/editors/calligra-l10n-gl/pkg-plist
+++ b/editors/calligra-l10n-gl/pkg-plist
@@ -1,6 +1,3 @@
-share/doc/HTML/gl/thesaurus/common
-share/doc/HTML/gl/thesaurus/index.cache.bz2
-share/doc/HTML/gl/thesaurus/index.docbook
 share/locale/gl/LC_MESSAGES/ArtisticTextShape.mo
 share/locale/gl/LC_MESSAGES/AutocorrectPlugin.mo
 share/locale/gl/LC_MESSAGES/CalendarTool.mo
@@ -56,4 +53,3 @@ share/locale/gl/LC_MESSAGES/stage.mo
 share/locale/gl/LC_MESSAGES/tablessolver.mo
 share/locale/gl/LC_MESSAGES/thesaurus_tool.mo
 share/locale/gl/LC_MESSAGES/words.mo
-@dirrm share/doc/HTML/gl/thesaurus
diff --git a/editors/calligra-l10n-it/Makefile b/editors/calligra-l10n-it/Makefile
index 30b3ecbaa223..51b68db8391e 100644
--- a/editors/calligra-l10n-it/Makefile
+++ b/editors/calligra-l10n-it/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Italian messages and documentation for Calligra
diff --git a/editors/calligra-l10n-it/distinfo b/editors/calligra-l10n-it/distinfo
index 15ed2e0d9637..dc596b7941ac 100644
--- a/editors/calligra-l10n-it/distinfo
+++ b/editors/calligra-l10n-it/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-it-2.5.2.tar.bz2) = c906326d8f2c9e006bd7974ea66b24c575ed5521c5ba6c3246c1f4a5f388be86
-SIZE (KDE/calligra-l10n/calligra-l10n-it-2.5.2.tar.bz2) = 602221
+SHA256 (KDE/calligra-l10n/calligra-l10n-it-2.5.5.tar.bz2) = e1d988c095f3e2810c404e4152da11b8c643444b514e806f895903cfff863873
+SIZE (KDE/calligra-l10n/calligra-l10n-it-2.5.5.tar.bz2) = 602297
diff --git a/editors/calligra-l10n-kk/Makefile b/editors/calligra-l10n-kk/Makefile
index 3bae7961d8c3..9d0e0e3cd3b2 100644
--- a/editors/calligra-l10n-kk/Makefile
+++ b/editors/calligra-l10n-kk/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Kazakh messages and documentation for Calligra
diff --git a/editors/calligra-l10n-kk/distinfo b/editors/calligra-l10n-kk/distinfo
index a4111bc57380..8e314b0619e7 100644
--- a/editors/calligra-l10n-kk/distinfo
+++ b/editors/calligra-l10n-kk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-kk-2.5.2.tar.bz2) = 536a4c9ab9c77209662b80f9d62845b411af17a7c30e481a1e528f83e679e5fe
-SIZE (KDE/calligra-l10n/calligra-l10n-kk-2.5.2.tar.bz2) = 380608
+SHA256 (KDE/calligra-l10n/calligra-l10n-kk-2.5.5.tar.bz2) = 5902fbf094195655f1105115f31170446c25476e1ecd2946ec6318cd045680ad
+SIZE (KDE/calligra-l10n/calligra-l10n-kk-2.5.5.tar.bz2) = 385741
diff --git a/editors/calligra-l10n-nb/Makefile b/editors/calligra-l10n-nb/Makefile
index 6a7be62944cc..0226284efe0d 100644
--- a/editors/calligra-l10n-nb/Makefile
+++ b/editors/calligra-l10n-nb/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Norwegian Bokmaal messages and documentation for Calligra
diff --git a/editors/calligra-l10n-nb/distinfo b/editors/calligra-l10n-nb/distinfo
index 8670bddfccec..7ec394a6f809 100644
--- a/editors/calligra-l10n-nb/distinfo
+++ b/editors/calligra-l10n-nb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-nb-2.5.2.tar.bz2) = 884adca9caed3ee29d5b0551b598ba80e5909bae82b1441834348eaf17b2415f
-SIZE (KDE/calligra-l10n/calligra-l10n-nb-2.5.2.tar.bz2) = 336667
+SHA256 (KDE/calligra-l10n/calligra-l10n-nb-2.5.5.tar.bz2) = bbfdba13a6c78c3dc939c055f3d3811a7513ee75a04737f14c2922a270481446
+SIZE (KDE/calligra-l10n/calligra-l10n-nb-2.5.5.tar.bz2) = 341104
diff --git a/editors/calligra-l10n-nb/pkg-plist b/editors/calligra-l10n-nb/pkg-plist
index 01257c0cb6b9..036def542975 100644
--- a/editors/calligra-l10n-nb/pkg-plist
+++ b/editors/calligra-l10n-nb/pkg-plist
@@ -14,6 +14,7 @@ share/locale/nb/LC_MESSAGES/PictureShape.mo
 share/locale/nb/LC_MESSAGES/PluginShape.mo
 share/locale/nb/LC_MESSAGES/SpellCheckPlugin.mo
 share/locale/nb/LC_MESSAGES/TableShape.mo
+share/locale/nb/LC_MESSAGES/TemplateShape.mo
 share/locale/nb/LC_MESSAGES/TextShape.mo
 share/locale/nb/LC_MESSAGES/VariablesPlugin.mo
 share/locale/nb/LC_MESSAGES/VectorShape.mo
diff --git a/editors/calligra-l10n-nds/Makefile b/editors/calligra-l10n-nds/Makefile
index 7178d02c68f0..0533bf558b58 100644
--- a/editors/calligra-l10n-nds/Makefile
+++ b/editors/calligra-l10n-nds/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Low German messages and documentation for Calligra
diff --git a/editors/calligra-l10n-nds/distinfo b/editors/calligra-l10n-nds/distinfo
index 97f2ef75fc87..22d4a82f6d18 100644
--- a/editors/calligra-l10n-nds/distinfo
+++ b/editors/calligra-l10n-nds/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-nds-2.5.2.tar.bz2) = 6d156f8289c5c40cc200a6724f02ff52595c763f5a52f6145779acdd9f32d658
-SIZE (KDE/calligra-l10n/calligra-l10n-nds-2.5.2.tar.bz2) = 389820
+SHA256 (KDE/calligra-l10n/calligra-l10n-nds-2.5.5.tar.bz2) = ece77c7a6dc472dedd1d2c08044af691ec8be42ee45eef95a4541260bca93f70
+SIZE (KDE/calligra-l10n/calligra-l10n-nds-2.5.5.tar.bz2) = 391414
diff --git a/editors/calligra-l10n-nl/Makefile b/editors/calligra-l10n-nl/Makefile
index 3147b83a5388..95fff404ab00 100644
--- a/editors/calligra-l10n-nl/Makefile
+++ b/editors/calligra-l10n-nl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Dutch messages and documentation for Calligra
diff --git a/editors/calligra-l10n-nl/distinfo b/editors/calligra-l10n-nl/distinfo
index 0b881dedde57..79392366908c 100644
--- a/editors/calligra-l10n-nl/distinfo
+++ b/editors/calligra-l10n-nl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-nl-2.5.2.tar.bz2) = c1733c5468dec6a75403d60141704f9594656140ba2a0c7957a5f77f4a558a9e
-SIZE (KDE/calligra-l10n/calligra-l10n-nl-2.5.2.tar.bz2) = 2547955
+SHA256 (KDE/calligra-l10n/calligra-l10n-nl-2.5.5.tar.bz2) = 8352229c5234d4a35202a378b761bf128e89a73ed38c4ff15734d673683af438
+SIZE (KDE/calligra-l10n/calligra-l10n-nl-2.5.5.tar.bz2) = 1608920
diff --git a/editors/calligra-l10n-nl/pkg-plist b/editors/calligra-l10n-nl/pkg-plist
index 60e6fc58df01..b7e75126f145 100644
--- a/editors/calligra-l10n-nl/pkg-plist
+++ b/editors/calligra-l10n-nl/pkg-plist
@@ -27,6 +27,73 @@ share/doc/HTML/nl/sheets/shortcut2.png
 share/doc/HTML/nl/sheets/shortcut3.png
 share/doc/HTML/nl/sheets/sort1.png
 share/doc/HTML/nl/sheets/starting1.png
+share/doc/HTML/nl/stage/barstyle1.png
+share/doc/HTML/nl/stage/barstyle2.png
+share/doc/HTML/nl/stage/barstyle3.png
+share/doc/HTML/nl/stage/barstyle4.png
+share/doc/HTML/nl/stage/barstyle5.png
+share/doc/HTML/nl/stage/barstyle6.png
+share/doc/HTML/nl/stage/barstyle7.png
+share/doc/HTML/nl/stage/common
+share/doc/HTML/nl/stage/great-presentations.docbook
+share/doc/HTML/nl/stage/guides.docbook
+share/doc/HTML/nl/stage/htmlshow00.png
+share/doc/HTML/nl/stage/htmlshow01.png
+share/doc/HTML/nl/stage/htmlshow02.png
+share/doc/HTML/nl/stage/htmlshow02a.png
+share/doc/HTML/nl/stage/htmlshow03.png
+share/doc/HTML/nl/stage/htmlshow04.png
+share/doc/HTML/nl/stage/htmlshow05.png
+share/doc/HTML/nl/stage/htmlshow07.png
+share/doc/HTML/nl/stage/index.cache.bz2
+share/doc/HTML/nl/stage/index.docbook
+share/doc/HTML/nl/stage/menus.docbook
+share/doc/HTML/nl/stage/msexport1.png
+share/doc/HTML/nl/stage/msexport2.png
+share/doc/HTML/nl/stage/msexport3.png
+share/doc/HTML/nl/stage/msexport4.png
+share/doc/HTML/nl/stage/options.docbook
+share/doc/HTML/nl/stage/settings01.png
+share/doc/HTML/nl/stage/settings03.png
+share/doc/HTML/nl/stage/settings04.png
+share/doc/HTML/nl/stage/settings05.png
+share/doc/HTML/nl/stage/settings06.png
+share/doc/HTML/nl/stage/template02.png
+share/doc/HTML/nl/stage/template03.png
+share/doc/HTML/nl/stage/template04.png
+share/doc/HTML/nl/stage/template05.png
+share/doc/HTML/nl/stage/template06.png
+share/doc/HTML/nl/stage/template07.png
+share/doc/HTML/nl/stage/textmenu01.png
+share/doc/HTML/nl/stage/textmenu02.png
+share/doc/HTML/nl/stage/textmenu03.png
+share/doc/HTML/nl/stage/textmenu03a.png
+share/doc/HTML/nl/stage/textmenu04.png
+share/doc/HTML/nl/stage/toolsmenu01.png
+share/doc/HTML/nl/stage/tut01.png
+share/doc/HTML/nl/stage/tut02.png
+share/doc/HTML/nl/stage/tut03.png
+share/doc/HTML/nl/stage/tut04.png
+share/doc/HTML/nl/stage/tut05.png
+share/doc/HTML/nl/stage/tut06.png
+share/doc/HTML/nl/stage/tut07.png
+share/doc/HTML/nl/stage/tut08.png
+share/doc/HTML/nl/stage/tut09.png
+share/doc/HTML/nl/stage/tut10.png
+share/doc/HTML/nl/stage/tut11.png
+share/doc/HTML/nl/stage/tut12.png
+share/doc/HTML/nl/stage/tut13.png
+share/doc/HTML/nl/stage/tut14.png
+share/doc/HTML/nl/stage/tut15.png
+share/doc/HTML/nl/stage/tut16.png
+share/doc/HTML/nl/stage/tut17.png
+share/doc/HTML/nl/stage/tut18.png
+share/doc/HTML/nl/stage/tut19.png
+share/doc/HTML/nl/stage/tut20.png
+share/doc/HTML/nl/stage/tut21.png
+share/doc/HTML/nl/stage/tut22.png
+share/doc/HTML/nl/stage/tut23.png
+share/doc/HTML/nl/stage/tutorial.docbook
 share/locale/nl/LC_MESSAGES/ArtisticTextShape.mo
 share/locale/nl/LC_MESSAGES/AutocorrectPlugin.mo
 share/locale/nl/LC_MESSAGES/CalendarTool.mo
@@ -82,6 +149,7 @@ share/locale/nl/LC_MESSAGES/stage.mo
 share/locale/nl/LC_MESSAGES/tablessolver.mo
 share/locale/nl/LC_MESSAGES/thesaurus_tool.mo
 share/locale/nl/LC_MESSAGES/words.mo
+@dirrm share/doc/HTML/nl/stage
 @dirrm share/doc/HTML/nl/sheets
 @dirrm share/doc/HTML/nl/kexi
 @dirrm share/doc/HTML/nl/calligra
diff --git a/editors/calligra-l10n-sk/Makefile b/editors/calligra-l10n-sk/Makefile
index 9c06ce7b97a5..2b272ee674e8 100644
--- a/editors/calligra-l10n-sk/Makefile
+++ b/editors/calligra-l10n-sk/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Slovak messages and documentation for Calligra
diff --git a/editors/calligra-l10n-sk/distinfo b/editors/calligra-l10n-sk/distinfo
index 6c98f6d7bc01..f23ef0bfde4d 100644
--- a/editors/calligra-l10n-sk/distinfo
+++ b/editors/calligra-l10n-sk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-sk-2.5.2.tar.bz2) = b43c115c5117a26e19efc0149c80bd5e7c4234d33516e753a6d0f9aed7ee7927
-SIZE (KDE/calligra-l10n/calligra-l10n-sk-2.5.2.tar.bz2) = 342599
+SHA256 (KDE/calligra-l10n/calligra-l10n-sk-2.5.5.tar.bz2) = e8fa0d1aff64428eff208ef150dcae74200a4b260154a546999d25e881afa29e
+SIZE (KDE/calligra-l10n/calligra-l10n-sk-2.5.5.tar.bz2) = 342084
diff --git a/editors/calligra-l10n-sv/Makefile b/editors/calligra-l10n-sv/Makefile
index 9365c2e06daf..33cf4db125c4 100644
--- a/editors/calligra-l10n-sv/Makefile
+++ b/editors/calligra-l10n-sv/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra-l10n
 PORTVERSION=	${CALLIGRA_VERSION}
-CATEGORIES?=	editors kde
+CATEGORIES=	editors kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Swedish messages and documentation for Calligra
diff --git a/editors/calligra-l10n-sv/distinfo b/editors/calligra-l10n-sv/distinfo
index 5e8b99c96533..6af16d3c7f25 100644
--- a/editors/calligra-l10n-sv/distinfo
+++ b/editors/calligra-l10n-sv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-sv-2.5.2.tar.bz2) = 729dc8d7a6a1c5ceee009a19f3c40984739699cf00c1584dce1f6af4a150944d
-SIZE (KDE/calligra-l10n/calligra-l10n-sv-2.5.2.tar.bz2) = 2015940
+SHA256 (KDE/calligra-l10n/calligra-l10n-sv-2.5.5.tar.bz2) = 3adc40dfef83bf3a441b480ddeda557994109adb2fcc066f6f0577e422c31f0e
+SIZE (KDE/calligra-l10n/calligra-l10n-sv-2.5.5.tar.bz2) = 2020558
diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile
index 92d28203fdef..3eb2779dd58c 100644
--- a/editors/calligra-l10n/Makefile
+++ b/editors/calligra-l10n/Makefile
@@ -33,19 +33,24 @@ zh_TW_PORT=	chinese/calligra-l10n-zh_TW
 .include "${.CURDIR}/../../misc/kde4-l10n/files/kde4-lang-names"
 nb_NAME=	Norwegian Bokmal
 
-OPTIONS=	ALL "All localizations" on
+OPTIONS_DEFINE=	ALL
+OPTIONS_DEFAULT=ALL
+
+ALL_DESC=	All localizations
+
 .for lang in ${CALLIGRA_LANG_ALL}
 ${lang}_DETECT?=	${KDE4_PREFIX}/share/locale/${lang}/LC_MESSAGES/calligra.mo
 ${lang}_PORT?=		editors/calligra-l10n-${lang}
 ${lang}_NAME?=		${lang}
 ${lang}_OPTION=		${lang:S/@/_/}
-OPTIONS+=	${${lang}_OPTION} "${${lang}_NAME} localization" off
+OPTIONS_DEFINE+=	${${lang}_OPTION}
+${${lang}_OPTION}_DESC=	${${lang}_NAME} localization
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for lang in ${CALLIGRA_LANG_ALL}
-.if defined(WITH_ALL) || defined(WITH_${${lang}_OPTION})
+.if ${PORT_OPTIONS:MALL} || ${PORT_OPTIONS:M${${lang}_OPTION}}
 RUN_DEPENDS+=	${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT}
 .endif
 .endfor
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 90a6324d9dca..581742a39c59 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	calligra
 PORTVERSION=	${CALLIGRA_VERSION}
-PORTREVISION=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/
@@ -14,22 +13,22 @@ COMMENT=	KDE graphic art and office suite
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		IlmImf:${PORTSDIR}/graphics/OpenEXR \
 		boost_thread:${PORTSDIR}/devel/boost-libs \
-		qca.2:${PORTSDIR}/devel/qca \
-		exiv2.12:${PORTSDIR}/graphics/exiv2 \
-		lcms2.2:${PORTSDIR}/graphics/lcms2 \
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		wpd-0.9.9:${PORTSDIR}/textproc/libwpd \
-		wpg-0.2.2:${PORTSDIR}/graphics/libwpg \
-		poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \
-		openjpeg.2:${PORTSDIR}/graphics/openjpeg \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		dcmdata.3:${PORTSDIR}/devel/dcmtk \
-		fftw3.6:${PORTSDIR}/math/fftw3 \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		gsl.16:${PORTSDIR}/math/gsl \
-		wps-0.2.2:${PORTSDIR}/textproc/libwps \
-		visio-0.0.0:${PORTSDIR}/textproc/libvisio
+		qca:${PORTSDIR}/devel/qca \
+		exiv2:${PORTSDIR}/graphics/exiv2 \
+		lcms2:${PORTSDIR}/graphics/lcms2 \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		freetype:${PORTSDIR}/print/freetype2 \
+		wpd-0.9:${PORTSDIR}/textproc/libwpd \
+		wpg-0.2:${PORTSDIR}/graphics/libwpg \
+		poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \
+		openjpeg:${PORTSDIR}/graphics/openjpeg \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		dcmdata:${PORTSDIR}/devel/dcmtk \
+		fftw3:${PORTSDIR}/math/fftw3 \
+		tiff:${PORTSDIR}/graphics/tiff \
+		gsl:${PORTSDIR}/math/gsl \
+		wps-0.2:${PORTSDIR}/textproc/libwps \
+		visio-0.0:${PORTSDIR}/textproc/libvisio
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2
 
 CONFLICTS=	koffice-kde4-2.*
@@ -41,6 +40,7 @@ USE_ICONV=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix libkdcraw okular pimlibs \
 		automoc4 sharedmime soprano
 USE_PERL5=	yes
+USE_PKGCONFIG=	build
 USE_QT4=	dbus designer gui opengl phonon porting_build qt3support \
 		qtestlib_build script sql svg webkit xml xmlpatterns \
 		moc_build qmake_build rcc_build uic_build uic3_build
@@ -55,11 +55,14 @@ CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS=	GTL	"Color transformations in Krita (requires LLVM)" off \
-		MARBLE	"Support for globe widget" on \
-		MYSQL	"MySQL support in Kexi" on \
-		PGSQL	"PostgreSQL support in Kexi" on \
-		SYBASE	"SyBase support in Kexi" off
+OPTIONS_DEFINE=	GTL MARBLE MYSQL PGSQL SYBASE
+OPTIONS_DEFAULT=MARBLE MYSQL PGSQL
+
+GTL_DESC=	Color transformations in Krita (requires LLVM)
+MARBLE_DESC=	World globe widget support via Marble
+MYSQL_DESC=	MySQL database support in Kexi
+PGSQL_DESC=	PostgreSQL database support in Kexi
+SYBASE_DESC=	Sybase database support in Kexi
 
 .if exists(${LOCALBASE}/lib/pstoedit/libp2edrvlplot.so)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/pstoedit/libp2edrvlplot.so:${PORTSDIR}/graphics/pstoedit
@@ -71,31 +74,31 @@ PLIST_SUB+=	EPS="@comment "
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GTL) || exists(${LOCALBASE}/lib/libQtShiva.so)
-LIB_DEPENDS+=	OpenCTL.0:${PORTSDIR}/graphics/opengtl \
-		QtShiva.0:${PORTSDIR}/graphics/qtgtl
+.if ${PORT_OPTIONS:MGTL} || exists(${LOCALBASE}/lib/libQtShiva.so)
+LIB_DEPENDS+=	OpenCTL:${PORTSDIR}/graphics/opengtl \
+		QtShiva:${PORTSDIR}/graphics/qtgtl
 PLIST_SUB+=	GTL=""
 .else
 PLIST_SUB+=	GTL="@comment "
 .endif
 
-.if !defined(WITHOUT_MARBLE)
+.if ${PORT_OPTIONS:MMARBLE}
 USE_KDE4+=	marble
-CMAKE_ARGS+=	-DWITH_Marble:BOOL=TRUE
 PLIST_SUB+=	MARBLE=""
 .else
 CMAKE_ARGS+=	-DWITH_Marble:BOOL=FALSE
 PLIST_SUB+=	MARBLE="@comment "
 .endif
 
-.if !defined(WITHOUT_MYSQL) || exists(${LOCALBASE}/lib/mysql/libmysqlclient.so)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 PLIST_SUB+=	MYSQL=""
 .else
+CMAKE_ARGS+=	-DWITH_MySQL:BOOL=FASE
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.if !defined(WITHOUT_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx3
 RUN_DEPENDS+=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx3
@@ -105,10 +108,11 @@ CMAKE_ARGS+=	-DWITH_PostgreSQL:BOOL=FALSE
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
-.if defined(WITH_SYBASE) || exists(${LOCALBASE}/lib/libsybdb.so)
-LIB_DEPENDS+=	sybdb.5:${PORTSDIR}/databases/freetds
+.if ${PORT_OPTIONS:MSYBASE}
+LIB_DEPENDS+=	sybdb:${PORTSDIR}/databases/freetds
 PLIST_SUB+=	SYBASE=""
 .else
+CMAKE_ARGS+=	-DWITH_FreeTDS:BOOL=FALSE
 PLIST_SUB+=	SYBASE="@comment "
 .endif
 
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
index dcd5e1aabdeb..f636f33deb11 100644
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-2.5.2.tar.bz2) = 4ea50791891de621caba4ddf1484539ab50a6a770ad21cbb428c66fa685689ca
-SIZE (KDE/calligra-2.5.2.tar.bz2) = 119280741
+SHA256 (KDE/calligra-2.5.5.tar.bz2) = 7c26bbe4e7c78891cf3a6c5fa08db2f75710c6a324663e2b685b7a969b6a3141
+SIZE (KDE/calligra-2.5.5.tar.bz2) = 115584471
diff --git a/editors/calligra/files/patch-git_e5f53594 b/editors/calligra/files/patch-git_e5f53594
deleted file mode 100644
index f1e4dca3f7d7..000000000000
--- a/editors/calligra/files/patch-git_e5f53594
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e5f535944132105f9acbe02f1042e1725c515f99
-Author: Boudewijn Rempt <boud@valdyas.org>
-Date:   Tue Sep 4 15:14:51 2012 +0200
-
-    Fix compilation with latest lcms2.4 rc
-
-diff --git a/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h b/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h
-index 8250ea5..62c777f 100644
---- ./plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h
-+++ ./plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h
-@@ -23,6 +23,8 @@
- #include <LcmsColorSpace.h>
- #include <KoColorSpaceTraits.h>
- 
-+#define TYPE_XYZA_FLT         (FLOAT_SH(1)|COLORSPACE_SH(PT_XYZ)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4))
-+
- #include <KoColorModelStandardIds.h>
- 
- class XyzF32ColorSpace : public LcmsColorSpace<KoXyzF32Traits>
diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
index 6334b92c9b03..900e581b126f 100644
--- a/editors/calligra/pkg-plist
+++ b/editors/calligra/pkg-plist
@@ -6385,6 +6385,7 @@ share/color/icc/pigment/fogra27l.icm
 share/config.kcfg/plansettings.kcfg
 share/config.kcfg/planworksettings.kcfg
 share/config.kcfg/sheets.kcfg
+share/config/braindumprc
 share/config/flow_stencils.knsrc
 share/config/flowrc
 share/config/karbonrc