Add a wrapper for skype so it would not need the complex parameter

any more.

Submitted by:	intron <intron intron ac>
PR:		128597
Approved by:	maintainer timeout

8 files changed, 28 insertions, 44 deletions

diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index 580c7da64981..d24c4ab5c756 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -37,9 +37,9 @@ RESTRICTED=	Redistribution prohibited.
 WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss
 SKYPEDIR=	share/skype
 PORTDOCS=	LICENSE README
-SUB_FILES=	pkg-message
-SUB_LIST=	SKYPEDIR=${SKYPEDIR}
-PLIST_SUB=	SKYPEDIR=${SKYPEDIR}
+PLIST_SUB+=	SKYPEDIR=${SKYPEDIR}
+SUB_FILES=	skype.sh
+SUB_LIST+=	SKYPEDIR=${SKYPEDIR}
 
 .include <bsd.port.pre.mk>
 
@@ -58,26 +58,24 @@ pre-fetch:
 	@${ECHO_MSG}	"* * * * * * * * * * * * * * * * * * * * * * * * * * * *"
 	@${ECHO_MSG}	""
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|Exec=skype|Exec=skype --resources=${PREFIX}/${SKYPEDIR}|' \
-		${WRKSRC}/skype.desktop
-
 do-build:
 	@${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
 	@${INSTALL} -d ${PREFIX}/share/applications
-	@${INSTALL} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+	@${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
 	@${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png
-	@${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype
-	@${CHMOD} a+rx ${PREFIX}/bin/skype
 	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "avatars icons sounds lang" ${PREFIX}/${SKYPEDIR}/
 
+# The binary main program
+	@${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/${SKYPEDIR}/
+
+# The wrapper for main program
+	@${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${PREFIX}/bin/skype
+
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>
diff --git a/net-im/skype/files/pkg-message.in b/net-im/skype/files/pkg-message.in
deleted file mode 100644
index d98bfdf5bf92..000000000000
--- a/net-im/skype/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-Skype has been installed in:
-
-%%PREFIX%%/bin/skype 
-
-If you are starting from a terminal, please use the following command:
-	skype --resources=%%DATADIR%%
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/net-im/skype/files/skype.sh.in b/net-im/skype/files/skype.sh.in
new file mode 100644
index 000000000000..b621c6483699
--- /dev/null
+++ b/net-im/skype/files/skype.sh.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+%%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% $@
+
diff --git a/net-im/skype/pkg-plist b/net-im/skype/pkg-plist
index c52b76cbd155..ab473316b8d1 100644
--- a/net-im/skype/pkg-plist
+++ b/net-im/skype/pkg-plist
@@ -1,6 +1,7 @@
 bin/skype
 share/pixmaps/skype.png
 share/applications/skype.desktop
+%%SKYPEDIR%%/skype
 %%SKYPEDIR%%/avatars/Angel Skype.png
 %%SKYPEDIR%%/avatars/Architect Skype.png
 %%SKYPEDIR%%/avatars/Beach Skype.png
diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile
index 580c7da64981..d24c4ab5c756 100644
--- a/net-im/skype20/Makefile
+++ b/net-im/skype20/Makefile
@@ -37,9 +37,9 @@ RESTRICTED=	Redistribution prohibited.
 WRKSRC=		${WRKDIR}/${PORTNAME}_static-${DISTVERSION}-oss
 SKYPEDIR=	share/skype
 PORTDOCS=	LICENSE README
-SUB_FILES=	pkg-message
-SUB_LIST=	SKYPEDIR=${SKYPEDIR}
-PLIST_SUB=	SKYPEDIR=${SKYPEDIR}
+PLIST_SUB+=	SKYPEDIR=${SKYPEDIR}
+SUB_FILES=	skype.sh
+SUB_LIST+=	SKYPEDIR=${SKYPEDIR}
 
 .include <bsd.port.pre.mk>
 
@@ -58,26 +58,24 @@ pre-fetch:
 	@${ECHO_MSG}	"* * * * * * * * * * * * * * * * * * * * * * * * * * * *"
 	@${ECHO_MSG}	""
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|Exec=skype|Exec=skype --resources=${PREFIX}/${SKYPEDIR}|' \
-		${WRKSRC}/skype.desktop
-
 do-build:
 	@${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
 	@${INSTALL} -d ${PREFIX}/share/applications
-	@${INSTALL} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+	@${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
 	@${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png
-	@${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/bin/skype
-	@${CHMOD} a+rx ${PREFIX}/bin/skype
 	@cd ${WRKSRC}/&&${COPYTREE_SHARE} "avatars icons sounds lang" ${PREFIX}/${SKYPEDIR}/
 
+# The binary main program
+	@${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/${SKYPEDIR}/
+
+# The wrapper for main program
+	@${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${PREFIX}/bin/skype
+
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>
diff --git a/net-im/skype20/files/pkg-message.in b/net-im/skype20/files/pkg-message.in
deleted file mode 100644
index d98bfdf5bf92..000000000000
--- a/net-im/skype20/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-Skype has been installed in:
-
-%%PREFIX%%/bin/skype 
-
-If you are starting from a terminal, please use the following command:
-	skype --resources=%%DATADIR%%
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/net-im/skype20/files/skype.sh.in b/net-im/skype20/files/skype.sh.in
new file mode 100644
index 000000000000..b621c6483699
--- /dev/null
+++ b/net-im/skype20/files/skype.sh.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+%%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% $@
+
diff --git a/net-im/skype20/pkg-plist b/net-im/skype20/pkg-plist
index c52b76cbd155..ab473316b8d1 100644
--- a/net-im/skype20/pkg-plist
+++ b/net-im/skype20/pkg-plist
@@ -1,6 +1,7 @@
 bin/skype
 share/pixmaps/skype.png
 share/applications/skype.desktop
+%%SKYPEDIR%%/skype
 %%SKYPEDIR%%/avatars/Angel Skype.png
 %%SKYPEDIR%%/avatars/Architect Skype.png
 %%SKYPEDIR%%/avatars/Beach Skype.png