[PC-BSD Commits] r3275 - in pbibuild/modules/eqonomize: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Fri Jan 16 04:41:49 PST 2009 

Author: kris
Date: 2009-01-16 04:41:48 -0800 (Fri, 16 Jan 2009)
New Revision: 3275

Modified:
   pbibuild/modules/eqonomize/build.sh
   pbibuild/modules/eqonomize/copy-files
   pbibuild/modules/eqonomize/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/eqonomize/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/eqonomize/pbi.conf
Log:

Updated eqonomize, now 100% self-contained!



Modified: pbibuild/modules/eqonomize/build.sh
===================================================================
--- pbibuild/modules/eqonomize/build.sh	2009-01-16 12:07:33 UTC (rev 3274)
+++ pbibuild/modules/eqonomize/build.sh	2009-01-16 12:41:48 UTC (rev 3275)
@@ -8,15 +8,3 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
-# Get all the various language files and copy them to the PBI
-LANGFILE="eqonomize.mo"
-mkdir ${PBIDIR}/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}/
-  fi
-done

Modified: pbibuild/modules/eqonomize/copy-files
===================================================================
--- pbibuild/modules/eqonomize/copy-files	2009-01-16 12:07:33 UTC (rev 3274)
+++ pbibuild/modules/eqonomize/copy-files	2009-01-16 12:41:48 UTC (rev 3275)
@@ -1,6 +1,5 @@
 /usr/local/bin/eqonomize bin/
 /usr/local/share/applications/kde/eqonomize.desktop share/applications/kde/
-/usr/local/share/apps/kde/eqonomize share/apps/
 /usr/local/share/docs/HTML/en/eqonomize share/docs/HTML/en/
 /usr/local/share/icons/hicolor/16x16/apps/eqonomize.png share/icons/hicolor/16x16/apps/
 /usr/local/share/icons/hicolor/16x16/mimetypes/eqz.png share/icons/hicolor/16x16/mimetypes/
@@ -15,4 +14,11 @@
 /usr/local/share/icons/hicolor/128x128/apps/eqonomize.png share/icons/hicolor/128x128/apps/
 /usr/local/share/icons/hicolor/128x128/mimetypes/eqz.png share/icons/hicolor/128x128/mimetypes/
 /usr/local/share/mimelnk/application/x-eqonomize.desktop share/mimelnk/application/
-
+/usr/local/share/apps share/
+/usr/local/share/config.kcfg share/config.kcfg
+/usr/local/share/config share/config
+/usr/local/share/services share/services
+/usr/local/share/servicetypes share/servicetypes
+/usr/local/share/mime share/mime
+/usr/local/share/mimelnk share/mimelnk
+/usr/local/libexec/gam* libexec/

Modified: pbibuild/modules/eqonomize/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/eqonomize/overlay-dir/PBI.RemoveScript.sh	2009-01-16 12:07:33 UTC (rev 3274)
+++ pbibuild/modules/eqonomize/overlay-dir/PBI.RemoveScript.sh	2009-01-16 12:41:48 UTC (rev 3275)
@@ -6,30 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/eqonomize
-rm -fR /usr/local/share/applications/kde/eqonomize.desktop
-rm -fR /usr/local/share/apps/kde/eqonomize
-rm -fR /usr/local/share/docs/HTML/en/eqonomize
-rm -fR /usr/local/share/icons/hicolor/16x16/apps/eqonomize.png
-rm -fR /usr/local/share/icons/hicolor/16x16/mimetypes/eqz.png
-rm -fR /usr/local/share/icons/hicolor/22x22/apps/eqonomize.png
-rm -fR /usr/local/share/icons/hicolor/22x22/mimetypes/eqz.png
-rm -fR /usr/local/share/icons/hicolor/32x32/apps/eqonomize.png
-rm -fR /usr/local/share/icons/hicolor/32x32/mimetypes/eqz.png
-rm -fR /usr/local/share/icons/hicolor/48x48/apps/eqonomize.png
-rm -fR /usr/local/share/icons/hicolor/48x48/mimetypes/eqz.png
-rm -fR /usr/local/share/icons/hicolor/64x64/apps/eqonomize.png
-rm -fR /usr/local/share/icons/hicolor/64x64/mimetypes/eqz.png
-rm -fR /usr/local/share/icons/hicolor/128x128/apps/eqonomize.png
-rm -fR /usr/local/share/icons/hicolor/128x128/mimetypes/eqz.png
-rm -fR /usr/local/share/mimelnk/application/x-eqonomize.desktop
-# Remove the old locale files since we are uninstalling
-LANGFILE="eqonomize.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/eqonomize/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/eqonomize/overlay-dir/PBI.SetupScript.sh	2009-01-16 12:07:33 UTC (rev 3274)
+++ pbibuild/modules/eqonomize/overlay-dir/PBI.SetupScript.sh	2009-01-16 12:41:48 UTC (rev 3275)
@@ -14,29 +14,14 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/eqonomize /usr/local/bin/eqonomize
-ln -s /Programs/${PROGDIR}/share/applications/kde/eqonomize.desktop /usr/local/share/applications/kde/eqonomize.desktop
-ln -s /Programs/${PROGDIR}/share/apps/kde/eqonomize /usr/local/share/apps/kde/eqonomize
-ln -s /Programs/${PROGDIR}/share/docs/HTML/en/eqonomize /usr/local/share/docs/HTML/en/eqonomize
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/16x16/apps/eqonomize.png /usr/local/share/icons/hicolor/16x16/apps/eqonomize.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/16x16/mimetypes/eqz.png /usr/local/share/icons/hicolor/16x16/mimetypes/eqz.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/22x22/apps/eqonomize.png /usr/local/share/icons/hicolor/22x22/apps/eqonomize.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/22x22/mimetypes/eqz.png /usr/local/share/icons/hicolor/22x22/mimetypes/eqz.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/apps/eqonomize.png /usr/local/share/icons/hicolor/32x32/apps/eqonomize.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/mimetypes/eqz.png /usr/local/share/icons/hicolor/32x32/mimetypes/eqz.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/apps/eqonomize.png /usr/local/share/icons/hicolor/48x48/apps/eqonomize.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/mimetypes/eqz.png /usr/local/share/icons/hicolor/48x48/mimetypes/eqz.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/64x64/apps/eqonomize.png /usr/local/share/icons/hicolor/64x64/apps/eqonomize.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/64x64/mimetypes/eqz.png /usr/local/share/icons/hicolor/64x64/mimetypes/eqz.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/128x128/apps/eqonomize.png /usr/local/share/icons/hicolor/128x128/apps/eqonomize.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/128x128/mimetypes/eqz.png /usr/local/share/icons/hicolor/128x128/mimetypes/eqz.png
-ln -s /Programs/${PROGDIR}/share/mimelnk/application/x-eqonomize.desktop /usr/local/share/mimelnk/application/x-eqonomize.desktop
-# Copy over all the LANG files
-LANGFILE="eqonomize.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/eqonomize"
+
+# 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
+
+
+echo "LAUNCHCLOSE: /Programs/bin/eqonomize"

Modified: pbibuild/modules/eqonomize/pbi.conf
===================================================================
--- pbibuild/modules/eqonomize/pbi.conf	2009-01-16 12:07:33 UTC (rev 3274)
+++ pbibuild/modules/eqonomize/pbi.conf	2009-01-16 12:41:48 UTC (rev 3275)
@@ -32,6 +32,6 @@
 
 # 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="03"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

More information about the Commits mailing list