[PC-BSD Commits] r3189 - in pbibuild/modules/abiword: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-07 06:59:04 -0800 (Wed, 07 Jan 2009)
New Revision: 3189

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

Updated AbiWord to be 100% self-contained now!



Modified: pbibuild/modules/abiword/copy-files
===================================================================
--- pbibuild/modules/abiword/copy-files	2009-01-07 14:52:14 UTC (rev 3188)
+++ pbibuild/modules/abiword/copy-files	2009-01-07 14:59:04 UTC (rev 3189)
@@ -3,3 +3,5 @@
 /usr/local/bin/ttftool bin/
 /usr/local/share/abiword-* share/
 /usr/local/share/applications/abiword.desktop share/applications/
+/usr/local/libexec/gconf* libexec/
+/usr/local/lib/GCo* lib/

Modified: pbibuild/modules/abiword/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/abiword/overlay-dir/PBI.RemoveScript.sh	2009-01-07 14:52:14 UTC (rev 3188)
+++ pbibuild/modules/abiword/overlay-dir/PBI.RemoveScript.sh	2009-01-07 14:59:04 UTC (rev 3189)
@@ -6,11 +6,7 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/abiword
-rm -fR /usr/local/bin/ttfadmin.sh
-rm -fR /usr/local/bin/ttftool
-rm -fR /usr/local/share/abiword-*
-#rm -fR /usr/local/share/applications/abiword.desktop
+
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/abiword/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/abiword/overlay-dir/PBI.SetupScript.sh	2009-01-07 14:52:14 UTC (rev 3188)
+++ pbibuild/modules/abiword/overlay-dir/PBI.SetupScript.sh	2009-01-07 14:59:04 UTC (rev 3189)
@@ -14,14 +14,13 @@
 # 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/abiword /usr/local/bin/abiword
-ln -s /Programs/${PROGDIR}/.sbin/ttfadmin.sh /usr/local/bin/ttfadmin.sh
-ln -s /Programs/${PROGDIR}/.sbin/ttftool /usr/local/bin/ttftool
 
-cd /Programs/${PROGDIR}/share
-ABIDIR="`ls -d abiword-*`"
+# 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}/share/$ABIDIR /usr/local/share/$ABIDIR
-#ln -s /Programs/${PROGDIR}/share/applications/abiword.desktop /usr/local/share/applications/abiword.desktop
-
-echo "LAUNCHCLOSE: /usr/local/bin/abiword"
+echo "LAUNCHCLOSE: /Programs/bin/abiword"

Modified: pbibuild/modules/abiword/pbi.conf
===================================================================
--- pbibuild/modules/abiword/pbi.conf	2009-01-07 14:52:14 UTC (rev 3188)
+++ pbibuild/modules/abiword/pbi.conf	2009-01-07 14:59:04 UTC (rev 3189)
@@ -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