[PC-BSD Commits] r20332 - in pbi/modules/net-im/skype: . scripts xdg-menu

svn at pcbsd.org svn at pcbsd.org
Fri Nov 30 09:22:15 PST 2012


Author: kenmoore
Date: 2012-11-30 17:22:15 +0000 (Fri, 30 Nov 2012)
New Revision: 20332

Modified:
   pbi/modules/net-im/skype/pbi.conf
   pbi/modules/net-im/skype/scripts/post-install.sh
   pbi/modules/net-im/skype/xdg-menu/skype.desktop
Log:
Try to fix the skype PBI. Prune all the FreeBSD libs that have an identical Linux lib in the PBI.



Modified: pbi/modules/net-im/skype/pbi.conf
===================================================================
--- pbi/modules/net-im/skype/pbi.conf	2012-11-30 17:21:15 UTC (rev 20331)
+++ pbi/modules/net-im/skype/pbi.conf	2012-11-30 17:22:15 UTC (rev 20332)
@@ -1,33 +1,23 @@
 #!/bin/sh
 # PBI Build Configuration
-# Place over-rides and settings here
-#
-# XDG Desktop Menu Spec:
-# http://standards.freedesktop.org/menu-spec/menu-spec-1.0.html
-##############################################################################
 
-# Program Name
+# -- Program Information --
 PBI_PROGNAME="Skype"
- 
-# Program Website
 PBI_PROGWEB="http://www.skype.com/"
- 
-# Program Author / Vendor
 PBI_PROGAUTHOR="The Skype Team"
- 
-# Default Icon (Relative to %%PBI_APPDIR%% or resources/)
 PBI_PROGICON="SkypeBlue_48x48.png"
- 
-# The target port we are building
+
+# -- Port Information --
 PBI_MAKEPORT="net-im/skype"
+PBI_MKPORTBEFORE=""
+PBI_MKPORTAFTER=""
+PBI_MAKEOPTS=""
 
-# Set which build key
+# -- Require Root Permissions to Install PBI --
+PBI_REQUIRESROOT="NO"
+# -- Auto-build Configuration Options --
 PBI_BUILDKEY="04"
-PBI_PROGREVISION="01"; export PBI_PROGREVISION
-
-# Set the priority
 PBI_AB_PRIORITY="20"
+PBI_AB_NOTMPFS="NO"
 
-PBI_MKPORTAFTER="audio/linux-f10-alsa-plugins-oss"
- 
-export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_BUILDKEY PBI_AB_PRIORITY PBI_MKPORTAFTER
+export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_REQUIRESROOT PBI_BUILDKEY PBI_AB_PRIORITY PBI_NOTMPFS

Modified: pbi/modules/net-im/skype/scripts/post-install.sh
===================================================================
--- pbi/modules/net-im/skype/scripts/post-install.sh	2012-11-30 17:21:15 UTC (rev 20331)
+++ pbi/modules/net-im/skype/scripts/post-install.sh	2012-11-30 17:22:15 UTC (rev 20332)
@@ -1,3 +1,10 @@
 #!/bin/sh
 
-rm ${PBI_PROGDIRPATH}/lib/libgcc_s.so.1
+#If there are both linux and FreeBSD versions of a lib, remove the FreeBSD one.
+cd ${PBI_PROGDIRPATH}/linuxlib
+for i in `ls *.so*`
+do
+  if [ -e ${PBI_PROGDIRPATH}/lib/${i} ]; then
+    rm ${PBI_PROGDIRPATH}/lib/${i}
+  fi
+done

Modified: pbi/modules/net-im/skype/xdg-menu/skype.desktop
===================================================================
--- pbi/modules/net-im/skype/xdg-menu/skype.desktop	2012-11-30 17:21:15 UTC (rev 20331)
+++ pbi/modules/net-im/skype/xdg-menu/skype.desktop	2012-11-30 17:22:15 UTC (rev 20332)
@@ -1,11 +1,11 @@
-#!/usr/bin/env xdg-open
+#!/usr/bin/env
 [Desktop Entry]
 Value=1.0
 Type=Application
 Name=Skype
-GenericName=Skype
+GenericName=skype
 Exec=%%PBI_EXEDIR%%/skype
 Path=%%PBI_APPDIR%%
 Icon=%%PBI_APPDIR%%/SkypeBlue_48x48.png
 StartupNotify=true
-Categories=Network;
+Categories=Network



More information about the Commits mailing list