15 files changed, 190 insertions, 70 deletions

diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile
index 112571836a4b..759dc976345a 100644
--- a/net-im/skype-devel/Makefile
+++ b/net-im/skype-devel/Makefile
@@ -6,30 +6,27 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	0.92.0.2
+PORTVERSION=	0.92.0.12
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
-DISTNAME=	skype_ver-${PORTVERSION:C/\./_/g}-staticQT
+DISTNAME=	skype_staticQT-${PORTVERSION}
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	P2P VoIP software
 
-RUN_DEPENDS=${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
+RUN_DEPENDS=	${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
 		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
 		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
 		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+#USE_LINUX=	yes
 WANT_GNOME=	yes
 ONLY_FOR_ARCHS=	i386
 
 RESTRICTED=	Redistribution not allowed yet.
 
-.if defined(PACKAGE_BUILDING)
-IGNORE=		conflicts between linux_base and linux_base-8
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgnomehier} != ""
@@ -38,7 +35,7 @@ PLIST_SUB+=	GNOME=""
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-WRKSRC= ${WRKDIR}/skype_ver-${PORTVERSION:C/\./_/g}-staticQT
+#WRKSRC= ${WRKDIR}/${DISTNAME}
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
@@ -49,22 +46,27 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
 	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
 .endif
-	${MKDIR} ${DATADIR}/icons
+	${MKDIR} ${DATADIR}/icons ${DATADIR}/lang
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
+	${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}/lang/
 	${INSTALL_DATA} ${WRKSRC}/call_in.wav ${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/
 
 post-install:
-	@${ECHO} "Since skype uses a hadcoded path to the language files (/usr/share/skype) which a port isn't allowed to install files into, call_in.wav and the language files are not installed. As soon as skype learns how to use other paths, this will change." | fmt
+	@${ECHO} "##########################################################################"
+	@${ECHO} "Since skype uses a hadcoded path to the data/language files (/usr/share/skype and .../lang) which a port isn't allowed to install files into, call_in.wav and the language files are not installed into the official path and therefore are not usable out of the box." | fmt
 	@${ECHO}
 	@${ECHO} "Known good soundcards for the use with Skype:"
 	@${ECHO} " - SiS 7012 (snd_ich) based ones"
 	@${ECHO} " - CMedia CMI8738 (snd_cmi) based ones"
+	@${ECHO} " - Creative EMU10K1 (snd_emu10k1) based ones"
 	@${ECHO}
 	@${ECHO} "Probably bad soundcards for the use with Skype:"
-	@${ECHO} " - VIA on-board sound"
+	@${ECHO} " - VIA on-board sound (FreeBSD 5.1 seems to be ok)"
 	@${ECHO} " - Creative CT5880 (snd_es137x) based ones"
+	@${ECHO} " - Yamaha DS-1E (snd_ds1) based ones (reported for FreeBSD 4.10)"
 	@${ECHO}
 	@${ECHO} "If your soundcard is not listed here, send the the output of 'cat /dev/sndstat' with a short note if it works or not to ${MAINTAINER} please." | fmt
+	@${ECHO} "##########################################################################"
 
 .include <bsd.port.post.mk>
diff --git a/net-im/skype-devel/distinfo b/net-im/skype-devel/distinfo
index 3420b138b747..f1a4e8325a69 100644
--- a/net-im/skype-devel/distinfo
+++ b/net-im/skype-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (skype_ver-0_92_0_2-staticQT.tar.bz2) = db551f7ed4e149e2b76d117d63e387bc
-SIZE (skype_ver-0_92_0_2-staticQT.tar.bz2) = 6601622
+MD5 (skype_staticQT-0.92.0.12.tar.bz2) = 08732abe23aeb9102cfc03731bbeb357
+SIZE (skype_staticQT-0.92.0.12.tar.bz2) = 6477090
diff --git a/net-im/skype-devel/pkg-plist b/net-im/skype-devel/pkg-plist
index 9fabd9e190d3..d4fb046506c4 100644
--- a/net-im/skype-devel/pkg-plist
+++ b/net-im/skype-devel/pkg-plist
@@ -1,9 +1,31 @@
 bin/skype
 %%DATADIR%%/icons/skype_16_32.png
-%%DATADIR%%/icons/skype_24_32.png
 %%DATADIR%%/icons/skype_32_32.png
 %%DATADIR%%/icons/skype_48_32.png
 @dirrm %%DATADIR%%/icons
+%%DATADIR%%/lang/skype_da.qm
+%%DATADIR%%/lang/skype_de.qm
+%%DATADIR%%/lang/skype_el.qm
+%%DATADIR%%/lang/skype_en.qm
+%%DATADIR%%/lang/skype_es.qm
+%%DATADIR%%/lang/skype_es_AR.qm
+%%DATADIR%%/lang/skype_et.qm
+%%DATADIR%%/lang/skype_fi.qm
+%%DATADIR%%/lang/skype_fr.qm
+%%DATADIR%%/lang/skype_it.qm
+%%DATADIR%%/lang/skype_iw.qm
+%%DATADIR%%/lang/skype_ja.qm
+%%DATADIR%%/lang/skype_ko.qm
+%%DATADIR%%/lang/skype_nl.qm
+%%DATADIR%%/lang/skype_no.qm
+%%DATADIR%%/lang/skype_pl.qm
+%%DATADIR%%/lang/skype_pt_BR.qm
+%%DATADIR%%/lang/skype_ro.qm
+%%DATADIR%%/lang/skype_ru.qm
+%%DATADIR%%/lang/skype_sv.qm
+%%DATADIR%%/lang/skype_zh_CN.qm
+%%DATADIR%%/lang/skype_zh_TW.qm
+@dirrm %%DATADIR%%/lang
 %%DATADIR%%/call_in.wav
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index 112571836a4b..759dc976345a 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -6,30 +6,27 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	0.92.0.2
+PORTVERSION=	0.92.0.12
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
-DISTNAME=	skype_ver-${PORTVERSION:C/\./_/g}-staticQT
+DISTNAME=	skype_staticQT-${PORTVERSION}
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	P2P VoIP software
 
-RUN_DEPENDS=${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
+RUN_DEPENDS=	${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
 		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
 		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
 		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+#USE_LINUX=	yes
 WANT_GNOME=	yes
 ONLY_FOR_ARCHS=	i386
 
 RESTRICTED=	Redistribution not allowed yet.
 
-.if defined(PACKAGE_BUILDING)
-IGNORE=		conflicts between linux_base and linux_base-8
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgnomehier} != ""
@@ -38,7 +35,7 @@ PLIST_SUB+=	GNOME=""
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-WRKSRC= ${WRKDIR}/skype_ver-${PORTVERSION:C/\./_/g}-staticQT
+#WRKSRC= ${WRKDIR}/${DISTNAME}
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
@@ -49,22 +46,27 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
 	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
 .endif
-	${MKDIR} ${DATADIR}/icons
+	${MKDIR} ${DATADIR}/icons ${DATADIR}/lang
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
+	${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}/lang/
 	${INSTALL_DATA} ${WRKSRC}/call_in.wav ${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/
 
 post-install:
-	@${ECHO} "Since skype uses a hadcoded path to the language files (/usr/share/skype) which a port isn't allowed to install files into, call_in.wav and the language files are not installed. As soon as skype learns how to use other paths, this will change." | fmt
+	@${ECHO} "##########################################################################"
+	@${ECHO} "Since skype uses a hadcoded path to the data/language files (/usr/share/skype and .../lang) which a port isn't allowed to install files into, call_in.wav and the language files are not installed into the official path and therefore are not usable out of the box." | fmt
 	@${ECHO}
 	@${ECHO} "Known good soundcards for the use with Skype:"
 	@${ECHO} " - SiS 7012 (snd_ich) based ones"
 	@${ECHO} " - CMedia CMI8738 (snd_cmi) based ones"
+	@${ECHO} " - Creative EMU10K1 (snd_emu10k1) based ones"
 	@${ECHO}
 	@${ECHO} "Probably bad soundcards for the use with Skype:"
-	@${ECHO} " - VIA on-board sound"
+	@${ECHO} " - VIA on-board sound (FreeBSD 5.1 seems to be ok)"
 	@${ECHO} " - Creative CT5880 (snd_es137x) based ones"
+	@${ECHO} " - Yamaha DS-1E (snd_ds1) based ones (reported for FreeBSD 4.10)"
 	@${ECHO}
 	@${ECHO} "If your soundcard is not listed here, send the the output of 'cat /dev/sndstat' with a short note if it works or not to ${MAINTAINER} please." | fmt
+	@${ECHO} "##########################################################################"
 
 .include <bsd.port.post.mk>
diff --git a/net-im/skype/distinfo b/net-im/skype/distinfo
index 3420b138b747..f1a4e8325a69 100644
--- a/net-im/skype/distinfo
+++ b/net-im/skype/distinfo
@@ -1,2 +1,2 @@
-MD5 (skype_ver-0_92_0_2-staticQT.tar.bz2) = db551f7ed4e149e2b76d117d63e387bc
-SIZE (skype_ver-0_92_0_2-staticQT.tar.bz2) = 6601622
+MD5 (skype_staticQT-0.92.0.12.tar.bz2) = 08732abe23aeb9102cfc03731bbeb357
+SIZE (skype_staticQT-0.92.0.12.tar.bz2) = 6477090
diff --git a/net-im/skype/pkg-plist b/net-im/skype/pkg-plist
index 9fabd9e190d3..d4fb046506c4 100644
--- a/net-im/skype/pkg-plist
+++ b/net-im/skype/pkg-plist
@@ -1,9 +1,31 @@
 bin/skype
 %%DATADIR%%/icons/skype_16_32.png
-%%DATADIR%%/icons/skype_24_32.png
 %%DATADIR%%/icons/skype_32_32.png
 %%DATADIR%%/icons/skype_48_32.png
 @dirrm %%DATADIR%%/icons
+%%DATADIR%%/lang/skype_da.qm
+%%DATADIR%%/lang/skype_de.qm
+%%DATADIR%%/lang/skype_el.qm
+%%DATADIR%%/lang/skype_en.qm
+%%DATADIR%%/lang/skype_es.qm
+%%DATADIR%%/lang/skype_es_AR.qm
+%%DATADIR%%/lang/skype_et.qm
+%%DATADIR%%/lang/skype_fi.qm
+%%DATADIR%%/lang/skype_fr.qm
+%%DATADIR%%/lang/skype_it.qm
+%%DATADIR%%/lang/skype_iw.qm
+%%DATADIR%%/lang/skype_ja.qm
+%%DATADIR%%/lang/skype_ko.qm
+%%DATADIR%%/lang/skype_nl.qm
+%%DATADIR%%/lang/skype_no.qm
+%%DATADIR%%/lang/skype_pl.qm
+%%DATADIR%%/lang/skype_pt_BR.qm
+%%DATADIR%%/lang/skype_ro.qm
+%%DATADIR%%/lang/skype_ru.qm
+%%DATADIR%%/lang/skype_sv.qm
+%%DATADIR%%/lang/skype_zh_CN.qm
+%%DATADIR%%/lang/skype_zh_TW.qm
+@dirrm %%DATADIR%%/lang
 %%DATADIR%%/call_in.wav
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile
index 112571836a4b..759dc976345a 100644
--- a/net-im/skype20/Makefile
+++ b/net-im/skype20/Makefile
@@ -6,30 +6,27 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	0.92.0.2
+PORTVERSION=	0.92.0.12
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
-DISTNAME=	skype_ver-${PORTVERSION:C/\./_/g}-staticQT
+DISTNAME=	skype_staticQT-${PORTVERSION}
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	P2P VoIP software
 
-RUN_DEPENDS=${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
+RUN_DEPENDS=	${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
 		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
 		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
 		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+#USE_LINUX=	yes
 WANT_GNOME=	yes
 ONLY_FOR_ARCHS=	i386
 
 RESTRICTED=	Redistribution not allowed yet.
 
-.if defined(PACKAGE_BUILDING)
-IGNORE=		conflicts between linux_base and linux_base-8
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgnomehier} != ""
@@ -38,7 +35,7 @@ PLIST_SUB+=	GNOME=""
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-WRKSRC= ${WRKDIR}/skype_ver-${PORTVERSION:C/\./_/g}-staticQT
+#WRKSRC= ${WRKDIR}/${DISTNAME}
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
@@ -49,22 +46,27 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
 	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
 .endif
-	${MKDIR} ${DATADIR}/icons
+	${MKDIR} ${DATADIR}/icons ${DATADIR}/lang
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
+	${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}/lang/
 	${INSTALL_DATA} ${WRKSRC}/call_in.wav ${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/
 
 post-install:
-	@${ECHO} "Since skype uses a hadcoded path to the language files (/usr/share/skype) which a port isn't allowed to install files into, call_in.wav and the language files are not installed. As soon as skype learns how to use other paths, this will change." | fmt
+	@${ECHO} "##########################################################################"
+	@${ECHO} "Since skype uses a hadcoded path to the data/language files (/usr/share/skype and .../lang) which a port isn't allowed to install files into, call_in.wav and the language files are not installed into the official path and therefore are not usable out of the box." | fmt
 	@${ECHO}
 	@${ECHO} "Known good soundcards for the use with Skype:"
 	@${ECHO} " - SiS 7012 (snd_ich) based ones"
 	@${ECHO} " - CMedia CMI8738 (snd_cmi) based ones"
+	@${ECHO} " - Creative EMU10K1 (snd_emu10k1) based ones"
 	@${ECHO}
 	@${ECHO} "Probably bad soundcards for the use with Skype:"
-	@${ECHO} " - VIA on-board sound"
+	@${ECHO} " - VIA on-board sound (FreeBSD 5.1 seems to be ok)"
 	@${ECHO} " - Creative CT5880 (snd_es137x) based ones"
+	@${ECHO} " - Yamaha DS-1E (snd_ds1) based ones (reported for FreeBSD 4.10)"
 	@${ECHO}
 	@${ECHO} "If your soundcard is not listed here, send the the output of 'cat /dev/sndstat' with a short note if it works or not to ${MAINTAINER} please." | fmt
+	@${ECHO} "##########################################################################"
 
 .include <bsd.port.post.mk>
diff --git a/net-im/skype20/distinfo b/net-im/skype20/distinfo
index 3420b138b747..f1a4e8325a69 100644
--- a/net-im/skype20/distinfo
+++ b/net-im/skype20/distinfo
@@ -1,2 +1,2 @@
-MD5 (skype_ver-0_92_0_2-staticQT.tar.bz2) = db551f7ed4e149e2b76d117d63e387bc
-SIZE (skype_ver-0_92_0_2-staticQT.tar.bz2) = 6601622
+MD5 (skype_staticQT-0.92.0.12.tar.bz2) = 08732abe23aeb9102cfc03731bbeb357
+SIZE (skype_staticQT-0.92.0.12.tar.bz2) = 6477090
diff --git a/net-im/skype20/pkg-plist b/net-im/skype20/pkg-plist
index 9fabd9e190d3..d4fb046506c4 100644
--- a/net-im/skype20/pkg-plist
+++ b/net-im/skype20/pkg-plist
@@ -1,9 +1,31 @@
 bin/skype
 %%DATADIR%%/icons/skype_16_32.png
-%%DATADIR%%/icons/skype_24_32.png
 %%DATADIR%%/icons/skype_32_32.png
 %%DATADIR%%/icons/skype_48_32.png
 @dirrm %%DATADIR%%/icons
+%%DATADIR%%/lang/skype_da.qm
+%%DATADIR%%/lang/skype_de.qm
+%%DATADIR%%/lang/skype_el.qm
+%%DATADIR%%/lang/skype_en.qm
+%%DATADIR%%/lang/skype_es.qm
+%%DATADIR%%/lang/skype_es_AR.qm
+%%DATADIR%%/lang/skype_et.qm
+%%DATADIR%%/lang/skype_fi.qm
+%%DATADIR%%/lang/skype_fr.qm
+%%DATADIR%%/lang/skype_it.qm
+%%DATADIR%%/lang/skype_iw.qm
+%%DATADIR%%/lang/skype_ja.qm
+%%DATADIR%%/lang/skype_ko.qm
+%%DATADIR%%/lang/skype_nl.qm
+%%DATADIR%%/lang/skype_no.qm
+%%DATADIR%%/lang/skype_pl.qm
+%%DATADIR%%/lang/skype_pt_BR.qm
+%%DATADIR%%/lang/skype_ro.qm
+%%DATADIR%%/lang/skype_ru.qm
+%%DATADIR%%/lang/skype_sv.qm
+%%DATADIR%%/lang/skype_zh_CN.qm
+%%DATADIR%%/lang/skype_zh_TW.qm
+@dirrm %%DATADIR%%/lang
 %%DATADIR%%/call_in.wav
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
diff --git a/net/skype-devel/Makefile b/net/skype-devel/Makefile
index 112571836a4b..759dc976345a 100644
--- a/net/skype-devel/Makefile
+++ b/net/skype-devel/Makefile
@@ -6,30 +6,27 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	0.92.0.2
+PORTVERSION=	0.92.0.12
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
-DISTNAME=	skype_ver-${PORTVERSION:C/\./_/g}-staticQT
+DISTNAME=	skype_staticQT-${PORTVERSION}
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	P2P VoIP software
 
-RUN_DEPENDS=${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
+RUN_DEPENDS=	${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
 		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
 		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
 		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+#USE_LINUX=	yes
 WANT_GNOME=	yes
 ONLY_FOR_ARCHS=	i386
 
 RESTRICTED=	Redistribution not allowed yet.
 
-.if defined(PACKAGE_BUILDING)
-IGNORE=		conflicts between linux_base and linux_base-8
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgnomehier} != ""
@@ -38,7 +35,7 @@ PLIST_SUB+=	GNOME=""
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-WRKSRC= ${WRKDIR}/skype_ver-${PORTVERSION:C/\./_/g}-staticQT
+#WRKSRC= ${WRKDIR}/${DISTNAME}
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
@@ -49,22 +46,27 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
 	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
 .endif
-	${MKDIR} ${DATADIR}/icons
+	${MKDIR} ${DATADIR}/icons ${DATADIR}/lang
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
+	${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}/lang/
 	${INSTALL_DATA} ${WRKSRC}/call_in.wav ${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/
 
 post-install:
-	@${ECHO} "Since skype uses a hadcoded path to the language files (/usr/share/skype) which a port isn't allowed to install files into, call_in.wav and the language files are not installed. As soon as skype learns how to use other paths, this will change." | fmt
+	@${ECHO} "##########################################################################"
+	@${ECHO} "Since skype uses a hadcoded path to the data/language files (/usr/share/skype and .../lang) which a port isn't allowed to install files into, call_in.wav and the language files are not installed into the official path and therefore are not usable out of the box." | fmt
 	@${ECHO}
 	@${ECHO} "Known good soundcards for the use with Skype:"
 	@${ECHO} " - SiS 7012 (snd_ich) based ones"
 	@${ECHO} " - CMedia CMI8738 (snd_cmi) based ones"
+	@${ECHO} " - Creative EMU10K1 (snd_emu10k1) based ones"
 	@${ECHO}
 	@${ECHO} "Probably bad soundcards for the use with Skype:"
-	@${ECHO} " - VIA on-board sound"
+	@${ECHO} " - VIA on-board sound (FreeBSD 5.1 seems to be ok)"
 	@${ECHO} " - Creative CT5880 (snd_es137x) based ones"
+	@${ECHO} " - Yamaha DS-1E (snd_ds1) based ones (reported for FreeBSD 4.10)"
 	@${ECHO}
 	@${ECHO} "If your soundcard is not listed here, send the the output of 'cat /dev/sndstat' with a short note if it works or not to ${MAINTAINER} please." | fmt
+	@${ECHO} "##########################################################################"
 
 .include <bsd.port.post.mk>
diff --git a/net/skype-devel/distinfo b/net/skype-devel/distinfo
index 3420b138b747..f1a4e8325a69 100644
--- a/net/skype-devel/distinfo
+++ b/net/skype-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (skype_ver-0_92_0_2-staticQT.tar.bz2) = db551f7ed4e149e2b76d117d63e387bc
-SIZE (skype_ver-0_92_0_2-staticQT.tar.bz2) = 6601622
+MD5 (skype_staticQT-0.92.0.12.tar.bz2) = 08732abe23aeb9102cfc03731bbeb357
+SIZE (skype_staticQT-0.92.0.12.tar.bz2) = 6477090
diff --git a/net/skype-devel/pkg-plist b/net/skype-devel/pkg-plist
index 9fabd9e190d3..d4fb046506c4 100644
--- a/net/skype-devel/pkg-plist
+++ b/net/skype-devel/pkg-plist
@@ -1,9 +1,31 @@
 bin/skype
 %%DATADIR%%/icons/skype_16_32.png
-%%DATADIR%%/icons/skype_24_32.png
 %%DATADIR%%/icons/skype_32_32.png
 %%DATADIR%%/icons/skype_48_32.png
 @dirrm %%DATADIR%%/icons
+%%DATADIR%%/lang/skype_da.qm
+%%DATADIR%%/lang/skype_de.qm
+%%DATADIR%%/lang/skype_el.qm
+%%DATADIR%%/lang/skype_en.qm
+%%DATADIR%%/lang/skype_es.qm
+%%DATADIR%%/lang/skype_es_AR.qm
+%%DATADIR%%/lang/skype_et.qm
+%%DATADIR%%/lang/skype_fi.qm
+%%DATADIR%%/lang/skype_fr.qm
+%%DATADIR%%/lang/skype_it.qm
+%%DATADIR%%/lang/skype_iw.qm
+%%DATADIR%%/lang/skype_ja.qm
+%%DATADIR%%/lang/skype_ko.qm
+%%DATADIR%%/lang/skype_nl.qm
+%%DATADIR%%/lang/skype_no.qm
+%%DATADIR%%/lang/skype_pl.qm
+%%DATADIR%%/lang/skype_pt_BR.qm
+%%DATADIR%%/lang/skype_ro.qm
+%%DATADIR%%/lang/skype_ru.qm
+%%DATADIR%%/lang/skype_sv.qm
+%%DATADIR%%/lang/skype_zh_CN.qm
+%%DATADIR%%/lang/skype_zh_TW.qm
+@dirrm %%DATADIR%%/lang
 %%DATADIR%%/call_in.wav
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
diff --git a/net/skype/Makefile b/net/skype/Makefile
index 112571836a4b..759dc976345a 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -6,30 +6,27 @@
 #
 
 PORTNAME=	skype
-PORTVERSION=	0.92.0.2
+PORTVERSION=	0.92.0.12
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
-DISTNAME=	skype_ver-${PORTVERSION:C/\./_/g}-staticQT
+DISTNAME=	skype_staticQT-${PORTVERSION}
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	P2P VoIP software
 
-RUN_DEPENDS=${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
+RUN_DEPENDS=	${LINUXBASE}/lib/libc-2.3.2.so:${PORTSDIR}/emulators/linux_base-8 \
 		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
 		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
 		${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+#USE_LINUX=	yes
 WANT_GNOME=	yes
 ONLY_FOR_ARCHS=	i386
 
 RESTRICTED=	Redistribution not allowed yet.
 
-.if defined(PACKAGE_BUILDING)
-IGNORE=		conflicts between linux_base and linux_base-8
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgnomehier} != ""
@@ -38,7 +35,7 @@ PLIST_SUB+=	GNOME=""
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-WRKSRC= ${WRKDIR}/skype_ver-${PORTVERSION:C/\./_/g}-staticQT
+#WRKSRC= ${WRKDIR}/${DISTNAME}
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
@@ -49,22 +46,27 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
 	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
 .endif
-	${MKDIR} ${DATADIR}/icons
+	${MKDIR} ${DATADIR}/icons ${DATADIR}/lang
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
+	${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}/lang/
 	${INSTALL_DATA} ${WRKSRC}/call_in.wav ${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/
 
 post-install:
-	@${ECHO} "Since skype uses a hadcoded path to the language files (/usr/share/skype) which a port isn't allowed to install files into, call_in.wav and the language files are not installed. As soon as skype learns how to use other paths, this will change." | fmt
+	@${ECHO} "##########################################################################"
+	@${ECHO} "Since skype uses a hadcoded path to the data/language files (/usr/share/skype and .../lang) which a port isn't allowed to install files into, call_in.wav and the language files are not installed into the official path and therefore are not usable out of the box." | fmt
 	@${ECHO}
 	@${ECHO} "Known good soundcards for the use with Skype:"
 	@${ECHO} " - SiS 7012 (snd_ich) based ones"
 	@${ECHO} " - CMedia CMI8738 (snd_cmi) based ones"
+	@${ECHO} " - Creative EMU10K1 (snd_emu10k1) based ones"
 	@${ECHO}
 	@${ECHO} "Probably bad soundcards for the use with Skype:"
-	@${ECHO} " - VIA on-board sound"
+	@${ECHO} " - VIA on-board sound (FreeBSD 5.1 seems to be ok)"
 	@${ECHO} " - Creative CT5880 (snd_es137x) based ones"
+	@${ECHO} " - Yamaha DS-1E (snd_ds1) based ones (reported for FreeBSD 4.10)"
 	@${ECHO}
 	@${ECHO} "If your soundcard is not listed here, send the the output of 'cat /dev/sndstat' with a short note if it works or not to ${MAINTAINER} please." | fmt
+	@${ECHO} "##########################################################################"
 
 .include <bsd.port.post.mk>
diff --git a/net/skype/distinfo b/net/skype/distinfo
index 3420b138b747..f1a4e8325a69 100644
--- a/net/skype/distinfo
+++ b/net/skype/distinfo
@@ -1,2 +1,2 @@
-MD5 (skype_ver-0_92_0_2-staticQT.tar.bz2) = db551f7ed4e149e2b76d117d63e387bc
-SIZE (skype_ver-0_92_0_2-staticQT.tar.bz2) = 6601622
+MD5 (skype_staticQT-0.92.0.12.tar.bz2) = 08732abe23aeb9102cfc03731bbeb357
+SIZE (skype_staticQT-0.92.0.12.tar.bz2) = 6477090
diff --git a/net/skype/pkg-plist b/net/skype/pkg-plist
index 9fabd9e190d3..d4fb046506c4 100644
--- a/net/skype/pkg-plist
+++ b/net/skype/pkg-plist
@@ -1,9 +1,31 @@
 bin/skype
 %%DATADIR%%/icons/skype_16_32.png
-%%DATADIR%%/icons/skype_24_32.png
 %%DATADIR%%/icons/skype_32_32.png
 %%DATADIR%%/icons/skype_48_32.png
 @dirrm %%DATADIR%%/icons
+%%DATADIR%%/lang/skype_da.qm
+%%DATADIR%%/lang/skype_de.qm
+%%DATADIR%%/lang/skype_el.qm
+%%DATADIR%%/lang/skype_en.qm
+%%DATADIR%%/lang/skype_es.qm
+%%DATADIR%%/lang/skype_es_AR.qm
+%%DATADIR%%/lang/skype_et.qm
+%%DATADIR%%/lang/skype_fi.qm
+%%DATADIR%%/lang/skype_fr.qm
+%%DATADIR%%/lang/skype_it.qm
+%%DATADIR%%/lang/skype_iw.qm
+%%DATADIR%%/lang/skype_ja.qm
+%%DATADIR%%/lang/skype_ko.qm
+%%DATADIR%%/lang/skype_nl.qm
+%%DATADIR%%/lang/skype_no.qm
+%%DATADIR%%/lang/skype_pl.qm
+%%DATADIR%%/lang/skype_pt_BR.qm
+%%DATADIR%%/lang/skype_ro.qm
+%%DATADIR%%/lang/skype_ru.qm
+%%DATADIR%%/lang/skype_sv.qm
+%%DATADIR%%/lang/skype_zh_CN.qm
+%%DATADIR%%/lang/skype_zh_TW.qm
+@dirrm %%DATADIR%%/lang
 %%DATADIR%%/call_in.wav
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%