4 files changed, 15 insertions, 326 deletions

diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 2176ecabf8ac..c32d9ee40aef 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -4,90 +4,26 @@
 #
 # $FreeBSD$
 
-PORTNAME=	kdeutils
+PORTNAME=	kgpg
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
-CATEGORIES=	misc kde
+CATEGORIES=	security kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Collection of utilities for KDE 4
-
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
+COMMENT=	Encryption tool for KDE
 
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
 
+CONFLICTS_INSTALL_INSTALL=	kdeutils-4.[0-7].*
 LATEST_LINK=	${PORTNAME}4
 
+USE_XZ=	yes
+USE_KDE4=	kdeprefix kdehier automoc4 kdelibs pimlibs
 KDE4_BUILDENV=	yes
-USE_KDE4=	kdeprefix kdehier automoc4 sharedmime \
-		kdelibs pimlibs workspace baseapps
-USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui network script xml xmlpatterns \
-		qmake_build moc_build rcc_build uic_build
-USE_XORG=	x11 xrender xtst
-USE_BZIP2=	yes
-CMAKE_ARGS+=	-DBUILD_filelight:BOOL=FALSE \
-		-DBUILD_printer-applet:BOOL=FALSE
+QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
-MAN1=		ark.1
-
-OPTIONS=	FILELIGHT "Install Filelight file system viewer" on \
-		LIRC "Support for IR remote controls" off \
-		PRINTER_APPLET "Install printer system tray utility" off \
-		7ZIP "Support for 7-Zip archives in Ark" off \
-		RAR "Support for RAR archives in Ark" off \
-		ZIP "Support for ZIP archives in Ark" off
-
-.include <bsd.port.options.mk>
-
-.ifndef(WITHOUT_FILELIGHT)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/filelight:${PORTSDIR}/sysutils/filelight-kde4
-.endif
-
-.ifdef(WITH_LIRC)
-RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
-.endif
-
-.ifdef(WITH_PRINTER_APPLET)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet
-.endif
-
-.ifdef(WITH_7ZIP)
-RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
-.endif
-
-.ifdef(WITH_ZIP)
-RUN_DEPENDS+=	unzip>0:${PORTSDIR}/archivers/unzip \
-		zip:${PORTSDIR}/archivers/zip
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+=	archive.12:${PORTSDIR}/archivers/libarchive
-.endif
-
-.ifdef(WITH_RAR)
-RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
-.if ${ARCH} != "amd64" && ${ARCH} != "ia64" && ${ARCH} != "powerpc" && ${ARCH} != "sparc64"
-INSTALL_RAR=	YES
-.elif ${ARCH} == "amd64"
-.ifndef(HAVE_COMPAT_IA32_KERN)
-HAVE_COMPAT_IA32_KERN!=	if ${SYSCTL} -n compat.ia32.maxvmem >/dev/null 2>&1; then ${ECHO_CMD} YES; fi
-.endif
-.if ${HAVE_COMPAT_IA32_KERN} == "YES"
-INSTALL_RAR=	YES
-.endif
-.endif
-.ifdef(INSTALL_RAR)
-RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo
index 2df4c25591af..910a96642ac6 100644
--- a/security/kgpg-kde4/distinfo
+++ b/security/kgpg-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeutils-4.7.4.tar.bz2) = bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
-SIZE (KDE/kdeutils-4.7.4.tar.bz2) = 3802873
+SHA256 (KDE/kgpg-4.8.3.tar.xz) = 07de8184c70201cbe77b5193033da840523f8dcaf90144d603e45c88da5c8cbf
+SIZE (KDE/kgpg-4.8.3.tar.xz) = 816908
diff --git a/security/kgpg-kde4/pkg-descr b/security/kgpg-kde4/pkg-descr
index e1be153978a1..2209957f1b2e 100644
--- a/security/kgpg-kde4/pkg-descr
+++ b/security/kgpg-kde4/pkg-descr
@@ -1,4 +1,7 @@
-The KDE utilities are a compilation of various desktop utilities,
-developed in the KDE module kdeutils.
+KGpg is a simple interface for GnuPG, a powerful encryption utility.
+
+With KGpg you will be able to encrypt and decrypt your files and
+emails, allowing much more secure communications. A mini howto on
+encryption with gpg is available on gnupg's web site.
 
 WWW: http://utils.kde.org
diff --git a/security/kgpg-kde4/pkg-plist b/security/kgpg-kde4/pkg-plist
index 2b26cef5db6e..0acff3506b8a 100644
--- a/security/kgpg-kde4/pkg-plist
+++ b/security/kgpg-kde4/pkg-plist
@@ -1,63 +1,5 @@
-bin/ark
-bin/kcalc
-bin/kcharselect
-bin/kdf
-bin/kfloppy
 bin/kgpg
-bin/krcdnotifieritem
-bin/ktimer
-bin/kwalletmanager
-bin/kwikdisk
-bin/superkaramba
-bin/sweeper
-lib/kde4/arkpart.so
-lib/kde4/kcm_kdf.so
-lib/kde4/kcm_kwallet.so
-lib/kde4/kcm_remotecontrol.so
-lib/kde4/kded_kremotecontroldaemon.so
-lib/kde4/kerfuffle_cli7z.so
-lib/kde4/kerfuffle_clirar.so
-lib/kde4/kerfuffle_clizip.so
-lib/kde4/kerfuffle_libarchive.so
-lib/kde4/kerfuffle_libbz2.so
-lib/kde4/kerfuffle_libgz.so
-lib/kde4/kerfuffle_libxz.so
-lib/kde4/kremotecontrol_lirc.so
-lib/kde4/libextracthere.so
-lib/kde4/plasma_engine_kremoteconrol.so
-lib/kde4/plasma_package_superkaramba.so
-lib/kde4/plasma_scriptengine_superkaramba.so
-lib/libkdeinit4_kcalc.so
-lib/libkerfuffle.so
-lib/libkerfuffle.so.5
-lib/libkerfuffle.so.5.0.1
-lib/liblibkremotecontrol.so
-lib/liblibkremotecontrol.so.1
-lib/liblibkremotecontrol.so.1.0.0
-lib/libsuperkaramba.so
-lib/libsuperkaramba.so.5
-lib/libsuperkaramba.so.5.0.1
-share/applications/kde4/KCharSelect.desktop
-share/applications/kde4/KFloppy.desktop
-share/applications/kde4/ark.desktop
-share/applications/kde4/kcalc.desktop
-share/applications/kde4/kdf.desktop
 share/applications/kde4/kgpg.desktop
-share/applications/kde4/krcdnotifieritem.desktop
-share/applications/kde4/ktimer.desktop
-share/applications/kde4/kwalletmanager-kwalletd.desktop
-share/applications/kde4/kwalletmanager.desktop
-share/applications/kde4/kwikdisk.desktop
-share/applications/kde4/superkaramba.desktop
-share/applications/kde4/sweeper.desktop
-share/apps/ark/ark_part.rc
-share/apps/ark/arkui.rc
-share/apps/kcalc/kcalcui.rc
-share/apps/kcalc/scienceconstants.xml
-share/apps/kcharselect/kcharselectui.rc
-share/apps/kconf_update/kcalcrc.upd
-share/apps/kconf_update/kcharselect.upd
-share/apps/kdf/kdfui.rc
 share/apps/kgpg/icons/hicolor/16x16/actions/document-export-key.png
 share/apps/kgpg/icons/hicolor/16x16/actions/document-import-key.png
 share/apps/kgpg/icons/hicolor/16x16/actions/document-properties-key.png
@@ -94,68 +36,9 @@ share/apps/kgpg/icons/hicolor/scalable/status/key-single.svgz
 share/apps/kgpg/keysmanager.rc
 share/apps/kgpg/kgpgeditor.rc
 share/apps/kgpg/tips
-share/apps/kremotecontrol/profiles/amarok.profile.xml
-share/apps/kremotecontrol/profiles/dragonplayer.profile.xml
-share/apps/kremotecontrol/profiles/klauncher.profile.xml
-share/apps/kremotecontrol/profiles/kmix.profile.xml
-share/apps/kremotecontrol/profiles/konqueror.profile.xml
-share/apps/kremotecontrol/profiles/kscd.profile.xml
-share/apps/kremotecontrol/profiles/okular.profile.xml
-share/apps/kremotecontrol/profiles/powermanagement.profile.xml
-share/apps/kremotecontrol/profiles/profile.xsd
-share/apps/kremotecontrol/profiles/vlc.profile.xml
-share/apps/kremotecontroldaemon/kremotecontroldaemon.notifyrc
-share/apps/kwalletmanager/icons/hicolor/22x22/actions/folder_closed.png
-share/apps/kwalletmanager/icons/hicolor/22x22/actions/folder_open.png
-share/apps/kwalletmanager/kwalleteditor.rc
-share/apps/kwalletmanager/kwalletmanager.rc
-share/apps/superkaramba/superkarambaui.rc
-share/apps/sweeper/sweeperui.rc
 share/autostart/kgpg.desktop
-share/config.kcfg/ark.kcfg
-share/config.kcfg/kcalc.kcfg
 share/config.kcfg/kgpg.kcfg
-share/config/superkaramba.knsrc
 share/dbus-1/interfaces/org.kde.kgpg.Key.xml
-share/dbus-1/interfaces/org.kde.superkaramba.xml
-share/dbus-1/interfaces/org.kde.sweeper.xml
-share/doc/HTML/en/ark/ark-mainwindow.png
-share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/index.cache.bz2
-share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/ark/man-ark.1.docbook
-share/doc/HTML/en/kcalc/commands.docbook
-share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/index.cache.bz2
-share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcharselect/common
-share/doc/HTML/en/kcharselect/index.cache.bz2
-share/doc/HTML/en/kcharselect/index.docbook
-share/doc/HTML/en/kcharselect/kcharselect.png
-share/doc/HTML/en/kcontrol/blockdevices/common
-share/doc/HTML/en/kcontrol/blockdevices/index.cache.bz2
-share/doc/HTML/en/kcontrol/blockdevices/index.docbook
-share/doc/HTML/en/kcontrol/kremotecontrol/AddAction.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddActionOptions.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddDBusAction.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddMode.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddProfileAction.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AutoPopulate.png
-share/doc/HTML/en/kcontrol/kremotecontrol/EditMasterMode.png
-share/doc/HTML/en/kcontrol/kremotecontrol/common
-share/doc/HTML/en/kcontrol/kremotecontrol/index.cache.bz2
-share/doc/HTML/en/kcontrol/kremotecontrol/index.docbook
-share/doc/HTML/en/kcontrol/kremotecontrol/irkick.png
-share/doc/HTML/en/kcontrol/kremotecontrol/irkickoff.png
-share/doc/HTML/en/kcontrol/kremotecontrol/kcmremotecontrol.png
-share/doc/HTML/en/kdf/common
-share/doc/HTML/en/kdf/index.cache.bz2
-share/doc/HTML/en/kdf/index.docbook
-share/doc/HTML/en/kdf/kdf.png
-share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kfloppy/common
-share/doc/HTML/en/kfloppy/index.cache.bz2
-share/doc/HTML/en/kfloppy/index.docbook
 share/doc/HTML/en/kgpg/common
 share/doc/HTML/en/kgpg/editor.png
 share/doc/HTML/en/kgpg/index.cache.bz2
@@ -169,144 +52,14 @@ share/doc/HTML/en/kgpg/keyserver.png
 share/doc/HTML/en/kgpg/options.png
 share/doc/HTML/en/kgpg/select-secret-key.png
 share/doc/HTML/en/kgpg/systray.png
-share/doc/HTML/en/ktimer/common
-share/doc/HTML/en/ktimer/first.png
-share/doc/HTML/en/ktimer/index.cache.bz2
-share/doc/HTML/en/ktimer/index.docbook
-share/doc/HTML/en/ktimer/main.png
-share/doc/HTML/en/ktimer/running.png
-share/doc/HTML/en/ktimer/two_at_once.png
-share/doc/HTML/en/kwallet/common
-share/doc/HTML/en/kwallet/edit1.png
-share/doc/HTML/en/kwallet/edit2.png
-share/doc/HTML/en/kwallet/first-open-request.png
-share/doc/HTML/en/kwallet/index.cache.bz2
-share/doc/HTML/en/kwallet/index.docbook
-share/doc/HTML/en/kwallet/kwalletmanager.png
-share/doc/HTML/en/kwallet/openwallet-request.png
-share/doc/HTML/en/kwallet/oxygen48-status-wallet-closed.png
-share/doc/HTML/en/kwallet/oxygen48-status-wallet-open.png
-share/doc/HTML/en/kwallet/save-login-information.png
-share/doc/HTML/en/sweeper/common
-share/doc/HTML/en/sweeper/index.cache.bz2
-share/doc/HTML/en/sweeper/index.docbook
-share/doc/HTML/en/sweeper/sweeper.png
-share/icons/hicolor/128x128/apps/kdf.png
-share/icons/hicolor/128x128/apps/kfloppy.png
-share/icons/hicolor/128x128/apps/ktimer.png
-share/icons/hicolor/128x128/apps/kwalletmanager.png
-share/icons/hicolor/128x128/apps/kwalletmanager2.png
-share/icons/hicolor/128x128/apps/kwikdisk.png
-share/icons/hicolor/128x128/apps/superkaramba.png
-share/icons/hicolor/128x128/devices/infrared-remote.png
-share/icons/hicolor/16x16/apps/kdf.png
-share/icons/hicolor/16x16/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/kgpg.png
-share/icons/hicolor/16x16/apps/ktimer.png
-share/icons/hicolor/16x16/apps/kwalletmanager.png
-share/icons/hicolor/16x16/apps/kwalletmanager2.png
-share/icons/hicolor/16x16/apps/kwikdisk.png
-share/icons/hicolor/16x16/apps/superkaramba.png
-share/icons/hicolor/16x16/devices/infrared-remote.png
-share/icons/hicolor/22x22/actions/krcd_flash.png
-share/icons/hicolor/22x22/actions/krcd_off.png
-share/icons/hicolor/22x22/apps/kdf.png
-share/icons/hicolor/22x22/apps/kfloppy.png
 share/icons/hicolor/22x22/apps/kgpg.png
-share/icons/hicolor/22x22/apps/krcd.png
-share/icons/hicolor/22x22/apps/kwalletmanager.png
-share/icons/hicolor/22x22/apps/kwikdisk.png
-share/icons/hicolor/22x22/apps/superkaramba.png
-share/icons/hicolor/22x22/devices/infrared-remote.png
-share/icons/hicolor/32x32/apps/kdf.png
-share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/kgpg.png
-share/icons/hicolor/32x32/apps/ktimer.png
-share/icons/hicolor/32x32/apps/kwalletmanager.png
-share/icons/hicolor/32x32/apps/kwalletmanager2.png
-share/icons/hicolor/32x32/apps/kwikdisk.png
-share/icons/hicolor/32x32/apps/superkaramba.png
-share/icons/hicolor/32x32/devices/infrared-remote.png
-share/icons/hicolor/42x42/devices/infrared-remote.png
-share/icons/hicolor/48x48/apps/kdf.png
-share/icons/hicolor/48x48/apps/kfloppy.png
 share/icons/hicolor/48x48/apps/kgpg.png
-share/icons/hicolor/48x48/apps/ktimer.png
-share/icons/hicolor/48x48/apps/kwalletmanager.png
-share/icons/hicolor/48x48/apps/kwalletmanager2.png
-share/icons/hicolor/48x48/apps/kwikdisk.png
-share/icons/hicolor/48x48/apps/superkaramba.png
-share/icons/hicolor/48x48/devices/infrared-remote.png
-share/icons/hicolor/64x64/apps/kdf.png
-share/icons/hicolor/64x64/apps/kfloppy.png
-share/icons/hicolor/64x64/apps/kwalletmanager.png
-share/icons/hicolor/64x64/apps/kwalletmanager2.png
-share/icons/hicolor/64x64/apps/kwikdisk.png
-share/icons/hicolor/64x64/apps/superkaramba.png
-share/icons/hicolor/64x64/devices/infrared-remote.png
-share/icons/hicolor/8x8/devices/infrared-remote.png
-share/icons/hicolor/scalable/actions/krcd_flash.svgz
-share/icons/hicolor/scalable/actions/krcd_off.svgz
-share/icons/hicolor/scalable/apps/krcd.svgz
-share/icons/hicolor/scalable/apps/superkaramba.svgz
-share/icons/hicolor/scalable/devices/infrared-remote.svgz
-share/icons/oxygen/16x16/apps/kcmdf.png
-share/icons/oxygen/22x22/apps/kcmdf.png
-share/icons/oxygen/32x32/apps/kcmdf.png
-share/kde4/services/ServiceMenus/ark_addtoservicemenu.desktop
-share/kde4/services/ServiceMenus/ark_servicemenu.desktop
 share/kde4/services/ServiceMenus/encryptfile.desktop
 share/kde4/services/ServiceMenus/encryptfolder.desktop
 share/kde4/services/ServiceMenus/viewdecrypted.desktop
