From owner-svn-ports-head@freebsd.org Wed Apr 11 09:57:27 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C2AAF850DD; Wed, 11 Apr 2018 09:57:27 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B1E1B8CA68; Wed, 11 Apr 2018 09:57:26 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ACD5B1AAB9; Wed, 11 Apr 2018 09:57:26 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3B9vQTb089994; Wed, 11 Apr 2018 09:57:26 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3B9vPYm089986; Wed, 11 Apr 2018 09:57:25 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201804110957.w3B9vPYm089986@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Wed, 11 Apr 2018 09:57:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467042 - in head: . deskutils/kdepim-kde4 deskutils/kdepim-runtime-kde4 devel devel/libkgapi devel/libkgapi-kde4 net-im/kopete-kde4 net/kdenetwork-kde4 x11/kde4 X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head: . deskutils/kdepim-kde4 deskutils/kdepim-runtime-kde4 devel devel/libkgapi devel/libkgapi-kde4 net-im/kopete-kde4 net/kdenetwork-kde4 x11/kde4 X-SVN-Commit-Revision: 467042 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2018 09:57:27 -0000 Author: tcberner Date: Wed Apr 11 09:57:25 2018 New Revision: 467042 URL: https://svnweb.freebsd.org/changeset/ports/467042 Log: Fix PKGBASE conflict of devel/libkgapi Reported by: antoine Added: head/devel/libkgapi-kde4/ - copied from r467041, head/devel/libkgapi/ Deleted: head/devel/libkgapi/ Modified: head/MOVED head/deskutils/kdepim-kde4/Makefile head/deskutils/kdepim-runtime-kde4/Makefile head/devel/Makefile head/devel/libkgapi-kde4/Makefile head/net-im/kopete-kde4/Makefile head/net/kdenetwork-kde4/Makefile head/x11/kde4/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Wed Apr 11 09:42:03 2018 (r467041) +++ head/MOVED Wed Apr 11 09:57:25 2018 (r467042) @@ -10141,3 +10141,4 @@ textproc/elasticsearch-plugin-marvel||2018-04-09|Elast textproc/elasticsearch-plugin-migration||2018-04-09|ElasticSearch 1.x End of Life textproc/elasticsearch-plugin-sql||2018-04-09|ElasticSearch 1.x End of Life textproc/elasticsearch-river-rabbitmq||2018-04-09|ElasticSearch 1.x End of Life +devel/libkgapi|devel/libkgapi-kde4|2018-04-11|Make room for KDE updates Modified: head/deskutils/kdepim-kde4/Makefile ============================================================================== --- head/deskutils/kdepim-kde4/Makefile Wed Apr 11 09:42:03 2018 (r467041) +++ head/deskutils/kdepim-kde4/Makefile Wed Apr 11 09:57:25 2018 (r467042) @@ -3,7 +3,7 @@ PORTNAME= kdepim PORTVERSION= ${KDE4_KDEPIM_VERSION} -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= deskutils kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} @@ -16,7 +16,7 @@ LIB_DEPENDS= libgpgme.so:security/gpgme \ libassuan.so:security/libassuan \ libsasl2.so:security/cyrus-sasl2 \ libboost_thread.so:devel/boost-libs \ - libkgapi2.so:devel/libkgapi + libkgapi2.so:devel/libkgapi-kde4 RUN_DEPENDS= ${KDE_PREFIX}/bin/accountwizard:deskutils/kdepim-runtime-kde4 \ ${LOCALBASE}/bin/gmd5sum:sysutils/coreutils Modified: head/deskutils/kdepim-runtime-kde4/Makefile ============================================================================== --- head/deskutils/kdepim-runtime-kde4/Makefile Wed Apr 11 09:42:03 2018 (r467041) +++ head/deskutils/kdepim-runtime-kde4/Makefile Wed Apr 11 09:57:25 2018 (r467042) @@ -3,7 +3,7 @@ PORTNAME= kdepim-runtime PORTVERSION= ${KDE4_KDEPIM_VERSION} -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= deskutils kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} @@ -13,7 +13,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE PIM tools and services LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ - libkgapi2.so:devel/libkgapi \ + libkgapi2.so:devel/libkgapi-kde4 \ libkolab.so:devel/libkolab \ libkolabxml.so:textproc/libkolabxml \ libkfbapi.so:net/libkfbapi \ Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Wed Apr 11 09:42:03 2018 (r467041) +++ head/devel/Makefile Wed Apr 11 09:57:25 2018 (r467042) @@ -1439,7 +1439,7 @@ SUBDIR += libixp SUBDIR += libjson++ SUBDIR += libk8055 - SUBDIR += libkgapi + SUBDIR += libkgapi-kde4 SUBDIR += libklel SUBDIR += libkolab SUBDIR += liblangtag Modified: head/devel/libkgapi-kde4/Makefile ============================================================================== --- head/devel/libkgapi/Makefile Wed Apr 11 09:42:03 2018 (r467041) +++ head/devel/libkgapi-kde4/Makefile Wed Apr 11 09:57:25 2018 (r467042) @@ -2,9 +2,10 @@ PORTNAME= libkgapi PORTVERSION= 2.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel kde MASTER_SITES= KDE/stable/libkgapi/${PORTVERSION}/src +PKGNAMESUFFIX= -kde4 DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org Modified: head/net-im/kopete-kde4/Makefile ============================================================================== --- head/net-im/kopete-kde4/Makefile Wed Apr 11 09:42:03 2018 (r467041) +++ head/net-im/kopete-kde4/Makefile Wed Apr 11 09:57:25 2018 (r467042) @@ -2,7 +2,7 @@ PORTNAME= kopete PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-im kde kde-kde4 MAINTAINER= kde@FreeBSD.org Modified: head/net/kdenetwork-kde4/Makefile ============================================================================== --- head/net/kdenetwork-kde4/Makefile Wed Apr 11 09:42:03 2018 (r467041) +++ head/net/kdenetwork-kde4/Makefile Wed Apr 11 09:57:25 2018 (r467042) @@ -2,7 +2,7 @@ PORTNAME= kdenetwork PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net kde PKGNAMESUFFIX= -kde4 Modified: head/x11/kde4/Makefile ============================================================================== --- head/x11/kde4/Makefile Wed Apr 11 09:42:03 2018 (r467041) +++ head/x11/kde4/Makefile Wed Apr 11 09:57:25 2018 (r467042) @@ -3,7 +3,7 @@ PORTNAME= kde PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 kde MAINTAINER= kde@FreeBSD.org