Upgrade to 1710 Beta 14.

3 files changed, 5 insertions, 118 deletions

diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index eec7d575b368..25f15c32db6c 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercury
-DISTVERSION=	1710_B12
+DISTVERSION=	1710_B14z
 PORTEPOCH=	2
 CATEGORIES=	net-im java
 MASTER_SITES=	${MASTER_SITE_LOCAL}		\
diff --git a/net-im/mercury/distinfo b/net-im/mercury/distinfo
index eb0a561dd5ea..de3b3a9b0ac3 100644
--- a/net-im/mercury/distinfo
+++ b/net-im/mercury/distinfo
@@ -1,6 +1,6 @@
-MD5 (mercury/1710_B12.zip) = f38b4060ea7fd7a97f52ca81dcb53c31
-SHA256 (mercury/1710_B12.zip) = 53e058e561fb463a7512cbed77afd65a199b64e9492a3065cd6f9145b0e073de
-SIZE (mercury/1710_B12.zip) = 5375917
+MD5 (mercury/1710_B14z.zip) = ab3ff9fb07988380e5ad345ccd52ea04
+SHA256 (mercury/1710_B14z.zip) = c74b4a587c87651a1270e99950b433a4bb32b621a8a378b10d9efc4ba2fedd07
+SIZE (mercury/1710_B14z.zip) = 5163208
 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 43a6b7684c40..2a3009f2f9a8 100644
--- a/net-im/mercury/pkg-plist
+++ b/net-im/mercury/pkg-plist
@@ -11,107 +11,6 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/Backgrounds/Default.png
 %%INSTDIR%%/resources/AppData/CustomEmoticons/MSN6.zip
 %%INSTDIR%%/resources/AppData/LoginImages/Default.gif
