- Update deskutils/plasma-applet-yawp to 0.3.3 release

PR:		147959
Submitted by:	Jason E. Hale (maintainer)
Feature safe:	yes

6 files changed, 35 insertions, 36 deletions

diff --git a/deskutils/plasma-applet-yawp/Makefile b/deskutils/plasma-applet-yawp/Makefile
index 537f79db603e..778e7cb700a5 100644
--- a/deskutils/plasma-applet-yawp/Makefile
+++ b/deskutils/plasma-applet-yawp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	yawp
-PORTVERSION=	0.3.2
-PORTREVISION=	2
+PORTVERSION=	0.3.3
 CATEGORIES=	deskutils kde
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	plasma-applet-
diff --git a/deskutils/plasma-applet-yawp/distinfo b/deskutils/plasma-applet-yawp/distinfo
index d862a6b5c8b9..ba3ecc280b35 100644
--- a/deskutils/plasma-applet-yawp/distinfo
+++ b/deskutils/plasma-applet-yawp/distinfo
@@ -1,3 +1,3 @@
-MD5 (yawp-0.3.2.tar.bz2) = ba4941e81e61086ccec06584f7ae98dd
-SHA256 (yawp-0.3.2.tar.bz2) = d311f3871258118de7d5032de895d5e11c9d42e1f18fc256bfac1fdbbb5b8daa
-SIZE (yawp-0.3.2.tar.bz2) = 982100
+MD5 (yawp-0.3.3.tar.bz2) = 82368f30828e66d7f136ba9f39240b25
+SHA256 (yawp-0.3.3.tar.bz2) = 423cf547bc79927762a31c1ccf060e75dadf319dad24fdd695fdf57e8681d81e
+SIZE (yawp-0.3.3.tar.bz2) = 1075277
diff --git a/deskutils/plasma-applet-yawp/files/patch-applet__CMakeLists.txt b/deskutils/plasma-applet-yawp/files/patch-applet__CMakeLists.txt
index 6abb26abaf07..76d50b7fd58f 100644
--- a/deskutils/plasma-applet-yawp/files/patch-applet__CMakeLists.txt
+++ b/deskutils/plasma-applet-yawp/files/patch-applet__CMakeLists.txt
@@ -1,26 +1,24 @@
---- ./applet/CMakeLists.txt.orig	2009-12-06 15:08:29.000000000 -0500
-+++ ./applet/CMakeLists.txt	2010-02-05 03:23:32.000000000 -0500
-@@ -54,23 +54,3 @@
-         DESTINATION     ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/
+--- ./applet/CMakeLists.txt.orig	2010-06-13 04:54:48.000000000 -0400
++++ ./applet/CMakeLists.txt	2010-06-13 04:55:30.000000000 -0400
+@@ -60,21 +60,4 @@
          )
  
--
+ 
 -## This is needed for the CPack package generator.
 -#
