[PC-BSD Commits] r3439 - in pcbsd/trunk/installcd-overlay/usr/local/pcbsd: Components/kdeedu Components/kdesdk Components/kdetoys Components/kdewebdev LANGS scripts

[svn at pcbsd.org]

Author: kris
Date: 2009-02-11 12:12:34 -0800 (Wed, 11 Feb 2009)
New Revision: 3439

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdeedu/install.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdesdk/install.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdetoys/install.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdewebdev/install.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/LANGS/PCInstall_nl.qm
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/LANGS/PCInstall_uk.qm
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config
Log:

Switched our package options to PBCSD.Config instead of each script, since its
sourced already



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdeedu/install.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdeedu/install.sh	2009-02-11 20:06:05 UTC (rev 3438)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdeedu/install.sh	2009-02-11 20:12:34 UTC (rev 3439)
@@ -20,9 +20,6 @@
 
 # Make our install script
 echo '#!/bin/sh
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
-
 cd /tmp/components/
 pkg_add -f kdeedu-*.tbz
 ' > /mnt/installComponent.sh

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdesdk/install.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdesdk/install.sh	2009-02-11 20:06:05 UTC (rev 3438)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdesdk/install.sh	2009-02-11 20:12:34 UTC (rev 3439)
@@ -20,8 +20,6 @@
 
 # Make our install script
 echo '#!/bin/sh
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
 cd /tmp/components/
 pkg_add -f kdesdk-*.tbz
 pkg_add -f kdevelop-*.tbz

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdetoys/install.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdetoys/install.sh	2009-02-11 20:06:05 UTC (rev 3438)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdetoys/install.sh	2009-02-11 20:12:34 UTC (rev 3439)
@@ -20,8 +20,6 @@
 
 # Make our install script
 echo '#!/bin/sh
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
 cd /tmp/components/
 . /PCBSD/Scripts/changeportdb.sh
 pkg_add -f kdetoys-*.tbz

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdewebdev/install.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdewebdev/install.sh	2009-02-11 20:06:05 UTC (rev 3438)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdewebdev/install.sh	2009-02-11 20:12:34 UTC (rev 3439)
@@ -19,8 +19,6 @@
 
 # Make our install script
 echo '#!/bin/sh
-PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
-PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
 cd /tmp/components/
 pkg_add -f kdewebdev-*.tbz
 ' > /mnt/installComponent.sh

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config	2009-02-11 20:06:05 UTC (rev 3438)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Config	2009-02-11 20:12:34 UTC (rev 3439)
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# Set our port options
+PKG_DBDIR="/PCBSD/var/db" ; export PKG_DBDIR
+PORT_DBDIR="/PCBSD/var/db" ; export PORT_DBDIR
+
 CDMNT="/cdmnt"
 FSMNT="/mnt"
 UZIPDIR="${CDMNT}/uzip"