[PC-BSD Commits] r3867 - in pbibuild/modules/flock: . kmenu-dir overlay-dir overlay-dir/bin

svn at pcbsd.org svn at pcbsd.org
Mon May 4 07:58:09 PDT 2009


Author: kris
Date: 2009-05-04 07:58:09 -0700 (Mon, 04 May 2009)
New Revision: 3867

Added:
   pbibuild/modules/flock/kmenu-dir/flock-browser
   pbibuild/modules/flock/kmenu-dir/flock-browser.sh
   pbibuild/modules/flock/overlay-dir/bin/flock-browser.sh
   pbibuild/modules/flock/overlay-dir/makedefault.sh
   pbibuild/modules/flock/overlay-dir/mimeTypes.rdf
Removed:
   pbibuild/modules/flock/kmenu-dir/flock
Modified:
   pbibuild/modules/flock/build.sh
   pbibuild/modules/flock/copy-files
   pbibuild/modules/flock/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/flock/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/flock/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/flock/overlay-dir/bin/defaultemail
Log:

Updated flock browser to version 2.0, which will be committed soon.



Modified: pbibuild/modules/flock/build.sh
===================================================================
--- pbibuild/modules/flock/build.sh	2009-05-04 14:22:30 UTC (rev 3866)
+++ pbibuild/modules/flock/build.sh	2009-05-04 14:58:09 UTC (rev 3867)
@@ -11,3 +11,14 @@
 
 # Now append our prefs file with the default email script
 echo "pref(\"network.protocol-handler.app.mailto\", \"/Programs/Flock${PORTVER}/bin/defaultemail\");" >> ${PBIDIR}/lib/flock/greprefs/all.js
+
+# Save the right version number in the removepbi.sh script
+sed -e "s,CHANGEME,Flock${PORTVER},g" ${PBIDIR}/bin/flock-browser.sh > /tmp/sed
+mv /tmp/sed ${PBIDIR}/bin/flock-browser.sh
+chmod 755 ${PBIDIR}/bin/flock-browser.sh
+chmod 755 ${PBIDIR}/makedefault.sh
+
+
+# We need to setup the mimeTypes.rdf file, so that FF3 can use the defaultemail script
+sed -e "s,CHANGEME,Flock${PORTVER},g" ${PBIDIR}/mimeTypes.rdf > /tmp/sed
+mv /tmp/sed ${PBIDIR}/lib/flock-2.0/defaults/profile/mimeTypes.rdf

Modified: pbibuild/modules/flock/copy-files
===================================================================
--- pbibuild/modules/flock/copy-files	2009-05-04 14:22:30 UTC (rev 3866)
+++ pbibuild/modules/flock/copy-files	2009-05-04 14:58:09 UTC (rev 3867)
@@ -1,4 +1,5 @@
 /usr/local/bin/certcgi bin/
+/usr/local/bin/es* bin/
 /usr/local/bin/mangle bin/
 /usr/local/bin/rsaperf bin/
 /usr/local/bin/certutil bin/
@@ -28,11 +29,10 @@
 /usr/local/bin/vfyserv bin/
 /usr/local/bin/makepqg bin/
 /usr/local/bin/pk12util bin/
-/usr/local/bin/flock bin/
-/usr/local/bin/flock-config bin/
+/usr/local/bin/flock* bin/
 /usr/local/include/flock include/
