svn commit: r365337 - in head/net-im: skype skype-devel skype-devel/files skype/files

[Matthias Andree]

Author: mandree
Date: Mon Aug 18 18:41:00 2014
New Revision: 365337
URL: http://svnweb.freebsd.org/changeset/ports/365337
QAT: https://qat.redports.org/buildarchive/r365337/

Log:
  STAGE.
  
  Fix skype.sh launcher script, using "$@" instead of the unsafe $@,
  and fixing its shebang line to /bin/sh.

Modified:
  head/net-im/skype-devel/Makefile
  head/net-im/skype-devel/files/skype.sh.in
  head/net-im/skype/Makefile
  head/net-im/skype/files/skype.sh.in

Modified: head/net-im/skype-devel/Makefile
==============================================================================
--- head/net-im/skype-devel/Makefile	Mon Aug 18 18:37:30 2014	(r365336)
+++ head/net-im/skype-devel/Makefile	Mon Aug 18 18:41:00 2014	(r365337)
@@ -9,13 +9,13 @@ MASTER_SITES=	http://download.skype.com/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	skype_static-${DISTVERSION}
 
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	P2P VoIP software, development version
 
 CONFLICTS=	skype-[0-9]*
 
 OPTIONS_DEFINE=	VIDEO NVIDIA_GL
-VIDEO_DESC=[broken] Video support
+VIDEO_DESC=	[broken] Video support
 NVIDIA_GL_DESC=	libGL provided by NVidia binary drivers
 
 OPTIONS_DEFAULT=	VIDEO
@@ -37,8 +37,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>
 
 .if ${PORT_OPTIONS:MNVIDIA_GL}
@@ -78,21 +76,21 @@ 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
-	@${CHMOD} a+rx ${PREFIX}/bin/skype
+	@${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${STAGEDIR}${PREFIX}/bin/skype
+	@${CHMOD} a+rx ${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}
 

Modified: head/net-im/skype-devel/files/skype.sh.in
==============================================================================
--- head/net-im/skype-devel/files/skype.sh.in	Mon Aug 18 18:37:30 2014	(r365336)
+++ head/net-im/skype-devel/files/skype.sh.in	Mon Aug 18 18:41:00 2014	(r365337)
@@ -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%% "$@"

Modified: head/net-im/skype/Makefile
==============================================================================
--- head/net-im/skype/Makefile	Mon Aug 18 18:37:30 2014	(r365336)
+++ head/net-im/skype/Makefile	Mon Aug 18 18:41:00 2014	(r365337)
@@ -9,7 +9,7 @@ CATEGORIES=	net-im
 MASTER_SITES=	http://download.skype.com/linux/
 DISTNAME=	skype_static-${DISTVERSION}
 
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER=	ports at 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>

Modified: head/net-im/skype/files/skype.sh.in
==============================================================================
--- head/net-im/skype/files/skype.sh.in	Mon Aug 18 18:37:30 2014	(r365336)
+++ head/net-im/skype/files/skype.sh.in	Mon Aug 18 18:41:00 2014	(r365337)
@@ -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%% "$@"