x11-themes/qtcurve: Update to 1.9.0

Remove old KDE4 pkg-plist

6 files changed, 43 insertions, 40 deletions

diff --git a/x11-themes/qtcurve-kf5/Makefile b/x11-themes/qtcurve-kf5/Makefile
index 3c683207325e..da17091dfb96 100644
--- a/x11-themes/qtcurve-kf5/Makefile
+++ b/x11-themes/qtcurve-kf5/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qtcurve
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	QtCurve KDE Frameworks 5 widget style and window decoration
 
diff --git a/x11-themes/qtcurve-qt5/Makefile b/x11-themes/qtcurve-qt5/Makefile
index 5516d5160712..59c647847147 100644
--- a/x11-themes/qtcurve-qt5/Makefile
+++ b/x11-themes/qtcurve-qt5/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qtcurve
-PORTREVISION=	1
+PORTREVISION=	0
 
 COMMENT=	QtCurve widget style for Qt 5
 
diff --git a/x11-themes/qtcurve/Makefile b/x11-themes/qtcurve/Makefile
index b13ab8940766..22c7e2232617 100644
--- a/x11-themes/qtcurve/Makefile
+++ b/x11-themes/qtcurve/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	qtcurve
-DISTVERSION=	1.9.0-rc1
-PORTREVISION?=	6
+PORTVERSION=	1.9.0
+PORTREVISION?=	0
 CATEGORIES=	x11-themes
+MASTER_SITES=	KDE/stable/${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT?=	Widget styles for Qt and GTK+ toolkits
@@ -24,17 +26,10 @@ KF5_RUN_DEPENDS=	kf5-style-qtcurve>=${PORTVERSION}:x11-themes/qtcurve-kf5
 QT5_RUN_DEPENDS=	qt5-style-qtcurve>=${PORTVERSION}:x11-themes/qtcurve-qt5
 
 .else # !defined(QTCURVE_SLAVE)
-PATCH_SITES=	https://github.com/KDE/${PORTNAME}/commit/
-PATCHFILES=	ee2228ea2f18ac5da9b434ee6089381df815aa94.patch:-p1
-
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	KDE
-GH_TAGNAME=	a1ec5f8
-
-USES=		compiler:c++11-lib cmake:insource pkgconfig xorg
+USES=		compiler:c++11-lib cmake:insource pkgconfig tar:xz xorg
 USE_XORG=	x11 xcb
 
 .for i in gtk2 kf5 qt5
@@ -56,6 +51,8 @@ PLIST=		${PKGDIR}/pkg-plist.${QTCURVE_SLAVE}
 
 .if ${QTCURVE_SLAVE} == "utils"
 PKGNAMESUFFIX=	-utils
+USES+=		gettext-runtime kde:5
+USE_KDE+=	i18n_build
 USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}
 .else
@@ -65,7 +62,8 @@ LIB_DEPENDS+=	libqtcurve-utils.so:x11-themes/qtcurve-utils
 .if ${QTCURVE_SLAVE} == "gtk2"
 PKGNAMEPREFIX=	gtk2-
 PKGNAMESUFFIX=	-theme
-USES+=		gnome
+USES+=		gettext-runtime gnome kde:5
+USE_KDE=	i18n_build
 USE_GNOME=	cairo gdkpixbuf2 gtk20 pango
 USE_LDCONFIG=	yes
 
@@ -90,7 +88,8 @@ BUILD_WRKSRC=	${WRKSRC}/qt5
 .if ${QTCURVE_SLAVE} == "qt5"
 CONFLICTS_INSTALL=	kf5-style-qtcurve
 PKGNAMEPREFIX=	qt5-style-
-USES+=		qt:5
+USES+=		kde:5 qt:5
+USE_KDE=	i18n_build
 USE_QT=		core dbus gui svg widgets x11extras \
 		buildtools_build qmake_build
 PLIST_FILES=	${QT_PLUGINDIR_REL}/styles/qtcurve.so