-share/kde4/services/ark_dndextract.desktop
-share/kde4/services/ark_part.desktop
-share/kde4/services/kcm_remotecontrol.desktop
-share/kde4/services/kcmdf.desktop
-share/kde4/services/kded/kremotecontroldaemon.desktop
-share/kde4/services/kerfuffle_cli7z.desktop
-share/kde4/services/kerfuffle_clirar.desktop
-share/kde4/services/kerfuffle_clizip.desktop
-share/kde4/services/kerfuffle_libarchive.desktop
-share/kde4/services/kerfuffle_libarchive_readonly.desktop
-share/kde4/services/kerfuffle_libbz2.desktop
-share/kde4/services/kerfuffle_libgz.desktop
-share/kde4/services/kerfuffle_libxz.desktop
-share/kde4/services/kremotecontrolbackends/kremotecontrol_lirc.desktop
-share/kde4/services/kwalletconfig.desktop
-share/kde4/services/kwalletmanager_show.desktop
-share/kde4/services/plasma-engine-kremotecontrol.desktop
-share/kde4/services/plasma-package-superkaramba.desktop
-share/kde4/services/plasma-scriptengine-superkaramba.desktop
-share/kde4/servicetypes/kerfufflePlugin.desktop
-share/kde4/servicetypes/kremotecontrolmanager.desktop
-@dirrm share/kde4/services/kremotecontrolbackends
-@dirrmtry share/icons/oxygen/42x42/devices
-@dirrmtry share/icons/oxygen/42x42
-@dirrmtry share/icons/hicolor/8x8/devices
-@dirrmtry share/icons/hicolor/8x8
-@dirrmtry share/icons/hicolor/42x42/devices
-@dirrmtry share/icons/hicolor/42x42
-@dirrm share/doc/HTML/en/sweeper
-@dirrm share/doc/HTML/en/kwallet
-@dirrm share/doc/HTML/en/ktimer
 @dirrm share/doc/HTML/en/kgpg
-@dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kcontrol/kremotecontrol
-@dirrm share/doc/HTML/en/kcontrol/blockdevices
-@dirrm share/doc/HTML/en/kcharselect
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/sweeper
-@dirrm share/apps/superkaramba
-@dirrm share/apps/kwalletmanager/icons/hicolor/22x22/actions
-@dirrm share/apps/kwalletmanager/icons/hicolor/22x22
-@dirrm share/apps/kwalletmanager/icons/hicolor
-@dirrm share/apps/kwalletmanager/icons
-@dirrm share/apps/kwalletmanager
-@dirrm share/apps/kremotecontroldaemon
-@dirrm share/apps/kremotecontrol/profiles
-@dirrm share/apps/kremotecontrol
 @dirrm share/apps/kgpg/icons/hicolor/scalable/status
 @dirrm share/apps/kgpg/icons/hicolor/scalable/actions
 @dirrm share/apps/kgpg/icons/hicolor/scalable
@@ -325,6 +78,3 @@ share/kde4/servicetypes/kremotecontrolmanager.desktop
 @dirrm share/apps/kgpg/icons/hicolor
 @dirrm share/apps/kgpg/icons
 @dirrm share/apps/kgpg
-@dirrm share/apps/kdf
-@dirrm share/apps/kcalc
-@dirrm share/apps/ark