Received: by mail.netbsd.org (Postfix, from userid 605) id 763AE84D60; Fri, 18 Aug 2017 12:19:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0795384D57 for ; Fri, 18 Aug 2017 12:19:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id KyJhvApyae0p for ; Fri, 18 Aug 2017 12:19:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D719584C6C for ; Fri, 18 Aug 2017 12:19:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CB0D8FAD0; Fri, 18 Aug 2017 12:19:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1503058763297470" MIME-Version: 1.0 Date: Fri, 18 Aug 2017 12:19:23 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/misc/kdepim3 To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20170818121923.CB0D8FAD0@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1503058763297470 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Fri Aug 18 12:19:23 UTC 2017 Modified Files: pkgsrc/misc/kdepim3: Makefile PLIST distinfo Added Files: pkgsrc/misc/kdepim3/patches: patch-libkdenetwork_gpgmepp_Makefile.in patch-libkdenetwork_gpgmepp_interfaces_Makefile.in Log Message: Do not conflict PLIST with security/gpgme 1.8 like sysutils/kdepim4 * Bump PKGREVISION * Fix PR pkg/52463 To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 pkgsrc/misc/kdepim3/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/misc/kdepim3/PLIST cvs rdiff -u -r1.70 -r1.71 pkgsrc/misc/kdepim3/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_Makefile.in \ pkgsrc/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_interfaces_Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1503058763297470 Content-Disposition: inline Content-Length: 5434 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/kdepim3/Makefile diff -u pkgsrc/misc/kdepim3/Makefile:1.133 pkgsrc/misc/kdepim3/Makefile:1.134 --- pkgsrc/misc/kdepim3/Makefile:1.133 Sat Apr 22 21:03:44 2017 +++ pkgsrc/misc/kdepim3/Makefile Fri Aug 18 12:19:23 2017 @@ -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 Index: pkgsrc/misc/kdepim3/PLIST diff -u pkgsrc/misc/kdepim3/PLIST:1.34 pkgsrc/misc/kdepim3/PLIST:1.35 --- pkgsrc/misc/kdepim3/PLIST:1.34 Sun Jun 14 20:52:12 2009 +++ pkgsrc/misc/kdepim3/PLIST Fri Aug 18 12:19:23 2017 @@ -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 Index: pkgsrc/misc/kdepim3/distinfo diff -u pkgsrc/misc/kdepim3/distinfo:1.70 pkgsrc/misc/kdepim3/distinfo:1.71 --- pkgsrc/misc/kdepim3/distinfo:1.70 Tue Nov 3 23:49:39 2015 +++ pkgsrc/misc/kdepim3/distinfo Fri Aug 18 12:19:23 2017 @@ -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) = aade341 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 Added files: Index: pkgsrc/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_Makefile.in diff -u /dev/null pkgsrc/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_Makefile.in:1.1 --- /dev/null Fri Aug 18 12:19:23 2017 +++ pkgsrc/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_Makefile.in Fri Aug 18 12:19:23 2017 @@ -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 \ Index: pkgsrc/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_interfaces_Makefile.in diff -u /dev/null pkgsrc/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_interfaces_Makefile.in:1.1 --- /dev/null Fri Aug 18 12:19:23 2017 +++ pkgsrc/misc/kdepim3/patches/patch-libkdenetwork_gpgmepp_interfaces_Makefile.in Fri Aug 18 12:19:23 2017 @@ -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 + --_----------=_1503058763297470--