3 files changed, 32 insertions, 9 deletions

diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile
index fab7a429d949..3f6cb859269a 100644
--- a/net-im/skype-devel/Makefile
+++ b/net-im/skype-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	1.4.0.118
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 PKGNAMESUFFIX=	-devel
@@ -31,7 +32,14 @@ USE_LINUX=	yes
 RESTRICTED=	Redistribution prohibited.
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss
-DATADIR=	${PREFIX}/share/${PKGBASE}
+PORTDOCS=	LICENSE README
+SUB_FILES=	pkg-message
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|Exec=skype|Exec=skype_devel --resources=${DATADIR}|' \
+		${WRKSRC}/skype.desktop
 
 do-build:
 	@${BRANDELF} -t Linux ${WRKSRC}/skype
@@ -41,7 +49,13 @@ do-install:
 	@${INSTALL} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
 	@${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype_devel
 	@${CHMOD} a+rx ${PREFIX}/bin/skype_devel
-	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sounds lang LICENSE README" ${DATADIR}/
-	@${ECHO} "There are known problems with some soundcards in 5.x. This is due to a bug in the kernel. If you experience problems update to the most recent FreeBSD RELEASE, if this does not fix your problems, ask on multimedia@FreeBSD.org." | fmt
+	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "icons sounds lang" ${DATADIR}/
+
+.if !defined(NOPORTDOCS)
+	@${INSTALL} -d ${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
+
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-im/skype-devel/files/pkg-message.in b/net-im/skype-devel/files/pkg-message.in
new file mode 100644
index 000000000000..320c5fd18814
--- /dev/null
+++ b/net-im/skype-devel/files/pkg-message.in
@@ -0,0 +1,10 @@
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+skype_devel has been installed in:
+
+%%PREFIX%%/bin/skype_devel 
+
+If you are starting from a terminal, please use the following command:
+	skype_devel --resources=%%DATADIR%%
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/net-im/skype-devel/pkg-plist b/net-im/skype-devel/pkg-plist
index 41f038026df2..0e26b2c1e73b 100644
--- a/net-im/skype-devel/pkg-plist
+++ b/net-im/skype-devel/pkg-plist
@@ -1,8 +1,8 @@
 bin/skype_devel
+share/applications/skype.desktop
 %%DATADIR%%/icons/SkypeBlue_16x16.png
 %%DATADIR%%/icons/SkypeBlue_32x32.png
 %%DATADIR%%/icons/SkypeBlue_48x48.png
-@dirrm %%DATADIR%%/icons
 %%DATADIR%%/lang/skype_de.ts
 %%DATADIR%%/lang/skype_et.ts
 %%DATADIR%%/lang/skype_lv.ts
@@ -13,7 +13,6 @@ bin/skype_devel
 %%DATADIR%%/lang/skype_tr.ts
 %%DATADIR%%/lang/skype_zh_s.ts
 %%DATADIR%%/lang/skype_zh_t.ts
-@dirrm %%DATADIR%%/lang
 %%DATADIR%%/sounds/CallBusy.wav
 %%DATADIR%%/sounds/CallConnecting.wav
 %%DATADIR%%/sounds/CallHangup.wav
@@ -36,8 +35,8 @@ bin/skype_devel
 %%DATADIR%%/sounds/TransferRequest.wav
 %%DATADIR%%/sounds/VoicemailReceived.wav
 @dirrm %%DATADIR%%/sounds
-%%DATADIR%%/LICENSE
-%%DATADIR%%/README
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/lang
 @dirrm %%DATADIR%%
-share/applications/skype.desktop
 @dirrmtry share/applications
+