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

[svn at pcbsd.org]

Author: kris
Date: 2008-04-21 11:59:14 -0700 (Mon, 21 Apr 2008)
New Revision: 1745

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:

Fixed up Abiword module, now it should work with future builds



Modified: pbibuild/modules/abiword/copy-files
===================================================================
--- pbibuild/modules/abiword/copy-files	2008-04-21 18:26:15 UTC (rev 1744)
+++ pbibuild/modules/abiword/copy-files	2008-04-21 18:59:14 UTC (rev 1745)
@@ -1,6 +1,5 @@
 /usr/local/bin/abiword bin/
-/usr/local/bin/AbiWord-2.6 bin/
 /usr/local/bin/ttfadmin.sh bin/
 /usr/local/bin/ttftool bin/
-/usr/local/share/AbiSuite-2.6 share/
-/usr/local/share/applications/abiword.desktop share/applications/
\ No newline at end of file
+/usr/local/share/abiword-* share/
+/usr/local/share/applications/abiword.desktop share/applications/

Modified: pbibuild/modules/abiword/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/abiword/overlay-dir/PBI.RemoveScript.sh	2008-04-21 18:26:15 UTC (rev 1744)
+++ pbibuild/modules/abiword/overlay-dir/PBI.RemoveScript.sh	2008-04-21 18:59:14 UTC (rev 1745)
@@ -7,10 +7,9 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 rm -fR /usr/local/bin/abiword
-rm -fR /usr/local/bin/AbiWord-2.6
 rm -fR /usr/local/bin/ttfadmin.sh
 rm -fR /usr/local/bin/ttftool
-rm -fR /usr/local/share/AbiSuite-2.6
+rm -fR /usr/local/share/abiword-*
 #rm -fR /usr/local/share/applications/abiword.desktop
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/abiword/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/abiword/overlay-dir/PBI.SetupScript.sh	2008-04-21 18:26:15 UTC (rev 1744)
+++ pbibuild/modules/abiword/overlay-dir/PBI.SetupScript.sh	2008-04-21 18:59:14 UTC (rev 1745)
@@ -15,10 +15,13 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 ln -s /Programs/${PROGDIR}/.sbin/abiword /usr/local/bin/abiword
-ln -s /Programs/${PROGDIR}/.sbin/AbiWord-2.6 /usr/local/bin/AbiWord-2.6
 ln -s /Programs/${PROGDIR}/.sbin/ttfadmin.sh /usr/local/bin/ttfadmin.sh
 ln -s /Programs/${PROGDIR}/.sbin/ttftool /usr/local/bin/ttftool
-ln -s /Programs/${PROGDIR}/share/AbiSuite-2.6 /usr/local/share/AbiSuite-2.6
+
+cd /Programs/${PROGDIR}/share
+ABIDIR="`ls -d abiword-`"
+
+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"

Modified: pbibuild/modules/abiword/pbi.conf
===================================================================
--- pbibuild/modules/abiword/pbi.conf	2008-04-21 18:26:15 UTC (rev 1744)
+++ pbibuild/modules/abiword/pbi.conf	2008-04-21 18:59:14 UTC (rev 1745)
@@ -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="04"
+BUILDKEY="24"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY