KDE/FreeBSD team presents KDE SC 4.9.5 ports!

- kdebindings ports have been renamed to match upstream.
- kdemultimedia and kdenetwork have been split.
- New port games/pairs added.
- Trim Makefile header
- Convert to new option framework
- New USE_KDE4 components: libkcddb, libkcompactdisc
- Update:
	databases/akonadi to 1.9.0
	devel/grantlee to 0.3.0
	textproc/rasqal to 0.9.30
	textproc/redland-bindings to 1.0.16.1
	textproc/soprano to 2.9.0
	x11-toolkits/attica to 0.4.1

The area51 repository features commits by Schaich Alonso, avilla, dbn,
jhale, makc and rakuco.

Contributors:
- Oleg Sidorkin
- Tobias Berner
- Kurt Jaeger

2 files changed, 81 insertions, 14 deletions

diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile
index 7b89217e2c6b..a92ff5037449 100644
--- a/misc/kde4-l10n/Makefile
+++ b/misc/kde4-l10n/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	kde4-l10n
-# Date created:				21 July 2008
-# Whom:					Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	kde-l10n
 PORTVERSION=	${KDE4_VERSION}
@@ -19,7 +15,7 @@ NO_BUILD=	yes
 USE_KDE4=	kdeprefix
 
 KDE4_LANG_ALL=	ar bg bs ca ca@valencia cs da de el en_GB es et eu fa \
-		fi fr ga gl he hr hu ia id is it ja kk km ko lt lv nb nds \
+		fi fr ga gl he hi hr hu ia is it ja kk km ko lt lv nb nds \
 		nl nn pa pl pt pt_BR ro ru si sk sl sr sv tg th tr ug uk \
 		vi wa zh_CN zh_TW
 
@@ -41,23 +37,32 @@ zh_CN_PORT=	chinese/kde4-l10n-zh_CN
 zh_TW_PORT=	chinese/kde4-l10n-zh_TW
 
 .include <${.CURDIR}/files/kde4-lang-names>
+# kde4-lang-names is encoded in UTF, override with plain ASCII:
 nb_NAME=	Norwegian Bokmal
 
-OPTIONS=	ALL "All localizations" on
+OPTIONS_DEFINE=	ALL ${LANG_OPT_ALL}
+OPTIONS_DEFAULT=	ALL
+
+ALL_DESC=	All localizations
+
 .for lang in ${KDE4_LANG_ALL}
 ${lang}_DETECT?=	${KDE4_PREFIX}/share/locale/${lang}/entry.desktop
 ${lang}_PORT?=		misc/kde4-l10n-${lang}
 ${lang}_NAME?=		${lang}
-${lang}_OPTION=		${lang:S/@/_/}
-OPTIONS+=	${${lang}_OPTION} "${${lang}_NAME} localization" off
+
+${lang}_OPT=		${lang:S/@/_/}
+LANG_OPT_ALL+=		${${lang}_OPT}
+${${lang}_OPT}_DESC=	${${lang}_NAME} localization
+
+${${lang}_OPT}_DEP=	${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT}
 .endfor
 
 .include <bsd.port.options.mk>
 
-.for lang in ${KDE4_LANG_ALL}
-.if defined(WITH_ALL) || defined(WITH_${${lang}_OPTION})
-RUN_DEPENDS+=	${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT}
-.endif
+.for opt in ${LANG_OPT_ALL}
+. if ${PORT_OPTIONS:M${opt}} || ${PORT_OPTIONS:MALL}
+RUN_DEPENDS+=	${${opt}_DEP}
+. endif
 .endfor
 
 do-install:
diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk
index e0e63e695df2..720254d1af9c 100644
--- a/misc/kde4-l10n/files/bsd.l10n.mk
+++ b/misc/kde4-l10n/files/bsd.l10n.mk
@@ -1,4 +1,3 @@
-.if defined(KDE4_L10N)
 MASTER_SITES?=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR?=	${KDE4_BRANCH}/${PORTVERSION}/src/kde-l10n/
 PKGNAMEPREFIX=	${KDE4_L10N:S/@/_/}-
@@ -13,4 +12,67 @@ USE_CMAKE=	yes
 
 MAKE_JOBS_SAFE=	yes
 
+# Support for spelling dictionaries
+
+${KDE4_L10N}_CATEGORY?=	textproc
+ar_CATEGORY=	arabic
+de_CATEGORY=	german
+fr_CATEGORY=	french
+he_CATEGORY=	hebrew
+hu_CATEGORY=	hungarian
+ko_CATEGORY=	korean
+pl_CATEGORY=	polish
+pt_BR_CATEGORY=	portuguese
+pt_CATEGORY=	portuguese
+ru_CATEGORY=	russian
+uk_CATEGORY=	ukrainian
+vi_CATEGORY=	vietnamese
+
+ca@valencia_aspell_PORT_PREFIX=		ca-
+ca@valencia_aspell_DETECT_PREFIX=	ca-
+
+pt_BR_aspell_PORT_SUFFIX=	-pt_BR
+pt_BR_hunspell_DETECT_PREFIX=	pt-
+
+pt_aspell_PORT_SUFFIX=		-pt_PT
+pt_aspell_DETECT_PREFIX=	pt_PT-
+
+.for i in ar de fr he hu ko pl pt_BR pt ru uk vi
+${i}_aspell_PORT_PREFIX=	#
+${i}_hunspell_PORT_PREFIX=	#
+.endfor
+
+.for i in aspell hunspell
+${KDE4_L10N}_${i}_DETECT_PREFIX?=	${KDE4_L10N}-
+${KDE4_L10N}_${i}_DETECT_SUFFIX?=	#
+${KDE4_L10N}_${i}_DETECT?=	${${KDE4_L10N}_${i}_DETECT_PREFIX}${i}${${KDE4_L10N}_${i}_DETECT_SUFFIX}>=0
+
+${KDE4_L10N}_${i}_PORT_PREFIX?=	${KDE4_L10N}-
+${KDE4_L10N}_${i}_PORT_SUFFIX?=	#
+${KDE4_L10N}_${i}_PORT?=	${${KDE4_L10N}_CATEGORY}/${${KDE4_L10N}_${i}_PORT_PREFIX}${i}${${KDE4_L10N}_${i}_PORT_SUFFIX}
+.endfor
+
+.include <bsd.port.pre.mk>
+
+OPTIONS_DEFINE=		#
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+
+.if exists(${PORTSDIR}/${${KDE4_L10N}_aspell_PORT}/Makefile)
+OPTIONS_DEFINE+=	ASPELL
+ASPELL_DESC=		Install aspell dictionary
+.endif
+
+.if exists(${PORTSDIR}/${${KDE4_L10N}_hunspell_PORT}/Makefile)
+OPTIONS_DEFINE+=	HUNSPELL
+HUNSPELL_DESC=		Install hunspell dictionary
+.endif
+
+.include <bsd.port.options.mk>
+
+.if ${OPTIONS_DEFINE:MASPELL} && ${PORT_OPTIONS:MASPELL}
+RUN_DEPENDS+=	${${KDE4_L10N}_aspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_aspell_PORT}
+.endif
+
+.if ${OPTIONS_DEFINE:MHUNSPELL} && ${PORT_OPTIONS:MHUNSPELL}
+RUN_DEPENDS+=	${${KDE4_L10N}_hunspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_hunspell_PORT}
 .endif