[PC-BSD Commits] r7227 - in pbibuild/modules/sysutils/warden: . kmenu-dir overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2010-07-16 12:07:45 -0700 (Fri, 16 Jul 2010)
New Revision: 7227

Modified:
   pbibuild/modules/sysutils/warden/kmenu-dir/pbreg
   pbibuild/modules/sysutils/warden/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/sysutils/warden/pbi.conf
Log:

Rebuild warden, don't want to put "pbreg" in users PATH, since it already exists on PC-BSD and doesn't work properly with using one in a different PREFIX



Modified: pbibuild/modules/sysutils/warden/kmenu-dir/pbreg
===================================================================
--- pbibuild/modules/sysutils/warden/kmenu-dir/pbreg	2010-07-16 09:03:29 UTC (rev 7226)
+++ pbibuild/modules/sysutils/warden/kmenu-dir/pbreg	2010-07-16 19:07:45 UTC (rev 7227)
@@ -2,7 +2,7 @@
 ExeIcon: warden.png
 ExeDescr: Warden
 ExeNoDesktop: 1
-ExeNoCrashHandler: 0
+ExeNoCrashHandler: 1
 ExeNoMenu: 1
 ExeRunRoot: 0
 ExeRunShell: 0

Modified: pbibuild/modules/sysutils/warden/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/sysutils/warden/overlay-dir/PBI.SetupScript.sh	2010-07-16 09:03:29 UTC (rev 7226)
+++ pbibuild/modules/sysutils/warden/overlay-dir/PBI.SetupScript.sh	2010-07-16 19:07:45 UTC (rev 7227)
@@ -87,3 +87,5 @@
   echo "Please ensure that /usr/ports is populated before building a jail"
 fi
 
+# Remove pbreg symlink if it exists, don't need to put it in PATH
+if [ -e "/Programs/bin/pbreg" ]; then rm /Programs/bin/pbreg ; fi

Modified: pbibuild/modules/sysutils/warden/pbi.conf
===================================================================
--- pbibuild/modules/sysutils/warden/pbi.conf	2010-07-16 09:03:29 UTC (rev 7226)
+++ pbibuild/modules/sysutils/warden/pbi.conf	2010-07-16 19:07:45 UTC (rev 7227)
@@ -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="02"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY