[PC-BSD Commits] r3233 - in pbibuild/modules/evolution: . overlay-dir overlay-dir/bin

svn at pcbsd.org svn at pcbsd.org
Mon Jan 12 13:26:04 PST 2009


Author: kris
Date: 2009-01-12 13:26:03 -0800 (Mon, 12 Jan 2009)
New Revision: 3233

Modified:
   pbibuild/modules/evolution/build.sh
   pbibuild/modules/evolution/copy-files
   pbibuild/modules/evolution/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/evolution/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/evolution/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/evolution/overlay-dir/bin/evolution.sh
   pbibuild/modules/evolution/pbi.conf
   pbibuild/modules/evolution/preportmake.sh
Log:

Updated evolution, now builds, and is 100% self-contained and works great!



Modified: pbibuild/modules/evolution/build.sh
===================================================================
--- pbibuild/modules/evolution/build.sh	2009-01-12 20:25:34 UTC (rev 3232)
+++ pbibuild/modules/evolution/build.sh	2009-01-12 21:26:03 UTC (rev 3233)
@@ -9,23 +9,14 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Get all the various language files and copy them to the PBI
-#LANGFILE="evolution-2.22.mo"
-#LANGFILE1="evolution-data-server-2.22.mo"
-#LANGFILE2="evolution-exchange-2.22.mo"
-#mkdir -p ${PBIDIR}/share/locale/
-#cd /usr/local/share/locale
-#for i in `ls`
-#do
-#  if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
-#  then
-#    mkdir -p ${PBIDIR}/share/locale/${i}/LC_MESSAGES
-#    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/share/locale/${i}/LC_MESSAGES/
-#    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE1} ${PBIDIR}/share/locale/${i}/LC_MESSAGES/
-#    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE2} ${PBIDIR}/share/locale/${i}/LC_MESSAGES/
-#  fi
-#done
+# Save the right version number in the evolution.sh script
+sed -e "s,CHANGEME,Evolution${PORTVER},g" ${PBIDIR}/bin/evolution.sh > /tmp/evolution.sh
+mv /tmp/evolution.sh ${PBIDIR}/bin/evolution.sh
+chmod 755 ${PBIDIR}/bin/evolution.sh
 
 
 # Remove the screensaver modules, don't need those
 rm ${PBIDIR}/autolibs/gnome-settings-daemon*/*screensaver*
+
+# Remove etc/fonts, don't need it
+rm -rf ${PBIDIR}/etc/fonts

Modified: pbibuild/modules/evolution/copy-files
===================================================================
--- pbibuild/modules/evolution/copy-files	2009-01-12 20:25:34 UTC (rev 3232)
+++ pbibuild/modules/evolution/copy-files	2009-01-12 21:26:03 UTC (rev 3233)
@@ -59,6 +59,8 @@
 /usr/local/share/dbus* share/
 /usr/local/share/gnome-settings-daemon share/
 /usr/local/share/gnome-spell* share/
+/usr/local/share/gtk* share/
 /usr/local/share/icons share/
 /usr/local/share/locale share/
+/usr/local/share/xml share/
 /usr/local/share/themes share/

Modified: pbibuild/modules/evolution/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/evolution/overlay-dir/PBI.FirstRun.sh	2009-01-12 20:25:34 UTC (rev 3232)
+++ pbibuild/modules/evolution/overlay-dir/PBI.FirstRun.sh	2009-01-12 21:26:03 UTC (rev 3233)
@@ -15,10 +15,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-
-
-if [ -e "/usr/local/bin/evolution" ]
-then
-  kdialog -error "Evolution is already installed! Please remove it before re-installing!"
-  exit 2
-fi

Modified: pbibuild/modules/evolution/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/evolution/overlay-dir/PBI.RemoveScript.sh	2009-01-12 20:25:34 UTC (rev 3232)
+++ pbibuild/modules/evolution/overlay-dir/PBI.RemoveScript.sh	2009-01-12 21:26:03 UTC (rev 3233)
@@ -7,34 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/evolution
-rm /Programs/Evolution
-
-
-# Remove the old locale files since we are uninstalling
-#LANGFILE="evolution-2.22.mo"
-#LANGFILE1="evolution-data-server-2.22.mo"
-#LANGFILE2="evolution-exchange-2.22.mo"
-#cd /Programs/${PROGDIR}/share/locale/
-#for i in `ls`
-#do
-#  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-#  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE1}
-#  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE2}
-#done
-
-ls -al /usr/local/share/dbus-1/services/org.gnome.keyring.service | grep "Evolution" >/dev/null 2>/dev/null
-if [ "$?" = "0" ]
-then
-  rm /usr/local/share/dbus-1/services/org.gnome.keyring.service
-fi
-
-ls -al /usr/local/share/dbus-1/services/org.gnome.SettingsDaemon.service | grep "Evolution" >/dev/null 2>/dev/null
-if [ "$?" = "0" ]
-then
-  rm /usr/local/share/dbus-1/services/org.gnome.SettingsDaemon.service
-fi
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/evolution/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/evolution/overlay-dir/PBI.SetupScript.sh	2009-01-12 20:25:34 UTC (rev 3232)
+++ pbibuild/modules/evolution/overlay-dir/PBI.SetupScript.sh	2009-01-12 21:26:03 UTC (rev 3233)
@@ -15,47 +15,12 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -fs /Programs/${PROGDIR} /Programs/Evolution
-ln -fs /Programs/${PROGDIR}/.sbin/evolution.sh /usr/local/bin/evolution
-ln -fs /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
-
-if [ ! -e "/usr/local/share/dbus-1/services/org.gnome.keyring.service" ]
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
 then
-  ln -fs /Programs/${PROGDIR}/share/dbus-1/services/org.gnome.keyring.service /usr/local/share/dbus-1/services/org.gnome.keyring.service
-fi
-
-if [ ! -e "/usr/local/share/dbus-1/services/org.gnome.SettingsDaemon.service" ]
-then
-  ln -fs /Programs/${PROGDIR}/share/dbus-1/services/org.gnome.SettingsDaemon.service /usr/local/share/dbus-1/services/org.gnome.SettingsDaemon.service
-fi
-
-# Copy over the evo icons to gnome
-tar cvf - -C /Programs/Evolution/share/evolution/2.22/icons/hicolor . 2>/dev/null | tar xvf - -C /Programs/Evolution/share/icons/gnome 2>/dev/null
-
-
-if [ -e "/usr/local/share/icons/gnome" ]
-then
-  tar cvf - -C /Programs/Evolution/share/icons/gnome . 2>/dev/null | tar xvf - -C /usr/local/share/icons/gnome 2>/dev/null
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
 else
-  cp -r /Programs/Evolution/share/icons/gnome /usr/local/share/icons
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
 fi
 
-
-# Copy over all the LANG files
-#LANGFILE="evolution-2.22.mo"
-#LANGFILE1="evolution-data-server-2.22.mo"
-#LANGFILE2="evolution-exchange-2.22.mo"
-#cd /Programs/${PROGDIR}/share/locale
-#for i in `ls`
-#do
-#  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-#  cp /Programs/${PROGDIR}/share/locale/${i}/LC_MESSAGES/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-#  cp /Programs/${PROGDIR}/share/locale/${i}/LC_MESSAGES/${LANGFILE1} /usr/local/share/locale/${i}/LC_MESSAGES/
-#  cp /Programs/${PROGDIR}/share/locale/${i}/LC_MESSAGES/${LANGFILE2} /usr/local/share/locale/${i}/LC_MESSAGES/
-#done
-
-# Copy over the qtcurve style for this app
-cp /usr/local/lib/gtk-2.0/2.10.0/engines/libqt* /Programs/${PROGDIR}/lib/gtk-2.0/2.10.0/engines/
-
-
-echo "LAUNCHCLOSE: /usr/local/bin/evolution"
+echo "LAUNCHCLOSE: /Programs/bin/evolution.sh"

Modified: pbibuild/modules/evolution/overlay-dir/bin/evolution.sh
===================================================================
--- pbibuild/modules/evolution/overlay-dir/bin/evolution.sh	2009-01-12 20:25:34 UTC (rev 3232)
+++ pbibuild/modules/evolution/overlay-dir/bin/evolution.sh	2009-01-12 21:26:03 UTC (rev 3233)
@@ -1,24 +1,29 @@
 #!/bin/sh
 # Execute gnome-settings-daemon before running evolution
 
+PROGDIR=CHANGEME
+
+XDG_DATA_DIRS="/Programs/${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/Evolution/libexec/gconfd-2 &
+   /Programs/${PROGDIR}libexec/gconfd-2 &
    sleep 2
-   /Programs/Evolution/libexec/gnome-settings-daemon &
+   /Programs/${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/Evolution/bin/gnome-keyring-daemon -d &
+   /Programs/${PROGDIR}/bin/gnome-keyring-daemon -d &
    sleep 2
 fi
 
 # Set the default browser handler
-/Programs/Evolution/bin/gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string '/Programs/Evolution/bin/defaultbrowser %s'
+/Programs/${PROGDIR}/bin/gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string '/Programs/${PROGDIR}/bin/defaultbrowser %s'
 
-/Programs/Evolution/bin/evolution $@
+/Programs/${PROGDIR}/bin/evolution $@

Modified: pbibuild/modules/evolution/pbi.conf
===================================================================
--- pbibuild/modules/evolution/pbi.conf	2009-01-12 20:25:34 UTC (rev 3232)
+++ pbibuild/modules/evolution/pbi.conf	2009-01-12 21:26:03 UTC (rev 3233)
@@ -26,11 +26,11 @@
 
 # Other Ports we need built (One per line)
 OTHERPORT="/usr/ports/mail/evolution-exchange
-/usr/ports/sysutils/gnome-settings-daemon"
+/usr/ports/sysutils/gnome-settings-daemon
+/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
-MAKEOPTS="PREFIX=/Programs/Evolution
-LOCALBASE=/Programs/Evolution"
+MAKEOPTS=""
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver

Modified: pbibuild/modules/evolution/preportmake.sh
===================================================================
--- pbibuild/modules/evolution/preportmake.sh	2009-01-12 20:25:34 UTC (rev 3232)
+++ pbibuild/modules/evolution/preportmake.sh	2009-01-12 21:26:03 UTC (rev 3233)
@@ -1,7 +1,2 @@
 #!/bin/sh
 
-# Remove any /Programs/Evolution link, and recreate it, so we can use PREFIX
-# in our make.conf properly
-rm -rf /Programs/Evolution
-mkdir /Programs
-ln -s /usr/local /Programs/Evolution



More information about the Commits mailing list