[PC-BSD Commits] r3388 - in pbibuild/modules/kompozer: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-02-02 09:27:26 -0800 (Mon, 02 Feb 2009)
New Revision: 3388

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

Updated kompozer, now 100% self-contained



Modified: pbibuild/modules/kompozer/copy-files
===================================================================
--- pbibuild/modules/kompozer/copy-files	2009-02-02 17:16:41 UTC (rev 3387)
+++ pbibuild/modules/kompozer/copy-files	2009-02-02 17:27:26 UTC (rev 3388)
@@ -3,6 +3,11 @@
 /usr/local/include/kompozer include/
 /usr/local/lib/kompozer lib/
 /usr/local/lib/kompozer/kompozer-bin bin/
-/usr/local/libdata/pkgconfig/kompozer* libdata/pkgconfig/
 /usr/local/share/idl/kompozer share/idl/
 /usr/local/share/applications/kompozer* share/applications/
+/usr/local/share/apps share/
+/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/libexec/gam* libexec/

Modified: pbibuild/modules/kompozer/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/kompozer/overlay-dir/PBI.FirstRun.sh	2009-02-02 17:16:41 UTC (rev 3387)
+++ pbibuild/modules/kompozer/overlay-dir/PBI.FirstRun.sh	2009-02-02 17:27:26 UTC (rev 3388)
@@ -15,33 +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/kompozer" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/qcad | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "KompoZer is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/kompozer | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep KompoZer 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "KompoZer could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "KompoZer 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 "KompoZer is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/kompozer/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/kompozer/overlay-dir/PBI.RemoveScript.sh	2009-02-02 17:16:41 UTC (rev 3387)
+++ pbibuild/modules/kompozer/overlay-dir/PBI.RemoveScript.sh	2009-02-02 17:27:26 UTC (rev 3388)
@@ -7,13 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm -fR /usr/local/bin/kompozer
-rm -fR /usr/local/bin/kompozer-config
-rm -fR /usr/local/include/kompozer 
-rm -fR /usr/local/lib/kompozer
-rm -fR /usr/local/libdata/pkgconfig/kompozer*
-rm -fR /usr/local/share/idl/kompozer
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/kompozer/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/kompozer/overlay-dir/PBI.SetupScript.sh	2009-02-02 17:16:41 UTC (rev 3387)
+++ pbibuild/modules/kompozer/overlay-dir/PBI.SetupScript.sh	2009-02-02 17:27:26 UTC (rev 3388)
@@ -14,14 +14,17 @@
 # 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/kompozer /usr/local/bin/kompozer
-ln -s /Programs/${PROGDIR}/.sbin/kompozer-config /usr/local/bin/kompozer-config
-ln -s /Programs/${PROGDIR}/include/kompozer /usr/local/include/kompozer 
-ln -s /Programs/${PROGDIR}/lib/kompozer /usr/local/lib/kompozer
-ln -s /Programs/${PROGDIR}/libdata/pkgconfig/kompozer* /usr/local/libdata/pkgconfig/
-ln -s /Programs/${PROGDIR}/share/idl/kompozer /usr/local/share/idl/kompozer
 
+# 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
+
+
 mkdir /Programs/${PROGDIR}/lib/kompozer/extensions
 chmod 777 /Programs/${PROGDIR}/lib/kompozer/extensions
 
-echo "LAUNCHCLOSE: /usr/local/bin/kompozer"
+echo "LAUNCHCLOSE: /Programs/bin/kompozer"

Modified: pbibuild/modules/kompozer/pbi.conf
===================================================================
--- pbibuild/modules/kompozer/pbi.conf	2009-02-02 17:16:41 UTC (rev 3387)
+++ pbibuild/modules/kompozer/pbi.conf	2009-02-02 17:27:26 UTC (rev 3388)
@@ -25,13 +25,13 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/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="14"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY