aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakc <makc@FreeBSD.org>2013-02-05 19:36:39 +0800
committermakc <makc@FreeBSD.org>2013-02-05 19:36:39 +0800
commit745d00589c6d99de75e4f80e3b1496d2e5882aa9 (patch)
tree309f1c85d8b979eaa5ff9dae4a2ab6b3464b092c
parent948bd31b4612c3ec268228f2eb1c56dfd789ba5e (diff)
downloadfreebsd-ports-gnome-745d00589c6d99de75e4f80e3b1496d2e5882aa9.tar.gz
freebsd-ports-gnome-745d00589c6d99de75e4f80e3b1496d2e5882aa9.tar.zst
freebsd-ports-gnome-745d00589c6d99de75e4f80e3b1496d2e5882aa9.zip
Merge from area51 repository:
- Update to 2.5.5 - Convert to new options framework - minor cleanups Courtesy of: avilla
-rw-r--r--Mk/bsd.kde4.mk2
-rw-r--r--chinese/calligra-l10n-zh_CN/Makefile2
-rw-r--r--chinese/calligra-l10n-zh_CN/distinfo4
-rw-r--r--chinese/calligra-l10n-zh_TW/Makefile2
-rw-r--r--chinese/calligra-l10n-zh_TW/distinfo4
-rw-r--r--editors/calligra-l10n-ca/Makefile2
-rw-r--r--editors/calligra-l10n-ca/distinfo4
-rw-r--r--editors/calligra-l10n-ca/pkg-plist1
-rw-r--r--editors/calligra-l10n-ca_valencia/Makefile4
-rw-r--r--editors/calligra-l10n-cs/Makefile2
-rw-r--r--editors/calligra-l10n-da/Makefile2
-rw-r--r--editors/calligra-l10n-da/distinfo4
-rw-r--r--editors/calligra-l10n-el/Makefile2
-rw-r--r--editors/calligra-l10n-el/distinfo4
-rw-r--r--editors/calligra-l10n-en_GB/Makefile2
-rw-r--r--editors/calligra-l10n-en_GB/distinfo4
-rw-r--r--editors/calligra-l10n-es/Makefile2
-rw-r--r--editors/calligra-l10n-es/distinfo4
-rw-r--r--editors/calligra-l10n-et/Makefile2
-rw-r--r--editors/calligra-l10n-et/distinfo4
-rw-r--r--editors/calligra-l10n-fi/Makefile2
-rw-r--r--editors/calligra-l10n-fi/distinfo4
-rw-r--r--editors/calligra-l10n-gl/Makefile2
-rw-r--r--editors/calligra-l10n-gl/distinfo4
-rw-r--r--editors/calligra-l10n-gl/pkg-plist4
-rw-r--r--editors/calligra-l10n-it/Makefile2
-rw-r--r--editors/calligra-l10n-it/distinfo4
-rw-r--r--editors/calligra-l10n-kk/Makefile2
-rw-r--r--editors/calligra-l10n-kk/distinfo4
-rw-r--r--editors/calligra-l10n-nb/Makefile2
-rw-r--r--editors/calligra-l10n-nb/distinfo4
-rw-r--r--editors/calligra-l10n-nb/pkg-plist1
-rw-r--r--editors/calligra-l10n-nds/Makefile2
-rw-r--r--editors/calligra-l10n-nds/distinfo4
-rw-r--r--editors/calligra-l10n-nl/Makefile2
-rw-r--r--editors/calligra-l10n-nl/distinfo4
-rw-r--r--editors/calligra-l10n-nl/pkg-plist68
-rw-r--r--editors/calligra-l10n-sk/Makefile2
-rw-r--r--editors/calligra-l10n-sk/distinfo4
-rw-r--r--editors/calligra-l10n-sv/Makefile2
-rw-r--r--editors/calligra-l10n-sv/distinfo4
-rw-r--r--editors/calligra-l10n/Makefile11
-rw-r--r--editors/calligra/Makefile66
-rw-r--r--editors/calligra/distinfo4
-rw-r--r--editors/calligra/files/patch-git_e5f5359419
-rw-r--r--editors/calligra/pkg-plist1
-rw-r--r--french/calligra-l10n/Makefile2
-rw-r--r--french/calligra-l10n/distinfo4
-rw-r--r--french/calligra-l10n/pkg-plist34
-rw-r--r--german/calligra-l10n/Makefile2
-rw-r--r--german/calligra-l10n/distinfo4
-rw-r--r--hungarian/calligra-l10n/Makefile2
-rw-r--r--hungarian/calligra-l10n/distinfo4
-rw-r--r--japanese/calligra-l10n/Makefile2
-rw-r--r--japanese/calligra-l10n/distinfo4
-rw-r--r--polish/calligra-l10n/Makefile2
-rw-r--r--polish/calligra-l10n/distinfo4
-rw-r--r--portuguese/calligra-l10n-pt_BR/Makefile2
-rw-r--r--portuguese/calligra-l10n-pt_BR/distinfo4
-rw-r--r--portuguese/calligra-l10n/Makefile2
-rw-r--r--portuguese/calligra-l10n/distinfo4
-rw-r--r--portuguese/calligra-l10n/pkg-plist4
-rw-r--r--russian/calligra-l10n/Makefile2
-rw-r--r--russian/calligra-l10n/distinfo4
-rw-r--r--russian/calligra-l10n/pkg-plist4
-rw-r--r--ukrainian/calligra-l10n/Makefile2
-rw-r--r--ukrainian/calligra-l10n/distinfo4
67 files changed, 232 insertions, 149 deletions
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index 4bf8553e4dae..87ff0e0b60d9 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -77,7 +77,7 @@ Kde_Pre_Include= bsd.kde4.mk
KDE4_VERSION?= 4.9.5
KDE4_BRANCH?= stable
-CALLIGRA_VERSION?= 2.5.2
+CALLIGRA_VERSION?= 2.5.5
CALLIGRA_BRANCH?= stable
KDEVELOP_VERSION?= 4.3.1
KDEVELOP_BRANCH?= stable
diff --git a/chinese/calligra-l10n-zh_CN/Makefile b/chinese/calligra-l10n-zh_CN/Makefile
index 8a69ca1a0864..985cd783c661 100644
--- a/chinese/calligra-l10n-zh_CN/Makefile
+++ b/chinese/calligra-l10n-zh_CN/Makefile
@@ -2,7 +2,7 @@
PORTNAME= calligra-l10n
PORTVERSION= ${CALLIGRA_VERSION}
-CATEGORIES?= chinese editors kde
+CATEGORIES= chinese editors kde
MAINTAINER= kde@FreeBSD.org
COMMENT= Simplified Chinese messages and documentation for Calligra
diff --git a/chinese/calligra-l10n-zh_CN/distinfo b/chinese/calligra-l10n-zh_CN/distinfo
index b21e071d5a45..ea4c7a7d8466 100644
--- a/chinese/calligra-l10n-zh_CN/distinfo
+++ b/chinese/calligra-l10n-zh_CN/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-zh_CN-2.5.2.tar.bz2) = 9a991f714bac9b90ef6bbab5abb371c17e9710bcc14fa4dfb208482eb9e44537
-SIZE (KDE/calligra-l10n/calligra-l10n-zh_CN-2.5.2.tar.bz2) = 329020
+SHA256 (KDE/calligra-l10n/calligra-l10n-zh_CN-2.5.5.tar.bz2) = 654fb53e3e5ff3417b38f94f7fd4fd2aa6dc615968982b752674a2309abc918d
+SIZE (KDE/calligra-l10n/calligra-l10n-zh_CN-2.5.5.tar.bz2) = 329040
diff --git a/chinese/calligra-l10n-zh_TW/Makefile b/chinese/calligra-l10n-zh_TW/Makefile
index 05620a0cd4a5..ad251945409e 100644
--- a/chinese/calligra-l10n-zh_TW/Makefile
+++ b/chinese/calligra-l10n-zh_TW/Makefile
@@ -2,7 +2,7 @@
PORTNAME= calligra-l10n
PORTVERSION= ${CALLIGRA_VERSION}
-CATEGORIES?= chinese editors kde
+CATEGORIES= chinese editors kde
MAINTAINER= kde@FreeBSD.org
COMMENT= Traditional Chinese messages and documentation for Calligra
diff --git a/chinese/calligra-l10n-zh_TW/distinfo b/chinese/calligra-l10n-zh_TW/distinfo
index 52b88b6bbddf..cd78b9bc19a8 100644
--- a/chinese/calligra-l10n-zh_TW/distinfo
+++ b/chinese/calligra-l10n-zh_TW/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-zh_TW-2.5.2.tar.bz2) = 3ce3120c857d156ba644af97f3effa0de13ae2973ee6e54fbe1ff6969421d286
-SIZE (KDE/calligra-l10n/calligra-l10n-zh_TW-2.5.2.tar.bz2) = 368155
+SHA256 (KDE/calligra-l10n/calligra-l10n-zh_TW-2.5.5.tar.bz2) = e3704179b18c4387b267f87529ecaba5d0bb27d344d3241824ccd4713363f9fd
+SIZE (KDE/calligra-l10n/calligra-l10n-zh_TW-2.5.5.tar.bz2) = 370697
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
diff --git a/french/calligra-l10n/Makefile b/french/calligra-l10n/Makefile
index 3308b69762fb..c5d651a836af 100644
--- a/french/calligra-l10n/Makefile
+++ b/french/calligra-l10n/Makefile
@@ -2,7 +2,7 @@
PORTNAME= calligra-l10n
PORTVERSION= ${CALLIGRA_VERSION}
-CATEGORIES?= french editors kde
+CATEGORIES= french editors kde
MAINTAINER= kde@FreeBSD.org
COMMENT= French messages and documentation for Calligra
diff --git a/french/calligra-l10n/distinfo b/french/calligra-l10n/distinfo
index 4d80577da978..104a7f7496f8 100644
--- a/french/calligra-l10n/distinfo
+++ b/french/calligra-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-fr-2.5.2.tar.bz2) = 9aba2a8a9029233812c6faf5f342ee8b36f3a9a2bbd3f7a602ac81796c164022
-SIZE (KDE/calligra-l10n/calligra-l10n-fr-2.5.2.tar.bz2) = 3930088
+SHA256 (KDE/calligra-l10n/calligra-l10n-fr-2.5.5.tar.bz2) = c576d0e895100c66a099f39dbb85d221f66a0ed48436edf2844c2ead6da09b1f
+SIZE (KDE/calligra-l10n/calligra-l10n-fr-2.5.5.tar.bz2) = 2552227
diff --git a/french/calligra-l10n/pkg-plist b/french/calligra-l10n/pkg-plist
index bd48e4f2a993..4ac57641a74e 100644
--- a/french/calligra-l10n/pkg-plist
+++ b/french/calligra-l10n/pkg-plist
@@ -1,4 +1,7 @@
share/apps/koffice/autocorrect/fr.xml
+share/doc/HTML/fr/calligra/common
+share/doc/HTML/fr/calligra/index.cache.bz2
+share/doc/HTML/fr/calligra/index.docbook
share/doc/HTML/fr/sheets/advanced.docbook
share/doc/HTML/fr/sheets/basics.docbook
share/doc/HTML/fr/sheets/cellformat0.png
@@ -22,6 +25,35 @@ share/doc/HTML/fr/sheets/shortcut2.png
share/doc/HTML/fr/sheets/shortcut3.png
share/doc/HTML/fr/sheets/sort1.png
share/doc/HTML/fr/sheets/starting1.png
+share/doc/HTML/fr/stage/barstyle1.png
+share/doc/HTML/fr/stage/common
+share/doc/HTML/fr/stage/configure-document.png
+share/doc/HTML/fr/stage/configure-grid.png
+share/doc/HTML/fr/stage/configure-misc.png
+share/doc/HTML/fr/stage/great-presentations.docbook
+share/doc/HTML/fr/stage/guides.docbook
+share/doc/HTML/fr/stage/htmlshow3.png
+share/doc/HTML/fr/stage/htmlshow9.png
+share/doc/HTML/fr/stage/index.cache.bz2
+share/doc/HTML/fr/stage/index.docbook
+share/doc/HTML/fr/stage/menus.docbook
+share/doc/HTML/fr/stage/options.docbook
+share/doc/HTML/fr/stage/settings03.png
+share/doc/HTML/fr/stage/settings04.png
+share/doc/HTML/fr/stage/template03.png
+share/doc/HTML/fr/stage/template04.png
+share/doc/HTML/fr/stage/tut01.png
+share/doc/HTML/fr/stage/tut03.png
+share/doc/HTML/fr/stage/tut04.png
+share/doc/HTML/fr/stage/tut07.png
+share/doc/HTML/fr/stage/tut09.png
+share/doc/HTML/fr/stage/tut10.png
+share/doc/HTML/fr/stage/tut13.png
+share/doc/HTML/fr/stage/tut19.png
+share/doc/HTML/fr/stage/tut21.png
+share/doc/HTML/fr/stage/tut25.png
+share/doc/HTML/fr/stage/tut26.png
+share/doc/HTML/fr/stage/tutorial.docbook
share/locale/fr/LC_MESSAGES/ArtisticTextShape.mo
share/locale/fr/LC_MESSAGES/AutocorrectPlugin.mo
share/locale/fr/LC_MESSAGES/CalendarTool.mo
@@ -77,6 +109,8 @@ share/locale/fr/LC_MESSAGES/stage.mo
share/locale/fr/LC_MESSAGES/tablessolver.mo
share/locale/fr/LC_MESSAGES/thesaurus_tool.mo
share/locale/fr/LC_MESSAGES/words.mo
+@dirrm share/doc/HTML/fr/stage
@dirrm share/doc/HTML/fr/sheets
+@dirrm share/doc/HTML/fr/calligra
@dirrmtry share/apps/koffice/autocorrect
@dirrmtry share/apps/koffice
diff --git a/german/calligra-l10n/Makefile b/german/calligra-l10n/Makefile
index 06e5e89d2443..91d02e686f33 100644
--- a/german/calligra-l10n/Makefile
+++ b/german/calligra-l10n/Makefile
@@ -2,7 +2,7 @@
PORTNAME= calligra-l10n
PORTVERSION= ${CALLIGRA_VERSION}
-CATEGORIES?= german editors kde
+CATEGORIES= german editors kde
MAINTAINER= kde@FreeBSD.org
COMMENT= German messages and documentation for Calligra
diff --git a/german/calligra-l10n/distinfo b/german/calligra-l10n/distinfo
index 8f1002166101..c328b7137ee6 100644
--- a/german/calligra-l10n/distinfo
+++ b/german/calligra-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-de-2.5.2.tar.bz2) = b449ee5c2f275f83c32901dcdc805979db467cda2ecc898e834e16f50f64b277
-SIZE (KDE/calligra-l10n/calligra-l10n-de-2.5.2.tar.bz2) = 684546
+SHA256 (KDE/calligra-l10n/calligra-l10n-de-2.5.5.tar.bz2) = c0e8c9d723b3000ca74528e554488def6c1cbcbc6c378a61a008f40415d8c4b4
+SIZE (KDE/calligra-l10n/calligra-l10n-de-2.5.5.tar.bz2) = 684375
diff --git a/hungarian/calligra-l10n/Makefile b/hungarian/calligra-l10n/Makefile
index fe2f50417313..4b536ed489d6 100644
--- a/hungarian/calligra-l10n/Makefile
+++ b/hungarian/calligra-l10n/Makefile
@@ -2,7 +2,7 @@
PORTNAME= calligra-l10n
PORTVERSION= ${CALLIGRA_VERSION}
-CATEGORIES?= hungarian editors kde
+CATEGORIES= hungarian editors kde
MAINTAINER= kde@FreeBSD.org
COMMENT= Hungarian messages and documentation for Calligra
diff --git a/hungarian/calligra-l10n/distinfo b/hungarian/calligra-l10n/distinfo
index 9943fd6f5a71..987f98a97ce6 100644
--- a/hungarian/calligra-l10n/distinfo
+++ b/hungarian/calligra-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-hu-2.5.2.tar.bz2) = 5f0d1bb596ecec8e0774f25af5ea7e23d91de441105f348f428d18df3baea3cf
-SIZE (KDE/calligra-l10n/calligra-l10n-hu-2.5.2.tar.bz2) = 413637
+SHA256 (KDE/calligra-l10n/calligra-l10n-hu-2.5.5.tar.bz2) = c816bbd7bd36ada108848974887064ec738eac1decae8d088b6f3423fe599a9b
+SIZE (KDE/calligra-l10n/calligra-l10n-hu-2.5.5.tar.bz2) = 416151
diff --git a/japanese/calligra-l10n/Makefile b/japanese/calligra-l10n/Makefile
index 267ecd6b70a8..4cd57c203b9e 100644
--- a/japanese/calligra-l10n/Makefile
+++ b/japanese/calligra-l10n/Makefile
@@ -2,7 +2,7 @@
PORTNAME= calligra-l10n
PORTVERSION= ${CALLIGRA_VERSION}
-CATEGORIES?= japanese editors kde
+CATEGORIES= japanese editors kde
MAINTAINER= kde@FreeBSD.org
COMMENT= Japanese messages and documentation for Calligra
diff --git a/japanese/calligra-l10n/distinfo b/japanese/calligra-l10n/distinfo
index ddc2784ce15f..c770022dcea4 100644
--- a/japanese/calligra-l10n/distinfo
+++ b/japanese/calligra-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-ja-2.5.2.tar.bz2) = 793b22b26a86f3931644bc0fe87b4c8089fb3b549af07c30a9df5ec70ddbb193
-SIZE (KDE/calligra-l10n/calligra-l10n-ja-2.5.2.tar.bz2) = 309399
+SHA256 (KDE/calligra-l10n/calligra-l10n-ja-2.5.5.tar.bz2) = ec57d8a5cc857b6fe8411572d7cd755adb1849759912742c82850b3dde01022f
+SIZE (KDE/calligra-l10n/calligra-l10n-ja-2.5.5.tar.bz2) = 308478
diff --git a/polish/calligra-l10n/Makefile b/polish/calligra-l10n/Makefile
index fc7366182827..7887b59d8227 100644
--- a/polish/calligra-l10n/Makefile
+++ b/polish/calligra-l10n/Makefile
@@ -2,7 +2,7 @@
PORTNAME= calligra-l10n
PORTVERSION= ${CALLIGRA_VERSION}
-CATEGORIES?= polish editors kde
+CATEGORIES= polish editors kde
MAINTAINER= kde@FreeBSD.org
COMMENT= Polish messages and documentation for Calligra
diff --git a/polish/calligra-l10n/distinfo b/polish/calligra-l10n/distinfo
index ba56e737ed88..0443d851bd20 100644
--- a/polish/calligra-l10n/distinfo
+++ b/polish/calligra-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-pl-2.5.2.tar.bz2) = 3dc622fedb8017cd251c5ec975e1539dad3145888040e409dc6e43a95ba78216
-SIZE (KDE/calligra-l10n/calligra-l10n-pl-2.5.2.tar.bz2) = 407137
+SHA256 (KDE/calligra-l10n/calligra-l10n-pl-2.5.5.tar.bz2) = 64fcc0a4e93b3bfa560b60daa7376e798a79b8fe6b7de7601b771f0e63d9b36e
+SIZE (KDE/calligra-l10n/calligra-l10n-pl-2.5.5.tar.bz2) = 408909
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
diff --git a/russian/calligra-l10n/Makefile b/russian/calligra-l10n/Makefile
index 23425a71db40..75fa31b407d6 100644
--- a/russian/calligra-l10n/Makefile
+++ b/russian/calligra-l10n/Makefile
@@ -2,7 +2,7 @@
PORTNAME= calligra-l10n
PORTVERSION= ${CALLIGRA_VERSION}
-CATEGORIES?= russian editors kde
+CATEGORIES= russian editors kde
MAINTAINER= kde@FreeBSD.org
COMMENT= Russian messages and documentation for Calligra
diff --git a/russian/calligra-l10n/distinfo b/russian/calligra-l10n/distinfo
index 9d3dd63b1193..8b34072e6eab 100644
--- a/russian/calligra-l10n/distinfo
+++ b/russian/calligra-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-ru-2.5.2.tar.bz2) = ae0a9cc694f072bc24021b345531de3cfeb41bf6335ffd79111d9b30c7a51856
-SIZE (KDE/calligra-l10n/calligra-l10n-ru-2.5.2.tar.bz2) = 561100
+SHA256 (KDE/calligra-l10n/calligra-l10n-ru-2.5.5.tar.bz2) = 45d7b8af2989688cb4713366f898c871912a0e536a011be6dbcc37dc02def72c
+SIZE (KDE/calligra-l10n/calligra-l10n-ru-2.5.5.tar.bz2) = 559990
diff --git a/russian/calligra-l10n/pkg-plist b/russian/calligra-l10n/pkg-plist
index 640ebc06140e..dcb90138ac61 100644
--- a/russian/calligra-l10n/pkg-plist
+++ b/russian/calligra-l10n/pkg-plist
@@ -14,9 +14,6 @@ share/doc/HTML/ru/sheets/format.docbook
share/doc/HTML/ru/sheets/importexport.docbook
share/doc/HTML/ru/sheets/index.cache.bz2
share/doc/HTML/ru/sheets/index.docbook
-share/doc/HTML/ru/thesaurus/common
-share/doc/HTML/ru/thesaurus/index.cache.bz2
-share/doc/HTML/ru/thesaurus/index.docbook
share/locale/ru/LC_MESSAGES/ArtisticTextShape.mo
share/locale/ru/LC_MESSAGES/AutocorrectPlugin.mo
share/locale/ru/LC_MESSAGES/CalendarTool.mo
@@ -71,7 +68,6 @@ share/locale/ru/LC_MESSAGES/stage.mo
share/locale/ru/LC_MESSAGES/tablessolver.mo
share/locale/ru/LC_MESSAGES/thesaurus_tool.mo
share/locale/ru/LC_MESSAGES/words.mo
-@dirrm share/doc/HTML/ru/thesaurus
@dirrm share/doc/HTML/ru/sheets
@dirrm share/doc/HTML/ru/calligra
@dirrmtry share/apps/calligra/autocorrect
diff --git a/ukrainian/calligra-l10n/Makefile b/ukrainian/calligra-l10n/Makefile
index e369dabe7b14..7d641ae02893 100644
--- a/ukrainian/calligra-l10n/Makefile
+++ b/ukrainian/calligra-l10n/Makefile
@@ -2,7 +2,7 @@
PORTNAME= calligra-l10n
PORTVERSION= ${CALLIGRA_VERSION}
-CATEGORIES?= ukrainian editors kde
+CATEGORIES= ukrainian editors kde
MAINTAINER= kde@FreeBSD.org
COMMENT= Ukrainian messages and documentation for Calligra
diff --git a/ukrainian/calligra-l10n/distinfo b/ukrainian/calligra-l10n/distinfo
index b49b88d5e158..2c6de171c977 100644
--- a/ukrainian/calligra-l10n/distinfo
+++ b/ukrainian/calligra-l10n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/calligra-l10n/calligra-l10n-uk-2.5.2.tar.bz2) = 993c5fbdc63521318e100e63ea5ac5e1d01b9612b1b4f11695796161a9b1b95b
-SIZE (KDE/calligra-l10n/calligra-l10n-uk-2.5.2.tar.bz2) = 2101633
+SHA256 (KDE/calligra-l10n/calligra-l10n-uk-2.5.5.tar.bz2) = 80af02abcac365e97f7817e82463b37ecd8f19ed166aaa4eda095e3b6712ac9b
+SIZE (KDE/calligra-l10n/calligra-l10n-uk-2.5.5.tar.bz2) = 2103370