3 files changed, 13 insertions, 10 deletions

diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index 346636894e07..9c305a478c6b 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -8,14 +8,13 @@
 
 PORTNAME?=	kde
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
-MAINTAINER?=	kde@FreeBSD.org
-COMMENT?=	The "meta-port" for KDE
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	The "meta-port" for KDE
 
 # This port conflicts with the kde-lite port, so make it known.
 .if defined(IS_INTERACTIVE)
@@ -34,9 +33,9 @@ CONFIG_FILE=	${LOCALBASE}/etc/kde-meta.conf
 ## The list of all modules that make up KDE, excluding the base modules
 ## arts, kdebase and kdelibs
 
-ALL_MODULES=	KDEADDONS KDEADMIN KDEARTWORK KDEVELOP KDEEDU KDEGAMES \
-		KDEGRAPHICS KDEMULTIMEDIA KDENETWORK KOFFICE KDEPIM KDESDK \
-		KDETOYS KDEUTILS QUANTA
+ALL_MODULES=	KDEACCESSIBILITY KDEADDONS KDEADMIN KDEARTWORK KDEVELOP KDEEDU\
+		KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK KOFFICE KDEPIM\
+		KDESDK KDETOYS KDEUTILS QUANTA
 
 ## Forwards parts of the environment to scripts/configure.kde3
 
@@ -153,6 +152,9 @@ RUN_DEPENDS+=	kmoon:${PORTSDIR}/x11-clocks/kdetoys3
 .if !defined(WITHOUT_KDEARTWORK)
 RUN_DEPENDS+=	kmatrix.kss:${PORTSDIR}/x11-wm/kdeartwork3
 .endif
+.if !defined(WITHOUT_KDEACCESSIBILITY)
+RUN_DEPENDS+=	kmag:${PORTSDIR}/accessibility/kdeaccessibility
+.endif
 
 .if make(package)
 DEPENDS_TARGET="package"
diff --git a/x11/kde3/Makefile.kde b/x11/kde3/Makefile.kde
index 85bdc20e1112..1950b4f548d9 100644
--- a/x11/kde3/Makefile.kde
+++ b/x11/kde3/Makefile.kde
@@ -19,7 +19,7 @@ DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION}
 # Since KDE 3.1.3, the kde-i18n tarballs have the ${KDE_VERSION}
 # as part of the name of their toplevel directory, while the
 # koffice-i18n ones have not, so we need to take care of that.
-.if ${PORTNAME}==koffice-i18n
+.if ${PORTNAME}==koffice-i18n && ${PORTVERSION}=="1.2.1"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PKGNAMEPREFIX:S/-$//}
 .endif
 DIST_SUBDIR=	KDE/kde-i18n
diff --git a/x11/kde3/scripts/configure.kde3 b/x11/kde3/scripts/configure.kde3
index d7a418ba9cdf..bb2f49bf41c0 100644
--- a/x11/kde3/scripts/configure.kde3
+++ b/x11/kde3/scripts/configure.kde3
@@ -67,7 +67,8 @@ if [ -z "${BATCH}" ]; then
 	--checklist "\n\
 Please select what additional KDE modules you would like to install.\n\n" \
 -1 -1 15 \
-"KDEADDONS"     "Additional plugins and scripts for some KDE applications" "$status_kdeaddons" \
+"KDEACCESS."    "Accessibility applications for KDE" "$status_kdeaccessibility" \
+"KDEADDONS"     "Additional plugins and scripts for some applications" "$status_kdeaddons" \
 "KDEADMIN"      "KDE applications related to system administration" "$status_kdeadmin" \
 "KDEARTWORK"    "Additional themes, sounds, wallpapers and window styles" "$status_kdeartwork" \
 "KDEVELOP"      "Powerful IDE for developing KDE/Qt-based applications" "$status_kdevelop" \
@@ -75,9 +76,9 @@ Please select what additional KDE modules you would like to install.\n\n" \
 "KDEGAMES"      "Games like kolf, patience, atlantik, etc" "$status_kdegames" \
 "KDEGRAPHICS"   "Graphics utilities like kview, kpaint, kghostview, etc" "$status_kdegraphics" \
 "KDEMULTIMEDIA" "Multimedia utilities like noatun, kmix, etc" "$status_kdemultimedia" \
-"KDENETWORK"    "Network-related programs like kmail, knode, kppp, etc" "$status_kdenetwork" \
+"KDENETWORK"    "Network-related programs like kopete, kppp, etc" "$status_kdenetwork" \
 "KOFFICE"       "Office Suite including wordprocessor, spreadsheet, etc" "$status_koffice" \
-"KDEPIM"        "Personal Information Management" "$status_kdepim" \
+"KDEPIM"        "Personal Information Management: Mail, News, Calendar" "$status_kdepim" \
 "KDESDK"        "KDE software development kit" "$status_kdesdk" \
 "KDETOYS"       "Miscellaneous small applications" "$status_kdetoys" \
 "KDEUTILS"      "Utilities like kcalc, kcharselect, ark, kedit, etc" "$status_kdeutils" \