From 8532af7993fac130c5815927d959a195c514647c Mon Sep 17 00:00:00 2001 From: Ion-Mihai Tetcu Date: Tue, 17 May 2011 07:56:19 +0000 Subject: [PATCH] Now that the skype ports are conflicting, don't install anything skype-devel. This brings -devel closer to the main port, and of course, fixes install/plist. PR: 156994 Submitted by: Zhihao Yuan --- net-im/skype-devel/Makefile | 4 ++-- net-im/skype-devel/pkg-plist | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile index 0ca340a10d54..c201e32768ba 100644 --- a/net-im/skype-devel/Makefile +++ b/net-im/skype-devel/Makefile @@ -86,8 +86,8 @@ do-install: @${INSTALL_PROGRAM} ${WRKSRC}/skype ${PREFIX}/${SKYPEDIR}/ # The wrapper for main program - @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${PREFIX}/bin/skype-devel - @${CHMOD} a+rx ${PREFIX}/bin/skype_devel + @${INSTALL_SCRIPT} ${WRKDIR}/skype.sh ${PREFIX}/bin/skype + @${CHMOD} a+rx ${PREFIX}/bin/skype .if !defined(NOPORTDOCS) @${INSTALL} -d ${DOCSDIR} diff --git a/net-im/skype-devel/pkg-plist b/net-im/skype-devel/pkg-plist index 902444ee53b4..27991f4eec35 100644 --- a/net-im/skype-devel/pkg-plist +++ b/net-im/skype-devel/pkg-plist @@ -1,6 +1,7 @@ -bin/skype_devel +bin/skype share/pixmaps/skype.png -share/applications/skype-devel.desktop +share/applications/skype.desktop +%%SKYPEDIR%%/skype %%SKYPEDIR%%/avatars/Angel Skype.png %%SKYPEDIR%%/avatars/Architect Skype.png %%SKYPEDIR%%/avatars/Beach Skype.png