-/usr/local/lib/flock lib/
-/usr/local/lib/flock/flock-bin bin/
+/usr/local/lib/floc* lib/
+/usr/local/lib/flock-2.0/flock-bin bin/
 /usr/local/lib/nss/* autolibs/
 /usr/local/lib/libnnss3* autolibs/
 /usr/local/lib/libnssckpi* autolibs/
@@ -41,6 +41,9 @@
 /usr/local/lib/libsmime3* autolibs/
 /usr/local/lib/libsoftokn3* autolibs/
 /usr/local/lib/libsssl3* autolibs/
+/usr/local/lib/libd* autolibs/
+/usr/local/lib/libfont* autolibs/
+/usr/local/lib/X11 autolibs/
 /usr/local/libdata/pkgconfig/flock-gtkmozembed.pc libdata/pkgconfig/
 /usr/local/libdata/pkgconfig/flock-js.pc libdata/pkgconfig/
 /usr/local/libdata/pkgconfig/flock-plugin.pc libdata/pkgconfig/
@@ -48,3 +51,4 @@
 /usr/local/share/applications/flock.desktop share/applications/
 /usr/local/share/idl/flock* share/idl/
 /usr/local/share/pixmaps/flock.xpm share/pixmaps/
+/usr/local/etc/fonts etc/

Modified: pbibuild/modules/flock/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/flock/overlay-dir/PBI.FirstRun.sh	2009-05-04 14:22:30 UTC (rev 3866)
+++ pbibuild/modules/flock/overlay-dir/PBI.FirstRun.sh	2009-05-04 14:58:09 UTC (rev 3867)
@@ -16,33 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/flock" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/flock | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Flock is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/flock | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Flock 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Flock could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Flock is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "Flock is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/flock/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/flock/overlay-dir/PBI.RemoveScript.sh	2009-05-04 14:22:30 UTC (rev 3866)
+++ pbibuild/modules/flock/overlay-dir/PBI.RemoveScript.sh	2009-05-04 14:58:09 UTC (rev 3867)
@@ -7,20 +7,3 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove Flock user settingss?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
-  cd /home
-  for i in `ls`
-  do
-   if [ -e "/home/${i}/.flock" ]
-   then
-    rm -rf /home/${i}/.flock
-   fi
-  done
- fi
-fi
-

Modified: pbibuild/modules/flock/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/flock/overlay-dir/PBI.SetupScript.sh	2009-05-04 14:22:30 UTC (rev 3866)
+++ pbibuild/modules/flock/overlay-dir/PBI.SetupScript.sh	2009-05-04 14:58:09 UTC (rev 3867)
@@ -16,51 +16,13 @@
 #########################################
 
 # Check which font config we want to link to
-if [ -d "/PCBSD/local/etc/fonts" ]
+if [ -d "/PCBSD/local/lib/X11/fonts" ]
 then
-  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+  ln -s /PCBSD/local/lib/X11/fonts/misc /Programs/${PROGDIR}/lib/X11/fonts/misc
 else
-  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+  ln -s /usr/local/lib/X11/fonts/misc /Programs/${PROGDIR}/lib/X11/fonts/misc
 fi
 
+ln -fs /Programs/${PROGDIR}/.sbin/flock-browser /Programs/bin/flock-browser
 
-if [ ! -z "$DISPLAY" ]
-then
-
-USER="$USERNAME"
-if [ "$USER" != "root" ]
-then
-  HOMEDIR="/home/${USER}"
-else
-  HOMEDIR="/root"
-fi
-
-  # Ask if we should make this the default browser application for our user
-  kdialog --yesno "Do you want to make Flock the default browser?" --title "Default browser?"
-  if [ "$?" = "0" ]
-  then
-      # Strip out the old BrowserApplication line to make way for the new
-      cat ${HOMEDIR}/.kde/share/config/kdeglobals | grep -v '^BrowserApplication' > ${HOMEDIR}/.kdeglobals.new
-
-      touch ${HOMEDIR}/.kdeglobals.new2
-      while read line
-      do
-
-         if [ "$line" = "[General]" ]
-         then
-           echo "$line" >> ${HOMEDIR}/.kdeglobals.new2
-           echo "BrowserApplication=!/usr/local/bin/flock" >> ${HOMEDIR}/.kdeglobals.new2
-    	 else
-       	   echo "$line" >> ${HOMEDIR}/.kdeglobals.new2
-  	 fi
-      done < ${HOMEDIR}/.kdeglobals.new
-
-      # all finished, now move it back over kdeglobals
-      rm ${HOMEDIR}/.kdeglobals.new
-      chown ${USERNAME}:${USERNAME} ${HOMEDIR}/.kdeglobals.new2
-      mv ${HOMEDIR}/.kdeglobals.new2 ${HOMEDIR}/.kde/share/config/kdeglobals
-  fi
-
-fi
-
-echo "LAUNCHCLOSE: /Programs/bin/flock"
+echo "LAUNCHCLOSE: /Programs/bin/flock-browser.sh"

Modified: pbibuild/modules/flock/overlay-dir/bin/defaultemail
===================================================================
--- pbibuild/modules/flock/overlay-dir/bin/defaultemail	2009-05-04 14:22:30 UTC (rev 3866)
+++ pbibuild/modules/flock/overlay-dir/bin/defaultemail	2009-05-04 14:58:09 UTC (rev 3867)
@@ -10,19 +10,19 @@
   HOMEDIR="/root"
 fi
 
-if [ -e "${HOMEDIR}/.kde/share/config/emaildefaults" ]
+if [ -e "${HOMEDIR}/.kde4/share/config/emaildefaults" ]
 then
-  EMAIL="`cat ${HOMEDIR}/.kde/share/config/emaildefaults | grep '^EmailClient=' | cut -d '=' -f 2`"
+  EMAIL="`cat ${HOMEDIR}/.kde4/share/config/emaildefaults | grep '^EmailClient=' | cut -d '=' -f 2`"
 
   if [ -e "$EMAIL" ]
   then
     ( $EMAIL "$@" ) &
     exit 0
   else
-    ( /usr/local/bin/kmail "$@" ) &
+    ( /PCBSD/local/bin/kmail "$@" ) &
     exit 0
   fi
 else
-  ( /usr/local/bin/kmail "$@" ) &
+  ( /PCBSD/local/bin/kmail "$@" ) &
   exit 0
 fi


Property changes on: pbibuild/modules/flock/overlay-dir/makedefault.sh
___________________________________________________________________
Added: svn:executable
   + *



More information about the Commits mailing list