- Upgrade to 1711_B04;

- Don't prune empty directories.

3 files changed, 23 insertions, 17 deletions

diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index 7026c93aee20..b87af8e7b1ae 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	mercury
-DISTVERSION=	1710_F2
+DISTVERSION=	1711_B04
 PORTEPOCH=	3
 CATEGORIES=	net-im java
 MASTER_SITES=	${MASTER_SITE_LOCAL}		\
 		http://download.mercury.to/
 MASTER_SITE_SUBDIR=	thierry/${PORTNAME}
-DISTNAME=	${DISTVERSION}
+#DISTNAME=	${DISTVERSION}
+DISTNAME=	55	# DISTNAME changed to 10th Fibonacci number ;-)
 DIST_SUBDIR=	${PORTNAME}
 
 # Maintainership available: drop me a line if interested
@@ -57,7 +58,9 @@ do-install:
 	cd ${WRKDIR} && ${FIND} ${sd} -type d -exec ${MKDIR} ${INSTDIR}/{} \;
 	cd ${WRKDIR} && ${FIND} ${sd} -type f -exec ${INSTALL_DATA} {} ${INSTDIR}/{} \;
 .endfor
-	@${RMDIR} ${DIR2PRUNE:S|^|${INSTDIR}/|}
+.for ed in ${DIR2PRUNE}
+	${TOUCH} ${INSTDIR}/${ed}/.keep_me
+.endfor
 .if defined(WITH_VIDEO)
 	${INSTALL_DATA} ${_DISTDIR}/${VIDJAR} ${INSTDIR}/lib
 .endif
diff --git a/net-im/mercury/distinfo b/net-im/mercury/distinfo
index c793827efb1b..e387a57829d6 100644
--- a/net-im/mercury/distinfo
+++ b/net-im/mercury/distinfo
@@ -1,6 +1,6 @@
-MD5 (mercury/1710_F2.zip) = f68b64e2ecf833d06876f4901eeec92d
-SHA256 (mercury/1710_F2.zip) = ceb243db5c6216e7f3f2b60611512adcf4c2ccceef931d3c95a441b28ad950fd
-SIZE (mercury/1710_F2.zip) = 5461124
+MD5 (mercury/55.zip) = 9ee2a348e383860f0481f6b9f857cf0c
+SHA256 (mercury/55.zip) = 161edf5b7f6766d2b800615736ff482e8336b23d22460727f22c31294891df23
+SIZE (mercury/55.zip) = 5487913
 MD5 (mercury/VidConf-libs.jar) = 873b832b9ccc9de4783d1770aaee6c65
 SHA256 (mercury/VidConf-libs.jar) = 13c7b81b1f60c10c347d5e3616c3a9881dea130891f2ebcdd2d7ffec03b0fe80
 SIZE (mercury/VidConf-libs.jar) = 617362
diff --git a/net-im/mercury/pkg-plist b/net-im/mercury/pkg-plist
index bb520265578f..cc63aa753185 100644
--- a/net-im/mercury/pkg-plist
+++ b/net-im/mercury/pkg-plist
@@ -10,7 +10,9 @@ bin/Mercury_Messenger
 %%INSTDIR%%/lib/xmlpull.jar
 %%INSTDIR%%/resources/AppData/Backgrounds/Default.png
 %%INSTDIR%%/resources/AppData/CustomEmoticons/MSN6.zip
+%%INSTDIR%%/resources/AppData/Games/.keep_me
 %%INSTDIR%%/resources/AppData/LoginImages/Default.gif
+%%INSTDIR%%/resources/AppData/Plugins/.keep_me
 %%INSTDIR%%/resources/AppData/Skins/Aqua.zip
 %%INSTDIR%%/resources/AppData/Skins/BBJ2.zip
 %%INSTDIR%%/resources/AppData/Skins/Barbie.zip
@@ -36,7 +38,6 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/SplashWindow/Default.zip
 %%INSTDIR%%/resources/AppData/SplashWindow/Girl.zip
 %%INSTDIR%%/resources/AppData/SplashWindow/Mercury.zip
-%%INSTDIR%%/resources/AppData/StatusIcons/J_ICQ/Thumbs.db
 %%INSTDIR%%/resources/AppData/StatusIcons/J_ICQ/away.gif
 %%INSTDIR%%/resources/AppData/StatusIcons/J_ICQ/chat.gif
 %%INSTDIR%%/resources/AppData/StatusIcons/J_ICQ/dnd.gif
@@ -58,8 +59,12 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/StatusIcons/M_Scarecrow 24p.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/M_Scarecrow 32p.zip
 %%INSTDIR%%/resources/AppData/StatusIcons/M_jMSN.zip
+%%INSTDIR%%/resources/AppData/Themes/.keep_me
+%%INSTDIR%%/resources/AppData/Views/ColorExample_GroupView/Example.html
+%%INSTDIR%%/resources/AppData/Views/ColorExample_GroupView/View.xml
 %%INSTDIR%%/resources/AppData/Views/Default_CLContact/Alias.html
 %%INSTDIR%%/resources/AppData/Views/Default_CLContact/Alias_MSNName.html
+%%INSTDIR%%/resources/AppData/Views/Default_CLContact/D1.html
 %%INSTDIR%%/resources/AppData/Views/Default_CLContact/DP_SI.html
 %%INSTDIR%%/resources/AppData/Views/Default_CLContact/Email.html
 %%INSTDIR%%/resources/AppData/Views/Default_CLContact/LargeDP_Alias_PM_Song.html
