[PC-BSD Commits] r3193 - in pbibuild/modules/abyssws: . overlay-dir overlay-dir/bin

[svn at pcbsd.org]

Author: kris
Date: 2009-01-07 08:14:44 -0800 (Wed, 07 Jan 2009)
New Revision: 3193

Modified:
   pbibuild/modules/abyssws/build.sh
   pbibuild/modules/abyssws/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/abyssws/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/abyssws/overlay-dir/bin/abyssws-start
   pbibuild/modules/abyssws/pbi.conf
Log:

Updated abyssws to be self-contained, doesn't need /usr/local/lib links anymore



Modified: pbibuild/modules/abyssws/build.sh
===================================================================
--- pbibuild/modules/abyssws/build.sh	2009-01-07 15:51:00 UTC (rev 3192)
+++ pbibuild/modules/abyssws/build.sh	2009-01-07 16:14:44 UTC (rev 3193)
@@ -8,3 +8,9 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
+
+# Update links to tclsh to the right dir
+sed -e "s,CHANGEME,AbyssWebServer${PORTVER},g" ${PBIDIR}/bin/abyssws-start > /tmp/abyssws-start
+mv /tmp/abyssws-start ${PBIDIR}/bin/abyssws-start
+chmod 755 ${PBIDIR}/bin/abyssws-start
+

Modified: pbibuild/modules/abyssws/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/abyssws/overlay-dir/PBI.RemoveScript.sh	2009-01-07 15:51:00 UTC (rev 3192)
+++ pbibuild/modules/abyssws/overlay-dir/PBI.RemoveScript.sh	2009-01-07 16:14:44 UTC (rev 3193)
@@ -9,4 +9,3 @@
 rm -fR /usr/local/bin/abyssws
 rm -fR /usr/local/bin/abyssws-start
 rm -fR /usr/local/etc/rc.d/abyssws
-rm -fR /usr/local/lib/abyssws

Modified: pbibuild/modules/abyssws/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/abyssws/overlay-dir/PBI.SetupScript.sh	2009-01-07 15:51:00 UTC (rev 3192)
+++ pbibuild/modules/abyssws/overlay-dir/PBI.SetupScript.sh	2009-01-07 16:14:44 UTC (rev 3193)
@@ -14,10 +14,9 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /usr/local/lib/abyssws/abyssws /usr/local/bin/abyssws
+ln -s /Programs/${PROGDIR}/lib/abyssws/abyssws /usr/local/bin/abyssws
 ln -s /Programs/${PROGDIR}/.sbin/abyssws-start /usr/local/bin/abyssws-start
 ln -s /Programs/${PROGDIR}/etc/rc.d/abyssws /usr/local/etc/rc.d/abyssws
-ln -s /Programs/${PROGDIR}/lib/abyssws /usr/local/lib/abyssws
 chmod -fR 775 /Programs/${PROGDIR}/lib/abyssws
 echo 'MSG: Installing lang packages'
 kdialog --warningyesno 'Do you want to install all languages support?\n Internet should be working!'
@@ -29,7 +28,7 @@
 		kdialog --error "Aprelium host down."
 	else
 	echo 'MSG: Network OK'
-	cd /usr/local/lib/abyssws/lang/
+	cd /Programs/${PROGDIR}/lib/abyssws/lang/
 	echo 'MSG: Downloading ar.lng...'
 	fetch http://www.aprelium.com/abyssws/languages/a/ar.lng
 	echo 'MSG: Downloading bg.lng...'

Modified: pbibuild/modules/abyssws/overlay-dir/bin/abyssws-start
===================================================================
--- pbibuild/modules/abyssws/overlay-dir/bin/abyssws-start	2009-01-07 15:51:00 UTC (rev 3192)
+++ pbibuild/modules/abyssws/overlay-dir/bin/abyssws-start	2009-01-07 16:14:44 UTC (rev 3193)
@@ -1,4 +1,6 @@
 #!/bin/sh
 
-cd /usr/local/lib/abyssws/
-./abyssws
\ No newline at end of file
+PROGDIR=CHANGEME
+
+cd /Programs/${PROGDIR}/lib/abyssws
+./abyssws

Modified: pbibuild/modules/abyssws/pbi.conf
===================================================================
--- pbibuild/modules/abyssws/pbi.conf	2009-01-07 15:51:00 UTC (rev 3192)
+++ pbibuild/modules/abyssws/pbi.conf	2009-01-07 16:14:44 UTC (rev 3193)
@@ -32,7 +32,7 @@
 
 # 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="06"
+BUILDKEY="01"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 ARCHIGNORE="amd64" ; export ARCHIGNORE