--INSTALL(TARGETS plasma_yawp
--        LIBRARY DESTINATION   "${YAWP_PACK_INSTALL_LIB_DIR}"
--        ARCHIVE DESTINATION   "${YAWP_PACK_INSTALL_LIB_DIR}"
--        RUNTIME DESTINATION   "${YAWP_PACK_INSTALL_LIB_DIR}"
+-INSTALL(TARGETS               plasma_applet_yawp
+-        LIBRARY DESTINATION   ${YAWP_PACK_INSTALL_LIB_DIR}
+-        ARCHIVE DESTINATION   ${YAWP_PACK_INSTALL_LIB_DIR}
+-        RUNTIME DESTINATION   ${YAWP_PACK_INSTALL_LIB_DIR}
 -        COMPONENT Libraries
 -        )
--
--INSTALL(FILES         plasma_yawp.desktop
--        DESTINATION   "${YAWP_PACK_SERVICES_DIR}"
--        COMPONENT     ApplicationData
+ 
+-INSTALL(FILES         ${CMAKE_CURRENT_BINARY_DIR}/plasma-applet-yawp.desktop
+-        DESTINATION   ${YAWP_PACK_SERVICES_DIR}
+-        COMPONENT     Libraries
 -        )
 -
--STRING(REGEX REPLACE "/usr/" "" YAWP_PACK_DATA_DIR "${DATA_INSTALL_DIR}/desktoptheme/default/widgets/")
 -INSTALL(FILES         yawp_theme15.svg
--        DESTINATION   "${YAWP_PACK_DATA_DIR}"
+-        DESTINATION   ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/
 -        COMPONENT     ApplicationData
 -        )
diff --git a/deskutils/plasma-applet-yawp/files/patch-ions__CMakeLists.txt b/deskutils/plasma-applet-yawp/files/patch-ions__CMakeLists.txt
index e37bbd57d16d..cce292d10f9f 100644
--- a/deskutils/plasma-applet-yawp/files/patch-ions__CMakeLists.txt
+++ b/deskutils/plasma-applet-yawp/files/patch-ions__CMakeLists.txt
@@ -1,20 +1,19 @@
---- ./ions/CMakeLists.txt.orig	2010-02-05 03:23:46.000000000 -0500
-+++ ./ions/CMakeLists.txt	2010-02-05 03:24:02.000000000 -0500
-@@ -38,17 +38,3 @@
- install(  TARGETS       ion_google            DESTINATION    ${PLUGIN_INSTALL_DIR})
- install(  FILES         ${GOOGLE_DESKTOP}     DESTINATION    ${SERVICES_INSTALL_DIR})
+--- ./ions/CMakeLists.txt.orig	2010-06-13 04:55:41.000000000 -0400
++++ ./ions/CMakeLists.txt	2010-06-13 04:56:31.000000000 -0400
+@@ -56,16 +56,4 @@
+ install(  FILES        ${WUNDERGROUND_DESKTOP}     DESTINATION    ${SERVICES_INSTALL_DIR})
+ 
  
--
 -## This is needed for the CPack package generator.
 -#
--INSTALL(TARGETS       ion_accuweather ion_google
+-INSTALL(TARGETS       ion_accuweather ion_google ion_wunderground
 -	LIBRARY       DESTINATION "${YAWP_PACK_INSTALL_LIB_DIR}"
 -	ARCHIVE       DESTINATION "${YAWP_PACK_INSTALL_LIB_DIR}"
 -	RUNTIME       DESTINATION "${YAWP_PACK_INSTALL_LIB_DIR}"
 -	COMPONENT     Libraries
 -	)
--
--INSTALL(FILES         ${ACCUWEATHER_DESKTOP} ${GOOGLE_DESKTOP}
+ 
+-INSTALL(FILES     ${ACCUWEATHER_DESKTOP} ${GOOGLE_DESKTOP} ${WUNDERGROUND_DESKTOP}
 -	DESTINATION   "${YAWP_PACK_SERVICES_DIR}"
--	COMPONENT     ApplicationData
+-	COMPONENT     Libraries
 -	)
diff --git a/deskutils/plasma-applet-yawp/files/patch-po__CMakeLists.txt b/deskutils/plasma-applet-yawp/files/patch-po__CMakeLists.txt
index 3d08d3c06bdc..911a70589eae 100644
--- a/deskutils/plasma-applet-yawp/files/patch-po__CMakeLists.txt
+++ b/deskutils/plasma-applet-yawp/files/patch-po__CMakeLists.txt
@@ -1,12 +1,12 @@
---- ./po/CMakeLists.txt.orig	2010-02-05 03:24:20.000000000 -0500
-+++ ./po/CMakeLists.txt	2010-02-05 03:24:41.000000000 -0500
+--- ./po/CMakeLists.txt.orig	2010-06-13 04:58:01.000000000 -0400
++++ ./po/CMakeLists.txt	2010-06-13 04:58:29.000000000 -0400
 @@ -27,12 +27,6 @@
  	        RENAME        plasma_applet_yawp.mo
  	        )
  
 -	INSTALL(FILES         ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo
--		DESTINATION   "${YAWP_PACK_LOCALE_DIR}/${_lang}/LC_MESSAGES/"
--		RENAME        plasma_applet_${CMAKE_PROJECT_NAME}.mo
+-		DESTINATION   ${YAWP_PACK_LOCALE_DIR}/${_lang}/LC_MESSAGES/
+-		RENAME        plasma_applet_yawp.mo
 -		COMPONENT     ApplicationData
 -		)
 -
diff --git a/deskutils/plasma-applet-yawp/pkg-plist b/deskutils/plasma-applet-yawp/pkg-plist
index d48b85a8b0b1..3db33aa71fcc 100644
--- a/deskutils/plasma-applet-yawp/pkg-plist
+++ b/deskutils/plasma-applet-yawp/pkg-plist
@@ -1,10 +1,12 @@
 lib/kde4/ion_accuweather.so
 lib/kde4/ion_google.so
-lib/kde4/plasma_yawp.so
+lib/kde4/ion_wunderground.so
+lib/kde4/plasma_applet_yawp.so
 share/apps/desktoptheme/default/widgets/yawp_theme15.svg
 share/kde4/services/ion-accuweather.desktop
 share/kde4/services/ion-google.desktop
-share/kde4/services/plasma_yawp.desktop
+share/kde4/services/ion-wunderground.desktop
+share/kde4/services/plasma-applet-yawp.desktop
 share/locale/af/LC_MESSAGES/plasma_applet_yawp.mo
 share/locale/cs/LC_MESSAGES/plasma_applet_yawp.mo
 share/locale/de/LC_MESSAGES/plasma_applet_yawp.mo
@@ -16,3 +18,4 @@ share/locale/pl/LC_MESSAGES/plasma_applet_yawp.mo
 share/locale/ru/LC_MESSAGES/plasma_applet_yawp.mo
 share/locale/sk/LC_MESSAGES/plasma_applet_yawp.mo
 share/locale/sl/LC_MESSAGES/plasma_applet_yawp.mo
+share/locale/uk/LC_MESSAGES/plasma_applet_yawp.mo