[PC-BSD Commits] r12810 - in pbi/modules/mail/evolution: . resources/bin scripts

[svn at pcbsd.org]

Author: kenmoore
Date: 2011-09-16 06:53:57 -0700 (Fri, 16 Sep 2011)
New Revision: 12810

Added:
   pbi/modules/mail/evolution/scripts/post-install.sh
Removed:
   pbi/modules/mail/evolution/scripts/post-portmake.sh
   pbi/modules/mail/evolution/scripts/pre-remove.sh
Modified:
   pbi/modules/mail/evolution/external-links
   pbi/modules/mail/evolution/pbi.conf
   pbi/modules/mail/evolution/resources/bin/evolution.sh
Log:
Large fix of the evolution module. Move post-portmake.sh to post-install.sh, add linking to evolution.sh binary, fix evolution.sh binary, remove legacy uninstall script


Modified: pbi/modules/mail/evolution/external-links
===================================================================
--- pbi/modules/mail/evolution/external-links	2011-09-16 13:15:04 UTC (rev 12809)
+++ pbi/modules/mail/evolution/external-links	2011-09-16 13:53:57 UTC (rev 12810)
@@ -9,3 +9,4 @@
 #bin/appfoo             bin/appfoo              binary,nocrash
 #bin/appfoo2            bin/appfoo-test         binary
 
+bin/evolution.sh	bin/evolution.sh	binary

Modified: pbi/modules/mail/evolution/pbi.conf
===================================================================
--- pbi/modules/mail/evolution/pbi.conf	2011-09-16 13:15:04 UTC (rev 12809)
+++ pbi/modules/mail/evolution/pbi.conf	2011-09-16 13:53:57 UTC (rev 12810)
@@ -27,5 +27,7 @@
 # Ports to build before / after
 PBI_MKPORTBEFORE=""
 PBI_MKPORTAFTER="mail/evolution-exchange sysutils/gnome-settings-daemon x11-themes/qtcurve-gtk2"
+
+PBI_BUILDKEY="01"; export PBI_BUILDKEY
  
 export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_MAKEOPTS PBI_MKPORTBEFORE PBI_MKPORTAFTER

Modified: pbi/modules/mail/evolution/resources/bin/evolution.sh
===================================================================
--- pbi/modules/mail/evolution/resources/bin/evolution.sh	2011-09-16 13:15:04 UTC (rev 12809)
+++ pbi/modules/mail/evolution/resources/bin/evolution.sh	2011-09-16 13:53:57 UTC (rev 12810)
@@ -3,27 +3,27 @@
 
 PROGDIR=CHANGEME
 
-XDG_DATA_DIRS="/Programs/${PROGDIR}/share:${XDG_DATA_DIRS}"
+XDG_DATA_DIRS="${PROGDIR}/share:${XDG_DATA_DIRS}"
 export XDG_DATA_DIRS
 
 ps -uwwx | grep -v grep | grep gnome-settings-daemon >/dev/null 2>/dev/null
 if [ "$?" != "0" ]
 then
    killall -9 gconfd-2 >/dev/null 2>/dev/null
-   /Programs/${PROGDIR}/libexec/gconfd-2 &
+   ${PROGDIR}/libexec/gconfd-2 &
    sleep 2
-   /Programs/${PROGDIR}/libexec/gnome-settings-daemon &
+   ${PROGDIR}/libexec/gnome-settings-daemon &
    sleep 2
 fi
 
 ps -uwwx | grep -v grep | grep gnome-keyring-daemon >/dev/null 2>/dev/null
 if [ "$?" != "0" ]
 then
-   /Programs/${PROGDIR}/bin/gnome-keyring-daemon -d &
+   ${PROGDIR}/bin/gnome-keyring-daemon -d &
    sleep 2
 fi
 
 # Set the default browser handler
-/Programs/${PROGDIR}/bin/gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string '/Programs/${PROGDIR}/bin/defaultbrowser %s'
+${PROGDIR}/bin/gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string '${PROGDIR}/bin/defaultbrowser %s'
 
-/Programs/${PROGDIR}/bin/evolution $@
+${PROGDIR}/bin/evolution $@