KDE/FreeBSD team presents KDE SC 4.10.1 ports!

- kdegames4 port has been split.
- kdeutils4-printer-applet and system-config-printer-kde have been
  replaced by print/kde4-print-manager.
- Recover misc/kde4-l10n-mr from attic.
- New USE_KDE4 components: kactivities, libkdegames, nepomuk-core,
  and nepomuk-widgets.
- Provide sharedmime component with magic: ports don't need to
  run update-mime-database themselves now.
- Switch some ports to out-of-source build.
- Update port comments.
- Adjust dependence on Qt4 components.
- x11/kde4 installs modern kdepim4 now.
- Remove redundant aspell and hspell from kdelibs4, both
  can be enabled in textproc/enchant if needed.
- Remove stale bits from bsd.kde4.mk

The area51 repository features commits by Schaich Alonso and myself.

Contributors:
- Tobias Berner

17 files changed, 61 insertions, 190 deletions

diff --git a/print/Makefile b/print/Makefile
index 62d92e704da4..64db1d05bd9c 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -115,8 +115,8 @@
     SUBDIR += jabref
     SUBDIR += jadetex
     SUBDIR += kcdlabel
+    SUBDIR += kde4-print-manager
     SUBDIR += kde_poster
-    SUBDIR += kdeutils4-printer-applet
     SUBDIR += kover
     SUBDIR += kpdftool
     SUBDIR += latex
@@ -279,7 +279,6 @@
     SUBDIR += splix
     SUBDIR += sv-acroread8
     SUBDIR += system-config-printer
-    SUBDIR += system-config-printer-kde
     SUBDIR += t1utils
     SUBDIR += teTeX
     SUBDIR += teTeX-base
