git: 907153406405 - main - math/rkward-kde: rename to math/rkward

From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Fri, 06 May 2022 15:32:55 UTC
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=907153406405c53e969577ac564d5efb647c0f82

commit 907153406405c53e969577ac564d5efb647c0f82
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2022-05-06 15:30:02 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2022-05-06 15:32:19 +0000

    math/rkward-kde: rename to math/rkward
    
    RKWard is the canonical name, there is no more reason to suffix it with KDE.
    
    Also remove the regression-test target: the regular test target is
    sufficient, and add some more libraries for the recommended option.
---
 MOVED                                                     |  2 +-
 math/Makefile                                             |  2 +-
 math/{rkward-kde => rkward}/Makefile                      | 15 +++++++--------
 math/{rkward-kde => rkward}/distinfo                      |  0
 .../files/patch-rkward_windows_rkhtmlwindow.cpp           |  0
 .../files/patch-rkward_windows_rktoolwindowbar.cpp        |  0
 .../{rkward-kde => rkward}/files/patch-tests_all__tests.R |  0
 math/{rkward-kde => rkward}/pkg-descr                     |  0
 math/{rkward-kde => rkward}/pkg-plist                     |  0
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/MOVED b/MOVED
index 6fca9d05431c..871c24dd80ed 100644
--- a/MOVED
+++ b/MOVED
@@ -4528,7 +4528,6 @@ math/fung-calc||2013-07-26|Has expired: Depends on Qt 3.x
 math/koctave||2013-07-26|Has expired: Depends on Qt 3.x
 math/kseg||2013-07-26|Has expired: Depends on Qt 3.x
 math/pgcalc||2013-07-26|Has expired: Depends on Qt 3.x
-math/rkward||2013-07-26|Has expired: Depends on Qt 3.x
 math/xgfe||2013-07-26|Has expired: Depends on Qt 3.x
 misc/gwenview-i18n||2013-07-26|Has expired: Depends on Qt 3.x
 misc/k3b-i18n||2013-07-26|Has expired: Depends on Qt 3.x
@@ -17146,3 +17145,4 @@ mail/p5-Email-Sender-Transport-SMTPS|mail/p5-Email-Sender|2022-04-30|Has expired
 net/gogoc||2022-04-30|Has expired: Services were discontinued in 2016
 graphics/drm-current-kmod||2022-05-01|Switched to a Linux version based naming scheme. Use graphics/drm-510-kmod
 graphics/drm-devel-kmod||2022-05-01|Switched to a Linux version based naming scheme. Use graphics/drm-510-kmod
+math/rkward-kde|math/rkward|2022-05-06|Switched to the name used by upstream
diff --git a/math/Makefile b/math/Makefile
index 936e02e4b73b..3829740d163e 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -991,7 +991,7 @@
     SUBDIR += reed-solomon
     SUBDIR += rehearse
     SUBDIR += rexx-regmath
-    SUBDIR += rkward-kde
+    SUBDIR += rkward
     SUBDIR += rngstreams
     SUBDIR += rocs
     SUBDIR += rpcalc
diff --git a/math/rkward-kde/Makefile b/math/rkward/Makefile
similarity index 88%
rename from math/rkward-kde/Makefile
rename to math/rkward/Makefile
index 99908cb270e7..9ce2c484fa29 100644
--- a/math/rkward-kde/Makefile
+++ b/math/rkward/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	rkward
 PORTVERSION=	0.7.3
 CATEGORIES=	math
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION:C/b//}/src
-PKGNAMESUFFIX=	-kde
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	IDE/GUI for the R-project
@@ -51,7 +50,13 @@ RUN_DEPENDS+=	${LR_MOD_DIR}/XML/INDEX:textproc/R-cran-XML		\
 		${LR_MOD_DIR}/qcc/INDEX:graphics/R-cran-qcc		\
 		${LR_MOD_DIR}/tseries/INDEX:finance/R-cran-tseries	\
 		${LR_MOD_DIR}/xtable/INDEX:textproc/R-cran-xtable	\
-		${LR_MOD_DIR}/car/INDEX:math/R-cran-car
+		${LR_MOD_DIR}/car/INDEX:math/R-cran-car			\
+		${LR_MOD_DIR}/XLConnect/INDEX:math/R-cran-XLConnect	\
+		${LR_MOD_DIR}/ltm/INDEX:math/R-cran-ltm			\
+		${LR_MOD_DIR}/moments/INDEX:math/R-cran-moments		\
+		${LR_MOD_DIR}/pwr/INDEX:math/R-cran-pwr			\
+		${LR_MOD_DIR}/hdrcde/INDEX:math/R-cran-hdrcde		\
+		${LR_MOD_DIR}/exactRankTests/INDEX:math/R-cran-exactRankTests
 .endif
 
 .if ${PORT_OPTIONS:MINSTTEST}
@@ -81,10 +86,4 @@ post-install:
 	${R_COMMAND} CMD INSTALL -l ${STAGEDIR}${PREFIX}/${R_LIB_DIR} . )
 .endif
 
-.if defined(MAINTAINER_MODE)
-regression-test:	install
-	(cd ${WRKSRC}/tests &&	\
-	KDE_LANG=en_US ${PREFIX}/bin/${PORTNAME}  --evaluate source\(\"all_tests.R\"\) )
-.endif
-
 .include <bsd.port.mk>
diff --git a/math/rkward-kde/distinfo b/math/rkward/distinfo
similarity index 100%
rename from math/rkward-kde/distinfo
rename to math/rkward/distinfo
diff --git a/math/rkward-kde/files/patch-rkward_windows_rkhtmlwindow.cpp b/math/rkward/files/patch-rkward_windows_rkhtmlwindow.cpp
similarity index 100%
rename from math/rkward-kde/files/patch-rkward_windows_rkhtmlwindow.cpp
rename to math/rkward/files/patch-rkward_windows_rkhtmlwindow.cpp
diff --git a/math/rkward-kde/files/patch-rkward_windows_rktoolwindowbar.cpp b/math/rkward/files/patch-rkward_windows_rktoolwindowbar.cpp
similarity index 100%
rename from math/rkward-kde/files/patch-rkward_windows_rktoolwindowbar.cpp
rename to math/rkward/files/patch-rkward_windows_rktoolwindowbar.cpp
diff --git a/math/rkward-kde/files/patch-tests_all__tests.R b/math/rkward/files/patch-tests_all__tests.R
similarity index 100%
rename from math/rkward-kde/files/patch-tests_all__tests.R
rename to math/rkward/files/patch-tests_all__tests.R
diff --git a/math/rkward-kde/pkg-descr b/math/rkward/pkg-descr
similarity index 100%
rename from math/rkward-kde/pkg-descr
rename to math/rkward/pkg-descr
diff --git a/math/rkward-kde/pkg-plist b/math/rkward/pkg-plist
similarity index 100%
rename from math/rkward-kde/pkg-plist
rename to math/rkward/pkg-plist