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

Mon Jan 5 11:15:37 PST 2009

Author: kris
Date: 2009-01-05 11:15:37 -0800 (Mon, 05 Jan 2009)
New Revision: 3171

Added:
   pbibuild/modules/sylpheed/overlay-dir/bin/sylpheed
Removed:
   pbibuild/modules/sylpheed/kmenu-dir/sylpheed.sh
   pbibuild/modules/sylpheed/overlay-dir/bin/sylpheed.sh
Modified:
   pbibuild/modules/sylpheed/build.sh
   pbibuild/modules/sylpheed/copy-files
   pbibuild/modules/sylpheed/kmenu-dir/sylpheed
   pbibuild/modules/sylpheed/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/sylpheed/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/sylpheed/pbi.conf
Log:

Updated Sylpheed to PBI 2.0 schema, no sym links needed outside of its own dir now :)



Modified: pbibuild/modules/sylpheed/build.sh
===================================================================

--- pbibuild/modules/sylpheed/build.sh	2009-01-03 23:24:25 UTC (rev 3170)
+++ pbibuild/modules/sylpheed/build.sh	2009-01-05 19:15:37 UTC (rev 3171)
@@ -10,13 +10,19 @@
 ##############################################################################
 # Get all the various language files and copy them to the PBI
 LANGFILE="sylpheed.mo"
-mkdir ${PBIDIR}/locale/
+mkdir ${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 ${PBIDIR}/locale/${i}
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/locale/${i}/
+    mkdir ${PBIDIR}/share/locale/${i}
+    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/share/locale/${i}/
   fi
 done
+
+# Save the right version number in bin wrapper
+sed -e "s,CHANGEME,Sylpheed${PORTVER},g" ${PBIDIR}/bin/sylpheed > /tmp/sylpheed
+mv /tmp/sylpheed ${PBIDIR}/bin/sylpheed
+chmod 755 ${PBIDIR}/bin/sylpheed
+

Modified: pbibuild/modules/sylpheed/copy-files
===================================================================
--- pbibuild/modules/sylpheed/copy-files	2009-01-03 23:24:25 UTC (rev 3170)
+++ pbibuild/modules/sylpheed/copy-files	2009-01-05 19:15:37 UTC (rev 3171)
@@ -1,3 +1,3 @@
-/usr/local/bin/sylpheed bin/
+/usr/local/bin/sylpheed bin/sylpheed-bin
 /usr/local/share/applications/sylpheed.desktop share/applications/
-/usr/local/share/doc/sylpheed share/doc/
\ No newline at end of file
+/usr/local/share/doc/sylpheed share/doc/

Modified: pbibuild/modules/sylpheed/kmenu-dir/sylpheed
===================================================================
--- pbibuild/modules/sylpheed/kmenu-dir/sylpheed	2009-01-03 23:24:25 UTC (rev 3170)
+++ pbibuild/modules/sylpheed/kmenu-dir/sylpheed	2009-01-05 19:15:37 UTC (rev 3171)
@@ -1,8 +1,8 @@
 ExePath: bin/sylpheed
 ExeIcon: share/pixmaps/sylpheed.png
 ExeDescr: Sylpheed
-ExeNoDesktop: 1
-ExeNoMenu: 1
+ExeNoDesktop: 0
+ExeNoMenu: 0
 ExeRunRoot: 0
 ExeRunShell: 0
 ExeNotify: 1

Modified: pbibuild/modules/sylpheed/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/sylpheed/overlay-dir/PBI.RemoveScript.sh	2009-01-03 23:24:25 UTC (rev 3170)
+++ pbibuild/modules/sylpheed/overlay-dir/PBI.RemoveScript.sh	2009-01-05 19:15:37 UTC (rev 3171)
@@ -7,18 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm -fR /usr/local/bin/sylpheed
-rm -fR /usr/local/bin/sylpheed-bin
-rm -fR /usr/local/share/doc/sylpheed
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="sylpheed.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/sylpheed/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/sylpheed/overlay-dir/PBI.SetupScript.sh	2009-01-03 23:24:25 UTC (rev 3170)
+++ pbibuild/modules/sylpheed/overlay-dir/PBI.SetupScript.sh	2009-01-05 19:15:37 UTC (rev 3171)
@@ -15,23 +15,12 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-# Cleanup old Sylpheed links
-rm /usr/local/bin/sylpheed
-rm /usr/local/bin/sylpheed-bin
-rm /usr/local/share/doc/sylpheed
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-ln -s /Programs/${PROGDIR}/.sbin/sylpheed /usr/local/bin/sylpheed-bin
-ln -s /Programs/${PROGDIR}/.sbin/sylpheed.sh /usr/local/bin/sylpheed
-ln -s /Programs/${PROGDIR}/share/doc/ /usr/local/share/doc/sylpheed
-
-# Copy over all the LANG files
-LANGFILE="sylpheed.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
-
-echo "LAUNCHCLOSE: /usr/local/bin/sylpheed"
+echo "LAUNCHCLOSE: /Programs/bin/sylpheed"


Property changes on: pbibuild/modules/sylpheed/overlay-dir/bin/sylpheed
___________________________________________________________________
Added: svn:executable
   + *

Modified: pbibuild/modules/sylpheed/pbi.conf
===================================================================
--- pbibuild/modules/sylpheed/pbi.conf	2009-01-03 23:24:25 UTC (rev 3170)
+++ pbibuild/modules/sylpheed/pbi.conf	2009-01-05 19:15:37 UTC (rev 3171)
@@ -25,13 +25,14 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/audio/esound
+/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
 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
-BUILDKEY="06"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

