[PC-BSD Commits] r3385 - in pbibuild/modules/kompose: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Mon Feb 2 06:24:33 PST 2009


Author: kris
Date: 2009-02-02 06:24:32 -0800 (Mon, 02 Feb 2009)
New Revision: 3385

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

Updated Kompose, now 100% self-contained



Modified: pbibuild/modules/kompose/build.sh
===================================================================
--- pbibuild/modules/kompose/build.sh	2009-02-01 14:53:48 UTC (rev 3384)
+++ pbibuild/modules/kompose/build.sh	2009-02-02 14:24:32 UTC (rev 3385)
@@ -8,17 +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="kompose.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/kompose/copy-files
===================================================================
--- pbibuild/modules/kompose/copy-files	2009-02-01 14:53:48 UTC (rev 3384)
+++ pbibuild/modules/kompose/copy-files	2009-02-02 14:24:32 UTC (rev 3385)
@@ -1,4 +1,18 @@
 /usr/local/bin/kompose bin/
 /usr/local/share/applnk/Utilities/kompose.desktop share/applnk/Utilities/
-/usr/local/share/apps/kompose share/apps/
 /usr/local/share/doc/HTML/en/kompose share/doc/HTML/en/
+/usr/local/bin/kio* bin/
+/usr/local/bin/*dcop* bin/
+/usr/local/bin/*arts* bin/
+/usr/local/lib/kde3/*kio* autolibs/kde3/
+/usr/local/lib/kde3/*knoti* autolibs/kde3/
+/usr/local/lib/kde3/kded* autolibs/kde3/
+/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/kompose/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/kompose/overlay-dir/PBI.FirstRun.sh	2009-02-01 14:53:48 UTC (rev 3384)
+++ pbibuild/modules/kompose/overlay-dir/PBI.FirstRun.sh	2009-02-02 14:24:32 UTC (rev 3385)
@@ -16,33 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/kompose" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/kompose | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Kompose is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/kompose | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Kompose 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Kompose could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Kompose 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 "Kompose is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/kompose/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/kompose/overlay-dir/PBI.RemoveScript.sh	2009-02-01 14:53:48 UTC (rev 3384)
+++ pbibuild/modules/kompose/overlay-dir/PBI.RemoveScript.sh	2009-02-02 14:24:32 UTC (rev 3385)
@@ -6,20 +6,7 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/kompose
-rm -fR /usr/local/share/applnk/Utilities/kompose.desktop
-rm -fR /usr/local/share/apps/kompose
-rm -fR /usr/local/share/doc/HTML/en/kompose
 
-# Remove the old locale files since we are uninstalling
-LANGFILE="kompose.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/kompose/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/kompose/overlay-dir/PBI.SetupScript.sh	2009-02-01 14:53:48 UTC (rev 3384)
+++ pbibuild/modules/kompose/overlay-dir/PBI.SetupScript.sh	2009-02-02 14:24:32 UTC (rev 3385)
@@ -15,18 +15,13 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -s /Programs/${PROGDIR}/.sbin/kompose /usr/local/bin/kompose
-ln -s /Programs/${PROGDIR}/share/applnk/Utilities/kompose.desktop /usr/local/share/applnk/Utilities/kompose.desktop
-ln -s /Programs/${PROGDIR}/share/apps/kompose /usr/local/share/apps/kompose
-ln -s /Programs/${PROGDIR}/share/doc/HTML/en/kompose /usr/local/share/doc/HTML/en/kompose
+# 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
 
-# Copy over all the LANG files
-LANGFILE="kompose.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/kompose"
+echo "LAUNCHCLOSE: /Programs/bin/kompose"

Modified: pbibuild/modules/kompose/pbi.conf
===================================================================
--- pbibuild/modules/kompose/pbi.conf	2009-02-01 14:53:48 UTC (rev 3384)
+++ pbibuild/modules/kompose/pbi.conf	2009-02-02 14:24:32 UTC (rev 3385)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is stillthe same ver
-BUILDKEY="01"
+BUILDKEY="08"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list