@@ -86,7 +91,6 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/Views/Default_ContactCard/msn_right.png
 %%INSTDIR%%/resources/AppData/Views/Default_ContactCard/msn_right_bot.png
 %%INSTDIR%%/resources/AppData/Views/Default_ContactCard/msn_shadow.png
-%%INSTDIR%%/resources/AppData/Views/Default_ContactCard/page2.html
 %%INSTDIR%%/resources/AppData/Views/Default_ContactCard/right_arrow.png
 %%INSTDIR%%/resources/AppData/Views/Default_General/Alias.txt
 %%INSTDIR%%/resources/AppData/Views/Default_General/Alias_MSNName.txt
@@ -97,6 +101,8 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/Views/Default_IM/Colors2.html
 %%INSTDIR%%/resources/AppData/Views/Default_IM/Default.html
 %%INSTDIR%%/resources/AppData/Views/Default_IM/View.xml
+%%INSTDIR%%/resources/AppData/Views/Default_MultiConvoList/Default.html
+%%INSTDIR%%/resources/AppData/Views/Default_MultiConvoList/View.xml
 %%INSTDIR%%/resources/AppData/Winks/L0g4WmxDZ1JTOXlsZmFvTCtnd0ZIektleXA4PQ==/Wink.cab
 %%INSTDIR%%/resources/AppData/Winks/L0g4WmxDZ1JTOXlsZmFvTCtnd0ZIektleXA4PQ==/content.xml
 %%INSTDIR%%/resources/AppData/Winks/L0g4WmxDZ1JTOXlsZmFvTCtnd0ZIektleXA4PQ==/crying.png
@@ -178,19 +184,11 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/settings/Window_Basic_Global.xml
 %%INSTDIR%%/resources/settings/Window_View.xml
 %%INSTDIR%%/resources/settings/Wizard_FirstTime_Account.xml
-%%INSTDIR%%/resources/text/ConvoCommands.xml
 %%INSTDIR%%/resources/text/JabberServers.xml
 %%INSTDIR%%/resources/text/Locations.xml
+%%INSTDIR%%/resources/text/MessageLog.xsl
 %%INSTDIR%%/resources/text/RSSFeeds.xml
-%%INSTDIR%%/resources/text/xsl templates/Chatachtig/MessageLog.xsl
-%%INSTDIR%%/resources/text/xsl templates/Default/MessageLog.xsl
-%%INSTDIR%%/resources/text/xsl templates/MessageLog.xsl
-%%INSTDIR%%/resources/text/xsl templates/Overzichtelijk/MessageLog.xsl
 %%VID%%%%INSTDIR%%/lib/VidConf-libs.jar
-@dirrm %%INSTDIR%%/resources/text/xsl templates/Overzichtelijk
-@dirrm %%INSTDIR%%/resources/text/xsl templates/Default
-@dirrm %%INSTDIR%%/resources/text/xsl templates/Chatachtig
-@dirrm %%INSTDIR%%/resources/text/xsl templates
 @dirrm %%INSTDIR%%/resources/text
 @dirrm %%INSTDIR%%/resources/settings
 @dirrm %%INSTDIR%%/resources/menu
@@ -214,19 +212,24 @@ bin/Mercury_Messenger
 @dirrm %%INSTDIR%%/resources/AppData/Winks/NVNZQXpvRkwyR3VtL0VOMnVMc2tPaURNMGFFPQ==
 @dirrm %%INSTDIR%%/resources/AppData/Winks/L0g4WmxDZ1JTOXlsZmFvTCtnd0ZIektleXA4PQ==
 @dirrm %%INSTDIR%%/resources/AppData/Winks
+@dirrm %%INSTDIR%%/resources/AppData/Views/Default_MultiConvoList
 @dirrm %%INSTDIR%%/resources/AppData/Views/Default_IM
 @dirrm %%INSTDIR%%/resources/AppData/Views/Default_General
 @dirrm %%INSTDIR%%/resources/AppData/Views/Default_ContactCard
 @dirrm %%INSTDIR%%/resources/AppData/Views/Default_Chat
 @dirrm %%INSTDIR%%/resources/AppData/Views/Default_CLGroup
 @dirrm %%INSTDIR%%/resources/AppData/Views/Default_CLContact
+@dirrm %%INSTDIR%%/resources/AppData/Views/ColorExample_GroupView
 @dirrm %%INSTDIR%%/resources/AppData/Views
+@dirrm %%INSTDIR%%/resources/AppData/Themes
 @dirrm %%INSTDIR%%/resources/AppData/StatusIcons/J_ICQ
 @dirrm %%INSTDIR%%/resources/AppData/StatusIcons
 @dirrm %%INSTDIR%%/resources/AppData/SplashWindow
 @dirrm %%INSTDIR%%/resources/AppData/Sounds
 @dirrm %%INSTDIR%%/resources/AppData/Skins
+@dirrm %%INSTDIR%%/resources/AppData/Plugins
 @dirrm %%INSTDIR%%/resources/AppData/LoginImages
+@dirrm %%INSTDIR%%/resources/AppData/Games
 @dirrm %%INSTDIR%%/resources/AppData/CustomEmoticons
 @dirrm %%INSTDIR%%/resources/AppData/Backgrounds
 @dirrm %%INSTDIR%%/resources/AppData