git: 5ac58edc57f0 - main - KDE Frameworks: remove stale DOCS option and CONFLICTS

[Adriaan de Groot]

The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5ac58edc57f032444d53c11d8381022f2e4c997b

commit 5ac58edc57f032444d53c11d8381022f2e4c997b
Author:     Adriaan de Groot <adridg at FreeBSD.org>
AuthorDate: 2021-04-21 15:44:26 +0000
Commit:     Adriaan de Groot <adridg at FreeBSD.org>
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 <bsd.port.mk>
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 <bsd.port.mk>
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 <bsd.port.mk>
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 <bsd.port.mk>