From owner-dev-commits-ports-main@freebsd.org Thu Apr 22 07:55:39 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A277A5E2E65; Thu, 22 Apr 2021 07:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQqV30Llzz3Gwg; Thu, 22 Apr 2021 07:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E86D516389; Thu, 22 Apr 2021 07:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13M7tchj033569; Thu, 22 Apr 2021 07:55:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13M7tcbx033568; Thu, 22 Apr 2021 07:55:38 GMT (envelope-from git) Date: Thu, 22 Apr 2021 07:55:38 GMT Message-Id: <202104220755.13M7tcbx033568@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 5ac58edc57f0 - main - KDE Frameworks: remove stale DOCS option and CONFLICTS MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ac58edc57f032444d53c11d8381022f2e4c997b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 07:55:40 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ac58edc57f032444d53c11d8381022f2e4c997b commit 5ac58edc57f032444d53c11d8381022f2e4c997b Author: Adriaan de Groot AuthorDate: 2021-04-21 15:44:26 +0000 Commit: Adriaan de Groot CommitDate: 2021-04-22 07:25:14 +0000 KDE Frameworks: remove stale DOCS option and CONFLICTS Some of the PIM-related frameworks still have CONFLICTS that are KDE4-era. Remove those. Also drop the DOCS option because these frameworks do not have documentation. --- net/kf5-kcalendarcore/Makefile | 6 +----- net/kf5-kcontacts/Makefile | 5 +---- net/kf5-kdav/Makefile | 3 +-- net/kf5-syndication/Makefile | 3 +-- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/net/kf5-kcalendarcore/Makefile b/net/kf5-kcalendarcore/Makefile index 1611cda8b1c2..0c7e1d94fdd8 100644 --- a/net/kf5-kcalendarcore/Makefile +++ b/net/kf5-kcalendarcore/Makefile @@ -1,6 +1,6 @@ PORTNAME= kcalendarcore DISTVERSION= ${KDE_FRAMEWORKS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net kde kde-frameworks @@ -19,8 +19,4 @@ USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr -OPTIONS_DEFINE= DOCS - -CONFLICTS_INSTALL= kcalcore-1* - .include diff --git a/net/kf5-kcontacts/Makefile b/net/kf5-kcontacts/Makefile index 1d968e04f776..0db72ea8fda6 100644 --- a/net/kf5-kcontacts/Makefile +++ b/net/kf5-kcontacts/Makefile @@ -1,5 +1,6 @@ PORTNAME= kcontacts DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net kde kde-frameworks @@ -19,8 +20,4 @@ USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr -OPTIONS_DEFINE= DOCS - -CONFLICTS_INSTALL= kcontacts-1* - .include diff --git a/net/kf5-kdav/Makefile b/net/kf5-kdav/Makefile index 12a9731eb9b3..805f1896d982 100644 --- a/net/kf5-kdav/Makefile +++ b/net/kf5-kdav/Makefile @@ -1,5 +1,6 @@ PORTNAME= kdav DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net kde kde-frameworks @@ -14,6 +15,4 @@ USE_LDCONFIG= yes DESCR= ${.CURDIR:H:H}/deskutils/kdepim/pkg-descr -OPTIONS_DEFINE= DOCS - .include diff --git a/net/kf5-syndication/Makefile b/net/kf5-syndication/Makefile index 4d4ca3799181..0a4f33983d02 100644 --- a/net/kf5-syndication/Makefile +++ b/net/kf5-syndication/Makefile @@ -1,5 +1,6 @@ PORTNAME= syndication DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net kde kde-frameworks @@ -14,6 +15,4 @@ USE_QT= core gui xml \ buildtools_build qmake_build USE_LDCONFIG= yes -OPTIONS_DEFINE= DOCS - .include