-%%INSTDIR%%/resources/AppData/Plugins/ContactExample/Plugin.class
-%%INSTDIR%%/resources/AppData/Plugins/ContactExample/Plugin.java
-%%INSTDIR%%/resources/AppData/Plugins/ContactExample/compile.bat
-%%INSTDIR%%/resources/AppData/Plugins/ConvoStats/Plugin.class
-%%INSTDIR%%/resources/AppData/Plugins/ConvoStats/Plugin.java
-%%INSTDIR%%/resources/AppData/Plugins/ConvoStats/Stats.class
-%%INSTDIR%%/resources/AppData/Plugins/ConvoStats/compile.bat
-%%INSTDIR%%/resources/AppData/Plugins/IrcCommand/Plugin.class
-%%INSTDIR%%/resources/AppData/Plugins/IrcCommand/Plugin.java
-%%INSTDIR%%/resources/AppData/Plugins/IrcCommand/compile.bat
-%%INSTDIR%%/resources/AppData/Plugins/LinuxCPU/Plugin.class
-%%INSTDIR%%/resources/AppData/Plugins/LinuxCPU/Plugin.java
-%%INSTDIR%%/resources/AppData/Plugins/LinuxCPU/compile.bat
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/Plugin$1.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/Plugin.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/Plugin.java
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/compile.bat
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter/Converter$PrintWriterProgressListener.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter/Converter$ProgressListener.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter/Converter.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter/RiffFile$RiffChunkHeader.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter/RiffFile.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter/WaveFile$WaveFileSample.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter/WaveFile$WaveFormat_Chunk.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter/WaveFile$WaveFormat_ChunkData.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter/WaveFile.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter/WaveFileObuffer.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter/jlc$jlcArgs.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter/jlc.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/BitReserve.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/Bitstream.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/BitstreamErrors.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/BitstreamException.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/Control.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/Crc16.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/Decoder$Params.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/Decoder.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/DecoderErrors.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/DecoderException.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/Equalizer$EQFunction.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/Equalizer.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/FrameDecoder.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/Header.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/InputStreamSource.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/JavaLayerError.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/JavaLayerErrors.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/JavaLayerException.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/JavaLayerHook.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/JavaLayerUtils.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIDecoder$Subband.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIDecoder$SubbandLayer1.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIDecoder$SubbandLayer1IntensityStereo.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIDecoder$SubbandLayer1Stereo.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIDecoder.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIIDecoder$SubbandLayer2.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIIDecoder$SubbandLayer2IntensityStereo.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIIDecoder$SubbandLayer2Stereo.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIIDecoder.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIIIDecoder$III_side_info_t.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIIIDecoder$SBI.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIIIDecoder$Sftable.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIIIDecoder$gr_info_s.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIIIDecoder$temporaire.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIIIDecoder$temporaire2.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/LayerIIIDecoder.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/Manager.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/Obuffer.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/OutputChannels.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/SampleBuffer.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/Source.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/SynthesisFilter.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/au2lin.ser
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/huffcodetab.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/l3reorder.ser
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/lin2au.ser
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder/sfd.ser
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/AudioDevice.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/AudioDeviceBase.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/AudioDeviceFactory.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/FactoryRegistry.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/JavaSoundAudioDevice.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/JavaSoundAudioDeviceFactory.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/NullAudioDevice.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/Player.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/PlayerApplet.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/advanced/AdvancedPlayer.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/advanced/PlaybackEvent.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/advanced/PlaybackListener.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/advanced/jlap$1.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/advanced/jlap$InfoListener.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/advanced/jlap.class
-%%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/jlp.class
-%%INSTDIR%%/resources/AppData/Plugins/WebcamTest/Plugin.class
-%%INSTDIR%%/resources/AppData/Plugins/WebcamTest/Plugin.java
-%%INSTDIR%%/resources/AppData/Plugins/WebcamTest/Stats.class
-%%INSTDIR%%/resources/AppData/Plugins/WebcamTest/compile.bat
-%%INSTDIR%%/resources/AppData/Plugins/dFileShare/Plugin.class
-%%INSTDIR%%/resources/AppData/Plugins/dFileShare/Plugin.java
-%%INSTDIR%%/resources/AppData/Plugins/dFileShare/Settings.txt
-%%INSTDIR%%/resources/AppData/Plugins/dFileShare/compile.bat
-%%INSTDIR%%/resources/AppData/RadioTest.zip
 %%INSTDIR%%/resources/AppData/Skins/Aqua.zip
 %%INSTDIR%%/resources/AppData/Skins/BBJ2.zip
 %%INSTDIR%%/resources/AppData/Skins/Barbie.zip
@@ -166,6 +65,7 @@ bin/Mercury_Messenger
 %%INSTDIR%%/resources/AppData/Views/Default_CLContact/LargeDP_Alias_PM_Song.html
 %%INSTDIR%%/resources/AppData/Views/Default_CLContact/LargeDP_MsnName_PM_Song.html
 %%INSTDIR%%/resources/AppData/Views/Default_CLContact/MSN7.html
+%%INSTDIR%%/resources/AppData/Views/Default_CLContact/MSN7_Full.html
 %%INSTDIR%%/resources/AppData/Views/Default_CLContact/MSNName.html
 %%INSTDIR%%/resources/AppData/Views/Default_CLContact/View.xml
 %%INSTDIR%%/resources/AppData/Views/Default_CLGroup/Default.html
@@ -326,19 +226,6 @@ bin/Mercury_Messenger
 @dirrm %%INSTDIR%%/resources/AppData/SplashWindow
 @dirrm %%INSTDIR%%/resources/AppData/Sounds
 @dirrm %%INSTDIR%%/resources/AppData/Skins
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/dFileShare
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/WebcamTest
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player/advanced
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/player
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/decoder
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl/converter
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom/jl
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/RadioTest/javazoom
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/RadioTest
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/LinuxCPU
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/IrcCommand
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/ConvoStats
-@dirrm %%INSTDIR%%/resources/AppData/Plugins/ContactExample
 @dirrm %%INSTDIR%%/resources/AppData/Plugins
 @dirrm %%INSTDIR%%/resources/AppData/LoginImages
 @dirrm %%INSTDIR%%/resources/AppData/Dictionaries