Let skype know where the resources are located:

 - allows to use the sound files
 - enables the use of skype in your locale (if an translation is available)

6 files changed, 42 insertions, 30 deletions

diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile
index 49ce10047270..62e69d5d8fc4 100644
--- a/net-im/skype-devel/Makefile
+++ b/net-im/skype-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	0.93.0.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 DISTNAME=	skype_staticQT-${PORTVERSION}
@@ -40,21 +41,21 @@ do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
-	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/
+	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
+	${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"$$@\"" >${PREFIX}/bin/skype
+	${CHMOD} a+rx ${PREFIX}/bin/skype
 .if ${HAVE_GNOME:Mgnomehier} != ""
 	${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 ${DATADIR}/lang
+	${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
 	${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
-	${INSTALL_DATA} ${WRKSRC}/sound/*.wav ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/sound/*.wav ${DATADIR}/sound/
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/
 
 post-install:
 	@${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"
@@ -64,6 +65,7 @@ post-install:
 	@${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} " - SB16 DSP 4.16 (snd_sb16) based ones"
 	@${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} "##########################################################################"
diff --git a/net-im/skype-devel/pkg-plist b/net-im/skype-devel/pkg-plist
index 57f7e97cfff7..d1ddac4c78ab 100644
--- a/net-im/skype-devel/pkg-plist
+++ b/net-im/skype-devel/pkg-plist
@@ -1,4 +1,5 @@
 bin/skype
+bin/skype_bin
 %%DATADIR%%/icons/skype_16_32.png
 %%DATADIR%%/icons/skype_32_32.png
 %%DATADIR%%/icons/skype_48_32.png
@@ -26,11 +27,12 @@ bin/skype
 %%DATADIR%%/lang/skype_zh_CN.qm
 %%DATADIR%%/lang/skype_zh_TW.qm
 @dirrm %%DATADIR%%/lang
-%%DATADIR%%/busy4.wav
-%%DATADIR%%/call_in.wav
-%%DATADIR%%/call_out.wav
-%%DATADIR%%/hangup.wav
-%%DATADIR%%/im.wav
+%%DATADIR%%/sound/busy4.wav
+%%DATADIR%%/sound/call_in.wav
+%%DATADIR%%/sound/call_out.wav
+%%DATADIR%%/sound/hangup.wav
+%%DATADIR%%/sound/im.wav
+@dirrm %%DATADIR%%/sound
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
 %%GNOME%%share/gnome/applications/skype.desktop
diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index 49ce10047270..62e69d5d8fc4 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	0.93.0.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 DISTNAME=	skype_staticQT-${PORTVERSION}
@@ -40,21 +41,21 @@ do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
-	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/
+	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
+	${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"$$@\"" >${PREFIX}/bin/skype
+	${CHMOD} a+rx ${PREFIX}/bin/skype
 .if ${HAVE_GNOME:Mgnomehier} != ""
 	${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 ${DATADIR}/lang
+	${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
 	${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
-	${INSTALL_DATA} ${WRKSRC}/sound/*.wav ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/sound/*.wav ${DATADIR}/sound/
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/
 
 post-install:
 	@${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"
@@ -64,6 +65,7 @@ post-install:
 	@${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} " - SB16 DSP 4.16 (snd_sb16) based ones"
 	@${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} "##########################################################################"
diff --git a/net-im/skype/pkg-plist b/net-im/skype/pkg-plist
index 57f7e97cfff7..d1ddac4c78ab 100644
--- a/net-im/skype/pkg-plist
+++ b/net-im/skype/pkg-plist
@@ -1,4 +1,5 @@
 bin/skype
+bin/skype_bin
 %%DATADIR%%/icons/skype_16_32.png
 %%DATADIR%%/icons/skype_32_32.png
 %%DATADIR%%/icons/skype_48_32.png
@@ -26,11 +27,12 @@ bin/skype
 %%DATADIR%%/lang/skype_zh_CN.qm
 %%DATADIR%%/lang/skype_zh_TW.qm
 @dirrm %%DATADIR%%/lang
-%%DATADIR%%/busy4.wav
-%%DATADIR%%/call_in.wav
-%%DATADIR%%/call_out.wav
-%%DATADIR%%/hangup.wav
-%%DATADIR%%/im.wav
+%%DATADIR%%/sound/busy4.wav
+%%DATADIR%%/sound/call_in.wav
+%%DATADIR%%/sound/call_out.wav
+%%DATADIR%%/sound/hangup.wav
+%%DATADIR%%/sound/im.wav
+@dirrm %%DATADIR%%/sound
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
 %%GNOME%%share/gnome/applications/skype.desktop
diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile
index 49ce10047270..62e69d5d8fc4 100644
--- a/net-im/skype20/Makefile
+++ b/net-im/skype20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	0.93.0.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 DISTNAME=	skype_staticQT-${PORTVERSION}
@@ -40,21 +41,21 @@ do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
-	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/
+	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
+	${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"$$@\"" >${PREFIX}/bin/skype
+	${CHMOD} a+rx ${PREFIX}/bin/skype
 .if ${HAVE_GNOME:Mgnomehier} != ""
 	${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 ${DATADIR}/lang
+	${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
 	${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
-	${INSTALL_DATA} ${WRKSRC}/sound/*.wav ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/sound/*.wav ${DATADIR}/sound/
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/
 
 post-install:
 	@${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"
@@ -64,6 +65,7 @@ post-install:
 	@${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} " - SB16 DSP 4.16 (snd_sb16) based ones"
 	@${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} "##########################################################################"
diff --git a/net-im/skype20/pkg-plist b/net-im/skype20/pkg-plist
index 57f7e97cfff7..d1ddac4c78ab 100644
--- a/net-im/skype20/pkg-plist
+++ b/net-im/skype20/pkg-plist
@@ -1,4 +1,5 @@
 bin/skype
+bin/skype_bin
 %%DATADIR%%/icons/skype_16_32.png
 %%DATADIR%%/icons/skype_32_32.png
 %%DATADIR%%/icons/skype_48_32.png
@@ -26,11 +27,12 @@ bin/skype
 %%DATADIR%%/lang/skype_zh_CN.qm
 %%DATADIR%%/lang/skype_zh_TW.qm
 @dirrm %%DATADIR%%/lang
-%%DATADIR%%/busy4.wav
-%%DATADIR%%/call_in.wav
-%%DATADIR%%/call_out.wav
-%%DATADIR%%/hangup.wav
-%%DATADIR%%/im.wav
+%%DATADIR%%/sound/busy4.wav
+%%DATADIR%%/sound/call_in.wav
+%%DATADIR%%/sound/call_out.wav
+%%DATADIR%%/sound/hangup.wav
+%%DATADIR%%/sound/im.wav
+@dirrm %%DATADIR%%/sound
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
 %%GNOME%%share/gnome/applications/skype.desktop