6 files changed, 19 insertions, 31 deletions

diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 58979017b208..4bb89a5f948d 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	kgpg
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	security kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -13,13 +12,9 @@ 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
 USES=		cmake:outsource
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo
index 2516483f615c..1dbeafab3eb5 100644
--- a/security/kgpg-kde4/distinfo
+++ b/security/kgpg-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kgpg-4.10.5.tar.xz) = fb8d1b68e40523c92626ceeef5e8f0e47f84d83476910344a615d6e98dac04f4
-SIZE (KDE/4.10.5/kgpg-4.10.5.tar.xz) = 816276
+SHA256 (KDE/4.12.2/kgpg-4.12.2.tar.xz) = 58913f2aa65f602aa299784f312366ce96db98088aab2cda07c9c84b3d1b4d9e
+SIZE (KDE/4.12.2/kgpg-4.12.2.tar.xz) = 803152
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 7d0d314b892c..106b822d34d4 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -4,19 +4,15 @@
 PORTNAME=	kwallet
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	security kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Password manager for KDE
 
-CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
-
 USE_XZ=		yes
 USE_KDE4=	kdeprefix kdehier automoc4 kdelibs
-USES=		cmake:outsource
+USES=		cmake:outsource gmake
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo
index e2f7dcdafbb6..4ed640da5e3d 100644
--- a/security/kwallet/distinfo
+++ b/security/kwallet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kwallet-4.10.5.tar.xz) = b5f1b4d1959fe585f2cd5d3edbf4a854b9feec27b1f6a3f57dc11cc701bc6855
-SIZE (KDE/4.10.5/kwallet-4.10.5.tar.xz) = 283016
+SHA256 (KDE/4.12.2/kwallet-4.12.2.tar.xz) = db234ebd830acb0a536fe0ba588325eac70be431cc2d244256605fbe9e0ca428
+SIZE (KDE/4.12.2/kwallet-4.12.2.tar.xz) = 456204
diff --git a/security/kwallet/pkg-plist b/security/kwallet/pkg-plist
index 2a4ae77b9f21..295eb1f58dd1 100644
--- a/security/kwallet/pkg-plist
+++ b/security/kwallet/pkg-plist
@@ -1,22 +1,28 @@
 bin/kwalletmanager
+etc/dbus-1/system.d/org.kde.kcontrol.kcmkwallet.conf
 lib/kde4/kcm_kwallet.so
+lib/kde4/libexec/kcm_kwallet_helper
 share/applications/kde4/kwalletmanager-kwalletd.desktop
 share/applications/kde4/kwalletmanager.desktop
 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/dbus-1/system-services/org.kde.kcontrol.kcmkwallet.service
+share/doc/HTML/en/kwallet/application-request-to-open-wallet.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/error-nokey.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/key-selection.png
+share/doc/HTML/en/kwallet/kwallet-applications.png
+share/doc/HTML/en/kwallet/kwallet-edit.png
 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/kwallet/wallet-encryption-selection.png
 share/icons/hicolor/128x128/apps/kwalletmanager.png
 share/icons/hicolor/128x128/apps/kwalletmanager2.png
 share/icons/hicolor/16x16/apps/kwalletmanager.png
@@ -30,6 +36,7 @@ share/icons/hicolor/64x64/apps/kwalletmanager.png
 share/icons/hicolor/64x64/apps/kwalletmanager2.png
 share/kde4/services/kwalletconfig.desktop
 share/kde4/services/kwalletmanager_show.desktop
+share/polkit-1/actions/org.kde.kcontrol.kcmkwallet.policy
 @dirrm share/doc/HTML/en/kwallet
 @dirrm share/apps/kwalletmanager/icons/hicolor/22x22/actions
 @dirrm share/apps/kwalletmanager/icons/hicolor/22x22
diff --git a/security/pam_kde/Makefile b/security/pam_kde/Makefile
index ed88d963e5d6..fdd0b91d502c 100644
--- a/security/pam_kde/Makefile
+++ b/security/pam_kde/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	pam_kde
 PORTVERSION=	1.0
 CATEGORIES=	security kde
-MASTER_SITES=	# empty
 DISTFILES=	# none
 
 MAINTAINER=	kde@FreeBSD.org
@@ -16,18 +15,9 @@ PLIST_FILES=	etc/pam.d/kde
 OPTIONS_DEFINE=	AUTOLOGIN
 OPTIONS_DEFAULT=	AUTOLOGIN
 AUTOLOGIN_DESC=	Install module for automatic login
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MAUTOLOGIN}
-PLIST_FILES+=	etc/pam.d/kde-np
-.endif
+AUTOLOGIN_PLIST_FILES=	etc/pam.d/kde-np
 
 do-install:
-	${INSTALL_DATA} ${FILESDIR}/kde ${PREFIX}/etc/pam.d
-.if ${PORT_OPTIONS:MAUTOLOGIN}
-	${INSTALL_DATA} ${FILESDIR}/kde-np ${PREFIX}/etc/pam.d
-.endif
+	${INSTALL_DATA} ${PLIST_FILES:S,etc/pam.d,${FILESDIR},} ${STAGEDIR}${PREFIX}/etc/pam.d
 
 .include <bsd.port.mk>