diff --git a/x11-themes/qtcurve/distinfo b/x11-themes/qtcurve/distinfo
index 61761c1a4c89..b6f6eec38201 100644
--- a/x11-themes/qtcurve/distinfo
+++ b/x11-themes/qtcurve/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1564853319
-SHA256 (KDE-qtcurve-1.9.0-rc1-a1ec5f8_GH0.tar.gz) = 1be388cb06f30c9dd4e5685a35ab5d5910619bc644c63e9f5fca75313fb8646d
-SIZE (KDE-qtcurve-1.9.0-rc1-a1ec5f8_GH0.tar.gz) = 800796
-SHA256 (ee2228ea2f18ac5da9b434ee6089381df815aa94.patch) = aadcd34dd4f3c66b1a4c9dbd163fc5642ca995f4095f49db05dc479716b5a7fe
-SIZE (ee2228ea2f18ac5da9b434ee6089381df815aa94.patch) = 1053
+TIMESTAMP = 1553871749
+SHA256 (qtcurve-1.9.tar.xz) = 281f5e3d13b0c1c0aeea6f5c7e895aedcb8f4ce91bdbd12d068d3616bc6d2f99
+SIZE (qtcurve-1.9.tar.xz) = 759944
diff --git a/x11-themes/qtcurve/pkg-plist.kde4 b/x11-themes/qtcurve/pkg-plist.kde4
deleted file mode 100644
index 7273aeb7dab2..000000000000
--- a/x11-themes/qtcurve/pkg-plist.kde4
+++ /dev/null
@@ -1,21 +0,0 @@
-lib/kde4/kstyle_qtcurve_config.so
-lib/kde4/kwin3_qtcurve.so
-lib/kde4/kwin_qtcurve_config.so
-lib/kde4/plugins/styles/qtcurve.so
-share/apps/QtCurve/Agua.qtcurve
-share/apps/QtCurve/Agua_II.qtcurve
-share/apps/QtCurve/Curve.qtcurve
-share/apps/QtCurve/Flat.qtcurve
-share/apps/QtCurve/Human.qtcurve
-share/apps/QtCurve/Inverted.qtcurve
-share/apps/QtCurve/Klearlooks.qtcurve
-share/apps/QtCurve/Milk.qtcurve
-share/apps/QtCurve/Murrine.qtcurve
-share/apps/QtCurve/Ozone.qtcurve
-share/apps/QtCurve/Plastic.qtcurve
-share/apps/QtCurve/QtCurveui.rc
-share/apps/QtCurve/Silk.qtcurve
-share/apps/color-schemes/QtCurve.colors
-share/apps/color-schemes/QtCurveAgua.colors
-share/apps/kstyle/themes/qtcurve.themerc
-share/apps/kwin/qtcurve.desktop
diff --git a/x11-themes/qtcurve/pkg-plist.utils b/x11-themes/qtcurve/pkg-plist.utils
index 297095834b83..448fc0d7959b 100644
--- a/x11-themes/qtcurve/pkg-plist.utils
+++ b/x11-themes/qtcurve/pkg-plist.utils
@@ -1,3 +1,30 @@
 lib/libqtcurve-utils.so
 lib/libqtcurve-utils.so.2
 lib/libqtcurve-utils.so.2.0
+share/locale/ast/LC_MESSAGES/qtcurve.mo
+share/locale/bs/LC_MESSAGES/qtcurve.mo
+share/locale/ca/LC_MESSAGES/qtcurve.mo
+share/locale/ca@valencia/LC_MESSAGES/qtcurve.mo
+share/locale/cs/LC_MESSAGES/qtcurve.mo
+share/locale/de/LC_MESSAGES/qtcurve.mo
+share/locale/el/LC_MESSAGES/qtcurve.mo
+share/locale/en_GB/LC_MESSAGES/qtcurve.mo
+share/locale/es/LC_MESSAGES/qtcurve.mo
+share/locale/fi/LC_MESSAGES/qtcurve.mo
+share/locale/fr/LC_MESSAGES/qtcurve.mo
+share/locale/gl/LC_MESSAGES/qtcurve.mo
+share/locale/it/LC_MESSAGES/qtcurve.mo
+share/locale/ja/LC_MESSAGES/qtcurve.mo
+share/locale/ko/LC_MESSAGES/qtcurve.mo
+share/locale/nl/LC_MESSAGES/qtcurve.mo
+share/locale/pl/LC_MESSAGES/qtcurve.mo
+share/locale/pt/LC_MESSAGES/qtcurve.mo
+share/locale/pt_BR/LC_MESSAGES/qtcurve.mo
+share/locale/ru/LC_MESSAGES/qtcurve.mo
+share/locale/sk/LC_MESSAGES/qtcurve.mo
+share/locale/sv/LC_MESSAGES/qtcurve.mo
+share/locale/tr/LC_MESSAGES/qtcurve.mo
+share/locale/uk/LC_MESSAGES/qtcurve.mo
+share/locale/zh_CN/LC_MESSAGES/qtcurve.mo
+share/locale/zh_HK/LC_MESSAGES/qtcurve.mo
+share/locale/zh_TW/LC_MESSAGES/qtcurve.mo