- Update to 2.9.9

PR:		177254
Submitted by:	ports fury

4 files changed, 63 insertions, 74 deletions

diff --git a/x11/yakuake-kde4/Makefile b/x11/yakuake-kde4/Makefile
index 14296730384e..4df0dfde71cc 100644
--- a/x11/yakuake-kde4/Makefile
+++ b/x11/yakuake-kde4/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	yakuake
-PORTVERSION=	2.9.8
-PORTREVISION=	3
+PORTVERSION=	2.9.9
 CATEGORIES=	x11 kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	ports@FreeBSD.org
@@ -14,28 +12,14 @@ COMMENT=	Drop-down terminal emulator for KDE
 
 LICENSE=	GPLv2
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USES=		cmake
-USE_KDE4=	kdelibs kdeprefix automoc4
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-PLIST_SUB+=	NLS=""
+USE_KDE4=	automoc4 kdelibs kdeprefix
+USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_GETTEXT=	yes
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
 
-post-patch:
-.if ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e 's/^%%NLS%%//' ${WRKSRC}/CMakeLists.txt
-.else
-	@${REINPLACE_CMD} -e 's/^%%NLS%%/# /' ${WRKSRC}/CMakeLists.txt
-.endif
+PLIST_SUB=	VERSION="${PORTVERSION}"
 
 .include <bsd.port.mk>
diff --git a/x11/yakuake-kde4/distinfo b/x11/yakuake-kde4/distinfo
index 88aac12536fa..0d0014803323 100644
--- a/x11/yakuake-kde4/distinfo
+++ b/x11/yakuake-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yakuake-2.9.8.tar.bz2) = a359dfe47cd230af9663854972f2594716674e63f9c0413ba11629aaaa1d3d29
-SIZE (yakuake-2.9.8.tar.bz2) = 319316
+SHA256 (yakuake-2.9.9.tar.xz) = 0e0e4994c568f8091c9424e4aab35645436a9ff341c00b1cd1eab0ada0bf61ce
+SIZE (yakuake-2.9.9.tar.xz) = 316716
diff --git a/x11/yakuake-kde4/files/patch-CMakeLists.txt b/x11/yakuake-kde4/files/patch-CMakeLists.txt
deleted file mode 100644
index 17ea62fffc51..000000000000
--- a/x11/yakuake-kde4/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- CMakeLists_.txt	2011-11-08 19:31:32.273220945 +0400
-+++ CMakeLists.txt	2011-11-08 19:31:10.253224705 +0400
-@@ -8,6 +8,6 @@
- 
- add_subdirectory( app )
- add_subdirectory( skins )
--find_package(Msgfmt REQUIRED)
--find_package(Gettext REQUIRED)
--add_subdirectory( po )
-+%%NLS%%find_package(Msgfmt REQUIRED)
-+%%NLS%%find_package(Gettext REQUIRED)
-+%%NLS%%add_subdirectory( po )
diff --git a/x11/yakuake-kde4/pkg-plist b/x11/yakuake-kde4/pkg-plist
index bfaa4d3b8184..630a01280182 100644
--- a/x11/yakuake-kde4/pkg-plist
+++ b/x11/yakuake-kde4/pkg-plist
@@ -1,5 +1,7 @@
 bin/yakuake
 share/applications/kde4/yakuake.desktop
+share/apps/kconf_update/yakuake-%%VERSION%%-startupnotification.pl
+share/apps/kconf_update/yakuake.upd
 share/apps/yakuake/skins/README
 share/apps/yakuake/skins/default/icon.png
 share/apps/yakuake/skins/default/tabs.skin
@@ -91,6 +93,8 @@ share/apps/yakuake/skins/plastik_light/title/quit_down.png
 share/apps/yakuake/skins/plastik_light/title/quit_over.png
 share/apps/yakuake/skins/plastik_light/title/quit_up.png
 share/apps/yakuake/skins/plastik_light/title/right.png
+share/apps/yakuake/yakuake.notifyrc
+share/config/yakuake.knsrc
 share/icons/hicolor/128x128/apps/yakuake.png
 share/icons/hicolor/16x16/apps/yakuake.png
 share/icons/hicolor/22x22/apps/yakuake.png
