Do not conflict PLIST with security/gpgme 1.8 like sysutils/kdepim4

* Bump PKGREVISION
* Fix PR pkg/52463

5 files changed, 50 insertions, 22 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index e3040212db5..cd25548e90b 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.133 2017/04/22 21:03:44 adam Exp $
+# $NetBSD: Makefile,v 1.134 2017/08/18 12:19:23 ryoon Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
-PKGREVISION=	49
+PKGREVISION=	50
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index 546c4a936ed..09cae6c4f76 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2009/06/14 20:52:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.35 2017/08/18 12:19:23 ryoon Exp $
 bin/akregator
 bin/egroupwarewizard
 bin/exchangewizard
@@ -51,24 +51,24 @@ include/akregator/storagefactory.h
 include/akregator/storagefactoryregistry.h
 include/calendar/calendardecoration.h
 include/calendar/plugin.h
-include/gpgme++/context.h
-include/gpgme++/data.h
-include/gpgme++/decryptionresult.h
-include/gpgme++/encryptionresult.h
-include/gpgme++/engineinfo.h
-include/gpgme++/eventloopinteractor.h
-include/gpgme++/gpgmefw.h
-include/gpgme++/importresult.h
-include/gpgme++/interfaces/editinteractor.h
-include/gpgme++/interfaces/passphraseprovider.h
-include/gpgme++/interfaces/progressprovider.h
-include/gpgme++/key.h
-include/gpgme++/keygenerationresult.h
-include/gpgme++/keylistresult.h
-include/gpgme++/result.h
-include/gpgme++/signingresult.h
-include/gpgme++/trustitem.h
-include/gpgme++/verificationresult.h
+include/KDE3/gpgme++/context.h
+include/KDE3/gpgme++/data.h
+include/KDE3/gpgme++/decryptionresult.h
+include/KDE3/gpgme++/encryptionresult.h
+include/KDE3/gpgme++/engineinfo.h
+include/KDE3/gpgme++/eventloopinteractor.h
+include/KDE3/gpgme++/gpgmefw.h
+include/KDE3/gpgme++/importresult.h
+include/KDE3/gpgme++/interfaces/editinteractor.h
+include/KDE3/gpgme++/interfaces/passphraseprovider.h
+include/KDE3/gpgme++/interfaces/progressprovider.h
+include/KDE3/gpgme++/key.h
+include/KDE3/gpgme++/keygenerationresult.h
+include/KDE3/gpgme++/keylistresult.h
+include/KDE3/gpgme++/result.h
+include/KDE3/gpgme++/signingresult.h
+include/KDE3/gpgme++/trustitem.h
+include/KDE3/gpgme++/verificationresult.h
 include/index/create.h
 include/index/index.h
 include/index/lockfile.h
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 48b0330008a..ffad4b8dc45 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.70 2015/11/03 23:49:39 agc Exp $
+$NetBSD: distinfo,v 1.71 2017/08/18 12:19:23 ryoon Exp $
 
 SHA1 (kdepim-3.5.10.tar.bz2) = 537da60fe3564ecc0ed2802e744fbf96386909a9
 RMD160 (kdepim-3.5.10.tar.bz2) = 52a834dc8eb377d397404a16a09c8a59b568b305
@@ -33,4 +33,6 @@ SHA1 (patch-kmail_quotajobs.h) = aade34199b86cf17c7968a9dd33c0e1a3693f5b4
 SHA1 (patch-korganizer_korgac_alarmdialog.cpp) = 5b85966c115fad9bbc3068d4eb5e5b0723188cab
 SHA1 (patch-kpilot_lib_pluginfactory.h) = 3496e8b57e50a4781afd542f829b19ae911e5b93
 SHA1 (patch-libkcal_listbase.h) = c012336ca7de42c2f135b5d866ba05b543be4576
+SHA1 (patch-libkdenetwork_gpgmepp_Makefile.in) = 8e66398a991eb85043824eb63fcc1eeb925a622d
+SHA1 (patch-libkdenetwork_gpgmepp_interfaces_Makefile.in) = 5627fa4e10e5d70cf2138afa9a26e5102ff5865d
 SHA1 (patch-libkpimidentities_identity.h) = ea5eb566d0d174eec09ce4ee0e523c3a76e31357
diff --git a/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_Makefile.in b/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_Makefile.in
new file mode 100644
index 00000000000..8fadd172336
--- /dev/null
+++ b/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-libkdenetwork_gpgmepp_Makefile.in,v 1.1 2017/08/18 12:19:23 ryoon Exp $
+
+--- libkdenetwork/gpgmepp/Makefile.in.orig	2008-08-20 15:24:58.000000000 +0000
++++ libkdenetwork/gpgmepp/Makefile.in
+@@ -394,7 +394,7 @@ SUBDIRS = interfaces .
+ INCLUDES = -I$(top_srcdir)/libkdenetwork -I$(top_srcdir)/libkdenetwork/gpgmepp \
+ 	$(GPGME_CFLAGS) $(all_includes)
+ 
+-gpgmeppdir = $(includedir)/gpgme++
++gpgmeppdir = $(includedir)/KDE3/gpgme++
+ gpgmepp_HEADERS = context.h \
+ 		key.h \
+ 		trustitem.h \
diff --git a/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_interfaces_Makefile.in b/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_interfaces_Makefile.in
new file mode 100644
index 00000000000..f65aa72fa9e
--- /dev/null
+++ b/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_interfaces_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-libkdenetwork_gpgmepp_interfaces_Makefile.in,v 1.1 2017/08/18 12:19:23 ryoon Exp $
+
+--- libkdenetwork/gpgmepp/interfaces/Makefile.in.orig	2008-08-20 15:24:58.000000000 +0000
++++ libkdenetwork/gpgmepp/interfaces/Makefile.in
+@@ -353,7 +353,7 @@ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-gpgmeppinterfacesdir = $(includedir)/gpgme++/interfaces
++gpgmeppinterfacesdir = $(includedir)/KDE3/gpgme++/interfaces
+ gpgmeppinterfaces_HEADERS = editinteractor.h \
+ 			passphraseprovider.h progressprovider.h
+