kmousetool: yet another kde4 vs kde5 oddity

[Antoine Jacoutot]

Hi.

There's something unhandled between x11/kde-applications/kmousetool and
x11/kde4/kmousetool.
They share the same PKGNAME, obviously not the same PKGPATH.
"pkg_add kmousetool" will only install the kde5 version. If you want the kde4
version you must explictely say so "pkg_add -z kmousetool-4.14.3".

And you can't build both:
$ cd /usr/ports/x11/kde-applications/kmousetool && make package
<...>
$ cd /usr/ports/x11/kde4/kmousetool && make package
<...>
Found newer package kmousetool-18.12.0p0 in /hack/cvs/ports/plist/amd64
*** Error 1 in . (/hack/cvs/ports/infrastructure/mk/bsd.port.mk:2026 '/hack/cvs/ports/packages/amd64/all/kmousetool-4.14.3p5.tgz')

Did we forget to rename one of them?

--
Antoine

[Rafael Sadowski]

Sorry, that was my mistake. The following diff enables kmouth and kcron
and disables the KDE4 bit.


Index: x11/kde4/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- x11/kde4/Makefile 28 Mar 2019 19:28:47 -0000 1.68
+++ x11/kde4/Makefile 14 Apr 2019 15:44:29 -0000
@@ -113,9 +113,9 @@ SUBDIR += webdev
# former kdeaccessibility
SUBDIR += jovie
SUBDIR += kaccessible
-SUBDIR += kmousetool
+#SUBDIR += kmousetool x11/kde-applications
#SUBDIR += kmag x11/kde-applications
-SUBDIR += kmouth
+#SUBDIR += kmouth x11/kde-applications

# former kdeutils
#SUBDIR += ark x11/kde-applications
@@ -232,7 +232,7 @@ SUBDIR += libkcompactdisc
SUBDIR += mplayerthumbs

# former kdeadmin
-SUBDIR += kcron
+#SUBDIR += kcron x11/kde-applications
#SUBDIR += ksystemlog x11/kde-applications
SUBDIR += kuser

Index: meta/kde4/Makefile
===================================================================
RCS file: /cvs/ports/meta/kde4/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- meta/kde4/Makefile 28 Mar 2019 19:28:47 -0000 1.62
+++ meta/kde4/Makefile 14 Apr 2019 15:44:29 -0000
@@ -26,15 +26,16 @@ PKGSPEC-network = kdenetwork-${MODKDE4_S
PKGSPEC-sdk = kdesdk-${MODKDE4_SPEC}
PKGSPEC-toys = kdetoys-${MODKDE4_SPEC}

-REVISION-minimal = 9
+REVISION-minimal = 10
REVISION-games = 3
REVISION-sdk = 3
REVISION-edu = 5
REVISION-multimedia = 0
REVISION-extras = 10
-REVISION-main = 23
-REVISION-admin = 0
+REVISION-main = 24
+REVISION-admin = 1
REVISION-graphics = 3
+REVISION-accessibility = 0

MAINTAINER = KDE porting team <openb...@googlegroups.com>

@@ -58,12 +59,9 @@ KDE4_ONLY = No

KDE4-accessibility = \
${MODKDE4_DEP_DIR}/jovie \
- ${MODKDE4_DEP_DIR}/kaccessible \
- ${MODKDE4_DEP_DIR}/kmousetool \
- ${MODKDE4_DEP_DIR}/kmouth
+ ${MODKDE4_DEP_DIR}/kaccessible

RUN_DEPENDS-admin = \
- ${MODKDE4_DEP_DIR}/kcron \
${MODKDE4_DEP_DIR}/kuser

KDE4-bindings = \