4 files changed, 25 insertions, 17 deletions

diff --git a/print/kdeutils4-printer-applet/Makefile b/print/kdeutils4-printer-applet/Makefile
index 9dd21876353e..44a1b4c82844 100644
--- a/print/kdeutils4-printer-applet/Makefile
+++ b/print/kdeutils4-printer-applet/Makefile
@@ -20,14 +20,15 @@ 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_BZIP2=	yes
-USE_CMAKE=	yes
-USE_KDE4=	kdeprefix pimlibs automoc4 pykde4 pykdeuic4
+USE_KDE4=	kdehier kdelibs kdeprefix pykde4 pykdeuic4 automoc4
+USE_PYTHON=	2.5+
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build
-USE_PYTHON=	2.5+
 DISTINFO_FILE=	${PORTSDIR}/misc/kdeutils4/distinfo
-CMAKE_ARGS+=	-DINSTALL_PRINTER_APPLET:Bool=On
+USE_BZIP2=	yes
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-DINSTALL_PRINTER_APPLET:BOOL=ON \
+		-DBUILD_kgpg:BOOL=OFF # Avoid checking for kdepimlibs.
 
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/print/kdeutils4-printer-applet/pkg-plist b/print/kdeutils4-printer-applet/pkg-plist
index b01e2a501e2d..063db8bc87c5 100644
--- a/print/kdeutils4-printer-applet/pkg-plist
+++ b/print/kdeutils4-printer-applet/pkg-plist
@@ -1,12 +1,16 @@
 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/printer-applet.notifyrc
 share/apps/printer-applet/statereason.py
-share/apps/printer-applet/monitor.py
-share/apps/printer-applet/authconn.py
-share/apps/printer-applet/debug.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
index b7e7e63b3445..e8647abb22fe 100644
--- a/print/system-config-printer-kde/Makefile
+++ b/print/system-config-printer-kde/Makefile
@@ -19,14 +19,15 @@ 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
 
-USE_BZIP2=	yes
-USE_CMAKE=	yes
-USE_KDE4=	kdeprefix pimlibs automoc4 pykde4 pykdeuic4
+USE_KDE4=	kdehier kdelibs kdeprefix pykde4 pykdeuic4 automoc4
+USE_PYTHON=	2.5+
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build
-USE_PYTHON=	2.5+
 DISTINFO_FILE=	${PORTSDIR}/sysutils/kdeadmin4/distinfo
-CMAKE_ARGS+=	-DINSTALL_SYSTEM_CONFIG_PRINTER:BOOL=On
+USE_BZIP2=	yes
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-DINSTALL_SYSTEM_CONFIG_PRINTER:BOOL=ON \
+		-DBUILD_kuser:BOOL=OFF # Avoid checking for kdepimlibs.
 
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/print/system-config-printer-kde/pkg-plist b/print/system-config-printer-kde/pkg-plist
index 11c3c7183e51..4c04c8d4b6d5 100644
--- a/print/system-config-printer-kde/pkg-plist
+++ b/print/system-config-printer-kde/pkg-plist
@@ -1,9 +1,11 @@
+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/system-config-printer.ui
-share/apps/system-config-printer-kde/system-config-printer-kde.py
 share/apps/system-config-printer-kde/options.py
 share/apps/system-config-printer-kde/optionwidgets.py
-share/apps/system-config-printer-kde/ipp-browse-dialog.ui
+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