diff --git a/print/kde4-print-manager/Makefile b/print/kde4-print-manager/Makefile
new file mode 100644
index 000000000000..9eb536215167
--- /dev/null
+++ b/print/kde4-print-manager/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME=	print-manager
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	print kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE/${PORTVERSION}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Printer manager for KDE 4
+
+LIB_DEPENDS=    cups.2:${PORTSDIR}/print/cups-client
+
+USES=		cmake:outsource
+USE_KDE4=	kdehier kdelibs kdeprefix automoc4
+USE_QT4=	network qmake_build moc_build uic_build rcc_build
+USE_XZ=		yes
+MAKE_JOBS_SAFE=	yes
+
+.include <bsd.port.mk>
diff --git a/print/kde4-print-manager/distinfo b/print/kde4-print-manager/distinfo
new file mode 100644
index 000000000000..ec7048c5ede1
--- /dev/null
+++ b/print/kde4-print-manager/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/4.10.1/print-manager-4.10.1.tar.xz) = 94d0816eb2403231729a6522229850d383abd075074dfaf3487fb93d6ffab057
+SIZE (KDE/4.10.1/print-manager-4.10.1.tar.xz) = 92428
diff --git a/print/kde4-print-manager/pkg-descr b/print/kde4-print-manager/pkg-descr
new file mode 100644
index 000000000000..e048367d4f71
--- /dev/null
+++ b/print/kde4-print-manager/pkg-descr
@@ -0,0 +1,5 @@
+printer-manager is a configuration module for printers. It
+replaces KDE 3's kjobviewer and kprint-applet of previous
+KDE 4 versions.
+
+WWW:	http://www.kde.org
diff --git a/print/kde4-print-manager/pkg-plist b/print/kde4-print-manager/pkg-plist
new file mode 100644
index 000000000000..09780645f8c4
--- /dev/null
+++ b/print/kde4-print-manager/pkg-plist
@@ -0,0 +1,32 @@
+lib/kde4/kcm_printer_manager.so
+lib/kde4/kded_printmanager.so
+lib/kde4/libexec/add-printer
+lib/kde4/libexec/configure-printer
+lib/kde4/libexec/print-queue
+lib/kde4/plasma_engine_printers.so
+lib/kde4/plasma_engine_printjobs.so
+lib/libkcupslib.so
+share/apps/plasma/plasmoids/printmanager/contents/config/main.xml
+share/apps/plasma/plasmoids/printmanager/contents/ui/JobItem.qml
+share/apps/plasma/plasmoids/printmanager/contents/ui/PrinterItem.qml
+share/apps/plasma/plasmoids/printmanager/contents/ui/ScrollableListView.qml
+share/apps/plasma/plasmoids/printmanager/contents/ui/config.ui
+share/apps/plasma/plasmoids/printmanager/contents/ui/printmanager.qml
+share/apps/plasma/plasmoids/printmanager/metadata.desktop
+share/apps/plasma/services/org.kde.printers.operations
+share/apps/plasma/services/org.kde.printjobs.operations
+share/apps/printmanager/printmanager.notifyrc
+share/dbus-1/services/org.kde.AddPrinter.service
+share/dbus-1/services/org.kde.ConfigurePrinter.service
+share/dbus-1/services/org.kde.PrintQueue.service
+share/kde4/services/kcm_printer_manager.desktop
+share/kde4/services/kded/printmanager.desktop
+share/kde4/services/plasma-applet-printmanager.desktop
+share/kde4/services/plasma-engine-printers.desktop
+share/kde4/services/plasma-engine-printjobs.desktop
+@dirrm share/apps/printmanager
+@dirrm share/apps/plasma/plasmoids/printmanager/contents/ui
+@dirrm share/apps/plasma/plasmoids/printmanager/contents/config
+@dirrm share/apps/plasma/plasmoids/printmanager/contents
+@dirrm share/apps/plasma/plasmoids/printmanager
+@dirrmtry share/apps/plasma/plasmoids
diff --git a/print/kdeutils4-printer-applet/Makefile b/print/kdeutils4-printer-applet/Makefile
deleted file mode 100644
index e0a4e094fcbb..000000000000
--- a/print/kdeutils4-printer-applet/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	printer-applet
-PORTVERSION=	${KDE4_VERSION}
-CATEGORIES=	print kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-PKGNAMEPREFIX=	kdeutils-
-DIST_SUBDIR=	KDE
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Printer system tray utility for KDE4
-
-RUN_DEPENDS=	system-config-printer:${PORTSDIR}/print/system-config-printer \
-		${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups
-
-USE_KDE4=	kdehier kdelibs kdeprefix pykde4 pykdeuic4 automoc4
-USE_PYTHON=	2.5+
-USE_QT4=	qmake_build moc_build uic_build rcc_build
-USE_XZ=	yes
-USES=		cmake
-CMAKE_ARGS+=	-DINSTALL_PRINTER_APPLET:BOOL=ON
-
-post-patch:
-	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
-		printer-applet-printers.ui \
-		printer-applet.py \
-		cmake-modules/FindSystemConfigPrinter.py
-
-.include <bsd.port.mk>
diff --git a/print/kdeutils4-printer-applet/distinfo b/print/kdeutils4-printer-applet/distinfo
deleted file mode 100644
index 8eef8c475d61..000000000000
--- a/print/kdeutils4-printer-applet/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/printer-applet-4.9.5.tar.xz) = 6c7df63a98e7dc6100f1d8d1b0a4923879f5772d9e02da943df93659c7fb7f50
-SIZE (KDE/printer-applet-4.9.5.tar.xz) = 36556
diff --git a/print/kdeutils4-printer-applet/files/patch-printer-applet__cmake-modules__FindSystemConfigPrinter.py b/print/kdeutils4-printer-applet/files/patch-printer-applet__cmake-modules__FindSystemConfigPrinter.py
deleted file mode 100644
index 6b15b381df33..000000000000
--- a/print/kdeutils4-printer-applet/files/patch-printer-applet__cmake-modules__FindSystemConfigPrinter.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake-modules/FindSystemConfigPrinter.py.orig	2008-09-13 12:13:57.000000000 +0400
-+++ cmake-modules/FindSystemConfigPrinter.py	2009-05-04 21:27:40.000000000 +0400
-@@ -4,7 +4,7 @@
- 
- import sys
- 
--SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
-+SYSTEM_CONFIG_PRINTER_DIR = "%%LOCALBASE%%/share/system-config-printer"
- sys.path.append (SYSTEM_CONFIG_PRINTER_DIR)
- 
- try:
diff --git a/print/kdeutils4-printer-applet/files/patch-printer-applet__printer-applet-printers.ui b/print/kdeutils4-printer-applet/files/patch-printer-applet__printer-applet-printers.ui
deleted file mode 100644
index 33579e858393..000000000000
--- a/print/kdeutils4-printer-applet/files/patch-printer-applet__printer-applet-printers.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- printer-applet-printers.ui.orig	2008-05-07 13:05:17.000000000 +0400
-+++ printer-applet-printers.ui	2009-05-04 21:25:51.000000000 +0400
-@@ -13,7 +13,7 @@
-    <string>Printer Status</string>
-   </property>
-   <property name="windowIcon" >
--   <iconset>/usr/share/system-config-printer/printer-128.png</iconset>
-+   <iconset>%%LOCALBASE%%/share/system-config-printer/printer-128.png</iconset>
-   </property>
-   <layout class="QGridLayout" >
-    <property name="leftMargin" >
diff --git a/print/kdeutils4-printer-applet/pkg-descr b/print/kdeutils4-printer-applet/pkg-descr
deleted file mode 100644
index 69193f500798..000000000000
--- a/print/kdeutils4-printer-applet/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-printer-applet is a system tray utility. It shows current print jobs,
-shows printer warnings and errors and shows when printers that have
-been plugged in for the first time are being auto-configured by
-hal-cups-utils.
-
-It replaces kjobviewer in KDE 3.
-
-WWW:	http://www.kde.org
diff --git a/print/kdeutils4-printer-applet/pkg-plist b/print/kdeutils4-printer-applet/pkg-plist
deleted file mode 100644
index 063db8bc87c5..000000000000
--- a/print/kdeutils4-printer-applet/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-bin/printer-applet
-share/apps/printer-applet/authconn.py
-share/apps/printer-applet/debug.py
-share/apps/printer-applet/monitor.py
-share/apps/printer-applet/printer-applet-printers.ui
-share/apps/printer-applet/printer-applet.notifyrc
-share/apps/printer-applet/printer-applet.py
-share/apps/printer-applet/printer-applet.ui
-share/apps/printer-applet/printer-appletui.rc
-share/apps/printer-applet/statereason.py
-share/autostart/printer-applet.desktop
-share/doc/HTML/en/printer-applet/common
-share/doc/HTML/en/printer-applet/index.cache.bz2
-share/doc/HTML/en/printer-applet/index.docbook
-@dirrm share/doc/HTML/en/printer-applet
-@dirrm share/apps/printer-applet
diff --git a/print/system-config-printer-kde/Makefile b/print/system-config-printer-kde/Makefile
deleted file mode 100644
index eb10140dfa45..000000000000
--- a/print/system-config-printer-kde/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	system-config-printer-kde
-PORTVERSION=	${KDE4_VERSION}
-CATEGORIES=	print kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DISTNAME=	kdeadmin-${PORTVERSION}
-DIST_SUBDIR=	KDE
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	KDE4 frontend for system-config-printer
-
-RUN_DEPENDS=	system-config-printer:${PORTSDIR}/print/system-config-printer \
-		${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \
-		cupsd:${PORTSDIR}/print/cups-base
-
-USE_KDE4=	kdehier kdelibs kdeprefix pykde4 pykdeuic4 automoc4
-USE_PYTHON=	2.5+
-USE_QT4=	qmake_build moc_build uic_build rcc_build
-DISTINFO_FILE=	${PORTSDIR}/sysutils/kdeadmin4/distinfo
-USE_XZ=	yes
-USES=		cmake
-CMAKE_ARGS+=	-DINSTALL_SYSTEM_CONFIG_PRINTER:BOOL=ON \
-		-DBUILD_kuser:BOOL=OFF # Avoid checking for kdepimlibs.
-
-BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-
-post-patch:
-	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
-		system-config-printer-kde.py \
-		cmake-modules/FindSystemConfigPrinter.py
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/print/system-config-printer-kde/files/patch-system-config-printer-kde__cmake-modules__FindSystemConfigPrinter.py b/print/system-config-printer-kde/files/patch-system-config-printer-kde__cmake-modules__FindSystemConfigPrinter.py
deleted file mode 100644
index cd6028d9f0c2..000000000000
--- a/print/system-config-printer-kde/files/patch-system-config-printer-kde__cmake-modules__FindSystemConfigPrinter.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py.orig	2008-09-13 12:16:28.000000000 +0400
-+++ ./system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py	2009-05-04 22:46:32.000000000 +0400
-@@ -4,7 +4,7 @@
- 
- import sys
- 
--SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
-+SYSTEM_CONFIG_PRINTER_DIR = "%%LOCALBASE%%/share/system-config-printer"
- sys.path.append (SYSTEM_CONFIG_PRINTER_DIR)
- 
- try:
diff --git a/print/system-config-printer-kde/files/patch-system-config-printer-kde__system-config-printer-kde.py b/print/system-config-printer-kde/files/patch-system-config-printer-kde__system-config-printer-kde.py
deleted file mode 100644
index 216bbe4f4bdb..000000000000
--- a/print/system-config-printer-kde/files/patch-system-config-printer-kde__system-config-printer-kde.py
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./system-config-printer-kde/system-config-printer-kde.py.orig	2008-12-21 23:20:45.000000000 +0300
-+++ ./system-config-printer-kde/system-config-printer-kde.py	2009-05-04 22:50:28.000000000 +0400
-@@ -33,7 +33,7 @@
- import thread
- 
- #load modules from system-config-printer-common (debug, smburi), change path here if you have it installed elsewhere
--SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
-+SYSTEM_CONFIG_PRINTER_DIR = "%%LOCALBASE%%/share/system-config-printer"
- if os.path.exists(SYSTEM_CONFIG_PRINTER_DIR + "/debug.py"):
-     sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
- 
-@@ -2265,7 +2265,7 @@
-         # Try to get make and model via SNMP
-         if host:
-             os.environ["HOST"] = host
--            cmd = '/usr/lib/cups/backend/snmp "${HOST}"'
-+            cmd = '%%LOCALBASE%%/libexec/cups/backend/snmp "${HOST}"'
-             debugprint (host + ": " + cmd)
-             stdout = None
-             try:
-@@ -2920,7 +2920,7 @@
-                 os.environ["PPD"] = filename
-                 # We want this to be in the current natural language,
-                 # so we intentionally don't set LC_ALL=C here.
--                p = os.popen ('/usr/bin/cupstestppd -rvv "$PPD"', 'r')
-+                p = os.popen ('%%LOCALBASE%%/bin/cupstestppd -rvv "$PPD"', 'r')
-                 output = p.readlines ()
-                 p.close ()
-                 err += reduce (lambda x, y: x + y, output)
-@@ -3168,7 +3168,7 @@
-         (pkgs, exes) = cupshelpers.missingPackagesAndExecutables (ppd)
-         if len (pkgs) > 0 or len (exes) > 0:
-             # We didn't find a necessary executable.  Complain.
--            install = "/usr/bin/system-install-packages"
-+            install = "/usr/bin/true"
-             if len (pkgs) > 0 and os.access (install, os.X_OK):
-                 pkg = pkgs[0]
-                 install_text = ('<span weight="bold" size="larger">' +
diff --git a/print/system-config-printer-kde/pkg-descr b/print/system-config-printer-kde/pkg-descr
deleted file mode 100644
index 2bbde24ce18a..000000000000
--- a/print/system-config-printer-kde/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-system-config-printer-kde is a port of Red Hat's Gnome
-system-config-printer to KDE.
-
-WWW:	http://www.kde.org
diff --git a/print/system-config-printer-kde/pkg-message b/print/system-config-printer-kde/pkg-message
deleted file mode 100644
index cc8341030867..000000000000
--- a/print/system-config-printer-kde/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-======================================================================
-
-You'll need cupsd running for the printer configuration utility to
-work:
-
-# service cupsd start
-
-======================================================================
diff --git a/print/system-config-printer-kde/pkg-plist b/print/system-config-printer-kde/pkg-plist
deleted file mode 100644
index 4c04c8d4b6d5..000000000000
--- a/print/system-config-printer-kde/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-share/apps/system-config-printer-kde/authconn.py
-share/apps/system-config-printer-kde/ipp-browse-dialog.ui
-share/apps/system-config-printer-kde/new-printer.ui
-share/apps/system-config-printer-kde/options.py
-share/apps/system-config-printer-kde/optionwidgets.py
-share/apps/system-config-printer-kde/pysmb.py
-share/apps/system-config-printer-kde/smb-browse-dialog.ui
-share/apps/system-config-printer-kde/system-config-printer-kde.py
-share/apps/system-config-printer-kde/system-config-printer.ui
-share/kde4/services/system-config-printer-kde.desktop
-@dirrm share/apps/system-config-printer-kde