diff options
| author | mandree <mandree@FreeBSD.org> | 2014-08-19 02:41:00 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2014-08-19 02:41:00 +0800 |
| commit | bc1d3c700e9f402f676fe39ac1f3eaa92349694a (patch) | |
| tree | c3ec5fb865931cbfa2f38f7c6e7c00f15bca451c /net-im/skype | |
| parent | 763a492324b523ab24d796aca4a4c6818420b441 (diff) | |
| download | freebsd-ports-gnome-bc1d3c700e9f402f676fe39ac1f3eaa92349694a.tar.gz freebsd-ports-gnome-bc1d3c700e9f402f676fe39ac1f3eaa92349694a.tar.zst freebsd-ports-gnome-bc1d3c700e9f402f676fe39ac1f3eaa92349694a.zip | |
STAGE.
Fix skype.sh launcher script, using "$@" instead of the unsafe $@,
and fixing its shebang line to /bin/sh.
Diffstat (limited to 'net-im/skype')
| -rw-r--r-- | net-im/skype/Makefile | 22 | ||||
| -rw-r--r-- | net-im/skype/files/skype.sh.in | 5 |
2 files changed, 12 insertions, 15 deletions
diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile index c7df12577455..627221dc356b 100644 --- a/net-im/skype/Makefile +++ b/net-im/skype/Makefile @@ -9,7 +9,7 @@ CATEGORIES= net-im MASTER_SITES= http://download.skype.com/linux/ DISTNAME= skype_static-${DISTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= P2P VoIP software CONFLICTS= skype-devel-[0-9]* @@ -21,7 +21,7 @@ OPTIONS_DEFAULT= VIDEO NO_BUILD= yes -USES= tar:bzip2 +USES= tar:bzip2 USE_LINUX= yes USE_LINUX_APPS+=alsalib alsa-plugins-oss expat fontconfig libasyncns \ libsigcpp20 @@ -34,7 +34,6 @@ PLIST_SUB+= SKYPEDIR=${SKYPEDIR} SUB_FILES= skype.sh SUB_LIST+= SKYPEDIR=${SKYPEDIR} -NO_STAGE= yes .include <bsd.port.options.mk> .include <bsd.port.pre.mk> @@ -75,21 +74,20 @@ IGNORE= ${IGNORE_MSG} .endif do-install: - @${INSTALL} -d ${PREFIX}/share/applications - @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/ - @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${PREFIX}/share/pixmaps/skype.png - @cd ${WRKSRC}/ && ${MKDIR} ${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${PREFIX}/${SKYPEDIR}/ + @${INSTALL} -d ${STAGEDIR}${PREFIX}/share/applications + @${INSTALL_DATA} ${WRKSRC}/skype.desktop ${STAGEDIR}${PREFIX}/share/applications/ + @${INSTALL_DATA} ${WRKSRC}/icons/SkypeBlue_48x48.png ${STAGEDIR}${PREFIX}/share/pixmaps/skype.png + @cd ${WRKSRC}/ && ${MKDIR} ${STAGEDIR}${PREFIX}/${SKYPEDIR} && ${COPYTREE_SHARE} "avatars icons sounds lang" ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ # The binary main program - @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/${SKYPEDIR}/ + @${INSTALL_PROGRAM} ${WRKSRC}/skype ${STAGEDIR}${PREFIX}/${SKYPEDIR}/ # The wrapper for main program - @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${PREFIX}/bin/skype + @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${STAGEDIR}${PREFIX}/bin/skype .if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${INSTALL} -d ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif - @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net-im/skype/files/skype.sh.in b/net-im/skype/files/skype.sh.in index 12470c8afc27..01ef93625b41 100644 --- a/net-im/skype/files/skype.sh.in +++ b/net-im/skype/files/skype.sh.in @@ -1,3 +1,2 @@ -#!/compat/linux/bin/sh -%%VIDEO%%%%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% $@ - +#!/bin/sh +exec %%VIDEO%%%%PREFIX%%/%%SKYPEDIR%%/skype --resources=%%PREFIX%%/%%SKYPEDIR%% "$@" |