@@ -99,41 +103,57 @@ share/icons/hicolor/32x32/apps/yakuake.png
 share/icons/hicolor/48x48/apps/yakuake.png
 share/icons/hicolor/64x64/apps/yakuake.png
 share/icons/hicolor/scalable/apps/yakuake.svgz
-%%NLS%%share/locale/ca/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/ca@valencia/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/da/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/de/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/el/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/es/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/et/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/it/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/nds/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/th/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/wa/LC_MESSAGES/yakuake.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/yakuake.mo
-@dirrmtry share/icons/hicolor/256x256/apps
-@dirrmtry share/icons/hicolor/256x256
+share/locale/ca/LC_MESSAGES/yakuake.mo
+share/locale/ca@valencia/LC_MESSAGES/yakuake.mo
+share/locale/cs/LC_MESSAGES/yakuake.mo
+share/locale/da/LC_MESSAGES/yakuake.mo
+share/locale/de/LC_MESSAGES/yakuake.mo
+share/locale/el/LC_MESSAGES/yakuake.mo
+share/locale/en_GB/LC_MESSAGES/yakuake.mo
+share/locale/es/LC_MESSAGES/yakuake.mo
+share/locale/et/LC_MESSAGES/yakuake.mo
+share/locale/fi/LC_MESSAGES/yakuake.mo
+share/locale/fr/LC_MESSAGES/yakuake.mo
+share/locale/ga/LC_MESSAGES/yakuake.mo
+share/locale/hr/LC_MESSAGES/yakuake.mo
+share/locale/hu/LC_MESSAGES/yakuake.mo
+share/locale/it/LC_MESSAGES/yakuake.mo
+share/locale/km/LC_MESSAGES/yakuake.mo
+share/locale/ko/LC_MESSAGES/yakuake.mo
+share/locale/nb/LC_MESSAGES/yakuake.mo
+share/locale/nds/LC_MESSAGES/yakuake.mo
+share/locale/nl/LC_MESSAGES/yakuake.mo
+share/locale/nn/LC_MESSAGES/yakuake.mo
+share/locale/pa/LC_MESSAGES/yakuake.mo
+share/locale/pl/LC_MESSAGES/yakuake.mo
+share/locale/pt/LC_MESSAGES/yakuake.mo
+share/locale/pt_BR/LC_MESSAGES/yakuake.mo
+share/locale/ro/LC_MESSAGES/yakuake.mo
+share/locale/ru/LC_MESSAGES/yakuake.mo
+share/locale/sk/LC_MESSAGES/yakuake.mo
+share/locale/sr/LC_MESSAGES/yakuake.mo
+share/locale/sr@ijekavian/LC_MESSAGES/yakuake.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/yakuake.mo
+share/locale/sr@latin/LC_MESSAGES/yakuake.mo
+share/locale/sv/LC_MESSAGES/yakuake.mo
+share/locale/th/LC_MESSAGES/yakuake.mo
+share/locale/tr/LC_MESSAGES/yakuake.mo
+share/locale/uk/LC_MESSAGES/yakuake.mo
+share/locale/wa/LC_MESSAGES/yakuake.mo
+share/locale/zh_CN/LC_MESSAGES/yakuake.mo
+share/locale/zh_TW/LC_MESSAGES/yakuake.mo
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/sr@ijekavianlatin/LC_MESSAGES
+@dirrmtry share/locale/sr@ijekavianlatin
+@dirrmtry share/locale/sr@ijekavian/LC_MESSAGES
+@dirrmtry share/locale/sr@ijekavian
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrm share/apps/yakuake/skins/plastik_light/title
 @dirrm share/apps/yakuake/skins/plastik_light/tabs
 @dirrm share/apps/yakuake/skins/plastik_light
@@ -145,6 +165,3 @@ share/icons/hicolor/scalable/apps/yakuake.svgz
 @dirrm share/apps/yakuake/skins/default
 @dirrm share/apps/yakuake/skins
 @dirrm share/apps/yakuake
-@dirrmtry share/apps
-@dirrmtry share/applications/kde4
-@dirrmtry share/applications