ports/156994: net-im/skype-devel: Fix broken port

[Zhihao Yuan]

>Number:         156994
>Category:       ports
>Synopsis:       net-im/skype-devel: Fix broken port
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 13 04:50:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Zhihao Yuan
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
Northern Illinois University
>Environment:
System: FreeBSD compaq.yuetime 8.2-STABLE FreeBSD 8.2-STABLE #1 r221793M: Wed May 11 21:44:19 CDT 2011 lichray at compaq.yuetime:/home/lichray/temp/obj/home/lichray/devel/freebsd-stable/sys/HOUKAGO amd64


	
>Description:
	
	1. skype, skype12 skype20 all use `skype` as their program names, but this port is different (skype_devel); If it's just different, it's fine, but the Makefile uses a name skype-devel, which is different from that in pkg-plist!
	2. Same, don't change the name of the desktop file. And, the file skype-devel.desktop does not exist.
>How-To-Repeat:
	
>Fix:

	
	Add missing pkg-plist entities, fix naming.

--- skype-devel_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-im/skype-devel.orig/Makefile /usr/ports/net-im/skype-devel/Makefile
--- /usr/ports/net-im/skype-devel.orig/Makefile	2011-05-12 23:23:55.672116000 -0500
+++ /usr/ports/net-im/skype-devel/Makefile	2011-05-12 23:33:48.461360685 -0500
@@ -7,6 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	2.2.0.25
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://download.skype.com/linux/
 PKGNAMESUFFIX=	-devel
@@ -78,7 +79,7 @@
 
 do-install:
 	@${INSTALL} -d ${PREFIX}/share/applications
-	@${INSTALL_DATA} ${WRKSRC}/skype-devel.desktop ${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}/
 
@@ -86,8 +87,8 @@
 	@${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 -ruN --exclude=CVS /usr/ports/net-im/skype-devel.orig/pkg-plist /usr/ports/net-im/skype-devel/pkg-plist
--- /usr/ports/net-im/skype-devel.orig/pkg-plist	2011-05-12 11:56:02.000000000 -0500
+++ /usr/ports/net-im/skype-devel/pkg-plist	2011-05-12 23:33:59.155347660 -0500
@@ -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
--- skype-devel_1.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: