[PC-BSD Commits] r153 - in pcbsd/trunk/system-overlay: PCBSD/Scripts PCBSD/Scripts/System PCBSD/cardDetect PCBSD/conf PCBSD/sound Programs/.config sbin usr/X11R6/etc/fonts usr/X11R6/share/fluxbox usr/X11R6/share/fluxbox/styles usr/local/bin usr/local/etc usr/local/etc/periodic/monthly usr/local/etc/rc.d usr/local/etc/xdg/menus usr/local/share/applnk/My Programs usr/local/share/apps/kdm/sessions usr/local/share/apps/kthememanager/themes/PC-BSD usr/local/share/config usr/local/share/config/kdm usr/share/config/kdm usr/share/skel usr/share/skel/.fluxbox usr/share/skel/.gkrellm2 usr/share/skel/.idesktop usr/share/skel/.kde/env usr/share/skel/.kde/share/apps/kconf_update/log usr/share/skel/.kde/share/apps/kcookiejar usr/share/skel/.kde/share/apps/kdesktop usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries usr/share/skel/.kde/share/apps/konqueror usr/share/skel/.kde/share/apps/konqueror/profiles usr/share/skel/.kde/share/apps/konqueror/servicemenus usr/share/skel/.kde/sh! are/apps/kstyle/themes/original usr/share/skel/.kde/share/apps/nsplugins usr/share/skel/.kde/share/config usr/share/skel/.kde/share/config/colors usr/share/skel/.kde/share/config/kresources/contact usr/share/skel/.kde/share/services usr/share/skel/Desktop usr/share/skel/Documents usr/share/skel/Images usr/share/skel/Music usr/share/skel/Videos

svn at pcbsd.org svn at pcbsd.org
Thu Apr 5 20:51:06 PDT 2007


Author: kris
Date: 2007-04-06 04:51:03 +0100 (Fri, 06 Apr 2007)
New Revision: 153

Modified:
   pcbsd/trunk/system-overlay/PCBSD/Scripts/CheckPBIUpdates.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/CheckUpdates.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/System/GenDiagSheet.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/System/InstallKernel.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/System/changes.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/System/portsnap.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/UpdateHints.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/adduser.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/autorunCD.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/create_drives.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/detectMedium.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/diskIcons.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/fsReplace.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/installPatch.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/refresh_fstab.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/registerPatch.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/runpbi.sh
   pcbsd/trunk/system-overlay/PCBSD/Scripts/startDetection.sh
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/XF86Config.default
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/XF86Config.vmware
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/firewall_config.sh
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/mouse_config.sh
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/nat_config.sh
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/net_config.sh
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/nvidia_card.sh
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/rules
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_defines
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_detect.sh
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/tv_cardtypes
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/tv_tunertypes
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/tvcard_config.sh
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/usertvcard_config.sh
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/verific_sunet.sh
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/videocard_dri.sh
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/x_config.sh
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/xfree_layout.sh
   pcbsd/trunk/system-overlay/PCBSD/conf/PCBSDv1.3
   pcbsd/trunk/system-overlay/PCBSD/conf/PCBSDv1.3-SMP
   pcbsd/trunk/system-overlay/PCBSD/sound/snd_card_ids.txt
   pcbsd/trunk/system-overlay/PCBSD/sound/sound_detect.sh
   pcbsd/trunk/system-overlay/Programs/.config/ProgList
   pcbsd/trunk/system-overlay/sbin/mount_auto
   pcbsd/trunk/system-overlay/usr/X11R6/etc/fonts/alias.conf
   pcbsd/trunk/system-overlay/usr/X11R6/share/fluxbox/init
   pcbsd/trunk/system-overlay/usr/X11R6/share/fluxbox/styles/Clean
   pcbsd/trunk/system-overlay/usr/local/bin/startkde
   pcbsd/trunk/system-overlay/usr/local/etc/denyhosts.conf
   pcbsd/trunk/system-overlay/usr/local/etc/periodic/monthly/300.statistics
   pcbsd/trunk/system-overlay/usr/local/etc/rc.d/denyhosts.sh
   pcbsd/trunk/system-overlay/usr/local/etc/rc.d/norefresh_fstab
   pcbsd/trunk/system-overlay/usr/local/etc/rc.d/pf_rules
   pcbsd/trunk/system-overlay/usr/local/etc/rc.d/refresh_fstab
   pcbsd/trunk/system-overlay/usr/local/etc/xdg/menus/applications-kmenuedit.menu
   pcbsd/trunk/system-overlay/usr/local/share/applnk/My Programs/.directory
   pcbsd/trunk/system-overlay/usr/local/share/apps/kdm/sessions/fluxbox.desktop
   pcbsd/trunk/system-overlay/usr/local/share/apps/kthememanager/themes/PC-BSD/PC-BSD.xml
   pcbsd/trunk/system-overlay/usr/local/share/config/kdm/backgroundrc
   pcbsd/trunk/system-overlay/usr/local/share/config/kdm/kdmrc
   pcbsd/trunk/system-overlay/usr/local/share/config/kdm/kdmrc-asian
   pcbsd/trunk/system-overlay/usr/local/share/config/kthemestylerc
   pcbsd/trunk/system-overlay/usr/share/config/kdm/kdmrc
   pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/init
   pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/keys
   pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/menu
   pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/menu.bak
   pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/startup
   pcbsd/trunk/system-overlay/usr/share/skel/.gkrellm2/user-config
   pcbsd/trunk/system-overlay/usr/share/skel/.idesktop/default.lnk
   pcbsd/trunk/system-overlay/usr/share/skel/.idesktop/fm.lnk
   pcbsd/trunk/system-overlay/usr/share/skel/.idesktop/pbi.lnk
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/env/win-key.sh
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kconf_update/log/update.log
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kcookiejar/cookies
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kdesktop/IconPositions
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/bookmarks.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/history.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/home.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/root.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/services.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/system.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/bookmarks.xml
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/profiles/webbrowsing
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/servicemenus/Play_Audio_CD_with_Kaffeine.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/servicemenus/Play_DVD_with_Kaffeine.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kstyle/themes/original/original.xml
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/nsplugins/pluginsinfo
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/clock_panelapplet_kry2atturw62n6fdfzxd_rc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/colors/Recent_Colors
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/converterrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/emaildefaults
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/emailidentities
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/gtkrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/gtkrc-2.0
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kab2kabcrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/katerc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kaudiocreatorrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kbookmarkrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcalcrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcharselectrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmaudiocdrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmcddbrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmdisplayrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcminputrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmkresourcesrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmnspluginrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmthememanagerrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kconf_updaterc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcontrolrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcookiejarrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdedrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdeglobals
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdeprintrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdesktoprc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kfmclientrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kfontinstuirc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kghostviewrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/khotkeys_update
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/khotkeysrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kickerrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kinetdrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kio_httprc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kioslaverc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/klaunchrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/klipperrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kmail.eventsrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kmailrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewsticker_appletrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewsticker_panelappletrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewstickerappletrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewstickerrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knotifyrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konq_history
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konqiconviewrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konqsidebartng.rc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konquerorrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konsolerc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kopeterc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/korgacrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/korganizerrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kornrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kpersonalizerrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kpgprc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kpilot_addressconduitrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kpilot_docconduitrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kpilot_mailconduitrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kpilot_malconduitrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kpilot_notesconduitrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kpilot_sysinfoconduitrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kpilot_vcalconduitsrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kpilotrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kresources/contact/stdrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/krfbrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/ksmserverrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/ksocksrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/ksplashrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/ktaskbarrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kuriikwsfilterrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kwin.eventsrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kwin_update
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kwincrystalrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kwinrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kwinrules_update
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kwinrulesrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/libkcal_htmlexportrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/libkleopatrarc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/minipager_panelapplet_urgqczcufucpwg0r4l6v_rc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/noatunrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/profilerc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/startupconfig
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/startupconfigfiles
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/startupconfigkeys
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/trashrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/uiserverrc
   pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/services/nsplugin.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/Desktop/PC-BSD.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/Desktop/guide.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/Desktop/software.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/Desktop/trash.desktop
   pcbsd/trunk/system-overlay/usr/share/skel/Documents/.directory
   pcbsd/trunk/system-overlay/usr/share/skel/Images/.directory
   pcbsd/trunk/system-overlay/usr/share/skel/Music/.directory
   pcbsd/trunk/system-overlay/usr/share/skel/Videos/.directory
   pcbsd/trunk/system-overlay/usr/share/skel/dot.cshrc
   pcbsd/trunk/system-overlay/usr/share/skel/dot.gtkrc-2.0
   pcbsd/trunk/system-overlay/usr/share/skel/dot.kderc
   pcbsd/trunk/system-overlay/usr/share/skel/dot.login
   pcbsd/trunk/system-overlay/usr/share/skel/dot.login_conf
   pcbsd/trunk/system-overlay/usr/share/skel/dot.mail_aliases
   pcbsd/trunk/system-overlay/usr/share/skel/dot.mailrc
   pcbsd/trunk/system-overlay/usr/share/skel/dot.profile
   pcbsd/trunk/system-overlay/usr/share/skel/dot.rhosts
   pcbsd/trunk/system-overlay/usr/share/skel/dot.shrc
Log:
Fixed even more ^M characters in the rest of our files

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/CheckPBIUpdates.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/CheckPBIUpdates.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/CheckPBIUpdates.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,50 +1,50 @@
-#!/bin/sh
-# PBI Update Checker Script
-# Usage "/PCBSD/Scripts/CheckPBIUpdates.sh" <Progdir>
-# I.E: CheckPBIUpdates.sh TestProg1.0 will check the 
-# directory /Programs/TestProg1.0 for updates
-# Returns 1 if updates are available, 0 if PBI is up to date
-###################################################################
-
-# The wget binary
-WGET="/PCBSD/bin/wget"
-
-# Where to save the tmp download file
-UPFILE="/PCBSD/tmp/PBIUpdateCheck";
-
-###############################################################
-
-if [ ! -f "/Programs/${1}/PBI.UpdateURL.sh" ]
-then
-  return 255 
-fi
-
-# Remove the file if it exists
-rm -f ${UPFILE}
-
-# Source the Update URL
-. /Programs/${1}/PBI.UpdateURL.sh
-
-# Check Update URL with WGET
-$WGET --tries=3 --post-data "PBIName=${1}" -O ${UPFILE} ${PBIUpdateURL} 2>/dev/null 
-
-case $? in
-     0) chmod 777 ${UPFILE}
-        . ${UPFILE} ;;
-     *) echo "Error connecting to update server..." ; return 255 ;;
-esac
-
-if [ -z $CurrentVersion ]
-then
-return 255
-fi
-
-if [ "$CurrentVersion" != "${1}" ]
-then
-  echo "${CurrentVersion}
-${UpdateURL}" >&1
-  return 1
-else
-  return 0
-fi
-
+#!/bin/sh
+# PBI Update Checker Script
+# Usage "/PCBSD/Scripts/CheckPBIUpdates.sh" <Progdir>
+# I.E: CheckPBIUpdates.sh TestProg1.0 will check the 
+# directory /Programs/TestProg1.0 for updates
+# Returns 1 if updates are available, 0 if PBI is up to date
+###################################################################
+
+# The wget binary
+WGET="/PCBSD/bin/wget"
+
+# Where to save the tmp download file
+UPFILE="/PCBSD/tmp/PBIUpdateCheck";
+
+###############################################################
+
+if [ ! -f "/Programs/${1}/PBI.UpdateURL.sh" ]
+then
+  return 255 
+fi
+
+# Remove the file if it exists
+rm -f ${UPFILE}
+
+# Source the Update URL
+. /Programs/${1}/PBI.UpdateURL.sh
+
+# Check Update URL with WGET
+$WGET --tries=3 --post-data "PBIName=${1}" -O ${UPFILE} ${PBIUpdateURL} 2>/dev/null 
+
+case $? in
+     0) chmod 777 ${UPFILE}
+        . ${UPFILE} ;;
+     *) echo "Error connecting to update server..." ; return 255 ;;
+esac
+
+if [ -z $CurrentVersion ]
+then
+return 255
+fi
+
+if [ "$CurrentVersion" != "${1}" ]
+then
+  echo "${CurrentVersion}
+${UpdateURL}" >&1
+  return 1
+else
+  return 0
+fi
+

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/CheckUpdates.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/CheckUpdates.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/CheckUpdates.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,177 +1,174 @@
-#!/bin/sh
-
-########################################################################
-# PC-BSD Update Checker
-# Author: Kris Moore 
-# (C) PC-BSD Software 2006
-# Options:
-# ${1} = MENU - Causes up-to-date notification to show
-# ${1} = SILENT - No notifications unless updates are available
-#
-########################################################################
-
-
-PCBSDVER="`/PCBSD/bin/PBReg get /PC-BSD/Version`"
-
-# If the patches directory is missing, create it
-if [ ! -d "/PCBSD/Patches/$PCBSDVER" ]
-then
- mkdir /PCBSD/Patches/$PCBSDVER
-fi
-
-if [ "$2" = "STARTUP" ]
-then
-  test="`/PCBSD/bin/PBReg get /PC-BSD/StartupUpdates`"
-  if [ "$test" = "1" ]
-  then
-    exit 1 
-  fi
-fi
-
-# Update Server
-UPSERVER="http://www.pcbsd.org/updates/checkupdates.php"
-
-# Mirror List
-MIRRORLIST="http://www.pcbsd.org/updates/mirrors.php"
-
-# Mirror File
-MIRRORFILE="/PCBSD/tmp/PBUMirrors"
-
-# Temporary Dir
-TMPDIR="/PCBSD/tmp"
-
-# Where to save download patch info
-PATCHDOWN="/tmp/PCBSDpatch"
-
-# Where to save the patches that need to be installed
-PATCHWORK="/PCBSD/tmp/patcheswork"
-
-# Display 
-DISPLAY=":0.0" ; export DISPLAY
-
-# Find out who, if any user is logged on via X
-USR=`who | grep :0 | cut -f 1 -d " "`
-
-# Kdialog Path
-KDIALOG="/usr/local/bin/kdialog"
-
-# Program to perform Updates
-UPPROGRAM="/PCBSD/bin/PCBSDUpdater"
-
-#####################################################################
-# End Settings
-
-#If No-one, exit with no error
-if [ "${USR}" = "" ]
-then
-        exit 0
-fi
-
-# Make sure we can write to X
-su ${USR} -c "xhost +" 
-
-if [ "${1}" != "SILENT" ]
-then
-
-$KDIALOG --passivepopup "Checking for Updates... Please wait..." 25 &
-CHECKPID=$!
-
-fi
-
-fetch -o $PATCHDOWN ${UPSERVER}?ver=${PCBSDVER}
-case $? in
-   0) ;;
-   *) kill -9 $CHECKPID
-      if [ "${1}" != "SILENT" ]
-      then
-         $KDIALOG --error "Error connecting to PC-BSD update server. Please try again later!" 
-      fi
-
-      exit
-      ;;
-esac
-
-# Make sure update file is deleted 
-rm $PATCHWORK
-
-firstCheck=0
-count=0
-for line_by_line in `cat ${PATCHDOWN}`
-do
-
- # Do first Check
- if [ "${firstCheck}" = "0" ]
- then
-    firstCheck="1" ; export firstCheck
-    if [ "PCBSDUPDATE" != "${line_by_line}" ]
-    then
-          if [ "${1}" != "SILENT" ]
-          then
-             $KDIALOG --error "Error connecting to PC-BSD update server. Please try again later!"
-          fi
-      exit
-    fi 
- else
-
-  # If the directory doesn't exist, then patch isn't installed
-  if [ ! -e "/PCBSD/Patches/${PCBSDVER}/${line_by_line}" ]
-  then
-    count="`expr $count + 1`"
-    fetch -o $TMPDIR/$line_by_line.pbu ${UPSERVER}?patch=${line_by_line}
-    case $? in
-       0) ;;
-       *) kill -9 $CHECKPID
-          if [ "${1}" != "SILENT" ]
-          then
-             $KDIALOG --error "Error connecting to PC-BSD update server. Please try again later!"
-          fi
-      exit
-      ;;
-    esac
-
-    echo "${line_by_line}" >> $PATCHWORK
-  fi
-
- fi # end of First Check
-  
-done
-
-fetch -o $MIRRORFILE ${MIRRORLIST}
-case $? in
-   0) ;;
-   *) kill -9 $CHECKPID
-
-      if [ "${1}" != "SILENT" ]
-      then
-        $KDIALOG --error "Error connecting to PC-BSD update server. Please try again later!" 
-      fi
-
-      exit
-      ;;
-esac
-
-# Kill the update notice
-kill -9 $CHECKPID
-
-# If we have new updates, then let the user decide if they want to install
-if [ "${count}" != "0" ]
-then
-
-$KDIALOG --yesno "${count} PC-BSD update(s) available! Update now?"
-case $? in
-   0) $UPPROGRAM $PATCHWORK $PCBSDVER ;;
-   *) exit ;;
-esac
-
-else
-
-if [ "${1}" = "MENU" ]
-then
-  $KDIALOG --msgbox "Your system is up-to-date!"
-fi
-
-fi
-
-rm $PATCHWORK
-rm $MIRRORFILE
-
+#!/bin/sh
+########################################################################
+# PC-BSD Update Checker
+# Author: Kris Moore 
+# (C) PC-BSD Software 2006
+# Options:
+# ${1} = MENU - Causes up-to-date notification to show
+# ${1} = SILENT - No notifications unless updates are available
+#
+########################################################################
+PCBSDVER="`/PCBSD/bin/PBReg get /PC-BSD/Version`"
+
+# If the patches directory is missing, create it
+if [ ! -d "/PCBSD/Patches/$PCBSDVER" ]
+then
+ mkdir /PCBSD/Patches/$PCBSDVER
+fi
+
+if [ "$2" = "STARTUP" ]
+then
+  test="`/PCBSD/bin/PBReg get /PC-BSD/StartupUpdates`"
+  if [ "$test" = "1" ]
+  then
+    exit 1 
+  fi
+fi
+
+# Update Server
+UPSERVER="http://www.pcbsd.org/updates/checkupdates.php"
+
+# Mirror List
+MIRRORLIST="http://www.pcbsd.org/updates/mirrors.php"
+
+# Mirror File
+MIRRORFILE="/PCBSD/tmp/PBUMirrors"
+
+# Temporary Dir
+TMPDIR="/PCBSD/tmp"
+
+# Where to save download patch info
+PATCHDOWN="/tmp/PCBSDpatch"
+
+# Where to save the patches that need to be installed
+PATCHWORK="/PCBSD/tmp/patcheswork"
+
+# Display 
+DISPLAY=":0.0" ; export DISPLAY
+
+# Find out who, if any user is logged on via X
+USR=`who | grep :0 | cut -f 1 -d " "`
+
+# Kdialog Path
+KDIALOG="/usr/local/bin/kdialog"
+
+# Program to perform Updates
+UPPROGRAM="/PCBSD/bin/PCBSDUpdater"
+
+#####################################################################
+# End Settings
+
+#If No-one, exit with no error
+if [ "${USR}" = "" ]
+then
+        exit 0
+fi
+
+# Make sure we can write to X
+su ${USR} -c "xhost +" 
+
+if [ "${1}" != "SILENT" ]
+then
+
+$KDIALOG --passivepopup "Checking for Updates... Please wait..." 25 &
+CHECKPID=$!
+
+fi
+
+fetch -o $PATCHDOWN ${UPSERVER}?ver=${PCBSDVER}
+case $? in
+   0) ;;
+   *) kill -9 $CHECKPID
+      if [ "${1}" != "SILENT" ]
+      then
+         $KDIALOG --error "Error connecting to PC-BSD update server. Please try again later!" 
+      fi
+
+      exit
+      ;;
+esac
+
+# Make sure update file is deleted 
+rm $PATCHWORK
+
+firstCheck=0
+count=0
+for line_by_line in `cat ${PATCHDOWN}`
+do
+
+ # Do first Check
+ if [ "${firstCheck}" = "0" ]
+ then
+    firstCheck="1" ; export firstCheck
+    if [ "PCBSDUPDATE" != "${line_by_line}" ]
+    then
+          if [ "${1}" != "SILENT" ]
+          then
+             $KDIALOG --error "Error connecting to PC-BSD update server. Please try again later!"
+          fi
+      exit
+    fi 
+ else
+
+  # If the directory doesn't exist, then patch isn't installed
+  if [ ! -e "/PCBSD/Patches/${PCBSDVER}/${line_by_line}" ]
+  then
+    count="`expr $count + 1`"
+    fetch -o $TMPDIR/$line_by_line.pbu ${UPSERVER}?patch=${line_by_line}
+    case $? in
+       0) ;;
+       *) kill -9 $CHECKPID
+          if [ "${1}" != "SILENT" ]
+          then
+             $KDIALOG --error "Error connecting to PC-BSD update server. Please try again later!"
+          fi
+      exit
+      ;;
+    esac
+
+    echo "${line_by_line}" >> $PATCHWORK
+  fi
+
+ fi # end of First Check
+  
+done
+
+fetch -o $MIRRORFILE ${MIRRORLIST}
+case $? in
+   0) ;;
+   *) kill -9 $CHECKPID
+
+      if [ "${1}" != "SILENT" ]
+      then
+        $KDIALOG --error "Error connecting to PC-BSD update server. Please try again later!" 
+      fi
+
+      exit
+      ;;
+esac
+
+# Kill the update notice
+kill -9 $CHECKPID
+
+# If we have new updates, then let the user decide if they want to install
+if [ "${count}" != "0" ]
+then
+
+$KDIALOG --yesno "${count} PC-BSD update(s) available! Update now?"
+case $? in
+   0) $UPPROGRAM $PATCHWORK $PCBSDVER ;;
+   *) exit ;;
+esac
+
+else
+
+if [ "${1}" = "MENU" ]
+then
+  $KDIALOG --msgbox "Your system is up-to-date!"
+fi
+
+fi
+
+rm $PATCHWORK
+rm $MIRRORFILE
+

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/System/GenDiagSheet.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/System/GenDiagSheet.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/System/GenDiagSheet.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,37 +1,37 @@
-#!/bin/sh
-
-PCVER="`PBReg get /PC-BSD/Version`"
-DATE="`date`"
-
-echo "PC-BSD $PCVER Diagnostic Sheet
-Generated: $DATE
-
------------------Dmesg Output-------------------------
-
-`dmesg`
-
------------------Messages Output----------------------
-
-`tail -20 /var/log/messages`
-
-------------------RC File-----------------------------
-
-` cat /etc/rc.conf`
-
-------------------Loader File-------------------------
-
-` cat /boot/loader.conf`
-
-------------------Free Space--------------------------
-
-`df -m`
-
-------------------System Processes--------------------
-
-`top -n`
-
-
-
-" > ${1}
-
-
+#!/bin/sh
+
+PCVER="`PBReg get /PC-BSD/Version`"
+DATE="`date`"
+
+echo "PC-BSD $PCVER Diagnostic Sheet
+Generated: $DATE
+
+-----------------Dmesg Output-------------------------
+
+`dmesg`
+
+-----------------Messages Output----------------------
+
+`tail -20 /var/log/messages`
+
+------------------RC File-----------------------------
+
+` cat /etc/rc.conf`
+
+------------------Loader File-------------------------
+
+` cat /boot/loader.conf`
+
+------------------Free Space--------------------------
+
+`df -m`
+
+------------------System Processes--------------------
+
+`top -n`
+
+
+
+" > ${1}
+
+

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/System/InstallKernel.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/System/InstallKernel.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/System/InstallKernel.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,8 +1,8 @@
-#!/bin/sh
-
-rm -rf /boot/kernel.save
-mv /boot/kernel /boot/kernel.save
-
-cd /boot
-tar xvpjf ${1}
-kldxref /boot/kernel /boot/modules
+#!/bin/sh
+
+rm -rf /boot/kernel.save
+mv /boot/kernel /boot/kernel.save
+
+cd /boot
+tar xvpjf ${1}
+kldxref /boot/kernel /boot/modules

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/System/changes.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/System/changes.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/System/changes.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,7 +1,7 @@
-#!/bin/sh
-
-if [ ${1} = 'first' ]; then
-		cat ${2}/INDEX;
-	else
-		sort ${2}/INDEX | comm -13 ${3}/.portsnap.INDEX -;
+#!/bin/sh
+
+if [ ${1} = 'first' ]; then
+		cat ${2}/INDEX;
+	else
+		sort ${2}/INDEX | comm -13 ${3}/.portsnap.INDEX -;
 fi 
\ No newline at end of file

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/System/portsnap.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/System/portsnap.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/System/portsnap.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,912 +1,912 @@
-#!/bin/sh
-
-#-
-# Copyright 2004-2005 Colin Percival
-# All rights reserved
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted providing that the following conditions 
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# $FreeBSD: src/usr.sbin/portsnap/portsnap/portsnap.sh,v 1.8.2.1 2005/08/15 20:24:08 cperciva Exp $
-
-#### Usage function -- called from command-line handling code.
-
-# Usage instructions.  Options not listed:
-# --debug	-- don't filter output from utilities
-# --no-stats	-- don't show progress statistics while fetching files
-usage() {
-	cat <<EOF
-usage: `basename $0` [options] command ... [path]
-
-Options:
-  -d workdir   -- Store working files in workdir
-                  (default: /var/db/portsnap/)
-  -f conffile  -- Read configuration options from conffile
-                  (default: /etc/portsnap.conf)
-  -I           -- Update INDEX only. (update command only)
-  -k KEY       -- Trust an RSA key with SHA256 hash of KEY
-  -p portsdir  -- Location of uncompressed ports tree
-                  (default: /usr/ports/)
-  -s server    -- Server from which to fetch updates.
-                  (default: portsnap.FreeBSD.org)
-  path         -- Extract only parts of the tree starting with the given
-                  string.  (extract command only)
-Commands:
-  fetch        -- Fetch a compressed snapshot of the ports tree,
-                  or update an existing snapshot.
-  cron         -- Sleep rand(3600) seconds, and then fetch updates.
-  extract      -- Extract snapshot of ports tree, replacing existing
-                  files and directories.
-  update       -- Update ports tree to match current snapshot, replacing
-                  files and directories which have changed.
-EOF
-	exit 0
-}
-
-#### Parameter handling functions.
-
-# Initialize parameters to null, just in case they're
-# set in the environment.
-init_params() {
-	KEYPRINT=""
-	EXTRACTPATH=""
-	WORKDIR=""
-	PORTSDIR=""
-	CONFFILE=""
-	COMMAND=""
-	COMMANDS=""
-	QUIETREDIR=""
-	QUIETFLAG=""
-	STATSREDIR=""
-	XARGST=""
-	NDEBUG=""
-	DDSTATS=""
-	INDEXONLY=""
-	SERVERNAME=""
-}
-
-# Parse the command line
-parse_cmdline() {
-	while [ $# -gt 0 ]; do
-		case "$1" in
-		-d)
-			if [ $# -eq 1 ]; then usage; fi
-			if [ ! -z "${WORKDIR}" ]; then usage; fi
-			shift; WORKDIR="$1"
-			;;
-		--debug)
-			QUIETREDIR="/dev/stderr"
-			STATSREDIR="/dev/stderr"
-			QUIETFLAG=" "
-			NDEBUG=" "
-			XARGST="-t"
-			DDSTATS=".."
-			;;
-		-f)
-			if [ $# -eq 1 ]; then usage; fi
-			if [ ! -z "${CONFFILE}" ]; then usage; fi
-			shift; CONFFILE="$1"
-			;;
-		-h | --help | help)
-			usage
-			;;
-		-I)
-			INDEXONLY="YES"
-			;;
-		-k)
-			if [ $# -eq 1 ]; then usage; fi
-			if [ ! -z "${KEYPRINT}" ]; then usage; fi
-			shift; KEYPRINT="$1"
-			;;
-		--no-stats)
-			if [ -z "${STATSREDIR}" ]; then
-				STATSREDIR="/dev/null"
-				DDSTATS=".. "
-			fi
-			;;
-		-p)
-			if [ $# -eq 1 ]; then usage; fi
-			if [ ! -z "${PORTSDIR}" ]; then usage; fi
-			shift; PORTSDIR="$1"
-			;;
-		-s)
-			if [ $# -eq 1 ]; then usage; fi
-			if [ ! -z "${SERVERNAME}" ]; then usage; fi
-			shift; SERVERNAME="$1"
-			;;
-		cron | extract | fetch | update)
-			COMMANDS="${COMMANDS} $1"
-			;;
-		*)
-			if [ $# -gt 1 ]; then usage; fi
-			if echo ${COMMANDS} | grep -vq extract; then
-				usage
-			fi
-			EXTRACTPATH="$1"
-			;;
-		esac
-		shift
-	done
-
-	if [ -z "${COMMANDS}" ]; then
-		usage
-	fi
-}
-
-# If CONFFILE was specified at the command-line, make
-# sure that it exists and is readable.
-sanity_conffile() {
-	if [ ! -z "${CONFFILE}" ] && [ ! -r "${CONFFILE}" ]; then
-		echo -n "File does not exist "
-		echo -n "or is not readable: "
-		echo ${CONFFILE}
-		exit 1
-	fi
-}
-
-# If a configuration file hasn't been specified, use
-# the default value (/etc/portsnap.conf)
-default_conffile() {
-	if [ -z "${CONFFILE}" ]; then
-		CONFFILE="/etc/portsnap.conf"
-	fi
-}
-
-# Read {KEYPRINT, SERVERNAME, WORKDIR, PORTSDIR} from the configuration
-# file if they haven't already been set.  If the configuration
-# file doesn't exist, do nothing.
-parse_conffile() {
-	if [ -r "${CONFFILE}" ]; then
-		for X in KEYPRINT WORKDIR PORTSDIR SERVERNAME; do
-			eval _=\$${X}
-			if [ -z "${_}" ]; then
-				eval ${X}=`grep "^${X}=" "${CONFFILE}" |
-				    cut -f 2- -d '=' | tail -1`
-			fi
-		done
-	fi
-}
-
-# If parameters have not been set, use default values
-default_params() {
-	_QUIETREDIR="/dev/null"
-	_QUIETFLAG="-q"
-	_STATSREDIR="/dev/stdout"
-	_WORKDIR="/var/db/portsnap"
-	_PORTSDIR="/usr/ports"
-	_NDEBUG="-n"
-	for X in QUIETREDIR QUIETFLAG STATSREDIR WORKDIR PORTSDIR NDEBUG; do
-		eval _=\$${X}
-		eval __=\$_${X}
-		if [ -z "${_}" ]; then
-			eval ${X}=${__}
-		fi
-	done
-}
-
-# Perform sanity checks and set some final parameters
-# in preparation for fetching files.  Also chdir into
-# the working directory.
-fetch_check_params() {
-	export HTTP_USER_AGENT="portsnap (${COMMAND}, `uname -r`)"
-
-	_SERVERNAME_z=\
-"SERVERNAME must be given via command line or configuration file."
-	_KEYPRINT_z="Key must be given via -k option or configuration file."
-	_KEYPRINT_bad="Invalid key fingerprint: "
-	_WORKDIR_bad="Directory does not exist or is not writable: "
-
-	if [ -z "${SERVERNAME}" ]; then
-		echo -n "`basename $0`: "
-		echo "${_SERVERNAME_z}"
-		exit 1
-	fi
-	if [ -z "${KEYPRINT}" ]; then
-		echo -n "`basename $0`: "
-		echo "${_KEYPRINT_z}"
-		exit 1
-	fi
-	if ! echo "${KEYPRINT}" | grep -qE "^[0-9a-f]{64}$"; then
-		echo -n "`basename $0`: "
-		echo -n "${_KEYPRINT_bad}"
-		echo ${KEYPRINT}
-		exit 1
-	fi
-	if ! [ -d "${WORKDIR}" -a -w "${WORKDIR}" ]; then
-		echo -n "`basename $0`: "
-		echo -n "${_WORKDIR_bad}"
-		echo ${WORKDIR}
-		exit 1
-	fi
-	cd ${WORKDIR} || exit 1
-
-	BSPATCH=/usr/bin/bspatch
-	SHA256=/sbin/sha256
-	PHTTPGET=/usr/libexec/phttpget
-}
-
-# Perform sanity checks and set some final parameters
-# in preparation for extracting or updating ${PORTSDIR}
-extract_check_params() {
-	_WORKDIR_bad="Directory does not exist: "
-	_PORTSDIR_bad="Directory does not exist or is not writable: "
-
-	if ! [ -d "${WORKDIR}" ]; then
-		echo -n "`basename $0`: "
-		echo -n "${_WORKDIR_bad}"
-		echo ${WORKDIR}
-		exit 1
-	fi
-	if ! [ -d "${PORTSDIR}" -a -w "${PORTSDIR}" ]; then
-		echo -n "`basename $0`: "
-		echo -n "${_PORTSDIR_bad}"
-		echo ${PORTSDIR}
-		exit 1
-	fi
-
-	if ! [ -d "${WORKDIR}/files" -a -r "${WORKDIR}/tag"	\
-	    -a -r "${WORKDIR}/INDEX" -a -r "${WORKDIR}/tINDEX" ]; then
-		echo "No snapshot available.  Try running"
-		echo "# `basename $0` fetch"
-		exit 1
-	fi
-
-	MKINDEX=/usr/libexec/make_index
-}
-
-# Perform sanity checks and set some final parameters
-# in preparation for updating ${PORTSDIR}
-update_check_params() {
-	extract_check_params
-
-	if ! [ -r ${PORTSDIR}/.portsnap.INDEX ]; then
-		echo "${PORTSDIR} was not created by portsnap."
-		echo -n "You must run '`basename $0` extract' before "
-		echo "running '`basename $0` update'."
-		exit 1
-	fi
-
-}
-
-#### Core functionality -- the actual work gets done here
-
-# Use an SRV query to pick a server.  If the SRV query doesn't provide
-# a useful answer, use the server name specified by the user.
-# Put another way... look up _http._tcp.${SERVERNAME} and pick a server
-# from that; or if no servers are returned, use ${SERVERNAME}.
-# This allows a user to specify "portsnap.freebsd.org" (in which case
-# portsnap will select one of the mirrors) or "portsnap5.tld.freebsd.org"
-# (in which case portsnap will use that particular server, since there
-# won't be an SRV entry for that name).
-#
-# We don't implement the recommendations from RFC 2782 completely, since
-# we are only looking to pick a single server -- the recommendations are
-# targetted at applications which obtain a list of servers and then try
-# each in turn, but we are instead just going to pick one server and let
-# the user re-run portsnap if a broken server was selected.
-#
-# We also ignore the Port field, since we are always going to use port 80.
-fetch_pick_server() {
-	echo -n "Looking up ${SERVERNAME} mirrors..."
-
-# Issue the SRV query and pull out the Priority, Weight, and Target fields.
-	host -t srv "_http._tcp.${SERVERNAME}" |
-	    grep -E "^_http._tcp.${SERVERNAME} has SRV record" |
-	    cut -f 5,6,8 -d ' ' > serverlist
-
-# If no records, give up -- we'll just use the server name we were given.
-	if [ `wc -l < serverlist` -eq 0 ]; then
-		echo " none found."
-		return
-	fi
-
-# Find the highest priority level (lowest numeric value).
-	SRV_PRIORITY=`cut -f 1 -d ' ' serverlist | sort -n | head -1`
-
-# Add up the weights of the response lines at that priority level.
-	SRV_WSUM=0;
-	while read X; do
-		case "$X" in
-		${SRV_PRIORITY}\ *)
-			SRV_W=`echo $X | cut -f 2 -d ' '`
-			SRV_WSUM=$(($SRV_WSUM + $SRV_W))
-			;;
-		esac
-	done < serverlist
-
-# If all the weights are 0, pretend that they are all 1 instead.
-	if [ ${SRV_WSUM} -eq 0 ]; then
-		SRV_WSUM=`grep -E "^${SRV_PRIORITY} " serverlist | wc -l`
-		SRV_W_ADD=1
-	else
-		SRV_W_ADD=0
-	fi
-
-# Pick a random value between 1 and the sum of the weights
-	SRV_RND=`jot -r 1 1 ${SRV_WSUM}`
-
-# Read through the list of mirrors and set SERVERNAME
-	while read X; do
-		case "$X" in
-		${SRV_PRIORITY}\ *)
-			SRV_W=`echo $X | cut -f 2 -d ' '`
-			SRV_W=$(($SRV_W + $SRV_W_ADD))
-			if [ $SRV_RND -le $SRV_W ]; then
-				SERVERNAME=`echo $X | cut -f 3 -d ' '`
-				break
-			else
-				SRV_RND=$(($SRV_RND - $SRV_W))
-			fi
-			;;
-		esac
-	done < serverlist
-
-	echo " using ${SERVERNAME}"
-}
-
-# Check that we have a public key with an appropriate hash, or
-# fetch the key if it doesn't exist.
-fetch_key() {
-	if [ -r pub.ssl ] && [ `${SHA256} -q pub.ssl` = ${KEYPRINT} ]; then
-		return
-	fi
-
-	echo -n "Fetching public key... "
-	rm -f pub.ssl
-	fetch ${QUIETFLAG} http://${SERVERNAME}/pub.ssl \
-	    2>${QUIETREDIR} || true
-	if ! [ -r pub.ssl ]; then
-		echo "failed."
-		return 1
-	fi
-	if ! [ `${SHA256} -q pub.ssl` = ${KEYPRINT} ]; then
-		echo "key has incorrect hash."
-		rm -f pub.ssl
-		return 1
-	fi
-	echo "done."
-}
-
-# Fetch a snapshot tag
-fetch_tag() {
-	rm -f snapshot.ssl tag.new
-
-	echo ${NDEBUG} "Fetching snapshot tag... "
-	fetch ${QUIETFLAG} http://${SERVERNAME}/$1.ssl
-	    2>${QUIETREDIR} || true
-	if ! [ -r $1.ssl ]; then
-		echo "failed."
-		return 1
-	fi
-
-	openssl rsautl -pubin -inkey pub.ssl -verify		\
-	    < $1.ssl > tag.new 2>${QUIETREDIR} || true
-	rm $1.ssl
-
-	if ! [ `wc -l < tag.new` = 1 ] ||
-	    ! grep -qE "^portsnap\|[0-9]{10}\|[0-9a-f]{64}" tag.new; then
-		echo "invalid snapshot tag."
-		return 1
-	fi
-
-	echo "done."
-
-	SNAPSHOTDATE=`cut -f 2 -d '|' < tag.new`
-	SNAPSHOTHASH=`cut -f 3 -d '|' < tag.new`
-}
-
-# Sanity-check the date on a snapshot tag
-fetch_snapshot_tagsanity() {
-	if [ `date "+%s"` -gt `expr ${SNAPSHOTDATE} + 31536000` ]; then
-		echo "Snapshot appears to be more than a year old!"
-		echo "(Is the system clock correct?)"
-		echo "Cowarly refusing to proceed any further."
-		return 1
-	fi
-	if [ `date "+%s"` -lt `expr ${SNAPSHOTDATE} - 86400` ]; then
-		echo -n "Snapshot appears to have been created more than "
-		echo "one day into the future!"
-		echo "(Is the system clock correct?)"
-		echo "Cowardly refusing to proceed any further."
-		return 1
-	fi
-}
-
-# Sanity-check the date on a snapshot update tag
-fetch_update_tagsanity() {
-	fetch_snapshot_tagsanity || return 1
-
-	if [ ${OLDSNAPSHOTDATE} -gt ${SNAPSHOTDATE} ]; then
-		echo -n "Latest snapshot on server is "
-		echo "older than what we already have!"
-		echo -n "Cowardly refusing to downgrade from "
-		date -r ${OLDSNAPSHOTDATE}
-		echo "to `date -r ${SNAPSHOTDATE}`."
-		return 1
-	fi
-}
-
-# Compare old and new tags; return 1 if update is unnecessary
-fetch_update_neededp() {
-	if [ ${OLDSNAPSHOTDATE} -eq ${SNAPSHOTDATE} ]; then
-		echo -n "Latest snapshot on server matches "
-		echo "what we already have."
-		echo "No updates needed."
-		rm tag.new
-		return 1
-	fi
-	if [ ${OLDSNAPSHOTHASH} = ${SNAPSHOTHASH} ]; then
-		echo -n "Ports tree hasn't changed since "
-		echo "last snapshot."
-		echo "No updates needed."
-		rm tag.new
-		return 1
-	fi
-
-	return 0
-}
-
-# Fetch snapshot metadata file
-fetch_metadata() {
-	rm -f ${SNAPSHOTHASH} tINDEX.new
-
-	echo ${NDEBUG} "Fetching snapshot metadata... "
-	fetch ${QUIETFLAG} http://${SERVERNAME}/t/${SNAPSHOTHASH}
-	    2>${QUIETREDIR} || return
-	if [ `${SHA256} -q ${SNAPSHOTHASH}` != ${SNAPSHOTHASH} ]; then
-		echo "snapshot metadata corrupt."
-		return 1
-	fi
-	mv ${SNAPSHOTHASH} tINDEX.new
-	echo "done."
-}
-
-# Warn user about bogus metadata
-fetch_metadata_freakout() {
-	echo
-	echo "Portsnap metadata is correctly signed, but contains"
-	echo "at least one line which appears bogus."
-	echo "Cowardly refusing to proceed any further."
-}
-
-# Sanity-check a snapshot metadata file
-fetch_metadata_sanity() {
-	if grep -qvE "^[0-9A-Z.]+\|[0-9a-f]{64}$" tINDEX.new; then
-		fetch_metadata_freakout
-		return 1
-	fi
-	if [ `look INDEX tINDEX.new | wc -l` != 1 ]; then
-		echo
-		echo "Portsnap metadata appears bogus."
-		echo "Cowardly refusing to proceed any further."
-		return 1
-	fi
-}
-
-# Take a list of ${oldhash}|${newhash} and output a list of needed patches
-fetch_make_patchlist() {
-	grep -vE "^([0-9a-f]{64})\|\1$" | 
-		while read LINE; do
-			X=`echo ${LINE} | cut -f 1 -d '|'`
-			Y=`echo ${LINE} | cut -f 2 -d '|'`
-			if [ -f "files/${Y}.gz" ]; then continue; fi
-			if [ ! -f "files/${X}.gz" ]; then continue; fi
-			echo "${LINE}"
-		done
-}
-
-# Print user-friendly progress statistics
-fetch_progress() {
-	LNC=0
-	while read x; do
-		LNC=$(($LNC + 1))
-		if [ $(($LNC % 10)) = 0 ]; then
-			echo -n $LNC
-		elif [ $(($LNC % 2)) = 0 ]; then
-			echo -n .
-		fi
-	done
-	echo -n " "
-}
-
-# Sanity-check an index file
-fetch_index_sanity() {
-	if grep -qvE "^[-_+./@0-9A-Za-z]+\|[0-9a-f]{64}$" INDEX.new ||
-	    fgrep -q "./" INDEX.new; then
-		fetch_metadata_freakout
-		return 1
-	fi
-}
-
-# Verify a list of files
-fetch_snapshot_verify() {
-	while read F; do
-		if [ `gunzip -c snap/${F} | ${SHA256} -q` != ${F} ]; then
-			echo "snapshot corrupt."
-			return 1
-		fi
-	done
-	return 0
-}
-
-# Fetch a snapshot tarball, extract, and verify.
-fetch_snapshot() {
-	fetch_tag snapshot || return 1
-	fetch_snapshot_tagsanity || return 1
-	fetch_metadata || return 1
-	fetch_metadata_sanity || return 1
-
-	rm -f ${SNAPSHOTHASH}.tgz
-	rm -rf snap/
-
-# Don't ask fetch(1) to be quiet -- downloading a snapshot of ~ 35MB will
-# probably take a while, so the progrees reports that fetch(1) generates
-# will be useful for keeping the users' attention from drifting.
-	echo "Fetching snapshot generated at `date -r ${SNAPSHOTDATE}`:"
-	fetch http://${SERVERNAME}/s/${SNAPSHOTHASH}.tgz || return 1
-
-	echo -n "Extracting snapshot... "
-	tar -xzf ${SNAPSHOTHASH}.tgz snap/ || return 1
-	rm ${SNAPSHOTHASH}.tgz
-	echo "done."
-
-	echo -n "Verifying snapshot integrity... "
-# Verify the metadata files
-	cut -f 2 -d '|' tINDEX.new | fetch_snapshot_verify || return 1
-# Extract the index
-	rm -f INDEX.new
-	gunzip -c snap/`look INDEX tINDEX.new |
-	    cut -f 2 -d '|'`.gz > INDEX.new
-	fetch_index_sanity || return 1
-# Verify the snapshot contents
-	cut -f 2 -d '|' INDEX.new | fetch_snapshot_verify || return 1
-	echo "done."
-
-# Move files into their proper locations
-	rm -f tag INDEX tINDEX
-	rm -rf files
-	mv tag.new tag
-	mv tINDEX.new tINDEX
-	mv INDEX.new INDEX
-	mv snap/ files/
-
-	return 0
-}
-
-# Update a compressed snapshot
-fetch_update() {
-	rm -f patchlist diff OLD NEW filelist INDEX.new
-
-	OLDSNAPSHOTDATE=`cut -f 2 -d '|' < tag`
-	OLDSNAPSHOTHASH=`cut -f 3 -d '|' < tag`
-
-	fetch_tag latest || return 1
-	fetch_update_tagsanity || return 1
-	fetch_update_neededp || return 0
-	fetch_metadata || return 1
-	fetch_metadata_sanity || return 1
-
-	echo -n "Updating from `date -r ${OLDSNAPSHOTDATE}` "
-	echo "to `date -r ${SNAPSHOTDATE}`."
-
-# Generate a list of wanted metadata patches
-	join -t '|' -o 1.2,2.2 tINDEX tINDEX.new |
-	    fetch_make_patchlist > patchlist
-
-# Attempt to fetch metadata patches
-	echo -n "Fetching `wc -l < patchlist | tr -d ' '` "
-	echo ${NDEBUG} "metadata patches.${DDSTATS}"
-	tr '|' '-' < patchlist |
-	    lam -s "tp/" - -s ".gz" |
-	    xargs ${XARGST} ${PHTTPGET} ${SERVERNAME}	\
-	    2>${STATSREDIR} | fetch_progress
-	echo "done."
-
-# Attempt to apply metadata patches
-	echo -n "Applying metadata patches... "
-	while read LINE; do
-		X=`echo ${LINE} | cut -f 1 -d '|'`
-		Y=`echo ${LINE} | cut -f 2 -d '|'`
-		if [ ! -f "${X}-${Y}.gz" ]; then continue; fi
-		gunzip -c < ${X}-${Y}.gz > diff
-		gunzip -c < files/${X}.gz > OLD
-		cut -c 2- diff | join -t '|' -v 2 - OLD > ptmp
-		grep '^\+' diff | cut -c 2- |
-		    sort -k 1,1 -t '|' -m - ptmp > NEW
-		if [ `${SHA256} -q NEW` = ${Y} ]; then
-			mv NEW files/${Y}
-			gzip -n files/${Y}
-		fi
-		rm -f diff OLD NEW ${X}-${Y}.gz ptmp
-	done < patchlist 2>${QUIETREDIR}
-	echo "done."
-
-# Update metadata without patches
-	join -t '|' -v 2 tINDEX tINDEX.new |
-	    cut -f 2 -d '|' /dev/stdin patchlist |
-		while read Y; do
-			if [ ! -f "files/${Y}.gz" ]; then
-				echo ${Y};
-			fi
-		done > filelist
-	echo -n "Fetching `wc -l < filelist | tr -d ' '` "
-	echo ${NDEBUG} "metadata files... "
-	lam -s "f/" - -s ".gz" < filelist |
-	    xargs ${XARGST} ${PHTTPGET} ${SERVERNAME}	\
-	    2>${QUIETREDIR}
-
-	while read Y; do
-		if [ `gunzip -c < ${Y}.gz | ${SHA256} -q` = ${Y} ]; then
-			mv ${Y}.gz files/${Y}.gz
-		else
-			echo "metadata is corrupt."
-			return 1
-		fi
-	done < filelist
-	echo "done."
-
-# Extract the index
-	gunzip -c files/`look INDEX tINDEX.new |
-	    cut -f 2 -d '|'`.gz > INDEX.new
-	fetch_index_sanity || return 1
-
-# Generate a list of wanted ports patches
-	join -t '|' -o 1.2,2.2 INDEX INDEX.new |
-	    fetch_make_patchlist > patchlist
-
-# Attempt to fetch ports patches
-	echo -n "Fetching `wc -l < patchlist | tr -d ' '` "
-	echo ${NDEBUG} "patches.${DDSTATS}"
-	tr '|' '-' < patchlist | lam -s "bp/" - |
-	    xargs ${XARGST} ${PHTTPGET} ${SERVERNAME}	\
-	    2>${STATSREDIR} | fetch_progress
-	echo "done."
-
-# Attempt to apply ports patches
-	echo -n "Applying patches... "
-	while read LINE; do
-		X=`echo ${LINE} | cut -f 1 -d '|'`
-		Y=`echo ${LINE} | cut -f 2 -d '|'`
-		if [ ! -f "${X}-${Y}" ]; then continue; fi
-		gunzip -c < files/${X}.gz > OLD
-		${BSPATCH} OLD NEW ${X}-${Y}
-		if [ `${SHA256} -q NEW` = ${Y} ]; then
-			mv NEW files/${Y}
-			gzip -n files/${Y}
-		fi
-		rm -f diff OLD NEW ${X}-${Y}
-	done < patchlist 2>${QUIETREDIR}
-	echo "done."
-
-# Update ports without patches
-	join -t '|' -v 2 INDEX INDEX.new |
-	    cut -f 2 -d '|' /dev/stdin patchlist |
-		while read Y; do
-			if [ ! -f "files/${Y}.gz" ]; then
-				echo ${Y};
-			fi
-		done > filelist
-	echo -n "Fetching `wc -l < filelist | tr -d ' '` "
-	echo ${NDEBUG} "new ports or files... "
-	lam -s "f/" - -s ".gz" < filelist |
-	    xargs ${XARGST} ${PHTTPGET} ${SERVERNAME}	\
-	    2>${QUIETREDIR}
-
-	while read Y; do
-		if [ `gunzip -c < ${Y}.gz | ${SHA256} -q` = ${Y} ]; then
-			mv ${Y}.gz files/${Y}.gz
-		else
-			echo "snapshot is corrupt."
-			return 1
-		fi
-	done < filelist
-	echo "done."
-
-# Remove files which are no longer needed
-	cut -f 2 -d '|' tINDEX INDEX | sort > oldfiles
-	cut -f 2 -d '|' tINDEX.new INDEX.new | sort | comm -13 - oldfiles |
-	    lam -s "files/" - -s ".gz" | xargs rm -f
-	rm patchlist filelist oldfiles
-
-# We're done!
-	mv INDEX.new INDEX
-	mv tINDEX.new tINDEX
-	mv tag.new tag
-
-	return 0
-}
-
-# Do the actual work involved in "fetch" / "cron".
-fetch_run() {
-	fetch_pick_server
-
-	fetch_key || return 1
-
-	if ! [ -d files -a -r tag -a -r INDEX -a -r tINDEX ]; then
-		fetch_snapshot || return 1
-	fi
-	fetch_update || return 1
-}
-
-# Build a ports INDEX file
-extract_make_index() {
-	gunzip -c "${WORKDIR}/files/`look $1 ${WORKDIR}/tINDEX |
-	    cut -f 2 -d '|'`.gz" | ${MKINDEX} /dev/stdin > ${PORTSDIR}/$2
-}
-
-# Create INDEX, INDEX-5, INDEX-6
-extract_indices() {
-	echo -n "Building new INDEX files... "
-	extract_make_index DESCRIBE.4 INDEX || return 1
-	extract_make_index DESCRIBE.5 INDEX-5 || return 1
-	extract_make_index DESCRIBE.6 INDEX-6 || return 1
-	echo "done."
-}
-
-# Create .portsnap.INDEX
-extract_metadata() {
-	sort ${WORKDIR}/INDEX > ${PORTSDIR}/.portsnap.INDEX
-}
-
-# Do the actual work involved in "extract"
-extract_run() {
-	if ! grep "^${EXTRACTPATH}" ${WORKDIR}/INDEX | while read LINE; do
-		FILE=`echo ${LINE} | cut -f 1 -d '|'`
-		HASH=`echo ${LINE} | cut -f 2 -d '|'`
-		echo ${PORTSDIR}/${FILE}
-		if ! [ -r "${WORKDIR}/files/${HASH}.gz" ]; then
-			echo "files/${HASH}.gz not found -- snapshot corrupt."
-			return 1
-		fi
-		case ${FILE} in
-		*/)
-			rm -rf ${PORTSDIR}/${FILE}
-			mkdir -p ${PORTSDIR}/${FILE}
-			tar -xzf ${WORKDIR}/files/${HASH}.gz	\
-			    -C ${PORTSDIR}/${FILE}
-			;;
-		*)
-			rm -f ${PORTSDIR}/${FILE}
-			tar -xzf ${WORKDIR}/files/${HASH}.gz	\
-			    -C ${PORTSDIR} ${FILE}
-			;;
-		esac
-	done; then
-		return 1
-	fi
-	if [ ! -z "${EXTRACTPATH}" ]; then
-		return 0;
-	fi
-
-	extract_metadata
-	extract_indices
-}
-
-# Do the actual work involved in "update"
-update_run() {
-	if ! [ -z "${INDEXONLY}" ]; then
-		extract_indices >/dev/null || return 1
-		return 0
-	fi
-
-	if sort ${WORKDIR}/INDEX |
-	    cmp -s ${PORTSDIR}/.portsnap.INDEX -; then
-		echo "Ports tree is already up to date."
-		return 0
-	fi
-
-	echo -n "Removing old files and directories... "
-	sort ${WORKDIR}/INDEX | comm -23 ${PORTSDIR}/.portsnap.INDEX - |
-	    cut -f 1 -d '|' | lam -s "${PORTSDIR}/" - | xargs rm -rf
-	echo "done."
-
-# Install new files
-	echo "Extracting new files:"
-	if ! sort ${WORKDIR}/INDEX |
-	    comm -13 ${PORTSDIR}/.portsnap.INDEX - |
-	    while read LINE; do
-		FILE=`echo ${LINE} | cut -f 1 -d '|'`
-		HASH=`echo ${LINE} | cut -f 2 -d '|'`
-		echo ${PORTSDIR}/${FILE}
-		if ! [ -r "${WORKDIR}/files/${HASH}.gz" ]; then
-			echo "files/${HASH}.gz not found -- snapshot corrupt."
-			return 1
-		fi
-		case ${FILE} in
-		*/)
-			mkdir -p ${PORTSDIR}/${FILE}
-			tar -xzf ${WORKDIR}/files/${HASH}.gz	\
-			    -C ${PORTSDIR}/${FILE}
-			;;
-		*)
-			tar -xzf ${WORKDIR}/files/${HASH}.gz	\
-			    -C ${PORTSDIR} ${FILE}
-			;;
-		esac
-	done; then
-		return 1
-	fi
-
-	extract_metadata
-	extract_indices
-}
-
-#### Main functions -- call parameter-handling and core functions
-
-# Using the command line, configuration file, and defaults,
-# set all the parameters which are needed later.
-get_params() {
-	init_params
-	parse_cmdline $@
-	sanity_conffile
-	default_conffile
-	parse_conffile
-	default_params
-}
-
-# Fetch command.  Make sure that we're being called
-# interactively, then run fetch_check_params and fetch_run
-cmd_fetch() {
-	fetch_check_params
-	fetch_run || exit 1
-}
-
-# Cron command.  Make sure the parameters are sensible; wait
-# rand(3600) seconds; then fetch updates.  While fetching updates,
-# send output to a temporary file; only print that file if the
-# fetching failed.
-cmd_cron() {
-	fetch_check_params
-	sleep `jot -r 1 0 3600`
-
-	TMPFILE=`mktemp /tmp/portsnap.XXXXXX` || exit 1
-	if ! fetch_run >> ${TMPFILE}; then
-		cat ${TMPFILE}
-		rm ${TMPFILE}
-		exit 1
-	fi
-
-	rm ${TMPFILE}
-}
-
-# Extract command.  Make sure the parameters are sensible,
-# then extract the ports tree (or part thereof).
-cmd_extract() {
-	extract_check_params
-	extract_run || exit 1
-}
-
-# Update command.  Make sure the parameters are sensible,
-# then update the ports tree.
-cmd_update() {
-	update_check_params
-	update_run || exit 1
-}
-
-#### Entry point
-
-# Make sure we find utilities from the base system
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PATH}
-
-get_params $@
-for COMMAND in ${COMMANDS}; do
-	cmd_${COMMAND}
-done
+#!/bin/sh
+
+#-
+# Copyright 2004-2005 Colin Percival
+# All rights reserved
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted providing that the following conditions 
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# $FreeBSD: src/usr.sbin/portsnap/portsnap/portsnap.sh,v 1.8.2.1 2005/08/15 20:24:08 cperciva Exp $
+
+#### Usage function -- called from command-line handling code.
+
+# Usage instructions.  Options not listed:
+# --debug	-- don't filter output from utilities
+# --no-stats	-- don't show progress statistics while fetching files
+usage() {
+	cat <<EOF
+usage: `basename $0` [options] command ... [path]
+
+Options:
+  -d workdir   -- Store working files in workdir
+                  (default: /var/db/portsnap/)
+  -f conffile  -- Read configuration options from conffile
+                  (default: /etc/portsnap.conf)
+  -I           -- Update INDEX only. (update command only)
+  -k KEY       -- Trust an RSA key with SHA256 hash of KEY
+  -p portsdir  -- Location of uncompressed ports tree
+                  (default: /usr/ports/)
+  -s server    -- Server from which to fetch updates.
+                  (default: portsnap.FreeBSD.org)
+  path         -- Extract only parts of the tree starting with the given
+                  string.  (extract command only)
+Commands:
+  fetch        -- Fetch a compressed snapshot of the ports tree,
+                  or update an existing snapshot.
+  cron         -- Sleep rand(3600) seconds, and then fetch updates.
+  extract      -- Extract snapshot of ports tree, replacing existing
+                  files and directories.
+  update       -- Update ports tree to match current snapshot, replacing
+                  files and directories which have changed.
+EOF
+	exit 0
+}
+
+#### Parameter handling functions.
+
+# Initialize parameters to null, just in case they're
+# set in the environment.
+init_params() {
+	KEYPRINT=""
+	EXTRACTPATH=""
+	WORKDIR=""
+	PORTSDIR=""
+	CONFFILE=""
+	COMMAND=""
+	COMMANDS=""
+	QUIETREDIR=""
+	QUIETFLAG=""
+	STATSREDIR=""
+	XARGST=""
+	NDEBUG=""
+	DDSTATS=""
+	INDEXONLY=""
+	SERVERNAME=""
+}
+
+# Parse the command line
+parse_cmdline() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-d)
+			if [ $# -eq 1 ]; then usage; fi
+			if [ ! -z "${WORKDIR}" ]; then usage; fi
+			shift; WORKDIR="$1"
+			;;
+		--debug)
+			QUIETREDIR="/dev/stderr"
+			STATSREDIR="/dev/stderr"
+			QUIETFLAG=" "
+			NDEBUG=" "
+			XARGST="-t"
+			DDSTATS=".."
+			;;
+		-f)
+			if [ $# -eq 1 ]; then usage; fi
+			if [ ! -z "${CONFFILE}" ]; then usage; fi
+			shift; CONFFILE="$1"
+			;;
+		-h | --help | help)
+			usage
+			;;
+		-I)
+			INDEXONLY="YES"
+			;;
+		-k)
+			if [ $# -eq 1 ]; then usage; fi
+			if [ ! -z "${KEYPRINT}" ]; then usage; fi
+			shift; KEYPRINT="$1"
+			;;
+		--no-stats)
+			if [ -z "${STATSREDIR}" ]; then
+				STATSREDIR="/dev/null"
+				DDSTATS=".. "
+			fi
+			;;
+		-p)
+			if [ $# -eq 1 ]; then usage; fi
+			if [ ! -z "${PORTSDIR}" ]; then usage; fi
+			shift; PORTSDIR="$1"
+			;;
+		-s)
+			if [ $# -eq 1 ]; then usage; fi
+			if [ ! -z "${SERVERNAME}" ]; then usage; fi
+			shift; SERVERNAME="$1"
+			;;
+		cron | extract | fetch | update)
+			COMMANDS="${COMMANDS} $1"
+			;;
+		*)
+			if [ $# -gt 1 ]; then usage; fi
+			if echo ${COMMANDS} | grep -vq extract; then
+				usage
+			fi
+			EXTRACTPATH="$1"
+			;;
+		esac
+		shift
+	done
+
+	if [ -z "${COMMANDS}" ]; then
+		usage
+	fi
+}
+
+# If CONFFILE was specified at the command-line, make
+# sure that it exists and is readable.
+sanity_conffile() {
+	if [ ! -z "${CONFFILE}" ] && [ ! -r "${CONFFILE}" ]; then
+		echo -n "File does not exist "
+		echo -n "or is not readable: "
+		echo ${CONFFILE}
+		exit 1
+	fi
+}
+
+# If a configuration file hasn't been specified, use
+# the default value (/etc/portsnap.conf)
+default_conffile() {
+	if [ -z "${CONFFILE}" ]; then
+		CONFFILE="/etc/portsnap.conf"
+	fi
+}
+
+# Read {KEYPRINT, SERVERNAME, WORKDIR, PORTSDIR} from the configuration
+# file if they haven't already been set.  If the configuration
+# file doesn't exist, do nothing.
+parse_conffile() {
+	if [ -r "${CONFFILE}" ]; then
+		for X in KEYPRINT WORKDIR PORTSDIR SERVERNAME; do
+			eval _=\$${X}
+			if [ -z "${_}" ]; then
+				eval ${X}=`grep "^${X}=" "${CONFFILE}" |
+				    cut -f 2- -d '=' | tail -1`
+			fi
+		done
+	fi
+}
+
+# If parameters have not been set, use default values
+default_params() {
+	_QUIETREDIR="/dev/null"
+	_QUIETFLAG="-q"
+	_STATSREDIR="/dev/stdout"
+	_WORKDIR="/var/db/portsnap"
+	_PORTSDIR="/usr/ports"
+	_NDEBUG="-n"
+	for X in QUIETREDIR QUIETFLAG STATSREDIR WORKDIR PORTSDIR NDEBUG; do
+		eval _=\$${X}
+		eval __=\$_${X}
+		if [ -z "${_}" ]; then
+			eval ${X}=${__}
+		fi
+	done
+}
+
+# Perform sanity checks and set some final parameters
+# in preparation for fetching files.  Also chdir into
+# the working directory.
+fetch_check_params() {
+	export HTTP_USER_AGENT="portsnap (${COMMAND}, `uname -r`)"
+
+	_SERVERNAME_z=\
+"SERVERNAME must be given via command line or configuration file."
+	_KEYPRINT_z="Key must be given via -k option or configuration file."
+	_KEYPRINT_bad="Invalid key fingerprint: "
+	_WORKDIR_bad="Directory does not exist or is not writable: "
+
+	if [ -z "${SERVERNAME}" ]; then
+		echo -n "`basename $0`: "
+		echo "${_SERVERNAME_z}"
+		exit 1
+	fi
+	if [ -z "${KEYPRINT}" ]; then
+		echo -n "`basename $0`: "
+		echo "${_KEYPRINT_z}"
+		exit 1
+	fi
+	if ! echo "${KEYPRINT}" | grep -qE "^[0-9a-f]{64}$"; then
+		echo -n "`basename $0`: "
+		echo -n "${_KEYPRINT_bad}"
+		echo ${KEYPRINT}
+		exit 1
+	fi
+	if ! [ -d "${WORKDIR}" -a -w "${WORKDIR}" ]; then
+		echo -n "`basename $0`: "
+		echo -n "${_WORKDIR_bad}"
+		echo ${WORKDIR}
+		exit 1
+	fi
+	cd ${WORKDIR} || exit 1
+
+	BSPATCH=/usr/bin/bspatch
+	SHA256=/sbin/sha256
+	PHTTPGET=/usr/libexec/phttpget
+}
+
+# Perform sanity checks and set some final parameters
+# in preparation for extracting or updating ${PORTSDIR}
+extract_check_params() {
+	_WORKDIR_bad="Directory does not exist: "
+	_PORTSDIR_bad="Directory does not exist or is not writable: "
+
+	if ! [ -d "${WORKDIR}" ]; then
+		echo -n "`basename $0`: "
+		echo -n "${_WORKDIR_bad}"
+		echo ${WORKDIR}
+		exit 1
+	fi
+	if ! [ -d "${PORTSDIR}" -a -w "${PORTSDIR}" ]; then
+		echo -n "`basename $0`: "
+		echo -n "${_PORTSDIR_bad}"
+		echo ${PORTSDIR}
+		exit 1
+	fi
+
+	if ! [ -d "${WORKDIR}/files" -a -r "${WORKDIR}/tag"	\
+	    -a -r "${WORKDIR}/INDEX" -a -r "${WORKDIR}/tINDEX" ]; then
+		echo "No snapshot available.  Try running"
+		echo "# `basename $0` fetch"
+		exit 1
+	fi
+
+	MKINDEX=/usr/libexec/make_index
+}
+
+# Perform sanity checks and set some final parameters
+# in preparation for updating ${PORTSDIR}
+update_check_params() {
+	extract_check_params
+
+	if ! [ -r ${PORTSDIR}/.portsnap.INDEX ]; then
+		echo "${PORTSDIR} was not created by portsnap."
+		echo -n "You must run '`basename $0` extract' before "
+		echo "running '`basename $0` update'."
+		exit 1
+	fi
+
+}
+
+#### Core functionality -- the actual work gets done here
+
+# Use an SRV query to pick a server.  If the SRV query doesn't provide
+# a useful answer, use the server name specified by the user.
+# Put another way... look up _http._tcp.${SERVERNAME} and pick a server
+# from that; or if no servers are returned, use ${SERVERNAME}.
+# This allows a user to specify "portsnap.freebsd.org" (in which case
+# portsnap will select one of the mirrors) or "portsnap5.tld.freebsd.org"
+# (in which case portsnap will use that particular server, since there
+# won't be an SRV entry for that name).
+#
+# We don't implement the recommendations from RFC 2782 completely, since
+# we are only looking to pick a single server -- the recommendations are
+# targetted at applications which obtain a list of servers and then try
+# each in turn, but we are instead just going to pick one server and let
+# the user re-run portsnap if a broken server was selected.
+#
+# We also ignore the Port field, since we are always going to use port 80.
+fetch_pick_server() {
+	echo -n "Looking up ${SERVERNAME} mirrors..."
+
+# Issue the SRV query and pull out the Priority, Weight, and Target fields.
+	host -t srv "_http._tcp.${SERVERNAME}" |
+	    grep -E "^_http._tcp.${SERVERNAME} has SRV record" |
+	    cut -f 5,6,8 -d ' ' > serverlist
+
+# If no records, give up -- we'll just use the server name we were given.
+	if [ `wc -l < serverlist` -eq 0 ]; then
+		echo " none found."
+		return
+	fi
+
+# Find the highest priority level (lowest numeric value).
+	SRV_PRIORITY=`cut -f 1 -d ' ' serverlist | sort -n | head -1`
+
+# Add up the weights of the response lines at that priority level.
+	SRV_WSUM=0;
+	while read X; do
+		case "$X" in
+		${SRV_PRIORITY}\ *)
+			SRV_W=`echo $X | cut -f 2 -d ' '`
+			SRV_WSUM=$(($SRV_WSUM + $SRV_W))
+			;;
+		esac
+	done < serverlist
+
+# If all the weights are 0, pretend that they are all 1 instead.
+	if [ ${SRV_WSUM} -eq 0 ]; then
+		SRV_WSUM=`grep -E "^${SRV_PRIORITY} " serverlist | wc -l`
+		SRV_W_ADD=1
+	else
+		SRV_W_ADD=0
+	fi
+
+# Pick a random value between 1 and the sum of the weights
+	SRV_RND=`jot -r 1 1 ${SRV_WSUM}`
+
+# Read through the list of mirrors and set SERVERNAME
+	while read X; do
+		case "$X" in
+		${SRV_PRIORITY}\ *)
+			SRV_W=`echo $X | cut -f 2 -d ' '`
+			SRV_W=$(($SRV_W + $SRV_W_ADD))
+			if [ $SRV_RND -le $SRV_W ]; then
+				SERVERNAME=`echo $X | cut -f 3 -d ' '`
+				break
+			else
+				SRV_RND=$(($SRV_RND - $SRV_W))
+			fi
+			;;
+		esac
+	done < serverlist
+
+	echo " using ${SERVERNAME}"
+}
+
+# Check that we have a public key with an appropriate hash, or
+# fetch the key if it doesn't exist.
+fetch_key() {
+	if [ -r pub.ssl ] && [ `${SHA256} -q pub.ssl` = ${KEYPRINT} ]; then
+		return
+	fi
+
+	echo -n "Fetching public key... "
+	rm -f pub.ssl
+	fetch ${QUIETFLAG} http://${SERVERNAME}/pub.ssl \
+	    2>${QUIETREDIR} || true
+	if ! [ -r pub.ssl ]; then
+		echo "failed."
+		return 1
+	fi
+	if ! [ `${SHA256} -q pub.ssl` = ${KEYPRINT} ]; then
+		echo "key has incorrect hash."
+		rm -f pub.ssl
+		return 1
+	fi
+	echo "done."
+}
+
+# Fetch a snapshot tag
+fetch_tag() {
+	rm -f snapshot.ssl tag.new
+
+	echo ${NDEBUG} "Fetching snapshot tag... "
+	fetch ${QUIETFLAG} http://${SERVERNAME}/$1.ssl
+	    2>${QUIETREDIR} || true
+	if ! [ -r $1.ssl ]; then
+		echo "failed."
+		return 1
+	fi
+
+	openssl rsautl -pubin -inkey pub.ssl -verify		\
+	    < $1.ssl > tag.new 2>${QUIETREDIR} || true
+	rm $1.ssl
+
+	if ! [ `wc -l < tag.new` = 1 ] ||
+	    ! grep -qE "^portsnap\|[0-9]{10}\|[0-9a-f]{64}" tag.new; then
+		echo "invalid snapshot tag."
+		return 1
+	fi
+
+	echo "done."
+
+	SNAPSHOTDATE=`cut -f 2 -d '|' < tag.new`
+	SNAPSHOTHASH=`cut -f 3 -d '|' < tag.new`
+}
+
+# Sanity-check the date on a snapshot tag
+fetch_snapshot_tagsanity() {
+	if [ `date "+%s"` -gt `expr ${SNAPSHOTDATE} + 31536000` ]; then
+		echo "Snapshot appears to be more than a year old!"
+		echo "(Is the system clock correct?)"
+		echo "Cowarly refusing to proceed any further."
+		return 1
+	fi
+	if [ `date "+%s"` -lt `expr ${SNAPSHOTDATE} - 86400` ]; then
+		echo -n "Snapshot appears to have been created more than "
+		echo "one day into the future!"
+		echo "(Is the system clock correct?)"
+		echo "Cowardly refusing to proceed any further."
+		return 1
+	fi
+}
+
+# Sanity-check the date on a snapshot update tag
+fetch_update_tagsanity() {
+	fetch_snapshot_tagsanity || return 1
+
+	if [ ${OLDSNAPSHOTDATE} -gt ${SNAPSHOTDATE} ]; then
+		echo -n "Latest snapshot on server is "
+		echo "older than what we already have!"
+		echo -n "Cowardly refusing to downgrade from "
+		date -r ${OLDSNAPSHOTDATE}
+		echo "to `date -r ${SNAPSHOTDATE}`."
+		return 1
+	fi
+}
+
+# Compare old and new tags; return 1 if update is unnecessary
+fetch_update_neededp() {
+	if [ ${OLDSNAPSHOTDATE} -eq ${SNAPSHOTDATE} ]; then
+		echo -n "Latest snapshot on server matches "
+		echo "what we already have."
+		echo "No updates needed."
+		rm tag.new
+		return 1
+	fi
+	if [ ${OLDSNAPSHOTHASH} = ${SNAPSHOTHASH} ]; then
+		echo -n "Ports tree hasn't changed since "
+		echo "last snapshot."
+		echo "No updates needed."
+		rm tag.new
+		return 1
+	fi
+
+	return 0
+}
+
+# Fetch snapshot metadata file
+fetch_metadata() {
+	rm -f ${SNAPSHOTHASH} tINDEX.new
+
+	echo ${NDEBUG} "Fetching snapshot metadata... "
+	fetch ${QUIETFLAG} http://${SERVERNAME}/t/${SNAPSHOTHASH}
+	    2>${QUIETREDIR} || return
+	if [ `${SHA256} -q ${SNAPSHOTHASH}` != ${SNAPSHOTHASH} ]; then
+		echo "snapshot metadata corrupt."
+		return 1
+	fi
+	mv ${SNAPSHOTHASH} tINDEX.new
+	echo "done."
+}
+
+# Warn user about bogus metadata
+fetch_metadata_freakout() {
+	echo
+	echo "Portsnap metadata is correctly signed, but contains"
+	echo "at least one line which appears bogus."
+	echo "Cowardly refusing to proceed any further."
+}
+
+# Sanity-check a snapshot metadata file
+fetch_metadata_sanity() {
+	if grep -qvE "^[0-9A-Z.]+\|[0-9a-f]{64}$" tINDEX.new; then
+		fetch_metadata_freakout
+		return 1
+	fi
+	if [ `look INDEX tINDEX.new | wc -l` != 1 ]; then
+		echo
+		echo "Portsnap metadata appears bogus."
+		echo "Cowardly refusing to proceed any further."
+		return 1
+	fi
+}
+
+# Take a list of ${oldhash}|${newhash} and output a list of needed patches
+fetch_make_patchlist() {
+	grep -vE "^([0-9a-f]{64})\|\1$" | 
+		while read LINE; do
+			X=`echo ${LINE} | cut -f 1 -d '|'`
+			Y=`echo ${LINE} | cut -f 2 -d '|'`
+			if [ -f "files/${Y}.gz" ]; then continue; fi
+			if [ ! -f "files/${X}.gz" ]; then continue; fi
+			echo "${LINE}"
+		done
+}
+
+# Print user-friendly progress statistics
+fetch_progress() {
+	LNC=0
+	while read x; do
+		LNC=$(($LNC + 1))
+		if [ $(($LNC % 10)) = 0 ]; then
+			echo -n $LNC
+		elif [ $(($LNC % 2)) = 0 ]; then
+			echo -n .
+		fi
+	done
+	echo -n " "
+}
+
+# Sanity-check an index file
+fetch_index_sanity() {
+	if grep -qvE "^[-_+./@0-9A-Za-z]+\|[0-9a-f]{64}$" INDEX.new ||
+	    fgrep -q "./" INDEX.new; then
+		fetch_metadata_freakout
+		return 1
+	fi
+}
+
+# Verify a list of files
+fetch_snapshot_verify() {
+	while read F; do
+		if [ `gunzip -c snap/${F} | ${SHA256} -q` != ${F} ]; then
+			echo "snapshot corrupt."
+			return 1
+		fi
+	done
+	return 0
+}
+
+# Fetch a snapshot tarball, extract, and verify.
+fetch_snapshot() {
+	fetch_tag snapshot || return 1
+	fetch_snapshot_tagsanity || return 1
+	fetch_metadata || return 1
+	fetch_metadata_sanity || return 1
+
+	rm -f ${SNAPSHOTHASH}.tgz
+	rm -rf snap/
+
+# Don't ask fetch(1) to be quiet -- downloading a snapshot of ~ 35MB will
+# probably take a while, so the progrees reports that fetch(1) generates
+# will be useful for keeping the users' attention from drifting.
+	echo "Fetching snapshot generated at `date -r ${SNAPSHOTDATE}`:"
+	fetch http://${SERVERNAME}/s/${SNAPSHOTHASH}.tgz || return 1
+
+	echo -n "Extracting snapshot... "
+	tar -xzf ${SNAPSHOTHASH}.tgz snap/ || return 1
+	rm ${SNAPSHOTHASH}.tgz
+	echo "done."
+
+	echo -n "Verifying snapshot integrity... "
+# Verify the metadata files
+	cut -f 2 -d '|' tINDEX.new | fetch_snapshot_verify || return 1
+# Extract the index
+	rm -f INDEX.new
+	gunzip -c snap/`look INDEX tINDEX.new |
+	    cut -f 2 -d '|'`.gz > INDEX.new
+	fetch_index_sanity || return 1
+# Verify the snapshot contents
+	cut -f 2 -d '|' INDEX.new | fetch_snapshot_verify || return 1
+	echo "done."
+
+# Move files into their proper locations
+	rm -f tag INDEX tINDEX
+	rm -rf files
+	mv tag.new tag
+	mv tINDEX.new tINDEX
+	mv INDEX.new INDEX
+	mv snap/ files/
+
+	return 0
+}
+
+# Update a compressed snapshot
+fetch_update() {
+	rm -f patchlist diff OLD NEW filelist INDEX.new
+
+	OLDSNAPSHOTDATE=`cut -f 2 -d '|' < tag`
+	OLDSNAPSHOTHASH=`cut -f 3 -d '|' < tag`
+
+	fetch_tag latest || return 1
+	fetch_update_tagsanity || return 1
+	fetch_update_neededp || return 0
+	fetch_metadata || return 1
+	fetch_metadata_sanity || return 1
+
+	echo -n "Updating from `date -r ${OLDSNAPSHOTDATE}` "
+	echo "to `date -r ${SNAPSHOTDATE}`."
+
+# Generate a list of wanted metadata patches
+	join -t '|' -o 1.2,2.2 tINDEX tINDEX.new |
+	    fetch_make_patchlist > patchlist
+
+# Attempt to fetch metadata patches
+	echo -n "Fetching `wc -l < patchlist | tr -d ' '` "
+	echo ${NDEBUG} "metadata patches.${DDSTATS}"
+	tr '|' '-' < patchlist |
+	    lam -s "tp/" - -s ".gz" |
+	    xargs ${XARGST} ${PHTTPGET} ${SERVERNAME}	\
+	    2>${STATSREDIR} | fetch_progress
+	echo "done."
+
+# Attempt to apply metadata patches
+	echo -n "Applying metadata patches... "
+	while read LINE; do
+		X=`echo ${LINE} | cut -f 1 -d '|'`
+		Y=`echo ${LINE} | cut -f 2 -d '|'`
+		if [ ! -f "${X}-${Y}.gz" ]; then continue; fi
+		gunzip -c < ${X}-${Y}.gz > diff
+		gunzip -c < files/${X}.gz > OLD
+		cut -c 2- diff | join -t '|' -v 2 - OLD > ptmp
+		grep '^\+' diff | cut -c 2- |
+		    sort -k 1,1 -t '|' -m - ptmp > NEW
+		if [ `${SHA256} -q NEW` = ${Y} ]; then
+			mv NEW files/${Y}
+			gzip -n files/${Y}
+		fi
+		rm -f diff OLD NEW ${X}-${Y}.gz ptmp
+	done < patchlist 2>${QUIETREDIR}
+	echo "done."
+
+# Update metadata without patches
+	join -t '|' -v 2 tINDEX tINDEX.new |
+	    cut -f 2 -d '|' /dev/stdin patchlist |
+		while read Y; do
+			if [ ! -f "files/${Y}.gz" ]; then
+				echo ${Y};
+			fi
+		done > filelist
+	echo -n "Fetching `wc -l < filelist | tr -d ' '` "
+	echo ${NDEBUG} "metadata files... "
+	lam -s "f/" - -s ".gz" < filelist |
+	    xargs ${XARGST} ${PHTTPGET} ${SERVERNAME}	\
+	    2>${QUIETREDIR}
+
+	while read Y; do
+		if [ `gunzip -c < ${Y}.gz | ${SHA256} -q` = ${Y} ]; then
+			mv ${Y}.gz files/${Y}.gz
+		else
+			echo "metadata is corrupt."
+			return 1
+		fi
+	done < filelist
+	echo "done."
+
+# Extract the index
+	gunzip -c files/`look INDEX tINDEX.new |
+	    cut -f 2 -d '|'`.gz > INDEX.new
+	fetch_index_sanity || return 1
+
+# Generate a list of wanted ports patches
+	join -t '|' -o 1.2,2.2 INDEX INDEX.new |
+	    fetch_make_patchlist > patchlist
+
+# Attempt to fetch ports patches
+	echo -n "Fetching `wc -l < patchlist | tr -d ' '` "
+	echo ${NDEBUG} "patches.${DDSTATS}"
+	tr '|' '-' < patchlist | lam -s "bp/" - |
+	    xargs ${XARGST} ${PHTTPGET} ${SERVERNAME}	\
+	    2>${STATSREDIR} | fetch_progress
+	echo "done."
+
+# Attempt to apply ports patches
+	echo -n "Applying patches... "
+	while read LINE; do
+		X=`echo ${LINE} | cut -f 1 -d '|'`
+		Y=`echo ${LINE} | cut -f 2 -d '|'`
+		if [ ! -f "${X}-${Y}" ]; then continue; fi
+		gunzip -c < files/${X}.gz > OLD
+		${BSPATCH} OLD NEW ${X}-${Y}
+		if [ `${SHA256} -q NEW` = ${Y} ]; then
+			mv NEW files/${Y}
+			gzip -n files/${Y}
+		fi
+		rm -f diff OLD NEW ${X}-${Y}
+	done < patchlist 2>${QUIETREDIR}
+	echo "done."
+
+# Update ports without patches
+	join -t '|' -v 2 INDEX INDEX.new |
+	    cut -f 2 -d '|' /dev/stdin patchlist |
+		while read Y; do
+			if [ ! -f "files/${Y}.gz" ]; then
+				echo ${Y};
+			fi
+		done > filelist
+	echo -n "Fetching `wc -l < filelist | tr -d ' '` "
+	echo ${NDEBUG} "new ports or files... "
+	lam -s "f/" - -s ".gz" < filelist |
+	    xargs ${XARGST} ${PHTTPGET} ${SERVERNAME}	\
+	    2>${QUIETREDIR}
+
+	while read Y; do
+		if [ `gunzip -c < ${Y}.gz | ${SHA256} -q` = ${Y} ]; then
+			mv ${Y}.gz files/${Y}.gz
+		else
+			echo "snapshot is corrupt."
+			return 1
+		fi
+	done < filelist
+	echo "done."
+
+# Remove files which are no longer needed
+	cut -f 2 -d '|' tINDEX INDEX | sort > oldfiles
+	cut -f 2 -d '|' tINDEX.new INDEX.new | sort | comm -13 - oldfiles |
+	    lam -s "files/" - -s ".gz" | xargs rm -f
+	rm patchlist filelist oldfiles
+
+# We're done!
+	mv INDEX.new INDEX
+	mv tINDEX.new tINDEX
+	mv tag.new tag
+
+	return 0
+}
+
+# Do the actual work involved in "fetch" / "cron".
+fetch_run() {
+	fetch_pick_server
+
+	fetch_key || return 1
+
+	if ! [ -d files -a -r tag -a -r INDEX -a -r tINDEX ]; then
+		fetch_snapshot || return 1
+	fi
+	fetch_update || return 1
+}
+
+# Build a ports INDEX file
+extract_make_index() {
+	gunzip -c "${WORKDIR}/files/`look $1 ${WORKDIR}/tINDEX |
+	    cut -f 2 -d '|'`.gz" | ${MKINDEX} /dev/stdin > ${PORTSDIR}/$2
+}
+
+# Create INDEX, INDEX-5, INDEX-6
+extract_indices() {
+	echo -n "Building new INDEX files... "
+	extract_make_index DESCRIBE.4 INDEX || return 1
+	extract_make_index DESCRIBE.5 INDEX-5 || return 1
+	extract_make_index DESCRIBE.6 INDEX-6 || return 1
+	echo "done."
+}
+
+# Create .portsnap.INDEX
+extract_metadata() {
+	sort ${WORKDIR}/INDEX > ${PORTSDIR}/.portsnap.INDEX
+}
+
+# Do the actual work involved in "extract"
+extract_run() {
+	if ! grep "^${EXTRACTPATH}" ${WORKDIR}/INDEX | while read LINE; do
+		FILE=`echo ${LINE} | cut -f 1 -d '|'`
+		HASH=`echo ${LINE} | cut -f 2 -d '|'`
+		echo ${PORTSDIR}/${FILE}
+		if ! [ -r "${WORKDIR}/files/${HASH}.gz" ]; then
+			echo "files/${HASH}.gz not found -- snapshot corrupt."
+			return 1
+		fi
+		case ${FILE} in
+		*/)
+			rm -rf ${PORTSDIR}/${FILE}
+			mkdir -p ${PORTSDIR}/${FILE}
+			tar -xzf ${WORKDIR}/files/${HASH}.gz	\
+			    -C ${PORTSDIR}/${FILE}
+			;;
+		*)
+			rm -f ${PORTSDIR}/${FILE}
+			tar -xzf ${WORKDIR}/files/${HASH}.gz	\
+			    -C ${PORTSDIR} ${FILE}
+			;;
+		esac
+	done; then
+		return 1
+	fi
+	if [ ! -z "${EXTRACTPATH}" ]; then
+		return 0;
+	fi
+
+	extract_metadata
+	extract_indices
+}
+
+# Do the actual work involved in "update"
+update_run() {
+	if ! [ -z "${INDEXONLY}" ]; then
+		extract_indices >/dev/null || return 1
+		return 0
+	fi
+
+	if sort ${WORKDIR}/INDEX |
+	    cmp -s ${PORTSDIR}/.portsnap.INDEX -; then
+		echo "Ports tree is already up to date."
+		return 0
+	fi
+
+	echo -n "Removing old files and directories... "
+	sort ${WORKDIR}/INDEX | comm -23 ${PORTSDIR}/.portsnap.INDEX - |
+	    cut -f 1 -d '|' | lam -s "${PORTSDIR}/" - | xargs rm -rf
+	echo "done."
+
+# Install new files
+	echo "Extracting new files:"
+	if ! sort ${WORKDIR}/INDEX |
+	    comm -13 ${PORTSDIR}/.portsnap.INDEX - |
+	    while read LINE; do
+		FILE=`echo ${LINE} | cut -f 1 -d '|'`
+		HASH=`echo ${LINE} | cut -f 2 -d '|'`
+		echo ${PORTSDIR}/${FILE}
+		if ! [ -r "${WORKDIR}/files/${HASH}.gz" ]; then
+			echo "files/${HASH}.gz not found -- snapshot corrupt."
+			return 1
+		fi
+		case ${FILE} in
+		*/)
+			mkdir -p ${PORTSDIR}/${FILE}
+			tar -xzf ${WORKDIR}/files/${HASH}.gz	\
+			    -C ${PORTSDIR}/${FILE}
+			;;
+		*)
+			tar -xzf ${WORKDIR}/files/${HASH}.gz	\
+			    -C ${PORTSDIR} ${FILE}
+			;;
+		esac
+	done; then
+		return 1
+	fi
+
+	extract_metadata
+	extract_indices
+}
+
+#### Main functions -- call parameter-handling and core functions
+
+# Using the command line, configuration file, and defaults,
+# set all the parameters which are needed later.
+get_params() {
+	init_params
+	parse_cmdline $@
+	sanity_conffile
+	default_conffile
+	parse_conffile
+	default_params
+}
+
+# Fetch command.  Make sure that we're being called
+# interactively, then run fetch_check_params and fetch_run
+cmd_fetch() {
+	fetch_check_params
+	fetch_run || exit 1
+}
+
+# Cron command.  Make sure the parameters are sensible; wait
+# rand(3600) seconds; then fetch updates.  While fetching updates,
+# send output to a temporary file; only print that file if the
+# fetching failed.
+cmd_cron() {
+	fetch_check_params
+	sleep `jot -r 1 0 3600`
+
+	TMPFILE=`mktemp /tmp/portsnap.XXXXXX` || exit 1
+	if ! fetch_run >> ${TMPFILE}; then
+		cat ${TMPFILE}
+		rm ${TMPFILE}
+		exit 1
+	fi
+
+	rm ${TMPFILE}
+}
+
+# Extract command.  Make sure the parameters are sensible,
+# then extract the ports tree (or part thereof).
+cmd_extract() {
+	extract_check_params
+	extract_run || exit 1
+}
+
+# Update command.  Make sure the parameters are sensible,
+# then update the ports tree.
+cmd_update() {
+	update_check_params
+	update_run || exit 1
+}
+
+#### Entry point
+
+# Make sure we find utilities from the base system
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PATH}
+
+get_params $@
+for COMMAND in ${COMMANDS}; do
+	cmd_${COMMAND}
+done

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/UpdateHints.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/UpdateHints.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/UpdateHints.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,20 +1,20 @@
-#!/bin/sh
-###########################################################################
-# UpdateHints (UpdateHints.sh) - Checks to make sure linker.hints is up to
-#				 date, if not it updates it.
-# (C) 2005 PC-BSD Project
-# Author: Timothy McCormick
-# Version: 1.0
-#
-###########################################################################
-
-CHANGES="`dmesg | grep 'linker.hints'`"
-
-echo "Checking for up to date linker.hints file..."
-
-if [ ! -z "${CHANGES}" ]
-then
-	echo -n "Updating linker.hints... "
-	kldxref /boot/kernel /boot/modules
-	echo "Done"
-fi
+#!/bin/sh
+###########################################################################
+# UpdateHints (UpdateHints.sh) - Checks to make sure linker.hints is up to
+#				 date, if not it updates it.
+# (C) 2005 PC-BSD Project
+# Author: Timothy McCormick
+# Version: 1.0
+#
+###########################################################################
+
+CHANGES="`dmesg | grep 'linker.hints'`"
+
+echo "Checking for up to date linker.hints file..."
+
+if [ ! -z "${CHANGES}" ]
+then
+	echo -n "Updating linker.hints... "
+	kldxref /boot/kernel /boot/modules
+	echo "Done"
+fi

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/adduser.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/adduser.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/adduser.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,1012 +1,1012 @@
-#!/bin/sh
-#
-# Copyright (c) 2002-2004 Michael Telahun Makonnen. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#       Email: Mike Makonnen <mtm at FreeBSD.Org>
-#
-# $FreeBSD: src/usr.sbin/adduser/adduser.sh,v 1.23.2.2 2004/09/24 14:18:16 roam Exp $
-#
-
-# err msg
-#       Display $msg on stderr, unless we're being quiet.
-# 
-err() {
-	if [ -z "$quietflag" ]; then
-        	echo 1>&2 ${THISCMD}: ERROR: $*
-	fi
-}
-
-# info msg
-#       Display $msg on stdout, unless we're being quiet.
-# 
-info() {
-	if [ -z "$quietflag" ]; then
-        	echo ${THISCMD}: INFO: $*
-	fi
-}
-
-# get_nextuid
-#	Output the value of $_uid if it is available for use. If it
-#	is not, output the value of the next higher uid that is available.
-#	If a uid is not specified, output the first available uid, as indicated
-#	by pw(8).
-# 
-get_nextuid () {
-	_uid=$1
-	_nextuid=
-
-	if [ -z "$_uid" ]; then
-		_nextuid="`${PWCMD} usernext | cut -f1 -d:`"
-	else
-		while : ; do
-			${PWCMD} usershow $_uid > /dev/null 2>&1
-			if [ ! "$?" -eq 0 ]; then
-				_nextuid=$_uid
-				break
-			fi
-			_uid=$(($_uid + 1))
-		done
-	fi
-	echo $_nextuid
-}
-
-# show_usage
-#	Display usage information for this utility.
-#
-show_usage() {
-	echo "usage: ${THISCMD} [options]"
-	echo "  options may include:"
-	echo "  -C		save to the configuration file only"
-	echo "  -D		do not attempt to create the home directory"
-	echo "  -E		disable this account after creation"
-	echo "  -G		additional groups to add accounts to"
-	echo "  -L		login class of the user"
-	echo "  -N		do not read configuration file"
-	echo "  -S		a nonexistent shell is not an error"
-	echo "  -d		home directory"
-	echo "  -f		file from which input will be received"
-	echo "  -g		default login group"
-	echo "  -h		display this usage message"
-	echo "  -k		path to skeleton home directory"
-	echo "  -m		user welcome message file"
-	echo "  -q		absolute minimal user feedback"
-	echo "  -s		shell"
-	echo "  -u		uid to start at"
-	echo "  -w		password type: no, none, yes or random"
-}
-
-# valid_shells
-#	Outputs a list of valid shells from /etc/shells. Only the
-#	basename of the shell is output.
-#
-valid_shells() {
-	_prefix=
-	cat ${ETCSHELLS} |
-	while read _path _junk ; do
-		case $_path in
-		\#*|'')
-			;;
-		*)
-			echo -n "${_prefix}`basename $_path`"
-			_prefix=' '
-			;;
-		esac
-	done
-
-	# /usr/sbin/nologin is a special case
-	[ -x "${NOLOGIN_PATH}" ] && echo -n " ${NOLOGIN}"
-}
-
-# fullpath_from_shell shell
-#	Given $shell, which is either the full path to a shell or
-#	the basename component of a valid shell, get the
-#	full path to the shell from the /etc/shells file.
-#
-fullpath_from_shell() {
-	_shell=$1
-	[ -z "$_shell" ] && return 1
-
-	# /usr/sbin/nologin is a special case; it needs to be handled
-	# before the cat | while loop, since a 'return' from within
-	# a subshell will not terminate the function's execution, and
-	# the path to the nologin shell might be printed out twice.
-	#
-	if [ "$_shell" = "${NOLOGIN}" -o \
-	    "$_shell" = "${NOLOGIN_PATH}" ]; then
-		echo ${NOLOGIN_PATH}
-		return 0;
-	fi
-
-	cat ${ETCSHELLS} |
-	while read _path _junk ; do
-		case "$_path" in
-		\#*|'')
-			;;
-		*)
-			if [ "$_path" = "$_shell" -o \
-			    "`basename $_path`" = "$_shell" ]; then
-				echo $_path
-				return 0
-			fi
-			;;
-		esac
-	done
-
-	return 1
-}
-
-# shell_exists shell
-#	If the given shell is listed in ${ETCSHELLS} or it is
-#	the nologin shell this function will return 0.
-#	Otherwise, it will return 1. If shell is valid but
-#	the path is invalid or it is not executable it
-#	will emit an informational message saying so.
-#
-shell_exists()
-{
-	_sh="$1"
-	_shellchk="${GREPCMD} '^$_sh$' ${ETCSHELLS} > /dev/null 2>&1"
-
-	if ! eval $_shellchk; then
-		# The nologin shell is not listed in /etc/shells.
-		if [ "$_sh" != "${NOLOGIN_PATH}" ]; then
-			err "Invalid shell ($_sh) for user $username."
-			return 1
-		fi
-	fi
-	! [ -x "$_sh" ] &&
-	    info "The shell ($_sh) does not exist or is not executable."
-
-	return 0
-}
-
-# save_config
-#	Save some variables to a configuration file.
-#	Note: not all script variables are saved, only those that
-#	      it makes sense to save.
-#
-save_config() {
-	echo "# Configuration file for adduser(8)."     >  ${ADDUSERCONF}
-	echo "# NOTE: only *some* variables are saved." >> ${ADDUSERCONF}
-	echo "# Last Modified on `${DATECMD}`."		>> ${ADDUSERCONF}
-	echo ''				>> ${ADDUSERCONF}
-	echo "defaultLgroup=$ulogingroup" >> ${ADDUSERCONF}
-	echo "defaultclass=$uclass"	>> ${ADDUSERCONF}
-	echo "defaultgroups=$ugroups"	>> ${ADDUSERCONF}
-	echo "passwdtype=$passwdtype" 	>> ${ADDUSERCONF}
-	echo "homeprefix=$homeprefix" 	>> ${ADDUSERCONF}
-	echo "defaultshell=$ushell"	>> ${ADDUSERCONF}
-	echo "udotdir=$udotdir"		>> ${ADDUSERCONF}
-	echo "msgfile=$msgfile"		>> ${ADDUSERCONF}
-	echo "disableflag=$disableflag" >> ${ADDUSERCONF}
-}
-
-# add_user
-#	Add a user to the user database. If the user chose to send a welcome
-#	message or lock the account, do so.
-#
-add_user() {
-
-	# Is this a configuration run? If so, don't modify user database.
-	#
-	if [ -n "$configflag" ]; then
-		save_config
-		return
-	fi
-
-	_uid=
-	_name=
-	_comment=
-	_gecos=
-	_home=
-	_group=
-	_grouplist=
-	_shell=
-	_class=
-	_dotdir=
-	_expire=
-	_pwexpire=
-	_passwd=
-	_upasswd=
-	_passwdmethod=
-
-	_name="-n '$username'"
-	[ -n "$uuid" ] && _uid='-u "$uuid"'
-	[ -n "$ulogingroup" ] && _group='-g "$ulogingroup"'
-	[ -n "$ugroups" ] && _grouplist='-G "$ugroups"'
-	[ -n "$ushell" ] && _shell='-s "$ushell"'
-	[ -n "$uclass" ] && _class='-L "$uclass"'
-	[ -n "$ugecos" ] && _comment='-c "$ugecos"'
-	[ -n "$udotdir" ] && _dotdir='-k "$udotdir"'
-	[ -n "$uexpire" ] && _expire='-e "$uexpire"'
-	[ -n "$upwexpire" ] && _pwexpire='-p "$upwexpire"'
-	if [ -z "$Dflag" -a -n "$uhome" ]; then
-		# The /nonexistent home directory is special. It
-		# means the user has no home directory.
-		if [ "$uhome" = "$NOHOME" ]; then
-			_home='-d "$uhome"'
-		else
-			_home='-m -d "$uhome"'
-		fi
-	elif [ -n "$Dflag" -a -n "$uhome" ]; then
-		_home='-d "$uhome"'
-	fi
-	case $passwdtype in
-	no)
-		_passwdmethod="-w no"
-		_passwd="-h -"
-		;;
-	yes)
-		# Note on processing the password: The outer double quotes
-		# make literal everything except ` and \ and $.
-		# The outer single quotes make literal ` and $.
-		# We can ensure the \ isn't treated specially by specifying
-		# the -r switch to the read command used to obtain the input.
-		#
-		_passwdmethod="-w yes"
-		_passwd="-h 0"
-		_upasswd='echo "$upass" |'
-		;;
-	none)
-		_passwdmethod="-w none"
-		;;
-	random)
-		_passwdmethod="-w random"
-		;;
-	esac
-
-	_pwcmd="$_upasswd ${PWCMD} useradd $_uid $_name $_group $_grouplist $_comment"
-	_pwcmd="$_pwcmd $_shell $_class $_home $_dotdir $_passwdmethod $_passwd"
-	_pwcmd="$_pwcmd $_expire $_pwexpire"
-
-	if ! _output=`eval $_pwcmd` ; then
-		err "There was an error adding user ($username)."
-		return 1
-	else
-		info "Successfully added ($username) to the user database."
-		if [ "random" = "$passwdtype" ]; then
-			randompass="$_output"
-			info "Password for ($username) is: $randompass"
-		fi
-	fi
-
-	if [ -n "$disableflag" ]; then
-		if ${PWCMD} lock $username ; then
-			info "Account ($username) is locked."
-		else
-			info "Account ($username) could NOT be locked."
-		fi
-	fi
-
-	_line=
-	_owner=
-	_perms=
-	if [ -n "$msgflag" ]; then
-		[ -r "$msgfile" ] && {
-			# We're evaluating the contents of an external file.
-			# Let's not open ourselves up for attack. _perms will
-			# be empty if it's writeable only by the owner. _owner
-			# will *NOT* be empty if the file is owned by root.
-			#
-			_dir="`dirname $msgfile`"
-			_file="`basename $msgfile`"
-			_perms=`/usr/bin/find $_dir -name $_file -perm +07022 -prune`
-			_owner=`/usr/bin/find $_dir -name $_file -user 0 -prune`
-			if [ -z "$_owner" -o -n "$_perms" ]; then
-				err "The message file ($msgfile) may be writeable only by root."
-				return 1
-			fi
-			cat "$msgfile" |
-			while read _line ; do
-				eval echo "$_line"
-			done | ${MAILCMD} -s"Welcome" ${username}
-			info "Sent welcome message to ($username)."
-		}
-	fi
-}
-
-# get_user
-#	Reads username of the account from standard input or from a global
-#	variable containing an account line from a file. The username is
-#	required. If this is an interactive session it will prompt in
-#	a loop until a username is entered. If it is batch processing from
-#	a file it will output an error message and return to the caller.
-#
-get_user() {
-	_input=
-
-	# No need to take down user names if this is a configuration saving run.
-	[ -n "$configflag" ] && return
-
-	while : ; do
-		if [ -z "$fflag" ]; then
-			echo -n "Username: "
-			read _input
-		else
-			_input="`echo "$fileline" | cut -f1 -d:`"
-		fi
-
-		# There *must* be a username. If this is an interactive
-		# session give the user an opportunity to retry.
-		#
-		if [ -z "$_input" ]; then
-			err "You must enter a username!"
-			[ -z "$fflag" ] && continue
-		fi
-		break
-	done
-	username="$_input"
-}
-
-# get_gecos
-#	Reads extra information about the user. Can be used both in interactive
-#	and batch (from file) mode.
-#
-get_gecos() {
-	_input=
-
-	# No need to take down additional user information for a configuration run.
-	[ -n "$configflag" ] && return
-
-	if [ -z "$fflag" ]; then
-		echo -n "Full name: "
-		read _input
-	else
-		_input="`echo "$fileline" | cut -f7 -d:`"
-	fi
-	ugecos="$_input"
-}
-
-# get_shell
-#	Get the account's shell. Works in interactive and batch mode. It
-#	accepts either the base name of the shell or the full path.
-#	If an invalid shell is entered it will simply use the default shell.
-#
-get_shell() {
-	_input=
-	_fullpath=
-	ushell="$defaultshell"
-
-	# Make sure the current value of the shell is a valid one
-	if [ -z "$Sflag" ]; then
-		if ! shell_exists $ushell ; then
-			info "Using default shell ${defaultshell}."
-			ushell="$defaultshell"
-		fi
-	fi
-
-	if [ -z "$fflag" ]; then
-		echo -n "Shell ($shells) [`basename $ushell`]: "
-		read _input
-	else
-		_input="`echo "$fileline" | cut -f9 -d:`"
-	fi
-	if [ -n "$_input" ]; then
-		if [ -n "$Sflag" ]; then
-			ushell="$_input"
-		else
-			_fullpath=`fullpath_from_shell $_input`
-			if [ -n "$_fullpath" ]; then
-				ushell="$_fullpath"
-			else
-				err "Invalid shell ($_input) for user $username."
-				info "Using default shell ${defaultshell}."
-				ushell="$defaultshell"
-			fi
-		fi
-	fi
-}
-
-# get_homedir
-#	Reads the account's home directory. Used both with interactive input
-#	and batch input.
-#
-get_homedir() {
-	_input=
-	if [ -z "$fflag" ]; then
-		echo -n "Home directory [${homeprefix}/${username}]: "
-		read _input
-	else
-		_input="`echo "$fileline" | cut -f8 -d:`"
-	fi
-
-	if [ -n "$_input" ]; then
-		uhome="$_input"
-		# if this is a configuration run, then user input is the home
-		# directory prefix. Otherwise it is understood to
-		# be $prefix/$user
-		#
-		[ -z "$configflag" ] && homeprefix="`dirname $uhome`" || homeprefix="$uhome"
-	else
-		uhome="${homeprefix}/${username}"
-	fi
-}
-
-# get_uid
-#	Reads a numeric userid in an interactive or batch session. Automatically
-#	allocates one if it is not specified.
-#
-get_uid() {
-	uuid=${uidstart}
-	_input=
-	_prompt=
-
-	# No need to take down uids for a configuration saving run.
-	[ -n "$configflag" ] && return
-
-	if [ -n "$uuid" ]; then
-		_prompt="Uid [$uuid]: "
-	else
-		_prompt="Uid (Leave empty for default): "
-	fi
-	if [ -z "$fflag" ]; then
-		echo -n "$_prompt"
-		read _input
-	else
-		_input="`echo "$fileline" | cut -f2 -d:`"
-	fi
-
-	[ -n "$_input" ] && uuid=$_input
-	uuid=`get_nextuid $uuid`
-	uidstart=$uuid
-}
-
-# get_class
-#	Reads login class of account. Can be used in interactive or batch mode.
-#
-get_class() {
-	uclass="$defaultclass"
-	_input=
-	_class=${uclass:-"default"}
-
-	if [ -z "$fflag" ]; then
-		echo -n "Login class [$_class]: "
-		read _input
-	else
-		_input="`echo "$fileline" | cut -f4 -d:`"
-	fi
-
-	[ -n "$_input" ] && uclass="$_input"
-}
-
-# get_logingroup
-#	Reads user's login group. Can be used in both interactive and batch
-#	modes. The specified value can be a group name or its numeric id.
-#	This routine leaves the field blank if nothing is provided and
-#	a default login group has not been set. The pw(8) command
-#	will then provide a login group with the same name as the username.
-#
-get_logingroup() {
-	ulogingroup="$defaultLgroup"
-	_input=
-
-	if [ -z "$fflag" ]; then
-		echo -n "Login group [${ulogingroup:-$username}]: "
-		read _input
-	else
-		_input="`echo "$fileline" | cut -f3 -d:`"
-	fi
-
-	# Pw(8) will use the username as login group if it's left empty
-	[ -n "$_input" ] && ulogingroup="$_input"
-}
-
-# get_groups
-#	Read additional groups for the user. It can be used in both interactive
-#	and batch modes.
-#
-get_groups() {
-	ugroups="$defaultgroups"
-	_input=
-	_group=${ulogingroup:-"${username}"}
-
-	if [ -z "$configflag" ]; then
-		[ -z "$fflag" ] && echo -n "Login group is $_group. Invite $username"
-		[ -z "$fflag" ] && echo -n " into other groups? [$ugroups]: "
-	else
-		[ -z "$fflag" ] && echo -n "Enter additional groups [$ugroups]: "
-	fi
-	read _input
-
-	[ -n "$_input" ] && ugroups="$_input"
-}
-
-# get_expire_dates
-#	Read expiry information for the account and also for the password. This
-#	routine is used only from batch processing mode.
-#
-get_expire_dates() {
-	upwexpire="`echo "$fileline" | cut -f5 -d:`"
-	uexpire="`echo "$fileline" | cut -f6 -d:`"
-}
-
-# get_password
-#	Read the password in batch processing mode. The password field matters
-#	only when the password type is "yes" or "random". If the field is empty and the
-#	password type is "yes", then it assumes the account has an empty passsword
-#	and changes the password type accordingly. If the password type is "random"
-#	and the password field is NOT empty, then it assumes the account will NOT
-#	have a random password and set passwdtype to "yes."
-#
-get_password() {
-	# We may temporarily change a password type. Make sure it's changed
-	# back to whatever it was before we process the next account.
-	#
-	[ -n "$savedpwtype" ] && {
-		passwdtype=$savedpwtype
-		savedpwtype=
-	}
-
-	# There may be a ':' in the password
-	upass=${fileline#*:*:*:*:*:*:*:*:*:}
-
-	if [ -z "$upass" ]; then
-		case $passwdtype in
-		yes)
-			# if it's empty, assume an empty password
-			passwdtype=none
-			savedpwtype=yes
-			;;
-		esac
-	else
-		case $passwdtype in
-		random)
-			passwdtype=yes
-			savedpwtype=random
-			;;
-		esac
-	fi
-}
-
-# input_from_file
-#	Reads a line of account information from standard input and
-#	adds it to the user database.
-#
-input_from_file() {
-	_field=
-
-	while read -r fileline ; do
-		case "$fileline" in
-		\#*|'')
-			return 0
-			;;
-		esac
-
-		get_user || continue
-		get_gecos
-		get_uid
-		get_logingroup
-		get_class
-		get_shell
-		get_homedir
-		get_password
-		get_expire_dates
-
-		add_user
-	done
-}
-
-# input_interactive
-#	Prompts for user information interactively, and commits to
-#	the user database.
-#
-input_interactive() {
-
-	_disable=
-	_pass=
-	_passconfirm=
-	_random="no"
-	_emptypass="no"
-	_usepass="yes"
-	_logingroup_ok="no"
-	_groups_ok="no"
-	case $passwdtype in
-	none)
-		_emptypass="yes"
-		_usepass="yes"
-		;;
-	no)
-		_usepass="no"
-		;;
-	random)
-		_random="yes"
-		;;
-	esac
-
-	get_user
-	get_gecos
-	get_uid
-
-	# The case where group = user is handled elsewhere, so
-	# validate any other groups the user is invited to.
-	until [ "$_logingroup_ok" = yes ]; do
-		get_logingroup
-		_logingroup_ok=yes
-		if [ -n "$ulogingroup" -a "$username" != "$ulogingroup" ]; then
-			if ! ${PWCMD} show group $ulogingroup > /dev/null 2>&1; then
-				echo "Group $ulogingroup does not exist!"
-				_logingroup_ok=no
-			fi
-		fi
-	done
-	until [ "$_groups_ok" = yes ]; do
-		get_groups
-		_groups_ok=yes
-		for i in $ugroups; do
-			if [ "$username" != "$i" ]; then
-				if ! ${PWCMD} show group $i > /dev/null 2>&1; then
-					echo "Group $i does not exist!"
-					_groups_ok=no
-				fi
-			fi
-		done
-	done
-
-	get_class
-	get_shell
-	get_homedir
-
-	while : ; do
-		echo -n "Use password-based authentication? [$_usepass]: "
-		read _input
-		[ -z "$_input" ] && _input=$_usepass
-		case $_input in
-		[Nn][Oo]|[Nn])
-			passwdtype="no"
-			;;
-		[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
-			while : ; do
-				echo -n "Use an empty password? (yes/no) [$_emptypass]: "
-				read _input
-				[ -n "$_input" ] && _emptypass=$_input
-				case $_emptypass in
-				[Nn][Oo]|[Nn])
-					echo -n "Use a random password? (yes/no) [$_random]: "
-					read _input
-					[ -n "$_input" ] && _random="$_input"
-					case $_random in
-					[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
-						passwdtype="random"
-						break
-						;;
-					esac
-					passwdtype="yes"
-					[ -n "$configflag" ] && break
-					trap 'stty echo; exit' 0 1 2 3 15
-					stty -echo
-					echo -n "Enter password: "
-					read -r upass
-					echo''
-					echo -n "Enter password again: "
-					read -r _passconfirm
-					echo ''
-					stty echo
-					# if user entered a blank password
-					# explicitly ask again.
-					[ -z "$upass" -a -z "$_passconfirm" ] \
-					    && continue
-					;;
-				[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
-					passwdtype="none"
-					break;
-					;;
-				*)
-					# invalid answer; repeat the loop
-					continue
-					;;
-				esac
-				if [ "$upass" != "$_passconfirm" ]; then
-					echo "Passwords did not match!"
-					continue
-				fi
-				break
-			done
-			;;
-		*)
-			# invalid answer; repeat loop
-			continue
-			;;
-		esac
-		break;
-	done
-	_disable=${disableflag:-"no"}
-	while : ; do
-		echo -n "Lock out the account after creation? [$_disable]: "
-		read _input
-		[ -z "$_input" ] && _input=$_disable
-		case $_input in
-		[Nn][Oo]|[Nn])
-			disableflag=
-			;;
-		[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
-			disableflag=yes
-			;;
-		*)
-			# invalid answer; repeat loop
-			continue
-			;;
-		esac
-		break
-	done
-	
-	# Display the information we have so far and prompt to
-	# commit it.
-	#
-	_disable=${disableflag:-"no"}
-	[ -z "$configflag" ] && printf "%-10s : %s\n" Username $username
-	case $passwdtype in
-	yes)
-		_pass='*****'
-		;;
-	no)
-		_pass='<disabled>'
-		;;
-	none)
-		_pass='<blank>'
-		;;
-	random)
-		_pass='<random>'
-		;;
-	esac
-	[ -z "$configflag" ] && printf "%-10s : %s\n" "Password" "$_pass"
-	[ -n "$configflag" ] && printf "%-10s : %s\n" "Pass Type" "$passwdtype"
-	[ -z "$configflag" ] && printf "%-10s : %s\n" "Full Name" "$ugecos"
-	[ -z "$configflag" ] && printf "%-10s : %s\n" "Uid" "$uuid"
-	printf "%-10s : %s\n" "Class" "$uclass"
-	printf "%-10s : %s %s\n" "Groups" "${ulogingroup:-$username}" "$ugroups"
-	printf "%-10s : %s\n" "Home" "$uhome"
-	printf "%-10s : %s\n" "Shell" "$ushell"
-	printf "%-10s : %s\n" "Locked" "$_disable"
-	while : ; do
-		echo -n "OK? (yes/no): "
-		read _input
-		case $_input in
-		[Nn][Oo]|[Nn])
-			return 1
-			;;
-		[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
-			add_user
-			;;
-		*)
-			continue
-			;;
-		esac
-		break
-	done
-	return 0
-}
-
-#### END SUBROUTINE DEFENITION ####
-
-THISCMD=`/usr/bin/basename $0`
-DEFAULTSHELL=/bin/sh
-ADDUSERCONF="${ADDUSERCONF:-/etc/adduser.conf}"
-PWCMD="${PWCMD:-/usr/sbin/pw}"
-MAILCMD="${MAILCMD:-mail}"
-ETCSHELLS="${ETCSHELLS:-/etc/shells}"
-NOHOME="/nonexistent"
-NOLOGIN="nologin"
-NOLOGIN_PATH="/usr/sbin/nologin"
-GREPCMD="/usr/bin/grep"
-DATECMD="/bin/date"
-
-# Set default values
-#
-username=
-uuid=
-uidstart=
-ugecos=
-ulogingroup=
-uclass=
-uhome=
-upass=
-ushell=
-udotdir=/usr/share/skel
-ugroups=
-uexpire=
-upwexpire=
-shells="`valid_shells`"
-passwdtype="yes"
-msgfile=/etc/adduser.msg
-msgflag=
-quietflag=
-configflag=
-fflag=
-infile=
-disableflag=
-Dflag=
-Sflag=
-readconfig="yes"
-homeprefix="/home"
-randompass=
-fileline=
-savedpwtype=
-defaultclass=
-defaultLgroup=
-defaultgroups=wheel
-defaultshell="${DEFAULTSHELL}"
-
-# Make sure the user running this program is root. This isn't a security
-# measure as much as it is a usefull method of reminding the user to
-# 'su -' before he/she wastes time entering data that won't be saved.
-#
-procowner=${procowner:-`/usr/bin/id -u`}
-if [ "$procowner" != "0" ]; then
-	err 'you must be the super-user (uid 0) to use this utility.'
-	exit 1
-fi
-
-# Overide from our conf file
-# Quickly go through the commandline line to see if we should read
-# from our configuration file. The actual parsing of the commandline
-# arguments happens after we read in our configuration file (commandline
-# should override configuration file).
-#
-for _i in $* ; do
-	if [ "$_i" = "-N" ]; then
-		readconfig=
-		break;
-	fi
-done
-if [ -n "$readconfig" ]; then
-	# On a long-lived system, the first time this script is run it
-	# will barf upon reading the configuration file for its perl predecessor.
-	if ( . ${ADDUSERCONF} > /dev/null 2>&1 ); then
-		[ -r ${ADDUSERCONF} ] && . ${ADDUSERCONF} > /dev/null 2>&1
-	fi
-fi 
-
-# Proccess command-line options
-#
-for _switch ; do
-	case $_switch in
-	-L)
-		defaultclass="$2"
-		shift; shift
-		;;
-	-C)
-		configflag=yes
-		shift
-		;;
-	-D)
-		Dflag=yes
-		shift
-		;;
-	-E)
-		disableflag=yes
-		shift
-		;;
-	-k)
-		udotdir="$2"
-		shift; shift
-		;;
-	-f)
-		[ "$2" != "-" ] && infile="$2"
-		fflag=yes
-		shift; shift
-		;;
-	-g)
-		defaultLgroup="$2"
-		shift; shift
-		;;
-	-G)
-		defaultgroups="$2"
-		shift; shift
-		;;
-	-h)
-		show_usage
-		exit 0
-		;;
-	-d)
-		homeprefix="$2"
-		shift; shift
-		;;
-	-m)
-		case "$2" in
-		[Nn][Oo])
-			msgflag=
-			;;
-		*)
-			msgflag=yes
-			msgfile="$2"
-			;;
-		esac
-		shift; shift
-		;;
-	-N)
-		readconfig=
-		shift
-		;;
-	-w)
-		case "$2" in
-		no|none|random|yes)
-			passwdtype=$2
-			;;
-		*)
-			show_usage
-			exit 1
-			;;
-		esac
-		shift; shift
-		;;
-	-q)
-		quietflag=yes
-		shift
-		;;
-	-s)
-		defaultshell="`fullpath_from_shell $2`"
-		shift; shift
-		;;
-	-S)
-		Sflag=yes
-		shift
-		;;
-	-u)
-		uidstart=$2
-		shift; shift
-		;;
-	esac
-done
-
-# If the -f switch was used, get input from a file. Otherwise,
-# this is an interactive session.
-#
-if [ -n "$fflag" ]; then
-	if [ -z "$infile" ]; then
-		input_from_file
-	elif [ -n "$infile" ]; then
-		if [ -r "$infile" ]; then
-			input_from_file < $infile
-		else
-			err "File ($infile) is unreadable or does not exist."
-		fi
-	fi
-else
-	input_interactive
-	while : ; do
-		#if [ -z "$configflag" ]; then
-		#	echo -n "Add another user? (yes/no): "
-		#else
-		#	echo -n "Re-edit the default configuration? (yes/no): "
-		#fi
-		#read _input
-		#case $_input in
-		#[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
-		#	uidstart=`get_nextuid $uidstart`
-		#	input_interactive
-		#	continue
-		#	;;
-		#[Nn][Oo]|[Nn])
-		#	echo "Goodbye!"
-		#	;;
-		#*)
-		#	continue
-		#	;;
-		#esac
-		break
-	done
-
-echo $username > /tmp/uname
-return 0
-
-fi
+#!/bin/sh
+#
+# Copyright (c) 2002-2004 Michael Telahun Makonnen. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#       Email: Mike Makonnen <mtm at FreeBSD.Org>
+#
+# $FreeBSD: src/usr.sbin/adduser/adduser.sh,v 1.23.2.2 2004/09/24 14:18:16 roam Exp $
+#
+
+# err msg
+#       Display $msg on stderr, unless we're being quiet.
+# 
+err() {
+	if [ -z "$quietflag" ]; then
+        	echo 1>&2 ${THISCMD}: ERROR: $*
+	fi
+}
+
+# info msg
+#       Display $msg on stdout, unless we're being quiet.
+# 
+info() {
+	if [ -z "$quietflag" ]; then
+        	echo ${THISCMD}: INFO: $*
+	fi
+}
+
+# get_nextuid
+#	Output the value of $_uid if it is available for use. If it
+#	is not, output the value of the next higher uid that is available.
+#	If a uid is not specified, output the first available uid, as indicated
+#	by pw(8).
+# 
+get_nextuid () {
+	_uid=$1
+	_nextuid=
+
+	if [ -z "$_uid" ]; then
+		_nextuid="`${PWCMD} usernext | cut -f1 -d:`"
+	else
+		while : ; do
+			${PWCMD} usershow $_uid > /dev/null 2>&1
+			if [ ! "$?" -eq 0 ]; then
+				_nextuid=$_uid
+				break
+			fi
+			_uid=$(($_uid + 1))
+		done
+	fi
+	echo $_nextuid
+}
+
+# show_usage
+#	Display usage information for this utility.
+#
+show_usage() {
+	echo "usage: ${THISCMD} [options]"
+	echo "  options may include:"
+	echo "  -C		save to the configuration file only"
+	echo "  -D		do not attempt to create the home directory"
+	echo "  -E		disable this account after creation"
+	echo "  -G		additional groups to add accounts to"
+	echo "  -L		login class of the user"
+	echo "  -N		do not read configuration file"
+	echo "  -S		a nonexistent shell is not an error"
+	echo "  -d		home directory"
+	echo "  -f		file from which input will be received"
+	echo "  -g		default login group"
+	echo "  -h		display this usage message"
+	echo "  -k		path to skeleton home directory"
+	echo "  -m		user welcome message file"
+	echo "  -q		absolute minimal user feedback"
+	echo "  -s		shell"
+	echo "  -u		uid to start at"
+	echo "  -w		password type: no, none, yes or random"
+}
+
+# valid_shells
+#	Outputs a list of valid shells from /etc/shells. Only the
+#	basename of the shell is output.
+#
+valid_shells() {
+	_prefix=
+	cat ${ETCSHELLS} |
+	while read _path _junk ; do
+		case $_path in
+		\#*|'')
+			;;
+		*)
+			echo -n "${_prefix}`basename $_path`"
+			_prefix=' '
+			;;
+		esac
+	done
+
+	# /usr/sbin/nologin is a special case
+	[ -x "${NOLOGIN_PATH}" ] && echo -n " ${NOLOGIN}"
+}
+
+# fullpath_from_shell shell
+#	Given $shell, which is either the full path to a shell or
+#	the basename component of a valid shell, get the
+#	full path to the shell from the /etc/shells file.
+#
+fullpath_from_shell() {
+	_shell=$1
+	[ -z "$_shell" ] && return 1
+
+	# /usr/sbin/nologin is a special case; it needs to be handled
+	# before the cat | while loop, since a 'return' from within
+	# a subshell will not terminate the function's execution, and
+	# the path to the nologin shell might be printed out twice.
+	#
+	if [ "$_shell" = "${NOLOGIN}" -o \
+	    "$_shell" = "${NOLOGIN_PATH}" ]; then
+		echo ${NOLOGIN_PATH}
+		return 0;
+	fi
+
+	cat ${ETCSHELLS} |
+	while read _path _junk ; do
+		case "$_path" in
+		\#*|'')
+			;;
+		*)
+			if [ "$_path" = "$_shell" -o \
+			    "`basename $_path`" = "$_shell" ]; then
+				echo $_path
+				return 0
+			fi
+			;;
+		esac
+	done
+
+	return 1
+}
+
+# shell_exists shell
+#	If the given shell is listed in ${ETCSHELLS} or it is
+#	the nologin shell this function will return 0.
+#	Otherwise, it will return 1. If shell is valid but
+#	the path is invalid or it is not executable it
+#	will emit an informational message saying so.
+#
+shell_exists()
+{
+	_sh="$1"
+	_shellchk="${GREPCMD} '^$_sh$' ${ETCSHELLS} > /dev/null 2>&1"
+
+	if ! eval $_shellchk; then
+		# The nologin shell is not listed in /etc/shells.
+		if [ "$_sh" != "${NOLOGIN_PATH}" ]; then
+			err "Invalid shell ($_sh) for user $username."
+			return 1
+		fi
+	fi
+	! [ -x "$_sh" ] &&
+	    info "The shell ($_sh) does not exist or is not executable."
+
+	return 0
+}
+
+# save_config
+#	Save some variables to a configuration file.
+#	Note: not all script variables are saved, only those that
+#	      it makes sense to save.
+#
+save_config() {
+	echo "# Configuration file for adduser(8)."     >  ${ADDUSERCONF}
+	echo "# NOTE: only *some* variables are saved." >> ${ADDUSERCONF}
+	echo "# Last Modified on `${DATECMD}`."		>> ${ADDUSERCONF}
+	echo ''				>> ${ADDUSERCONF}
+	echo "defaultLgroup=$ulogingroup" >> ${ADDUSERCONF}
+	echo "defaultclass=$uclass"	>> ${ADDUSERCONF}
+	echo "defaultgroups=$ugroups"	>> ${ADDUSERCONF}
+	echo "passwdtype=$passwdtype" 	>> ${ADDUSERCONF}
+	echo "homeprefix=$homeprefix" 	>> ${ADDUSERCONF}
+	echo "defaultshell=$ushell"	>> ${ADDUSERCONF}
+	echo "udotdir=$udotdir"		>> ${ADDUSERCONF}
+	echo "msgfile=$msgfile"		>> ${ADDUSERCONF}
+	echo "disableflag=$disableflag" >> ${ADDUSERCONF}
+}
+
+# add_user
+#	Add a user to the user database. If the user chose to send a welcome
+#	message or lock the account, do so.
+#
+add_user() {
+
+	# Is this a configuration run? If so, don't modify user database.
+	#
+	if [ -n "$configflag" ]; then
+		save_config
+		return
+	fi
+
+	_uid=
+	_name=
+	_comment=
+	_gecos=
+	_home=
+	_group=
+	_grouplist=
+	_shell=
+	_class=
+	_dotdir=
+	_expire=
+	_pwexpire=
+	_passwd=
+	_upasswd=
+	_passwdmethod=
+
+	_name="-n '$username'"
+	[ -n "$uuid" ] && _uid='-u "$uuid"'
+	[ -n "$ulogingroup" ] && _group='-g "$ulogingroup"'
+	[ -n "$ugroups" ] && _grouplist='-G "$ugroups"'
+	[ -n "$ushell" ] && _shell='-s "$ushell"'
+	[ -n "$uclass" ] && _class='-L "$uclass"'
+	[ -n "$ugecos" ] && _comment='-c "$ugecos"'
+	[ -n "$udotdir" ] && _dotdir='-k "$udotdir"'
+	[ -n "$uexpire" ] && _expire='-e "$uexpire"'
+	[ -n "$upwexpire" ] && _pwexpire='-p "$upwexpire"'
+	if [ -z "$Dflag" -a -n "$uhome" ]; then
+		# The /nonexistent home directory is special. It
+		# means the user has no home directory.
+		if [ "$uhome" = "$NOHOME" ]; then
+			_home='-d "$uhome"'
+		else
+			_home='-m -d "$uhome"'
+		fi
+	elif [ -n "$Dflag" -a -n "$uhome" ]; then
+		_home='-d "$uhome"'
+	fi
+	case $passwdtype in
+	no)
+		_passwdmethod="-w no"
+		_passwd="-h -"
+		;;
+	yes)
+		# Note on processing the password: The outer double quotes
+		# make literal everything except ` and \ and $.
+		# The outer single quotes make literal ` and $.
+		# We can ensure the \ isn't treated specially by specifying
+		# the -r switch to the read command used to obtain the input.
+		#
+		_passwdmethod="-w yes"
+		_passwd="-h 0"
+		_upasswd='echo "$upass" |'
+		;;
+	none)
+		_passwdmethod="-w none"
+		;;
+	random)
+		_passwdmethod="-w random"
+		;;
+	esac
+
+	_pwcmd="$_upasswd ${PWCMD} useradd $_uid $_name $_group $_grouplist $_comment"
+	_pwcmd="$_pwcmd $_shell $_class $_home $_dotdir $_passwdmethod $_passwd"
+	_pwcmd="$_pwcmd $_expire $_pwexpire"
+
+	if ! _output=`eval $_pwcmd` ; then
+		err "There was an error adding user ($username)."
+		return 1
+	else
+		info "Successfully added ($username) to the user database."
+		if [ "random" = "$passwdtype" ]; then
+			randompass="$_output"
+			info "Password for ($username) is: $randompass"
+		fi
+	fi
+
+	if [ -n "$disableflag" ]; then
+		if ${PWCMD} lock $username ; then
+			info "Account ($username) is locked."
+		else
+			info "Account ($username) could NOT be locked."
+		fi
+	fi
+
+	_line=
+	_owner=
+	_perms=
+	if [ -n "$msgflag" ]; then
+		[ -r "$msgfile" ] && {
+			# We're evaluating the contents of an external file.
+			# Let's not open ourselves up for attack. _perms will
+			# be empty if it's writeable only by the owner. _owner
+			# will *NOT* be empty if the file is owned by root.
+			#
+			_dir="`dirname $msgfile`"
+			_file="`basename $msgfile`"
+			_perms=`/usr/bin/find $_dir -name $_file -perm +07022 -prune`
+			_owner=`/usr/bin/find $_dir -name $_file -user 0 -prune`
+			if [ -z "$_owner" -o -n "$_perms" ]; then
+				err "The message file ($msgfile) may be writeable only by root."
+				return 1
+			fi
+			cat "$msgfile" |
+			while read _line ; do
+				eval echo "$_line"
+			done | ${MAILCMD} -s"Welcome" ${username}
+			info "Sent welcome message to ($username)."
+		}
+	fi
+}
+
+# get_user
+#	Reads username of the account from standard input or from a global
+#	variable containing an account line from a file. The username is
+#	required. If this is an interactive session it will prompt in
+#	a loop until a username is entered. If it is batch processing from
+#	a file it will output an error message and return to the caller.
+#
+get_user() {
+	_input=
+
+	# No need to take down user names if this is a configuration saving run.
+	[ -n "$configflag" ] && return
+
+	while : ; do
+		if [ -z "$fflag" ]; then
+			echo -n "Username: "
+			read _input
+		else
+			_input="`echo "$fileline" | cut -f1 -d:`"
+		fi
+
+		# There *must* be a username. If this is an interactive
+		# session give the user an opportunity to retry.
+		#
+		if [ -z "$_input" ]; then
+			err "You must enter a username!"
+			[ -z "$fflag" ] && continue
+		fi
+		break
+	done
+	username="$_input"
+}
+
+# get_gecos
+#	Reads extra information about the user. Can be used both in interactive
+#	and batch (from file) mode.
+#
+get_gecos() {
+	_input=
+
+	# No need to take down additional user information for a configuration run.
+	[ -n "$configflag" ] && return
+
+	if [ -z "$fflag" ]; then
+		echo -n "Full name: "
+		read _input
+	else
+		_input="`echo "$fileline" | cut -f7 -d:`"
+	fi
+	ugecos="$_input"
+}
+
+# get_shell
+#	Get the account's shell. Works in interactive and batch mode. It
+#	accepts either the base name of the shell or the full path.
+#	If an invalid shell is entered it will simply use the default shell.
+#
+get_shell() {
+	_input=
+	_fullpath=
+	ushell="$defaultshell"
+
+	# Make sure the current value of the shell is a valid one
+	if [ -z "$Sflag" ]; then
+		if ! shell_exists $ushell ; then
+			info "Using default shell ${defaultshell}."
+			ushell="$defaultshell"
+		fi
+	fi
+
+	if [ -z "$fflag" ]; then
+		echo -n "Shell ($shells) [`basename $ushell`]: "
+		read _input
+	else
+		_input="`echo "$fileline" | cut -f9 -d:`"
+	fi
+	if [ -n "$_input" ]; then
+		if [ -n "$Sflag" ]; then
+			ushell="$_input"
+		else
+			_fullpath=`fullpath_from_shell $_input`
+			if [ -n "$_fullpath" ]; then
+				ushell="$_fullpath"
+			else
+				err "Invalid shell ($_input) for user $username."
+				info "Using default shell ${defaultshell}."
+				ushell="$defaultshell"
+			fi
+		fi
+	fi
+}
+
+# get_homedir
+#	Reads the account's home directory. Used both with interactive input
+#	and batch input.
+#
+get_homedir() {
+	_input=
+	if [ -z "$fflag" ]; then
+		echo -n "Home directory [${homeprefix}/${username}]: "
+		read _input
+	else
+		_input="`echo "$fileline" | cut -f8 -d:`"
+	fi
+
+	if [ -n "$_input" ]; then
+		uhome="$_input"
+		# if this is a configuration run, then user input is the home
+		# directory prefix. Otherwise it is understood to
+		# be $prefix/$user
+		#
+		[ -z "$configflag" ] && homeprefix="`dirname $uhome`" || homeprefix="$uhome"
+	else
+		uhome="${homeprefix}/${username}"
+	fi
+}
+
+# get_uid
+#	Reads a numeric userid in an interactive or batch session. Automatically
+#	allocates one if it is not specified.
+#
+get_uid() {
+	uuid=${uidstart}
+	_input=
+	_prompt=
+
+	# No need to take down uids for a configuration saving run.
+	[ -n "$configflag" ] && return
+
+	if [ -n "$uuid" ]; then
+		_prompt="Uid [$uuid]: "
+	else
+		_prompt="Uid (Leave empty for default): "
+	fi
+	if [ -z "$fflag" ]; then
+		echo -n "$_prompt"
+		read _input
+	else
+		_input="`echo "$fileline" | cut -f2 -d:`"
+	fi
+
+	[ -n "$_input" ] && uuid=$_input
+	uuid=`get_nextuid $uuid`
+	uidstart=$uuid
+}
+
+# get_class
+#	Reads login class of account. Can be used in interactive or batch mode.
+#
+get_class() {
+	uclass="$defaultclass"
+	_input=
+	_class=${uclass:-"default"}
+
+	if [ -z "$fflag" ]; then
+		echo -n "Login class [$_class]: "
+		read _input
+	else
+		_input="`echo "$fileline" | cut -f4 -d:`"
+	fi
+
+	[ -n "$_input" ] && uclass="$_input"
+}
+
+# get_logingroup
+#	Reads user's login group. Can be used in both interactive and batch
+#	modes. The specified value can be a group name or its numeric id.
+#	This routine leaves the field blank if nothing is provided and
+#	a default login group has not been set. The pw(8) command
+#	will then provide a login group with the same name as the username.
+#
+get_logingroup() {
+	ulogingroup="$defaultLgroup"
+	_input=
+
+	if [ -z "$fflag" ]; then
+		echo -n "Login group [${ulogingroup:-$username}]: "
+		read _input
+	else
+		_input="`echo "$fileline" | cut -f3 -d:`"
+	fi
+
+	# Pw(8) will use the username as login group if it's left empty
+	[ -n "$_input" ] && ulogingroup="$_input"
+}
+
+# get_groups
+#	Read additional groups for the user. It can be used in both interactive
+#	and batch modes.
+#
+get_groups() {
+	ugroups="$defaultgroups"
+	_input=
+	_group=${ulogingroup:-"${username}"}
+
+	if [ -z "$configflag" ]; then
+		[ -z "$fflag" ] && echo -n "Login group is $_group. Invite $username"
+		[ -z "$fflag" ] && echo -n " into other groups? [$ugroups]: "
+	else
+		[ -z "$fflag" ] && echo -n "Enter additional groups [$ugroups]: "
+	fi
+	read _input
+
+	[ -n "$_input" ] && ugroups="$_input"
+}
+
+# get_expire_dates
+#	Read expiry information for the account and also for the password. This
+#	routine is used only from batch processing mode.
+#
+get_expire_dates() {
+	upwexpire="`echo "$fileline" | cut -f5 -d:`"
+	uexpire="`echo "$fileline" | cut -f6 -d:`"
+}
+
+# get_password
+#	Read the password in batch processing mode. The password field matters
+#	only when the password type is "yes" or "random". If the field is empty and the
+#	password type is "yes", then it assumes the account has an empty passsword
+#	and changes the password type accordingly. If the password type is "random"
+#	and the password field is NOT empty, then it assumes the account will NOT
+#	have a random password and set passwdtype to "yes."
+#
+get_password() {
+	# We may temporarily change a password type. Make sure it's changed
+	# back to whatever it was before we process the next account.
+	#
+	[ -n "$savedpwtype" ] && {
+		passwdtype=$savedpwtype
+		savedpwtype=
+	}
+
+	# There may be a ':' in the password
+	upass=${fileline#*:*:*:*:*:*:*:*:*:}
+
+	if [ -z "$upass" ]; then
+		case $passwdtype in
+		yes)
+			# if it's empty, assume an empty password
+			passwdtype=none
+			savedpwtype=yes
+			;;
+		esac
+	else
+		case $passwdtype in
+		random)
+			passwdtype=yes
+			savedpwtype=random
+			;;
+		esac
+	fi
+}
+
+# input_from_file
+#	Reads a line of account information from standard input and
+#	adds it to the user database.
+#
+input_from_file() {
+	_field=
+
+	while read -r fileline ; do
+		case "$fileline" in
+		\#*|'')
+			return 0
+			;;
+		esac
+
+		get_user || continue
+		get_gecos
+		get_uid
+		get_logingroup
+		get_class
+		get_shell
+		get_homedir
+		get_password
+		get_expire_dates
+
+		add_user
+	done
+}
+
+# input_interactive
+#	Prompts for user information interactively, and commits to
+#	the user database.
+#
+input_interactive() {
+
+	_disable=
+	_pass=
+	_passconfirm=
+	_random="no"
+	_emptypass="no"
+	_usepass="yes"
+	_logingroup_ok="no"
+	_groups_ok="no"
+	case $passwdtype in
+	none)
+		_emptypass="yes"
+		_usepass="yes"
+		;;
+	no)
+		_usepass="no"
+		;;
+	random)
+		_random="yes"
+		;;
+	esac
+
+	get_user
+	get_gecos
+	get_uid
+
+	# The case where group = user is handled elsewhere, so
+	# validate any other groups the user is invited to.
+	until [ "$_logingroup_ok" = yes ]; do
+		get_logingroup
+		_logingroup_ok=yes
+		if [ -n "$ulogingroup" -a "$username" != "$ulogingroup" ]; then
+			if ! ${PWCMD} show group $ulogingroup > /dev/null 2>&1; then
+				echo "Group $ulogingroup does not exist!"
+				_logingroup_ok=no
+			fi
+		fi
+	done
+	until [ "$_groups_ok" = yes ]; do
+		get_groups
+		_groups_ok=yes
+		for i in $ugroups; do
+			if [ "$username" != "$i" ]; then
+				if ! ${PWCMD} show group $i > /dev/null 2>&1; then
+					echo "Group $i does not exist!"
+					_groups_ok=no
+				fi
+			fi
+		done
+	done
+
+	get_class
+	get_shell
+	get_homedir
+
+	while : ; do
+		echo -n "Use password-based authentication? [$_usepass]: "
+		read _input
+		[ -z "$_input" ] && _input=$_usepass
+		case $_input in
+		[Nn][Oo]|[Nn])
+			passwdtype="no"
+			;;
+		[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
+			while : ; do
+				echo -n "Use an empty password? (yes/no) [$_emptypass]: "
+				read _input
+				[ -n "$_input" ] && _emptypass=$_input
+				case $_emptypass in
+				[Nn][Oo]|[Nn])
+					echo -n "Use a random password? (yes/no) [$_random]: "
+					read _input
+					[ -n "$_input" ] && _random="$_input"
+					case $_random in
+					[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
+						passwdtype="random"
+						break
+						;;
+					esac
+					passwdtype="yes"
+					[ -n "$configflag" ] && break
+					trap 'stty echo; exit' 0 1 2 3 15
+					stty -echo
+					echo -n "Enter password: "
+					read -r upass
+					echo''
+					echo -n "Enter password again: "
+					read -r _passconfirm
+					echo ''
+					stty echo
+					# if user entered a blank password
+					# explicitly ask again.
+					[ -z "$upass" -a -z "$_passconfirm" ] \
+					    && continue
+					;;
+				[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
+					passwdtype="none"
+					break;
+					;;
+				*)
+					# invalid answer; repeat the loop
+					continue
+					;;
+				esac
+				if [ "$upass" != "$_passconfirm" ]; then
+					echo "Passwords did not match!"
+					continue
+				fi
+				break
+			done
+			;;
+		*)
+			# invalid answer; repeat loop
+			continue
+			;;
+		esac
+		break;
+	done
+	_disable=${disableflag:-"no"}
+	while : ; do
+		echo -n "Lock out the account after creation? [$_disable]: "
+		read _input
+		[ -z "$_input" ] && _input=$_disable
+		case $_input in
+		[Nn][Oo]|[Nn])
+			disableflag=
+			;;
+		[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
+			disableflag=yes
+			;;
+		*)
+			# invalid answer; repeat loop
+			continue
+			;;
+		esac
+		break
+	done
+	
+	# Display the information we have so far and prompt to
+	# commit it.
+	#
+	_disable=${disableflag:-"no"}
+	[ -z "$configflag" ] && printf "%-10s : %s\n" Username $username
+	case $passwdtype in
+	yes)
+		_pass='*****'
+		;;
+	no)
+		_pass='<disabled>'
+		;;
+	none)
+		_pass='<blank>'
+		;;
+	random)
+		_pass='<random>'
+		;;
+	esac
+	[ -z "$configflag" ] && printf "%-10s : %s\n" "Password" "$_pass"
+	[ -n "$configflag" ] && printf "%-10s : %s\n" "Pass Type" "$passwdtype"
+	[ -z "$configflag" ] && printf "%-10s : %s\n" "Full Name" "$ugecos"
+	[ -z "$configflag" ] && printf "%-10s : %s\n" "Uid" "$uuid"
+	printf "%-10s : %s\n" "Class" "$uclass"
+	printf "%-10s : %s %s\n" "Groups" "${ulogingroup:-$username}" "$ugroups"
+	printf "%-10s : %s\n" "Home" "$uhome"
+	printf "%-10s : %s\n" "Shell" "$ushell"
+	printf "%-10s : %s\n" "Locked" "$_disable"
+	while : ; do
+		echo -n "OK? (yes/no): "
+		read _input
+		case $_input in
+		[Nn][Oo]|[Nn])
+			return 1
+			;;
+		[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
+			add_user
+			;;
+		*)
+			continue
+			;;
+		esac
+		break
+	done
+	return 0
+}
+
+#### END SUBROUTINE DEFENITION ####
+
+THISCMD=`/usr/bin/basename $0`
+DEFAULTSHELL=/bin/sh
+ADDUSERCONF="${ADDUSERCONF:-/etc/adduser.conf}"
+PWCMD="${PWCMD:-/usr/sbin/pw}"
+MAILCMD="${MAILCMD:-mail}"
+ETCSHELLS="${ETCSHELLS:-/etc/shells}"
+NOHOME="/nonexistent"
+NOLOGIN="nologin"
+NOLOGIN_PATH="/usr/sbin/nologin"
+GREPCMD="/usr/bin/grep"
+DATECMD="/bin/date"
+
+# Set default values
+#
+username=
+uuid=
+uidstart=
+ugecos=
+ulogingroup=
+uclass=
+uhome=
+upass=
+ushell=
+udotdir=/usr/share/skel
+ugroups=
+uexpire=
+upwexpire=
+shells="`valid_shells`"
+passwdtype="yes"
+msgfile=/etc/adduser.msg
+msgflag=
+quietflag=
+configflag=
+fflag=
+infile=
+disableflag=
+Dflag=
+Sflag=
+readconfig="yes"
+homeprefix="/home"
+randompass=
+fileline=
+savedpwtype=
+defaultclass=
+defaultLgroup=
+defaultgroups=wheel
+defaultshell="${DEFAULTSHELL}"
+
+# Make sure the user running this program is root. This isn't a security
+# measure as much as it is a usefull method of reminding the user to
+# 'su -' before he/she wastes time entering data that won't be saved.
+#
+procowner=${procowner:-`/usr/bin/id -u`}
+if [ "$procowner" != "0" ]; then
+	err 'you must be the super-user (uid 0) to use this utility.'
+	exit 1
+fi
+
+# Overide from our conf file
+# Quickly go through the commandline line to see if we should read
+# from our configuration file. The actual parsing of the commandline
+# arguments happens after we read in our configuration file (commandline
+# should override configuration file).
+#
+for _i in $* ; do
+	if [ "$_i" = "-N" ]; then
+		readconfig=
+		break;
+	fi
+done
+if [ -n "$readconfig" ]; then
+	# On a long-lived system, the first time this script is run it
+	# will barf upon reading the configuration file for its perl predecessor.
+	if ( . ${ADDUSERCONF} > /dev/null 2>&1 ); then
+		[ -r ${ADDUSERCONF} ] && . ${ADDUSERCONF} > /dev/null 2>&1
+	fi
+fi 
+
+# Proccess command-line options
+#
+for _switch ; do
+	case $_switch in
+	-L)
+		defaultclass="$2"
+		shift; shift
+		;;
+	-C)
+		configflag=yes
+		shift
+		;;
+	-D)
+		Dflag=yes
+		shift
+		;;
+	-E)
+		disableflag=yes
+		shift
+		;;
+	-k)
+		udotdir="$2"
+		shift; shift
+		;;
+	-f)
+		[ "$2" != "-" ] && infile="$2"
+		fflag=yes
+		shift; shift
+		;;
+	-g)
+		defaultLgroup="$2"
+		shift; shift
+		;;
+	-G)
+		defaultgroups="$2"
+		shift; shift
+		;;
+	-h)
+		show_usage
+		exit 0
+		;;
+	-d)
+		homeprefix="$2"
+		shift; shift
+		;;
+	-m)
+		case "$2" in
+		[Nn][Oo])
+			msgflag=
+			;;
+		*)
+			msgflag=yes
+			msgfile="$2"
+			;;
+		esac
+		shift; shift
+		;;
+	-N)
+		readconfig=
+		shift
+		;;
+	-w)
+		case "$2" in
+		no|none|random|yes)
+			passwdtype=$2
+			;;
+		*)
+			show_usage
+			exit 1
+			;;
+		esac
+		shift; shift
+		;;
+	-q)
+		quietflag=yes
+		shift
+		;;
+	-s)
+		defaultshell="`fullpath_from_shell $2`"
+		shift; shift
+		;;
+	-S)
+		Sflag=yes
+		shift
+		;;
+	-u)
+		uidstart=$2
+		shift; shift
+		;;
+	esac
+done
+
+# If the -f switch was used, get input from a file. Otherwise,
+# this is an interactive session.
+#
+if [ -n "$fflag" ]; then
+	if [ -z "$infile" ]; then
+		input_from_file
+	elif [ -n "$infile" ]; then
+		if [ -r "$infile" ]; then
+			input_from_file < $infile
+		else
+			err "File ($infile) is unreadable or does not exist."
+		fi
+	fi
+else
+	input_interactive
+	while : ; do
+		#if [ -z "$configflag" ]; then
+		#	echo -n "Add another user? (yes/no): "
+		#else
+		#	echo -n "Re-edit the default configuration? (yes/no): "
+		#fi
+		#read _input
+		#case $_input in
+		#[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
+		#	uidstart=`get_nextuid $uidstart`
+		#	input_interactive
+		#	continue
+		#	;;
+		#[Nn][Oo]|[Nn])
+		#	echo "Goodbye!"
+		#	;;
+		#*)
+		#	continue
+		#	;;
+		#esac
+		break
+	done
+
+echo $username > /tmp/uname
+return 0
+
+fi

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/autorunCD.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/autorunCD.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/autorunCD.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,82 +1,82 @@
-#!/bin/sh
-#        Name: autorunCD.sh
-#      Author: Kris Moore
-#        Date: 10-4-05
-# Description: Script which is called by detectDisks.sh, and waits
-#              in the background for CD mounts perfomed, then checks
-#              for the presence of <mountpoint>/autorun.pbi
-#              If the file exists, it executes it
-##########################################################################
-
-# Mount Point
-CDMNT="${1}"
-
-# Raw Device
-RAWDEV="${2}"
-
-# Execute Program
-ExecProg() {
-
-# Who is logged into X?
-USR=`who | grep :0 | cut -f 1 -d " "`
-
-#If No-one, exit with no error
-if [ "${USR}" = "" ]
-then
-        return 0
-fi
-
-# Make sure we can write to X
-su ${USR} -c "xhost +"
-
-# Display
-DISPLAY=":0.0" ; export DISPLAY
-
-
-# Execute the autorun.pbi file
-su ${USR} -c "cd ; /PCBSD/Scripts/runpbi.sh ${1}"
-
-} ; 
-
-
-
-
-while
-i="1"
-do
-
-# Only check every 5 seconds or so
-sleep 5 
-
-# If we have a autorun.pbi file show up
-if [ -f "${CDMNT}/autorun.pbi" ]
-then
-  # If there is a previous autorun.pbi file
-  if [ -f "/PCBSD/tmp/autorun.${RAWDEV}" ]
-  then
-     ls -al ${CDMNT}/autorun.pbi >/PCBSD/tmp/autorun.${RAWDEV}.tmp
-     diff /PCBSD/tmp/autorun.${RAWDEV}.tmp /PCBSD/tmp/autorun.${RAWDEV} >/dev/null 2>/dev/null
-     if [ "$?" = "1" ]
-     then
-        rm /PCBSD/tmp/autorun.${RAWDEV} >/dev/null 2>/dev/null
-        mv /PCBSD/tmp/autorun.${RAWDEV}.tmp /PCBSD/tmp/autorun.${RAWDEV}
-        ExecProg ${CDMNT}/autorun.pbi
-     else
-       rm /PCBSD/tmp/autorun.${RAWDEV}.tmp
-     fi
-     
-  else
-    ls -al ${CDMNT}/autorun.pbi >/PCBSD/tmp/autorun.${RAWDEV}
-    ExecProg ${CDMNT}/autorun.pbi 
-  fi
-
-else
-  rm /PCBSD/tmp/autorun.${RAWDEV} >/dev/null 2>/dev/null
-fi
-
-
-
-done
-
-
-
+#!/bin/sh
+#        Name: autorunCD.sh
+#      Author: Kris Moore
+#        Date: 10-4-05
+# Description: Script which is called by detectDisks.sh, and waits
+#              in the background for CD mounts perfomed, then checks
+#              for the presence of <mountpoint>/autorun.pbi
+#              If the file exists, it executes it
+##########################################################################
+
+# Mount Point
+CDMNT="${1}"
+
+# Raw Device
+RAWDEV="${2}"
+
+# Execute Program
+ExecProg() {
+
+# Who is logged into X?
+USR=`who | grep :0 | cut -f 1 -d " "`
+
+#If No-one, exit with no error
+if [ "${USR}" = "" ]
+then
+        return 0
+fi
+
+# Make sure we can write to X
+su ${USR} -c "xhost +"
+
+# Display
+DISPLAY=":0.0" ; export DISPLAY
+
+
+# Execute the autorun.pbi file
+su ${USR} -c "cd ; /PCBSD/Scripts/runpbi.sh ${1}"
+
+} ; 
+
+
+
+
+while
+i="1"
+do
+
+# Only check every 5 seconds or so
+sleep 5 
+
+# If we have a autorun.pbi file show up
+if [ -f "${CDMNT}/autorun.pbi" ]
+then
+  # If there is a previous autorun.pbi file
+  if [ -f "/PCBSD/tmp/autorun.${RAWDEV}" ]
+  then
+     ls -al ${CDMNT}/autorun.pbi >/PCBSD/tmp/autorun.${RAWDEV}.tmp
+     diff /PCBSD/tmp/autorun.${RAWDEV}.tmp /PCBSD/tmp/autorun.${RAWDEV} >/dev/null 2>/dev/null
+     if [ "$?" = "1" ]
+     then
+        rm /PCBSD/tmp/autorun.${RAWDEV} >/dev/null 2>/dev/null
+        mv /PCBSD/tmp/autorun.${RAWDEV}.tmp /PCBSD/tmp/autorun.${RAWDEV}
+        ExecProg ${CDMNT}/autorun.pbi
+     else
+       rm /PCBSD/tmp/autorun.${RAWDEV}.tmp
+     fi
+     
+  else
+    ls -al ${CDMNT}/autorun.pbi >/PCBSD/tmp/autorun.${RAWDEV}
+    ExecProg ${CDMNT}/autorun.pbi 
+  fi
+
+else
+  rm /PCBSD/tmp/autorun.${RAWDEV} >/dev/null 2>/dev/null
+fi
+
+
+
+done
+
+
+

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/create_drives.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/create_drives.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/create_drives.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,90 +1,90 @@
-#!/bin/sh
-#        Name: create_drives
-#      Author: Tanner Schultz
-#        Date: 12-13-05
-#     License: Public domain
-# Description: Creates .desktop entries in /PCBSD/Computer/Drives based
-#              on input from refresh_fstab
-##########################################################################
-
-case $1 in
-	cd)
-case ${2} in
- cd0) MNTPNT="cdrom0" ;;
- cd1) MNTPNT="cdrom1" ;;
- cd2) MNTPNT="cdrom2" ;;
- cd3) MNTPNT="cdrom3" ;;
-
-esac
-
-
-		echo "[Desktop Action Eject]
-Exec=eject %v
-Name=Eject
-
-[Desktop Entry]
-Name=CD-ROM (${2})
-Actions=Eject;
-Dev=/dev/${2}
-Encoding=UTF-8
-Icon=cdrom_mount
-MountPoint=/mnt/${MNTPNT}
-ReadOnly=true
-Type=FSDevice
-UnmountIcon=cdrom_unmount
-X-KDE-Priority=TopLevel" > "/PCBSD/Computer/Drives/CD-ROM (${2})"
-	;;	
-	hd)
-                CHKDEV=`echo "${2}" | cut -c -3`
-		ISUSB=`dmesg | grep "${CHKDEV}" | grep "umass"`
-		if [ -z "$ISUSB" ]
-		then
-			echo "[Desktop Entry]
-Dev=/dev/${2}
-Encoding=UTF-8
-Icon=hdd_mount
-MountPoint=/mnt/${2}
-ReadOnly=false
-Type=FSDevice
-UnmountIcon=hdd_unmount" > "/PCBSD/Computer/Drives/Hard Disk (${2})"
-		else
-			echo "[Desktop Entry]
-Dev=/dev/${2}
-Encoding=UTF-8
-Icon=usbpendrive_mount
-MountPoint=/mnt/${2}
-ReadOnly=false
-Type=FSDevice
-UnmountIcon=usbpendrive_unmount" > "/PCBSD/Computer/Drives/USB Drive (${2})"
-
-# Create Icon on desktop now as well
-cd /home
-for i in `ls`
-do
-  if [ -d "/home/${i}/Desktop" ]
-  then
-       echo "[Desktop Entry]
-       Dev=/dev/${2}
-       Encoding=UTF-8
-       Icon=usbpendrive_mount
-       MountPoint=/mnt/${2}
-       ReadOnly=false
-       Type=FSDevice
-       UnmountIcon=usbpendrive_unmount" > "/home/${i}/Desktop/USB Drive (${2})"
-       chown ${i}:${i} "/home/${i}/Desktop/USB Drive (${2})"
-  fi
-done
-
-          fi # End of IFUSB section
-	;;
-	fd)
-		echo "[Desktop Entry]
-Dev=/dev/${2}
-Encoding=UTF-8
-Icon=3floppy_mount
-MountPoint=/mnt/${2}
-ReadOnly=false
-Type=FSDevice
-UnmountIcon=3floppy_unmount" > "/PCBSD/Computer/Drives/Floppy Disk (${2})"
-	;;
-esac
+#!/bin/sh
+#        Name: create_drives
+#      Author: Tanner Schultz
+#        Date: 12-13-05
+#     License: Public domain
+# Description: Creates .desktop entries in /PCBSD/Computer/Drives based
+#              on input from refresh_fstab
+##########################################################################
+
+case $1 in
+	cd)
+case ${2} in
+ cd0) MNTPNT="cdrom0" ;;
+ cd1) MNTPNT="cdrom1" ;;
+ cd2) MNTPNT="cdrom2" ;;
+ cd3) MNTPNT="cdrom3" ;;
+
+esac
+
+
+		echo "[Desktop Action Eject]
+Exec=eject %v
+Name=Eject
+
+[Desktop Entry]
+Name=CD-ROM (${2})
+Actions=Eject;
+Dev=/dev/${2}
+Encoding=UTF-8
+Icon=cdrom_mount
+MountPoint=/mnt/${MNTPNT}
+ReadOnly=true
+Type=FSDevice
+UnmountIcon=cdrom_unmount
+X-KDE-Priority=TopLevel" > "/PCBSD/Computer/Drives/CD-ROM (${2})"
+	;;	
+	hd)
+                CHKDEV=`echo "${2}" | cut -c -3`
+		ISUSB=`dmesg | grep "${CHKDEV}" | grep "umass"`
+		if [ -z "$ISUSB" ]
+		then
+			echo "[Desktop Entry]
+Dev=/dev/${2}
+Encoding=UTF-8
+Icon=hdd_mount
+MountPoint=/mnt/${2}
+ReadOnly=false
+Type=FSDevice
+UnmountIcon=hdd_unmount" > "/PCBSD/Computer/Drives/Hard Disk (${2})"
+		else
+			echo "[Desktop Entry]
+Dev=/dev/${2}
+Encoding=UTF-8
+Icon=usbpendrive_mount
+MountPoint=/mnt/${2}
+ReadOnly=false
+Type=FSDevice
+UnmountIcon=usbpendrive_unmount" > "/PCBSD/Computer/Drives/USB Drive (${2})"
+
+# Create Icon on desktop now as well
+cd /home
+for i in `ls`
+do
+  if [ -d "/home/${i}/Desktop" ]
+  then
+       echo "[Desktop Entry]
+       Dev=/dev/${2}
+       Encoding=UTF-8
+       Icon=usbpendrive_mount
+       MountPoint=/mnt/${2}
+       ReadOnly=false
+       Type=FSDevice
+       UnmountIcon=usbpendrive_unmount" > "/home/${i}/Desktop/USB Drive (${2})"
+       chown ${i}:${i} "/home/${i}/Desktop/USB Drive (${2})"
+  fi
+done
+
+          fi # End of IFUSB section
+	;;
+	fd)
+		echo "[Desktop Entry]
+Dev=/dev/${2}
+Encoding=UTF-8
+Icon=3floppy_mount
+MountPoint=/mnt/${2}
+ReadOnly=false
+Type=FSDevice
+UnmountIcon=3floppy_unmount" > "/PCBSD/Computer/Drives/Floppy Disk (${2})"
+	;;
+esac

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/detectMedium.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/detectMedium.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/detectMedium.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,46 +1,46 @@
-#!/bin/sh
-# Detects when a CD has been inserted into the drive
-# Author: Kris Moore
-# Copyright 2006 PC-BSD Software
-############################################################################
-
-case $2 in
-   cd0) MNTPNT="cdrom0" ;;
-   cd1) MNTPNT="cdrom1" ;;
-   cd2) MNTPNT="cdrom2" ;;
-   cd3) MNTPNT="cdrom3" ;;
-esac
-
-while
-i="1"
-do
-
-  sleep 4
-  test="`camcontrol tur ${1} -v >&1 2>&1`"
-  echo $test | grep "Unit is ready" >/dev/null 2>/dev/null
-  case $? in
-    0) if [ ! -f "/tmp/.cdmedia${2}" ]
-       then
-         /PCBSD/Scripts/fsReplace.sh $MNTPNT
-         echo "Loaded" > /tmp/.cdmedia${2} 
-       fi
-       ;;
-    *) if [ -e "/tmp/.cdmedia${2}" ]
-       then
-          rm /tmp/.cdmedia${2}
-          cd /home
-          for i in `ls`
-          do
-            if [ -e "/home/${i}/Desktop/${2}" ]
-            then
-             rm /home/${i}/Desktop/${2} 
-            fi 
-          done
-       fi
-       ;;
-  esac
-
-done
-
-
-
+#!/bin/sh
+# Detects when a CD has been inserted into the drive
+# Author: Kris Moore
+# Copyright 2006 PC-BSD Software
+############################################################################
+
+case $2 in
+   cd0) MNTPNT="cdrom0" ;;
+   cd1) MNTPNT="cdrom1" ;;
+   cd2) MNTPNT="cdrom2" ;;
+   cd3) MNTPNT="cdrom3" ;;
+esac
+
+while
+i="1"
+do
+
+  sleep 4
+  test="`camcontrol tur ${1} -v >&1 2>&1`"
+  echo $test | grep "Unit is ready" >/dev/null 2>/dev/null
+  case $? in
+    0) if [ ! -f "/tmp/.cdmedia${2}" ]
+       then
+         /PCBSD/Scripts/fsReplace.sh $MNTPNT
+         echo "Loaded" > /tmp/.cdmedia${2} 
+       fi
+       ;;
+    *) if [ -e "/tmp/.cdmedia${2}" ]
+       then
+          rm /tmp/.cdmedia${2}
+          cd /home
+          for i in `ls`
+          do
+            if [ -e "/home/${i}/Desktop/${2}" ]
+            then
+             rm /home/${i}/Desktop/${2} 
+            fi 
+          done
+       fi
+       ;;
+  esac
+
+done
+
+
+

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/diskIcons.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/diskIcons.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/diskIcons.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,100 +1,100 @@
-#!/bin/sh
-
-count=1
-while read line
-do
-   echo $line | grep ^sysid >/dev/null 2>/dev/null
-   if [ $? = 0 ]
-   then
-
-     # Check for NTFS Partitions and create icon / fstab listing
-     echo $line | grep NTFS >/dev/null 2>/dev/null
-     if [ $? = 0 ]
-     then
-     
-     # Create the mount point
-     mkdir /mnt/${1}s$count >/dev/null 2>/dev/null
-     chmod 777 /mnt/${1}s$count >/dev/null 2>/dev/null
-
-     # Create the fstab entry
-     echo "/dev/${1}s${count}              /mnt/${1}s${count}    ntfs    ro,noauto              0       0" >> /etc/fstab
-
-     # Create the devfs.conf entry
-     #echo "own 	/dev/${1}s${count}	root:operator
-#perm	/dev/${1}s${count}	0660" >> /etc/devfs.conf
-      
-     # Create the desktop entry
-       echo "[Desktop Entry]
-Dev=/dev/${1}s${count}
-Encoding=UTF-8
-Icon=hdd_mount
-MountPoint=/mnt/${1}s${count}
-ReadOnly=false
-Type=FSDevice
-UnmountIcon=hdd_unmount" > "/PCBSD/Computer/Drives/Windows (${1}s$count)"
-
-     fi
-
-     # Check for FAT Partitions and create icon / fstab listing
-     echo $line | grep FAT >/dev/null 2>/dev/null
-     if [ $? = 0 ]
-     then
-     
-     # Create the mount point
-     mkdir /mnt/${1}s$count >/dev/null 2>/dev/null
-
-     chmod 777 /mnt/${1}s$count >/dev/null 2>/dev/null
- 
-     # Create the fstab entry
-     echo "/dev/${1}s${count}              /mnt/${1}s${count}    msdos    ro,noauto,acls=777              0       0" >> /etc/fstab
-
-     # Create the devfs.conf entry
-#     echo "own 	/dev/${1}s${count}	root:operator
-#perm	/dev/${1}s${count}	0660" >> /etc/devfs.conf
-      
-     # Create the desktop entry
-       echo "[Desktop Entry]
-Dev=/dev/${1}s${count}
-Encoding=UTF-8
-Icon=hdd_mount
-MountPoint=/mnt/${1}s${count}
-ReadOnly=false
-Type=FSDevice
-UnmountIcon=hdd_unmount" > "/PCBSD/Computer/Drives/Windows (${1}s$count)"
-
-     fi
-
-
-    # Check for Linux Partitions and create icon / fstab listing
-     echo $line | grep "Linux native" >/dev/null 2>/dev/null
-     if [ $? = 0 ]
-     then
-
-     # Create the mount point
-     mkdir /mnt/${1}s$count >/dev/null 2>/dev/null
-
-     chmod 777 /mnt/${1}s$count >/dev/null 2>/dev/null
-
-# Create the fstab entry
-echo "/dev/${1}s${count}              /mnt/${1}s${count}    ext2fs    ro,noauto,acls=777              0       0" >> /etc/fstab
-
-
-# Create the desktop entry
-echo "[Desktop Entry]
-Dev=/dev/${1}s${count}
-Encoding=UTF-8
-Icon=hdd_mount
-MountPoint=/mnt/${1}s${count}
-ReadOnly=false
-Type=FSDevice
-UnmountIcon=hdd_unmount" > "/PCBSD/Computer/Drives/Linux (${1}s$count)"
-
-     fi
-
-
-
-     #bsdlabel /dev/ad0s${count}
-     count="`expr $count + 1`"
-   fi
-done
-
+#!/bin/sh
+
+count=1
+while read line
+do
+   echo $line | grep ^sysid >/dev/null 2>/dev/null
+   if [ $? = 0 ]
+   then
+
+     # Check for NTFS Partitions and create icon / fstab listing
+     echo $line | grep NTFS >/dev/null 2>/dev/null
+     if [ $? = 0 ]
+     then
+     
+     # Create the mount point
+     mkdir /mnt/${1}s$count >/dev/null 2>/dev/null
+     chmod 777 /mnt/${1}s$count >/dev/null 2>/dev/null
+
+     # Create the fstab entry
+     echo "/dev/${1}s${count}              /mnt/${1}s${count}    ntfs    ro,noauto              0       0" >> /etc/fstab
+
+     # Create the devfs.conf entry
+     #echo "own 	/dev/${1}s${count}	root:operator
+#perm	/dev/${1}s${count}	0660" >> /etc/devfs.conf
+      
+     # Create the desktop entry
+       echo "[Desktop Entry]
+Dev=/dev/${1}s${count}
+Encoding=UTF-8
+Icon=hdd_mount
+MountPoint=/mnt/${1}s${count}
+ReadOnly=false
+Type=FSDevice
+UnmountIcon=hdd_unmount" > "/PCBSD/Computer/Drives/Windows (${1}s$count)"
+
+     fi
+
+     # Check for FAT Partitions and create icon / fstab listing
+     echo $line | grep FAT >/dev/null 2>/dev/null
+     if [ $? = 0 ]
+     then
+     
+     # Create the mount point
+     mkdir /mnt/${1}s$count >/dev/null 2>/dev/null
+
+     chmod 777 /mnt/${1}s$count >/dev/null 2>/dev/null
+ 
+     # Create the fstab entry
+     echo "/dev/${1}s${count}              /mnt/${1}s${count}    msdos    ro,noauto,acls=777              0       0" >> /etc/fstab
+
+     # Create the devfs.conf entry
+#     echo "own 	/dev/${1}s${count}	root:operator
+#perm	/dev/${1}s${count}	0660" >> /etc/devfs.conf
+      
+     # Create the desktop entry
+       echo "[Desktop Entry]
+Dev=/dev/${1}s${count}
+Encoding=UTF-8
+Icon=hdd_mount
+MountPoint=/mnt/${1}s${count}
+ReadOnly=false
+Type=FSDevice
+UnmountIcon=hdd_unmount" > "/PCBSD/Computer/Drives/Windows (${1}s$count)"
+
+     fi
+
+
+    # Check for Linux Partitions and create icon / fstab listing
+     echo $line | grep "Linux native" >/dev/null 2>/dev/null
+     if [ $? = 0 ]
+     then
+
+     # Create the mount point
+     mkdir /mnt/${1}s$count >/dev/null 2>/dev/null
+
+     chmod 777 /mnt/${1}s$count >/dev/null 2>/dev/null
+
+# Create the fstab entry
+echo "/dev/${1}s${count}              /mnt/${1}s${count}    ext2fs    ro,noauto,acls=777              0       0" >> /etc/fstab
+
+
+# Create the desktop entry
+echo "[Desktop Entry]
+Dev=/dev/${1}s${count}
+Encoding=UTF-8
+Icon=hdd_mount
+MountPoint=/mnt/${1}s${count}
+ReadOnly=false
+Type=FSDevice
+UnmountIcon=hdd_unmount" > "/PCBSD/Computer/Drives/Linux (${1}s$count)"
+
+     fi
+
+
+
+     #bsdlabel /dev/ad0s${count}
+     count="`expr $count + 1`"
+   fi
+done
+

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/fsReplace.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/fsReplace.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/fsReplace.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,55 +1,55 @@
-#!/bin/sh
-# Removes and readds a CD entry to /etc/fstab, triggering KDE popup
-# Author: Kris Moore
-# Copyright 2006 PC-BSD Software
-###########################################################################
-
-if [ -z "${1}" ]
-then
- exit
-fi
-
-
-cat /etc/fstab | grep -v ${1} >/tmp/fstab.tmp
-mv /etc/fstab /etc/fstab.bak
-mv /tmp/fstab.tmp /etc/fstab
-
-sleep 3
-
-case $1 in
-   cdrom0) DEV="cd0" ;;
-   cdrom1) DEV="cd1" ;;
-   cdrom2) DEV="cd2" ;;
-   cdrom3) DEV="cd3" ;;
-esac
-
-
-
-
-echo "/dev/${DEV}       /mnt/${1}               auto    ro,noauto       0       0">> /etc/fstab
-
-cd /home
-for i in `ls`
-do
-  if [ -d "/home/${i}/Desktop" ]
-  then
-      echo "[Desktop Action Eject]
-Exec=eject %v
-Name=Eject
-
-[Desktop Entry]
-Name=CD-ROM (${1})
-Actions=Eject;
-Dev=/dev/${DEV}
-Encoding=UTF-8
-Icon=cdrom_mount
-MountPoint=/mnt/${1}
-ReadOnly=true
-Type=FSDevice
-UnmountIcon=cdrom_unmount
-X-KDE-Priority=TopLevel" > "/home/${i}/Desktop/${DEV}"
-chown ${i}:${i} /home/${i}/Desktop/${DEV}
-  fi
-done
-
-
+#!/bin/sh
+# Removes and readds a CD entry to /etc/fstab, triggering KDE popup
+# Author: Kris Moore
+# Copyright 2006 PC-BSD Software
+###########################################################################
+
+if [ -z "${1}" ]
+then
+ exit
+fi
+
+
+cat /etc/fstab | grep -v ${1} >/tmp/fstab.tmp
+mv /etc/fstab /etc/fstab.bak
+mv /tmp/fstab.tmp /etc/fstab
+
+sleep 3
+
+case $1 in
+   cdrom0) DEV="cd0" ;;
+   cdrom1) DEV="cd1" ;;
+   cdrom2) DEV="cd2" ;;
+   cdrom3) DEV="cd3" ;;
+esac
+
+
+
+
+echo "/dev/${DEV}       /mnt/${1}               auto    ro,noauto       0       0">> /etc/fstab
+
+cd /home
+for i in `ls`
+do
+  if [ -d "/home/${i}/Desktop" ]
+  then
+      echo "[Desktop Action Eject]
+Exec=eject %v
+Name=Eject
+
+[Desktop Entry]
+Name=CD-ROM (${1})
+Actions=Eject;
+Dev=/dev/${DEV}
+Encoding=UTF-8
+Icon=cdrom_mount
+MountPoint=/mnt/${1}
+ReadOnly=true
+Type=FSDevice
+UnmountIcon=cdrom_unmount
+X-KDE-Priority=TopLevel" > "/home/${i}/Desktop/${DEV}"
+chown ${i}:${i} /home/${i}/Desktop/${DEV}
+  fi
+done
+
+

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/installPatch.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/installPatch.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/installPatch.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,30 +1,30 @@
-#!/bin/sh
-
-# Remove the tmpdir if it exists
-rm -rf /PCBSD/tmp/patchdir >/dev/null 2>/dev/null
-
-# Change Directories
-mkdir /PCBSD/tmp/patchdir >/dev/null 2>/dev/null
-
-# Change Directories
-cd /PCBSD/tmp/patchdir
-
-# Untar the patch file
-tar xvjf $1 >/dev/null 2>/dev/null
-
-if [ "$?" != "0" ]
-then
-  exit 1
-fi
-
-#  Make it executable
-chmod 755 /PCBSD/tmp/patchdir/PBUPatch.sh
-
-# Run the patch script file
-/PCBSD/tmp/patchdir/PBUPatch.sh >&1 2>&1
-
-
-# Delete the tmp dir
-rm -rf /PCBSD/tmp/patchdir
-
-exit 0
+#!/bin/sh
+
+# Remove the tmpdir if it exists
+rm -rf /PCBSD/tmp/patchdir >/dev/null 2>/dev/null
+
+# Change Directories
+mkdir /PCBSD/tmp/patchdir >/dev/null 2>/dev/null
+
+# Change Directories
+cd /PCBSD/tmp/patchdir
+
+# Untar the patch file
+tar xvjf $1 >/dev/null 2>/dev/null
+
+if [ "$?" != "0" ]
+then
+  exit 1
+fi
+
+#  Make it executable
+chmod 755 /PCBSD/tmp/patchdir/PBUPatch.sh
+
+# Run the patch script file
+/PCBSD/tmp/patchdir/PBUPatch.sh >&1 2>&1
+
+
+# Delete the tmp dir
+rm -rf /PCBSD/tmp/patchdir
+
+exit 0

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/refresh_fstab.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/refresh_fstab.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/refresh_fstab.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,198 +1,198 @@
-#!/bin/sh
-#        Name: refresh_fstab.sh
-#      Author: Tanner Schultz
-#        Date: 12-13-05
-#     License: Public domain
-# Description: Scans /dev/ for disk devices and adds them to /etc/fstab 
-#              and /mnt/ if they aren't already there. Removes no longer 
-#              valid /etc/fstab and /mnt/ entries 
-##########################################################################
-
-#is it safe to do our thing yet?
-if [ -e "/tmp/NOREFRESH_FSTAB" ]
-then
-	exit
-fi
-
-# Check if the enable flag is on
-if [ ! -f "/PCBSD/conf/enable_refresh_fstab" ]
-then
-  exit
-fi
-
-#sleep to allow time for the new dev node to appear
-sleep 1
-
-#remove no longer valid entries from /etc/fstab /mnt
-for x in `cat /etc/fstab | cut -d" " -f 1 | cut -f 1 | egrep ^/`
-do
-	if [ -e "$x" ]
-	then
-		#do nothing
-	else
-		dev=`echo $x | cut -d / -f 3`
-		rmdir /mnt/${dev} >/dev/null 2>/dev/null
-		cat /etc/fstab | grep -v "$x" > /tmp/fstab.tmp
-		cp /tmp/fstab.tmp /etc/fstab
-		
-		#remove /PCBSD/Computer/Drives/ entry
-		#try and remove it as an CD first and anything else second
-		(rm "/PCBSD/Computer/Drives/CD-ROM (${dev})" 2>/dev/null && (ps -a > /tmp/ps.tmp; kill `cat /tmp/ps.tmp 2>/dev/null | grep "/PCBSD/Scripts/autorunCD.sh" | grep "${dev}" | awk '{print $1}'`; cat /PCBSD/Computer/Drives/.autoruntab | grep -v "${dev}" > /tmp/autoruntab.tmp; cp /tmp/autoruntab.tmp /PCBSD/Computer/Drives/.autoruntab)) || rm /PCBSD/Computer/Drives/*"(${dev})"
-
-
-              # Remove any desktop icons if it was a USB drive
-              cd /home
-              for i in `ls`
-              do
-
-               if [ -d "/home/${i}/Desktop" ]
-               then            
-                 if [ -e "/home/${i}/Desktop/USB Drive (${dev})" ]
-                 then
-                   rm "/home/${i}/Desktop/USB Drive (${dev})" >/dev/null 2>/dev/null
-                 fi
-               fi
-
-              done
-
-	fi # End of $x if statement
-done
-
-#detect harddisks first (IDE, SCSI, UMASS)
-for i in `ls -1 /dev/ | egrep "^(ad|aacd|mlxd|mlyd|amrd|idad|twed|da)[0-9]$"`
-do
-	pi=`ls -1 /dev/ | egrep "^${i}s[1-9]$"`
-	if [ -n "$pi" ]
-	then
-		for j in `ls -1 /dev/ | egrep "^${i}s[1-9]$"`
-		do
-	           IGNORE=`fdisk $j 2>/dev/null | egrep "Extended"`
-                   if [ -z "$IGNORE" ]
-                   then
-
-			pj=`ls -1 /dev/ | egrep "^${j}[abdef]$"`
-			if [ -n "$pj" ]
-			then
-				for k in `ls -1 /dev/ | egrep "^${j}[abdef]$"`
-				do
-					PART=`echo $k | tail -c2`
-					IGNORE=`disklabel $j 2>/dev/null | egrep ${PART}: | egrep "swap|unused"`
-					if [ -z "$IGNORE" ]
-					then
-						#check if k is in fstab already, if not, add it
-						exk=`cat /etc/fstab | grep /dev/${k}`
-						if [ -z "$exk" ]
-						then
-							echo "/dev/${k}	/mnt/${k}		auto	rw,noauto	0	0" >> /etc/fstab
-							#Add to /PCBSD/Computer/Drives
-							#/PCBSD/Scripts/create_drives.sh hd ${k}
-							
-						fi
-
-						mkdir /mnt/${k} >/dev/null 2>/dev/null
-						chmod 775 /mnt/${k} >/dev/null 2>/dev/null
-					fi
-				done
-			else
-				#check if j is in fstab already, if not, add it
-				exj=`cat /etc/fstab | grep /dev/${j}`
-				if [ -z "$exj" ]
-				then
-					echo "/dev/${j}	/mnt/${j}		auto	rw,noauto	0	0" >> /etc/fstab
-					#Add to /PCBSD/Computer/Drives
-					#/PCBSD/Scripts/create_drives.sh hd ${j}
-					
-				fi
-
-				mkdir /mnt/${j} >/dev/null 2>/dev/null
-				chmod 775 /mnt/${j} >/dev/null 2>/dev/null
-			fi
-
-                   fi #End first IGNORE Statement
-		done
-	else 
-		#check if i is in fstab already, if not, add it
-		exi=`cat /etc/fstab | grep /dev/${i}`
-		if [ -z "$exi" ]
-		then
-			echo "/dev/${i}	/mnt/${i}		auto	rw,noauto	0	0" >> /etc/fstab
-			#/PCBSD/Scripts/create_drives.sh hd ${i}
-		fi
-
-		mkdir /mnt/${i} >/dev/null 2>/dev/null
-	        chmod 775 /mnt/${i} >/dev/null 2>/dev/null
-	fi
-done
-
-#detect cdroms
-camcontrol devlist | grep cd0 >/dev/null 2>/dev/null 
-if [ "$?" = "0" ]
-then
-        # Check if its already in the fstab
-	exj=`cat /etc/fstab | grep /dev/cd0`
-	if [ -z "$exj" ]
-	then
-	echo "/dev/cd0	/mnt/cdrom0		auto	ro,noauto	0	0" >> /etc/fstab
-        fi
-
-	mkdir /mnt/cdrom0 >/dev/null 2>/dev/null
-	chmod 775 /mnt/cdrom0
-fi
-
-camcontrol devlist | grep cd1 >/dev/null 2>/dev/null 
-if [ "$?" = "0" ]
-then
-        # Check if its already in the fstab
-	exj=`cat /etc/fstab | grep /dev/cd1`
-	if [ -z "$exj" ]
-	then
-	echo "/dev/cd1	/mnt/cdrom1		auto	ro,noauto	0	0" >> /etc/fstab
-        fi
-
-	mkdir /mnt/cdrom1 >/dev/null 2>/dev/null
-	chmod 775 /mnt/cdrom1
-fi
-
-camcontrol devlist | grep cd2 >/dev/null 2>/dev/null 
-if [ "$?" = "0" ]
-then
-        # Check if its already in the fstab
-	exj=`cat /etc/fstab | grep /dev/cd2`
-	if [ -z "$exj" ]
-	then
-	echo "/dev/cd2	/mnt/cdrom2		auto	ro,noauto	0	0" >> /etc/fstab
-        fi
-
-	mkdir /mnt/cdrom2 >/dev/null 2>/dev/null
-	chmod 775 /mnt/cdrom2
-fi
-
-camcontrol devlist | grep cd3 >/dev/null 2>/dev/null 
-if [ "$?" = "0" ]
-then
-        # Check if its already in the fstab
-	exj=`cat /etc/fstab | grep /dev/cd3`
-	if [ -z "$exj" ]
-	then
-	echo "/dev/cd3	/mnt/cdrom3		auto	ro,noauto	0	0" >> /etc/fstab
-        fi
-
-	mkdir /mnt/cdrom3 >/dev/null 2>/dev/null
-	chmod 775 /mnt/cdrom3
-fi
-
-
-#detect floppy drives
-for m in `ls -1 /dev/ | egrep "^fd[0-9]$"`
-do
-	exm=`cat /etc/fstab | grep /dev/${m}`
-	if [ -z "$exm" ]
-	then
-		echo "/dev/${m}	/mnt/${m}		auto	rw,noauto	0	0" >> /etc/fstab
-		#Add to /PCBSD/Computer/Drives
-		#/PCBSD/Scripts/create_drives.sh fd ${m}
-	fi
-
-	mkdir /mnt/${m} >/dev/null 2>/dev/null
-	chmod 775 /mnt/${m} >/dev/null 2>/dev/null
-done
+#!/bin/sh
+#        Name: refresh_fstab.sh
+#      Author: Tanner Schultz
+#        Date: 12-13-05
+#     License: Public domain
+# Description: Scans /dev/ for disk devices and adds them to /etc/fstab 
+#              and /mnt/ if they aren't already there. Removes no longer 
+#              valid /etc/fstab and /mnt/ entries 
+##########################################################################
+
+#is it safe to do our thing yet?
+if [ -e "/tmp/NOREFRESH_FSTAB" ]
+then
+	exit
+fi
+
+# Check if the enable flag is on
+if [ ! -f "/PCBSD/conf/enable_refresh_fstab" ]
+then
+  exit
+fi
+
+#sleep to allow time for the new dev node to appear
+sleep 1
+
+#remove no longer valid entries from /etc/fstab /mnt
+for x in `cat /etc/fstab | cut -d" " -f 1 | cut -f 1 | egrep ^/`
+do
+	if [ -e "$x" ]
+	then
+		#do nothing
+	else
+		dev=`echo $x | cut -d / -f 3`
+		rmdir /mnt/${dev} >/dev/null 2>/dev/null
+		cat /etc/fstab | grep -v "$x" > /tmp/fstab.tmp
+		cp /tmp/fstab.tmp /etc/fstab
+		
+		#remove /PCBSD/Computer/Drives/ entry
+		#try and remove it as an CD first and anything else second
+		(rm "/PCBSD/Computer/Drives/CD-ROM (${dev})" 2>/dev/null && (ps -a > /tmp/ps.tmp; kill `cat /tmp/ps.tmp 2>/dev/null | grep "/PCBSD/Scripts/autorunCD.sh" | grep "${dev}" | awk '{print $1}'`; cat /PCBSD/Computer/Drives/.autoruntab | grep -v "${dev}" > /tmp/autoruntab.tmp; cp /tmp/autoruntab.tmp /PCBSD/Computer/Drives/.autoruntab)) || rm /PCBSD/Computer/Drives/*"(${dev})"
+
+
+              # Remove any desktop icons if it was a USB drive
+              cd /home
+              for i in `ls`
+              do
+
+               if [ -d "/home/${i}/Desktop" ]
+               then            
+                 if [ -e "/home/${i}/Desktop/USB Drive (${dev})" ]
+                 then
+                   rm "/home/${i}/Desktop/USB Drive (${dev})" >/dev/null 2>/dev/null
+                 fi
+               fi
+
+              done
+
+	fi # End of $x if statement
+done
+
+#detect harddisks first (IDE, SCSI, UMASS)
+for i in `ls -1 /dev/ | egrep "^(ad|aacd|mlxd|mlyd|amrd|idad|twed|da)[0-9]$"`
+do
+	pi=`ls -1 /dev/ | egrep "^${i}s[1-9]$"`
+	if [ -n "$pi" ]
+	then
+		for j in `ls -1 /dev/ | egrep "^${i}s[1-9]$"`
+		do
+	           IGNORE=`fdisk $j 2>/dev/null | egrep "Extended"`
+                   if [ -z "$IGNORE" ]
+                   then
+
+			pj=`ls -1 /dev/ | egrep "^${j}[abdef]$"`
+			if [ -n "$pj" ]
+			then
+				for k in `ls -1 /dev/ | egrep "^${j}[abdef]$"`
+				do
+					PART=`echo $k | tail -c2`
+					IGNORE=`disklabel $j 2>/dev/null | egrep ${PART}: | egrep "swap|unused"`
+					if [ -z "$IGNORE" ]
+					then
+						#check if k is in fstab already, if not, add it
+						exk=`cat /etc/fstab | grep /dev/${k}`
+						if [ -z "$exk" ]
+						then
+							echo "/dev/${k}	/mnt/${k}		auto	rw,noauto	0	0" >> /etc/fstab
+							#Add to /PCBSD/Computer/Drives
+							#/PCBSD/Scripts/create_drives.sh hd ${k}
+							
+						fi
+
+						mkdir /mnt/${k} >/dev/null 2>/dev/null
+						chmod 775 /mnt/${k} >/dev/null 2>/dev/null
+					fi
+				done
+			else
+				#check if j is in fstab already, if not, add it
+				exj=`cat /etc/fstab | grep /dev/${j}`
+				if [ -z "$exj" ]
+				then
+					echo "/dev/${j}	/mnt/${j}		auto	rw,noauto	0	0" >> /etc/fstab
+					#Add to /PCBSD/Computer/Drives
+					#/PCBSD/Scripts/create_drives.sh hd ${j}
+					
+				fi
+
+				mkdir /mnt/${j} >/dev/null 2>/dev/null
+				chmod 775 /mnt/${j} >/dev/null 2>/dev/null
+			fi
+
+                   fi #End first IGNORE Statement
+		done
+	else 
+		#check if i is in fstab already, if not, add it
+		exi=`cat /etc/fstab | grep /dev/${i}`
+		if [ -z "$exi" ]
+		then
+			echo "/dev/${i}	/mnt/${i}		auto	rw,noauto	0	0" >> /etc/fstab
+			#/PCBSD/Scripts/create_drives.sh hd ${i}
+		fi
+
+		mkdir /mnt/${i} >/dev/null 2>/dev/null
+	        chmod 775 /mnt/${i} >/dev/null 2>/dev/null
+	fi
+done
+
+#detect cdroms
+camcontrol devlist | grep cd0 >/dev/null 2>/dev/null 
+if [ "$?" = "0" ]
+then
+        # Check if its already in the fstab
+	exj=`cat /etc/fstab | grep /dev/cd0`
+	if [ -z "$exj" ]
+	then
+	echo "/dev/cd0	/mnt/cdrom0		auto	ro,noauto	0	0" >> /etc/fstab
+        fi
+
+	mkdir /mnt/cdrom0 >/dev/null 2>/dev/null
+	chmod 775 /mnt/cdrom0
+fi
+
+camcontrol devlist | grep cd1 >/dev/null 2>/dev/null 
+if [ "$?" = "0" ]
+then
+        # Check if its already in the fstab
+	exj=`cat /etc/fstab | grep /dev/cd1`
+	if [ -z "$exj" ]
+	then
+	echo "/dev/cd1	/mnt/cdrom1		auto	ro,noauto	0	0" >> /etc/fstab
+        fi
+
+	mkdir /mnt/cdrom1 >/dev/null 2>/dev/null
+	chmod 775 /mnt/cdrom1
+fi
+
+camcontrol devlist | grep cd2 >/dev/null 2>/dev/null 
+if [ "$?" = "0" ]
+then
+        # Check if its already in the fstab
+	exj=`cat /etc/fstab | grep /dev/cd2`
+	if [ -z "$exj" ]
+	then
+	echo "/dev/cd2	/mnt/cdrom2		auto	ro,noauto	0	0" >> /etc/fstab
+        fi
+
+	mkdir /mnt/cdrom2 >/dev/null 2>/dev/null
+	chmod 775 /mnt/cdrom2
+fi
+
+camcontrol devlist | grep cd3 >/dev/null 2>/dev/null 
+if [ "$?" = "0" ]
+then
+        # Check if its already in the fstab
+	exj=`cat /etc/fstab | grep /dev/cd3`
+	if [ -z "$exj" ]
+	then
+	echo "/dev/cd3	/mnt/cdrom3		auto	ro,noauto	0	0" >> /etc/fstab
+        fi
+
+	mkdir /mnt/cdrom3 >/dev/null 2>/dev/null
+	chmod 775 /mnt/cdrom3
+fi
+
+
+#detect floppy drives
+for m in `ls -1 /dev/ | egrep "^fd[0-9]$"`
+do
+	exm=`cat /etc/fstab | grep /dev/${m}`
+	if [ -z "$exm" ]
+	then
+		echo "/dev/${m}	/mnt/${m}		auto	rw,noauto	0	0" >> /etc/fstab
+		#Add to /PCBSD/Computer/Drives
+		#/PCBSD/Scripts/create_drives.sh fd ${m}
+	fi
+
+	mkdir /mnt/${m} >/dev/null 2>/dev/null
+	chmod 775 /mnt/${m} >/dev/null 2>/dev/null
+done

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/registerPatch.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/registerPatch.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/registerPatch.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,16 +1,16 @@
-#!/bin/sh
-
-# Source the main INI file
-#. /PCBSD/conf/pcbsd.ini
-
-PCBSDVER="`PBReg get /PC-BSD/Version`"
-
-# Make the patch Directory
-mkdir /PCBSD/Patches/${PCBSDVER}/${1}
-
-# Move the .pbu file to that dir
-mv /PCBSD/tmp/${1}.pbu /PCBSD/Patches/${PCBSDVER}/${1}/
-
-# Remove the tarball
-rm ${2}
-
+#!/bin/sh
+
+# Source the main INI file
+#. /PCBSD/conf/pcbsd.ini
+
+PCBSDVER="`PBReg get /PC-BSD/Version`"
+
+# Make the patch Directory
+mkdir /PCBSD/Patches/${PCBSDVER}/${1}
+
+# Move the .pbu file to that dir
+mv /PCBSD/tmp/${1}.pbu /PCBSD/Patches/${PCBSDVER}/${1}/
+
+# Remove the tarball
+rm ${2}
+

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/runpbi.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/runpbi.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/runpbi.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,15 +1,15 @@
-#!/bin/sh
-
-. /PCBSD/LANGS/PCBSDLANG
-
-file "$1" | grep ELF 
-test="$?"
-
-if [ "$test" = "0" ]
-then
- chmod 755 "$1"
- exec "$1"
-else
- sh "$1"
-fi
-
+#!/bin/sh
+
+. /PCBSD/LANGS/PCBSDLANG
+
+file "$1" | grep ELF 
+test="$?"
+
+if [ "$test" = "0" ]
+then
+ chmod 755 "$1"
+ exec "$1"
+else
+ sh "$1"
+fi
+

Modified: pcbsd/trunk/system-overlay/PCBSD/Scripts/startDetection.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Scripts/startDetection.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/Scripts/startDetection.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,37 +1,37 @@
-#!/bin/sh
-# Finds any "cd" devices and starts the medium detection program
-# Author: Kris Moore
-# Copyright 2006 PC-BSD Software
-############################################################################
-
-camcontrol devlist | grep cd0 >/dev/null 2>/dev/null
-if [ "$?" = "0" ]
-then
- PASS=`camcontrol devlist | grep "cd0" | cut -f 2 -d "(" | cut -f 1 -d "," | cut -f 1 -d ")"`
- mkdir /mnt/cdrom0
- (nice /PCBSD/Scripts/detectMedium.sh $PASS cd0) &
-fi
-
-camcontrol devlist | grep cd1 >/dev/null 2>/dev/null
-if [ "$?" = "0" ]
-then
- PASS=`camcontrol devlist | grep "cd1" | cut -f 2 -d "(" | cut -f 1 -d "," | cut -f 1 -d ")"`
-  mkdir /mnt/cdrom1
- (nice /PCBSD/Scripts/detectMedium.sh $PASS cd1) &
-fi
-
-camcontrol devlist | grep cd2 >/dev/null 2>/dev/null
-if [ "$?" = "0" ]
-then
- PASS=`camcontrol devlist | grep "cd2" | cut -f 2 -d "(" | cut -f 1 -d "," | cut -f 1 -d ")"`
- mkdir /mnt/cdrom2
- (nice /PCBSD/Scripts/detectMedium.sh $PASS cd2) &
-fi
-
-camcontrol devlist | grep cd3 >/dev/null 2>/dev/null
-if [ "$?" = "0" ]
-then
- PASS=`camcontrol devlist | grep "cd3" | cut -f 2 -d "(" | cut -f 1 -d "," | cut -f 1 -d ")"`
- mkdir /mnt/cdrom3
- (nice /PCBSD/Scripts/detectMedium.sh $PASS cd3) &
-fi
+#!/bin/sh
+# Finds any "cd" devices and starts the medium detection program
+# Author: Kris Moore
+# Copyright 2006 PC-BSD Software
+############################################################################
+
+camcontrol devlist | grep cd0 >/dev/null 2>/dev/null
+if [ "$?" = "0" ]
+then
+ PASS=`camcontrol devlist | grep "cd0" | cut -f 2 -d "(" | cut -f 1 -d "," | cut -f 1 -d ")"`
+ mkdir /mnt/cdrom0
+ (nice /PCBSD/Scripts/detectMedium.sh $PASS cd0) &
+fi
+
+camcontrol devlist | grep cd1 >/dev/null 2>/dev/null
+if [ "$?" = "0" ]
+then
+ PASS=`camcontrol devlist | grep "cd1" | cut -f 2 -d "(" | cut -f 1 -d "," | cut -f 1 -d ")"`
+  mkdir /mnt/cdrom1
+ (nice /PCBSD/Scripts/detectMedium.sh $PASS cd1) &
+fi
+
+camcontrol devlist | grep cd2 >/dev/null 2>/dev/null
+if [ "$?" = "0" ]
+then
+ PASS=`camcontrol devlist | grep "cd2" | cut -f 2 -d "(" | cut -f 1 -d "," | cut -f 1 -d ")"`
+ mkdir /mnt/cdrom2
+ (nice /PCBSD/Scripts/detectMedium.sh $PASS cd2) &
+fi
+
+camcontrol devlist | grep cd3 >/dev/null 2>/dev/null
+if [ "$?" = "0" ]
+then
+ PASS=`camcontrol devlist | grep "cd3" | cut -f 2 -d "(" | cut -f 1 -d "," | cut -f 1 -d ")"`
+ mkdir /mnt/cdrom3
+ (nice /PCBSD/Scripts/detectMedium.sh $PASS cd3) &
+fi

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/XF86Config.default
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/XF86Config.default	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/XF86Config.default	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,108 +1,108 @@
-# XFree86 configuration file for RoFreeSBIE
-
-Section "ServerLayout"
-	Identifier     "XFree86 Configured"
-	Screen      0  "Screen0" 0 0
-	InputDevice    "Mouse0" "CorePointer"
-	InputDevice    "Keyboard0" "CoreKeyboard"
-EndSection
-
-Section "ServerFlags"
-        #Option "DisableVidModeExtension" "True" 
-	#Option "NoTrapSignals"  "True"
-	#Option "DisableModInDev"  "True"
-EndSection
-			  
-Section "Files"
-	RgbPath      "/usr/X11R6/lib/X11/rgb"
-	ModulePath   "/usr/X11R6/lib/modules"
-	FontPath     "/usr/X11R6/lib/X11/fonts/cyrillic/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/TrueType/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/illinoy/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/webfonts/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/misc/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/TTF/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/Speedo/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/Type1/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/CID/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/75dpi/"
-        FontPath     "/usr/X11R6/lib/X11/fonts/100dpi/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/dejavu/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/cyrillic/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/hebrew/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/vietnamese/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/indic/"
-	FontPath     "/usr/X11R6/lib/X11/fonts/ae_fonts1/AAHS"
-	FontPath     "/usr/X11R6/lib/X11/fonts/ae_fonts1/AGA"
-	FontPath     "/usr/X11R6/lib/X11/fonts/ae_fonts1/FS"
-	FontPath     "/usr/X11R6/lib/X11/fonts/ae_fonts1/Kasr"
-	FontPath     "/usr/X11R6/lib/X11/fonts/ae_fonts1/MCS"
-	FontPath     "/usr/X11R6/lib/X11/fonts/ae_fonts1/Shmookh"
-	FontPath     "/usr/X11R6/lib/X11/fonts/local/"
-		EndSection
-
-Section "Module"
-#	Load  "record"
-	Load  "ddc"
-       #Load  "dri"
-	Load  "dbe"
-	Load  "extmod"
-	Load  "glx"
-	Load  "xtrap"
-	Load  "freetype"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Keyboard0"
-	Driver      "keyboard"
-	Option      "XkbModel"   "pc105"
-	Option      "XkbLayout"  "us"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Mouse0"
-	Driver      "mouse"
-	Option	    "Protocol" "auto"
-	Option	    "Device" "/dev/sysmouse"
-	Option      "Buttons" "6"
-	Option      "ZAxisMapping" "4 5"
-	Option      "Emulate3Buttons"
-EndSection
-
-Section "Screen"
-	Identifier "Screen0"
-	Device     "Card0"
-	Monitor    "Monitor0"
-        DefaultDepth 24
-	#DefaultDepth 16
-	SubSection "Display"
-		Depth     1
-		Modes	"640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     4
-		Modes	"800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     8
-		Modes	"800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     15
-		Modes	"1280x1024" "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     16
-		Modes	"1280x1024" "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     24
-		Modes	"1280x1024" "1024x768" "800x600" "640x480"
-	EndSubSection
-EndSection
-
-Section "DRI"
-        Mode 0666
-EndSection
-
-
+# XFree86 configuration file for RoFreeSBIE
+
+Section "ServerLayout"
+	Identifier     "XFree86 Configured"
+	Screen      0  "Screen0" 0 0
+	InputDevice    "Mouse0" "CorePointer"
+	InputDevice    "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "ServerFlags"
+        #Option "DisableVidModeExtension" "True" 
+	#Option "NoTrapSignals"  "True"
+	#Option "DisableModInDev"  "True"
+EndSection
+			  
+Section "Files"
+	RgbPath      "/usr/X11R6/lib/X11/rgb"
+	ModulePath   "/usr/X11R6/lib/modules"
+	FontPath     "/usr/X11R6/lib/X11/fonts/cyrillic/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/TrueType/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/illinoy/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/webfonts/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/misc/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/TTF/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/Speedo/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/Type1/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/CID/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/75dpi/"
+        FontPath     "/usr/X11R6/lib/X11/fonts/100dpi/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/dejavu/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/cyrillic/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/hebrew/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/vietnamese/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/indic/"
+	FontPath     "/usr/X11R6/lib/X11/fonts/ae_fonts1/AAHS"
+	FontPath     "/usr/X11R6/lib/X11/fonts/ae_fonts1/AGA"
+	FontPath     "/usr/X11R6/lib/X11/fonts/ae_fonts1/FS"
+	FontPath     "/usr/X11R6/lib/X11/fonts/ae_fonts1/Kasr"
+	FontPath     "/usr/X11R6/lib/X11/fonts/ae_fonts1/MCS"
+	FontPath     "/usr/X11R6/lib/X11/fonts/ae_fonts1/Shmookh"
+	FontPath     "/usr/X11R6/lib/X11/fonts/local/"
+		EndSection
+
+Section "Module"
+#	Load  "record"
+	Load  "ddc"
+       #Load  "dri"
+	Load  "dbe"
+	Load  "extmod"
+	Load  "glx"
+	Load  "xtrap"
+	Load  "freetype"
+EndSection
+
+Section "InputDevice"
+	Identifier  "Keyboard0"
+	Driver      "keyboard"
+	Option      "XkbModel"   "pc105"
+	Option      "XkbLayout"  "us"
+EndSection
+
+Section "InputDevice"
+	Identifier  "Mouse0"
+	Driver      "mouse"
+	Option	    "Protocol" "auto"
+	Option	    "Device" "/dev/sysmouse"
+	Option      "Buttons" "6"
+	Option      "ZAxisMapping" "4 5"
+	Option      "Emulate3Buttons"
+EndSection
+
+Section "Screen"
+	Identifier "Screen0"
+	Device     "Card0"
+	Monitor    "Monitor0"
+        DefaultDepth 24
+	#DefaultDepth 16
+	SubSection "Display"
+		Depth     1
+		Modes	"640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth     4
+		Modes	"800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth     8
+		Modes	"800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth     15
+		Modes	"1280x1024" "1024x768" "800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth     16
+		Modes	"1280x1024" "1024x768" "800x600" "640x480"
+	EndSubSection
+	SubSection "Display"
+		Depth     24
+		Modes	"1280x1024" "1024x768" "800x600" "640x480"
+	EndSubSection
+EndSection
+
+Section "DRI"
+        Mode 0666
+EndSection
+
+

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/XF86Config.vmware
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/XF86Config.vmware	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/XF86Config.vmware	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,11 +1,11 @@
-Section "Monitor"
-	Identifier	"Monitor0"
-	HorizSync	30 - 60
-	VertRefresh	50.0 - 100.0
-	Option		"DPMS"
-EndSection
-
-Section "Device"
-	Identifier	"Card0"
-	Driver		"vmware"
-EndSection
+Section "Monitor"
+	Identifier	"Monitor0"
+	HorizSync	30 - 60
+	VertRefresh	50.0 - 100.0
+	Option		"DPMS"
+EndSection
+
+Section "Device"
+	Identifier	"Card0"
+	Driver		"vmware"
+EndSection

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/firewall_config.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/firewall_config.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/firewall_config.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,246 +1,246 @@
-#!/bin/sh
-#
-# This code was developed by Angelescu Ovidiu.
-#As the licence says, here is the copyright note
-#
-# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at gmail.com>
-# All Rights Reserved.
-#
-# THIS SOFTWARE IS PROVIDED BY ANGELESCU OVIDIU ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT ANGELESCU OVIDIU BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-# DAMAGE.
-##########################################
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
-export PATH
-HOME=/root
-export HOME
-TERM=${TERM:-cons25}
-export TERM
-cd /scripts/cardDetect
-
-
-XDIALOG_HIGH_DIALOG_COMPAT=1
-export XDIALOG_HIGH_DIALOG_COMPAT
-
-DIALOG="dialog"
-[ -n "$DISPLAY" ] && [ -x /usr/X11R6/bin/Xdialog ] && DIALOG="Xdialog"
-
-CONFIG_IFACE() {
-
-OIF_TMP=`/usr/bin/mktemp -t oif`
-$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --textbox ./interfaces 15 60 
-$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --inputbox "Enter external interface to be firewalled." 7 60  \
-2>${OIF_TMP}
-OIF=`cat $OIF_TMP`
-[ -e ./header ] && rm ./header
-echo "# Define the firewall command (as in /etc/rc.firewall) for easy" >> ./header
-echo "# reference.  Helps to make it easier to read." >> ./header
-echo "fwcmd=\"/sbin/ipfw\"" >> ./header
-echo >> ./header
-echo "# Define our outside interface.  With userland-ppp this" >> ./header
-echo "# defaults to tun0." >> ./header
-echo "oif=\"$OIF\"" >> ./header
-echo >> ./header
-rm /tmp/oif*
-
-IIF_TMP=`/usr/bin/mktemp -t iif`
-$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --inputbox "Enter internal interface not firewalled." 7 60  \
-2>${IIF_TMP}
-IIF=`cat $IIF_TMP`
-echo "# Define our inside interface." >> ./header
-echo "iif=\"$IIF\"" >> ./header
-[ -e /etc/firewall/fwrules ] && rm /etc/firewall/fwrules
-mkdir /etc/firewall > /dev/null 2>&1
-cat ./header ./rules >> /etc/firewall/fwrules 
-echo "firewall_script=\"/etc/firewall/fwrules\"" >> /etc/rc.conf  
-rm /tmp/iif* > /dev/null 2>&1
-rm ./header > /dev/null 2>&1
-}
-
-CONFIG_RULES() {
-
-$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --yesno " Do you want to view firewall rules ?" 5 50
-case $? in
-1)
-;;
-0)
-if [ -e /etc/firewall/fwrules ]; then
-$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "  In next box we'll show firewall rules." 5 50
-$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --textbox /etc/firewall/fwrules 26 70
-$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --yesno "    Are these rules OK ? " 5 50
-case $? in
-1)
-$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "If these rules are not OK please edit /etc/firewall/fwrules
-for define your own rules." 6 63
-menu;;
-0)
-$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "  Since rules are OK you can start firewall." 5 50
-;;
-esac
-else
-$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --msgbox " Firewall was not configured." 5 50
-fi
-;;
-esac
-} 
-
-CONFIG_START() {
-$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --yesno " Start Firewall ?" 5 50
-case $? in
-1)
-;;
-0)
-/etc/rc.d/ipfw start > /dev/null 2>&1
-RETVAL=$?
-if [ $RETVAL = 0 ]; then
-        $DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --msgbox " Firewall was started..." 5 50
-		else
-$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "   Couldn't start firewall.Please retry." 5 50
-fi
-;;
-esac
-}
-
-CONFIG_STOP() {
-$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --yesno "  Stop Firewall ? Beware, this will allow all traffic." 5 60
-case $? in
-1)
-;;
-0)
-ipfw -f flush
-ipfw add allow ip from any to any 
-RETVAL=$?
-if [ $RETVAL = 0 ]; then
-        $DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "     Firewall was stoped..." 5 50
-	                else
-			$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "   Couldn't stop firewall.Please retry." 5 50
-			fi
-;;
-esac
-}
-
-CONFIG_RESTART() {
-$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --yesno "Restart Firewall ?" 5 50
-case $? in
-1)
-;;
-0)
-/etc/rc.d/ipfw restart > /dev/null 2>&1
-RETVAL=$?
-if [ $RETVAL = 0 ]; then
-        $DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "     Firewall was restarted..." 5 50
-		else
-$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "    Couldn't restart firewall.Please retry." 5 50
-fi
-;;
-esac
-}
-
-CONFIG_BLOCK() {
-
-$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --yesno "    Block all traffic throught firewall ?" 5 50
-case $? in
-1)
-;;
-0)
-/sbin/sysctl net.inet.ip.fw.enable=1 > /dev/null 2>&1
-/sbin/ipfw -f flush > /dev/null 2>&1
-RETVAL=$?
-if [ $RETVAL = 0 ]; then        
-$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "     Now firewall block all traffic..." 5 50
-		else
-$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "   Couldn't block traffic.Please retry." 5 50
-fi
-;;
-esac
-}
-
-TEMP=`/usr/bin/mktemp -t checklist`
-menu() {
-
-$DIALOG --title "    RoFreeSBIE Live CD Firewall Configuration Tool." \
- --menu "    " 16 62 8 \
-                I "Choose interfaces."\
-		V "View firewall rules."\
-		S "Start firewall." \
-		R "Restart firewall."\
-		K "Stop firewall(allow all traffic)." \
-		B "Block all traffic throught firewall."\
-		C "Choose interfaces, view rules & start firewall." \
-                Q "Quit" \
-        2> $TEMP
-        case `cat $TEMP` in
-                I)
-                     CONFIG_IFACE				
-		     ;;
-		V)
-		     CONFIG_RULES
-		     ;;     
-        	S)
-	             CONFIG_START
-	             ;;
-                R)
-		     CONFIG_RESTART
-		     ;;     
-	        K)
-		     CONFIG_STOP
-		     ;;
-		B)
-		     CONFIG_BLOCK
-		     ;;
-		C)
-                     CONFIG_IFACE				
-                     CONFIG_RULES
-		     CONFIG_START
-		     ;;
-	        Q)
-                rm ./interfaces > /dev/null 2>&1
-		rm /tmp/checklist* > /dev/null 2>&1     
-		exit 0       
-                      ;;
-		*)
-                rm ./interfaces > /dev/null 2>&1
-		rm /tmp/checklist* > /dev/null 2>&1
-                exit 1        
-        esac
-        menu        
-	rm ./interfaces > /dev/null 2>&1
-	rm /tmp/checklist* > /dev/null 2>&1
-}
-
-rm ./interfaces > /dev/null 2>&1
-echo >> ./interfaces
-echo " Choose two interfaces and type them in following boxes." >> ./interfaces
-echo " 
-          The following interfaces can be used." >> ./interfaces
-echo >> ./interfaces
-echo "   Zapp connection ................ interface .. ppp0." >> ./interfaces
-echo "   Dialup connection .............. interface .. tun0.">> ./interfaces
-
-
-$DIALOG --title "    RoFreeSBIE Live CD Firewall Configuration Tool." \
---yesno "    
-                Proceed with firewall configuration ? " 7 70
-case $? in
-1)
-rm ./interfaces > /dev/null 2>&1
-exit ;;
-0)
-for i in `ls /dev/net | grep -v lo| grep -v plip `
-do
-echo "   Network connection ............. interface ... $i." >> ./interfaces
-done
-esac
-menu
-rm ./interfaces > /dev/null 2>&1
-rm /tmp/checklist* > /dev/null 2>&1
+#!/bin/sh
+#
+# This code was developed by Angelescu Ovidiu.
+#As the licence says, here is the copyright note
+#
+# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at gmail.com>
+# All Rights Reserved.
+#
+# THIS SOFTWARE IS PROVIDED BY ANGELESCU OVIDIU ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT ANGELESCU OVIDIU BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
+##########################################
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
+export PATH
+HOME=/root
+export HOME
+TERM=${TERM:-cons25}
+export TERM
+cd /scripts/cardDetect
+
+
+XDIALOG_HIGH_DIALOG_COMPAT=1
+export XDIALOG_HIGH_DIALOG_COMPAT
+
+DIALOG="dialog"
+[ -n "$DISPLAY" ] && [ -x /usr/X11R6/bin/Xdialog ] && DIALOG="Xdialog"
+
+CONFIG_IFACE() {
+
+OIF_TMP=`/usr/bin/mktemp -t oif`
+$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --textbox ./interfaces 15 60 
+$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --inputbox "Enter external interface to be firewalled." 7 60  \
+2>${OIF_TMP}
+OIF=`cat $OIF_TMP`
+[ -e ./header ] && rm ./header
+echo "# Define the firewall command (as in /etc/rc.firewall) for easy" >> ./header
+echo "# reference.  Helps to make it easier to read." >> ./header
+echo "fwcmd=\"/sbin/ipfw\"" >> ./header
+echo >> ./header
+echo "# Define our outside interface.  With userland-ppp this" >> ./header
+echo "# defaults to tun0." >> ./header
+echo "oif=\"$OIF\"" >> ./header
+echo >> ./header
+rm /tmp/oif*
+
+IIF_TMP=`/usr/bin/mktemp -t iif`
+$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --inputbox "Enter internal interface not firewalled." 7 60  \
+2>${IIF_TMP}
+IIF=`cat $IIF_TMP`
+echo "# Define our inside interface." >> ./header
+echo "iif=\"$IIF\"" >> ./header
+[ -e /etc/firewall/fwrules ] && rm /etc/firewall/fwrules
+mkdir /etc/firewall > /dev/null 2>&1
+cat ./header ./rules >> /etc/firewall/fwrules 
+echo "firewall_script=\"/etc/firewall/fwrules\"" >> /etc/rc.conf  
+rm /tmp/iif* > /dev/null 2>&1
+rm ./header > /dev/null 2>&1
+}
+
+CONFIG_RULES() {
+
+$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --yesno " Do you want to view firewall rules ?" 5 50
+case $? in
+1)
+;;
+0)
+if [ -e /etc/firewall/fwrules ]; then
+$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "  In next box we'll show firewall rules." 5 50
+$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --textbox /etc/firewall/fwrules 26 70
+$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --yesno "    Are these rules OK ? " 5 50
+case $? in
+1)
+$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "If these rules are not OK please edit /etc/firewall/fwrules
+for define your own rules." 6 63
+menu;;
+0)
+$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "  Since rules are OK you can start firewall." 5 50
+;;
+esac
+else
+$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --msgbox " Firewall was not configured." 5 50
+fi
+;;
+esac
+} 
+
+CONFIG_START() {
+$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --yesno " Start Firewall ?" 5 50
+case $? in
+1)
+;;
+0)
+/etc/rc.d/ipfw start > /dev/null 2>&1
+RETVAL=$?
+if [ $RETVAL = 0 ]; then
+        $DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --msgbox " Firewall was started..." 5 50
+		else
+$DIALOG --title " RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "   Couldn't start firewall.Please retry." 5 50
+fi
+;;
+esac
+}
+
+CONFIG_STOP() {
+$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --yesno "  Stop Firewall ? Beware, this will allow all traffic." 5 60
+case $? in
+1)
+;;
+0)
+ipfw -f flush
+ipfw add allow ip from any to any 
+RETVAL=$?
+if [ $RETVAL = 0 ]; then
+        $DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "     Firewall was stoped..." 5 50
+	                else
+			$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "   Couldn't stop firewall.Please retry." 5 50
+			fi
+;;
+esac
+}
+
+CONFIG_RESTART() {
+$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --yesno "Restart Firewall ?" 5 50
+case $? in
+1)
+;;
+0)
+/etc/rc.d/ipfw restart > /dev/null 2>&1
+RETVAL=$?
+if [ $RETVAL = 0 ]; then
+        $DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "     Firewall was restarted..." 5 50
+		else
+$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "    Couldn't restart firewall.Please retry." 5 50
+fi
+;;
+esac
+}
+
+CONFIG_BLOCK() {
+
+$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --yesno "    Block all traffic throught firewall ?" 5 50
+case $? in
+1)
+;;
+0)
+/sbin/sysctl net.inet.ip.fw.enable=1 > /dev/null 2>&1
+/sbin/ipfw -f flush > /dev/null 2>&1
+RETVAL=$?
+if [ $RETVAL = 0 ]; then        
+$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "     Now firewall block all traffic..." 5 50
+		else
+$DIALOG --title "RoFreeSBIE Live CD - Firewall Configuration ." --msgbox "   Couldn't block traffic.Please retry." 5 50
+fi
+;;
+esac
+}
+
+TEMP=`/usr/bin/mktemp -t checklist`
+menu() {
+
+$DIALOG --title "    RoFreeSBIE Live CD Firewall Configuration Tool." \
+ --menu "    " 16 62 8 \
+                I "Choose interfaces."\
+		V "View firewall rules."\
+		S "Start firewall." \
+		R "Restart firewall."\
+		K "Stop firewall(allow all traffic)." \
+		B "Block all traffic throught firewall."\
+		C "Choose interfaces, view rules & start firewall." \
+                Q "Quit" \
+        2> $TEMP
+        case `cat $TEMP` in
+                I)
+                     CONFIG_IFACE				
+		     ;;
+		V)
+		     CONFIG_RULES
+		     ;;     
+        	S)
+	             CONFIG_START
+	             ;;
+                R)
+		     CONFIG_RESTART
+		     ;;     
+	        K)
+		     CONFIG_STOP
+		     ;;
+		B)
+		     CONFIG_BLOCK
+		     ;;
+		C)
+                     CONFIG_IFACE				
+                     CONFIG_RULES
+		     CONFIG_START
+		     ;;
+	        Q)
+                rm ./interfaces > /dev/null 2>&1
+		rm /tmp/checklist* > /dev/null 2>&1     
+		exit 0       
+                      ;;
+		*)
+                rm ./interfaces > /dev/null 2>&1
+		rm /tmp/checklist* > /dev/null 2>&1
+                exit 1        
+        esac
+        menu        
+	rm ./interfaces > /dev/null 2>&1
+	rm /tmp/checklist* > /dev/null 2>&1
+}
+
+rm ./interfaces > /dev/null 2>&1
+echo >> ./interfaces
+echo " Choose two interfaces and type them in following boxes." >> ./interfaces
+echo " 
+          The following interfaces can be used." >> ./interfaces
+echo >> ./interfaces
+echo "   Zapp connection ................ interface .. ppp0." >> ./interfaces
+echo "   Dialup connection .............. interface .. tun0.">> ./interfaces
+
+
+$DIALOG --title "    RoFreeSBIE Live CD Firewall Configuration Tool." \
+--yesno "    
+                Proceed with firewall configuration ? " 7 70
+case $? in
+1)
+rm ./interfaces > /dev/null 2>&1
+exit ;;
+0)
+for i in `ls /dev/net | grep -v lo| grep -v plip `
+do
+echo "   Network connection ............. interface ... $i." >> ./interfaces
+done
+esac
+menu
+rm ./interfaces > /dev/null 2>&1
+rm /tmp/checklist* > /dev/null 2>&1

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/mouse_config.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/mouse_config.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/mouse_config.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,47 +1,47 @@
-#!/usr/bin/perl
-#
-#This script was taken from Frenzy Live CD developed by Sergei Mozhaisky
-# Name    : Mouse detection script
-# Version : 0.3 
-# Author  : Sergei Mozhaisky (techniX)
-#
-
-$msg_detect = "Detecting mouse...";
-$msg_running = " moused is already running.\n";
-$msg_notfound = " NOT FOUND\n";
-$msg_found = "found at";
-$msg_started = "mouse daemon started.\n";
-
-print $msg_detect;
-
-open (M, "/var/run/moused.pid"); $pidx = <M>; close (M); $pidx =~ s/\n//g;
-if ($pidx eq "") {$pidx = 0}
-$moused_is_running = "ps ax | grep moused | grep -v grep ";
-$cmd = `$moused_is_running`;
-if ($cmd ne "") {print $msg_running; exit;}
-
-if (probe_mouse("/dev/psm0")) {exit;}
-if (probe_mouse("/dev/cuaa0")) {exit;}
-if (probe_mouse("/dev/cuaa1")) {exit;}
-print $msg_notfound;
-exit;
-
-sub probe_mouse
-{
-my $device = $_[0];
-my $mouseprobe = `moused -i all -p $device 2>&1`;
-if (($mouseprobe =~ m/unable/g)||($mouseprobe =~ m/cannot/g))
-{
-return 0;
-} 
-else 
-{
-print " $msg_found $device, ";
-$moused_start=`moused -3 -r high -t auto -p $device`;
-print $msg_started;
-$vidcontrol=`vidcontrol -m on`;
-return -1;
-}
-}
-
-
+#!/usr/bin/perl
+#
+#This script was taken from Frenzy Live CD developed by Sergei Mozhaisky
+# Name    : Mouse detection script
+# Version : 0.3 
+# Author  : Sergei Mozhaisky (techniX)
+#
+
+$msg_detect = "Detecting mouse...";
+$msg_running = " moused is already running.\n";
+$msg_notfound = " NOT FOUND\n";
+$msg_found = "found at";
+$msg_started = "mouse daemon started.\n";
+
+print $msg_detect;
+
+open (M, "/var/run/moused.pid"); $pidx = <M>; close (M); $pidx =~ s/\n//g;
+if ($pidx eq "") {$pidx = 0}
+$moused_is_running = "ps ax | grep moused | grep -v grep ";
+$cmd = `$moused_is_running`;
+if ($cmd ne "") {print $msg_running; exit;}
+
+if (probe_mouse("/dev/psm0")) {exit;}
+if (probe_mouse("/dev/cuaa0")) {exit;}
+if (probe_mouse("/dev/cuaa1")) {exit;}
+print $msg_notfound;
+exit;
+
+sub probe_mouse
+{
+my $device = $_[0];
+my $mouseprobe = `moused -i all -p $device 2>&1`;
+if (($mouseprobe =~ m/unable/g)||($mouseprobe =~ m/cannot/g))
+{
+return 0;
+} 
+else 
+{
+print " $msg_found $device, ";
+$moused_start=`moused -3 -r high -t auto -p $device`;
+print $msg_started;
+$vidcontrol=`vidcontrol -m on`;
+return -1;
+}
+}
+
+

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/nat_config.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/nat_config.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/nat_config.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,164 +1,164 @@
-#!/bin/sh
-#
-# This code was developed by Angelescu Ovidiu.
-#As the licence says, here is the copyright note
-#
-# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at gmail.com>
-# All Rights Reserved.
-#
-# THIS SOFTWARE IS PROVIDED BY ANGELESCU OVIDIU ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT ANGELESCU OVIDIU BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-# DAMAGE.
-##########################################
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
-export PATH
-HOME=/root
-export HOME
-TERM=${TERM:-cons25}
-export TERM
-cd /scripts/cardDetect
-
-XDIALOG_HIGH_DIALOG_COMPAT=1
-export XDIALOG_HIGH_DIALOG_COMPAT
-
-DIALOG="dialog"
-[ -n "$DISPLAY" ] && [ -x /usr/X11R6/bin/Xdialog ] && DIALOG="Xdialog"
-
-CONFIG_IFACE() {
-OIF_TMP=`/usr/bin/mktemp -t oif`
-$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --textbox ./interface 14 60 
-$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --inputbox "Enter external interface throught we'll send packets." 7 68  \
-2>${OIF_TMP}
-OIF=`cat $OIF_TMP`
-echo "gateway_enable=\"YES\"" >> /etc/rc.conf
-echo "natd_interface=\"$OIF\"" >> /etc/rc.conf
-echo "natd_enable=\"YES\"" >> /etc/rc.conf
-echo "natd_flags=\"\"" >> /etc/rc.conf
-rm /tmp/oif*
-}
-
-CONFIG_START() {
-$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --yesno "  Start Natd ?" 6 50
-case $? in
-1)
-;;
-0)
-/etc/rc.d/ipnat start > /dev/null 2>&1
-RETVAL=$?
-if [ $RETVAL = 0 ]; then
-        $DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --msgbox "     Natd was started..." 6 50
-		else
-$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --msgbox "   Couldn't start natd.Please retry." 6 50
-fi
-;;
-esac
-}
-
-CONFIG_STOP() {
-$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --yesno "  Stop Natd ?" 6 50
-case $? in
-1)
-;;
-0)
-/etc/rc.d/ipnat stop > /dev/null  2>&1
-RETVAL=$?
-if [ $RETVAL = 0 ]; then
-        $DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --msgbox "      Natd was stoped..." 6 50
-	                else
-			$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --msgbox "   Couldn't stop natd.Please retry." 6 50
-			fi
-;;
-esac
-}
-
-CONFIG_RESTART() {
-$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --yesno " Restart Natd ?" 6 50
-case $? in
-1)
-;;
-0)
-/etc/rc.d/ipnat restart > /dev/null 2>&1
-RETVAL=$?
-if [ $RETVAL = 0 ]; then
-        $DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --msgbox "      Natd was restarted..." 6 50
-		else
-$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --msgbox "    Couldn't restart natd.Please retry." 6 50
-fi
-;;
-esac
-}
-
-TEMP=`/usr/bin/mktemp -t checklist`
-menu() {
-$DIALOG --title " RoFreeSBIE Live CD - Nat Configuration ."  --menu "  " 13 62 6\
-                I "Choose external interface"\
-		S "Start natd." \
-		K "Stop natd." \
-		R "Restart natd"\
-		C "Choose external interface, & start natd." \
-                Q "Quit" \
-        2> $TEMP
-        case `cat $TEMP` in
-                I)
-                     CONFIG_IFACE				
-		     ;;
-        	S)
-	             CONFIG_START
-	             ;;
-                K)
-		     CONFIG_STOP
-		     ;;
-		R)
-		     CONFIG_RESTART
-		     ;;     
-		C)
-                     CONFIG_IFACE				
-		     CONFIG_START
-		     ;;
-	        Q)
-                rm ./interfaces > /dev/null 2>&1
-		rm /tmp/checklist* > /dev/null 2>&1     
-		exit 0       
-                      ;;
-		*)
-                rm ./interfaces > /dev/null 2>&1
-		rm /tmp/checklist* > /dev/null 2>&1
-                exit 1        
-        esac
-        menu        
-	rm ./interfaces > /dev/null 2>&1
-	rm /tmp/checklist* > /dev/null 2>&1
-}
-rm ./interface > /dev/null 2>&1
-echo "    Choose a interface and type it in following box." >> ./interface
-echo " 
-          The following interfaces can be used." >> ./interface
-echo >> ./interface
-echo "   Zapp connection ................ interface .. ppp0." >> ./interface
-echo "   Dialup connection .............. interface .. tun0.">> ./interface
-$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --yesno "Nat permets you to connect an entire network to internet using only one IP.
-      
-                    Proceed with nat configuration ? " 8 79
-case $? in
-1)
-rm ./interface > /dev/null 2>&1
-exit ;;
-0)
-for i in `ls /dev/net| grep -v lo| grep -v plip`
-do
-echo "   Network connection ............. interface ... $i." >> ./interface
-done
-esac
-menu
-rm ./interface > /dev/null 2>&1
-rm /tmp/checklist* > /dev/null 2>&1
+#!/bin/sh
+#
+# This code was developed by Angelescu Ovidiu.
+#As the licence says, here is the copyright note
+#
+# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at gmail.com>
+# All Rights Reserved.
+#
+# THIS SOFTWARE IS PROVIDED BY ANGELESCU OVIDIU ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT ANGELESCU OVIDIU BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
+##########################################
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
+export PATH
+HOME=/root
+export HOME
+TERM=${TERM:-cons25}
+export TERM
+cd /scripts/cardDetect
+
+XDIALOG_HIGH_DIALOG_COMPAT=1
+export XDIALOG_HIGH_DIALOG_COMPAT
+
+DIALOG="dialog"
+[ -n "$DISPLAY" ] && [ -x /usr/X11R6/bin/Xdialog ] && DIALOG="Xdialog"
+
+CONFIG_IFACE() {
+OIF_TMP=`/usr/bin/mktemp -t oif`
+$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --textbox ./interface 14 60 
+$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --inputbox "Enter external interface throught we'll send packets." 7 68  \
+2>${OIF_TMP}
+OIF=`cat $OIF_TMP`
+echo "gateway_enable=\"YES\"" >> /etc/rc.conf
+echo "natd_interface=\"$OIF\"" >> /etc/rc.conf
+echo "natd_enable=\"YES\"" >> /etc/rc.conf
+echo "natd_flags=\"\"" >> /etc/rc.conf
+rm /tmp/oif*
+}
+
+CONFIG_START() {
+$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --yesno "  Start Natd ?" 6 50
+case $? in
+1)
+;;
+0)
+/etc/rc.d/ipnat start > /dev/null 2>&1
+RETVAL=$?
+if [ $RETVAL = 0 ]; then
+        $DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --msgbox "     Natd was started..." 6 50
+		else
+$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --msgbox "   Couldn't start natd.Please retry." 6 50
+fi
+;;
+esac
+}
+
+CONFIG_STOP() {
+$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --yesno "  Stop Natd ?" 6 50
+case $? in
+1)
+;;
+0)
+/etc/rc.d/ipnat stop > /dev/null  2>&1
+RETVAL=$?
+if [ $RETVAL = 0 ]; then
+        $DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --msgbox "      Natd was stoped..." 6 50
+	                else
+			$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --msgbox "   Couldn't stop natd.Please retry." 6 50
+			fi
+;;
+esac
+}
+
+CONFIG_RESTART() {
+$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --yesno " Restart Natd ?" 6 50
+case $? in
+1)
+;;
+0)
+/etc/rc.d/ipnat restart > /dev/null 2>&1
+RETVAL=$?
+if [ $RETVAL = 0 ]; then
+        $DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --msgbox "      Natd was restarted..." 6 50
+		else
+$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --msgbox "    Couldn't restart natd.Please retry." 6 50
+fi
+;;
+esac
+}
+
+TEMP=`/usr/bin/mktemp -t checklist`
+menu() {
+$DIALOG --title " RoFreeSBIE Live CD - Nat Configuration ."  --menu "  " 13 62 6\
+                I "Choose external interface"\
+		S "Start natd." \
+		K "Stop natd." \
+		R "Restart natd"\
+		C "Choose external interface, & start natd." \
+                Q "Quit" \
+        2> $TEMP
+        case `cat $TEMP` in
+                I)
+                     CONFIG_IFACE				
+		     ;;
+        	S)
+	             CONFIG_START
+	             ;;
+                K)
+		     CONFIG_STOP
+		     ;;
+		R)
+		     CONFIG_RESTART
+		     ;;     
+		C)
+                     CONFIG_IFACE				
+		     CONFIG_START
+		     ;;
+	        Q)
+                rm ./interfaces > /dev/null 2>&1
+		rm /tmp/checklist* > /dev/null 2>&1     
+		exit 0       
+                      ;;
+		*)
+                rm ./interfaces > /dev/null 2>&1
+		rm /tmp/checklist* > /dev/null 2>&1
+                exit 1        
+        esac
+        menu        
+	rm ./interfaces > /dev/null 2>&1
+	rm /tmp/checklist* > /dev/null 2>&1
+}
+rm ./interface > /dev/null 2>&1
+echo "    Choose a interface and type it in following box." >> ./interface
+echo " 
+          The following interfaces can be used." >> ./interface
+echo >> ./interface
+echo "   Zapp connection ................ interface .. ppp0." >> ./interface
+echo "   Dialup connection .............. interface .. tun0.">> ./interface
+$DIALOG --title "RoFreeSBIE Live CD - Nat Configuration ." --yesno "Nat permets you to connect an entire network to internet using only one IP.
+      
+                    Proceed with nat configuration ? " 8 79
+case $? in
+1)
+rm ./interface > /dev/null 2>&1
+exit ;;
+0)
+for i in `ls /dev/net| grep -v lo| grep -v plip`
+do
+echo "   Network connection ............. interface ... $i." >> ./interface
+done
+esac
+menu
+rm ./interface > /dev/null 2>&1
+rm /tmp/checklist* > /dev/null 2>&1

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/net_config.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/net_config.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/net_config.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,182 +1,182 @@
-#!/bin/sh
-#
-# This code was developed by Angelescu Ovidiu.
-#As the licence says, here is the copyright note
-#
-# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at gmail.com>
-# All Rights Reserved.
-#
-# THIS SOFTWARE IS PROVIDED BY ANGELESCU OVIDIU ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT ANGELESCU OVIDIU BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-# DAMAGE.
-##########################################
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
-export PATH
-HOME=/root
-export HOME
-TERM=${TERM:-cons25}
-export TERM
-cd /scripts/cardDetect
-
-XDIALOG_HIGH_DIALOG_COMPAT=1
-export XDIALOG_HIGH_DIALOG_COMPAT
-
-DIALOG="dialog"
-[ -n "$DISPLAY" ] && [ -x /usr/X11R6/bin/Xdialog ] && DIALOG="Xdialog"
-
-CONFIG_CARD() {
-CARD_TMP=`/usr/bin/mktemp -t card`
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --textbox ./netcards 11 63
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --inputbox "Enter what network card you want to configure." 7 63  \
-2>${CARD_TMP}
-CARD=`cat $CARD_TMP`
-rm /tmp/card*
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --yesno "Do you want DHCP configuration of network card?" 5 63
-case $? in
-0)
-echo "ifconfig_$CARD=\"DHCP\"" >> /etc/rc.conf
-/etc/rc.d/netif restart > /dev/null 2>&1
-CONF=`ifconfig $CARD | grep netmask`
-case "${CONF:-NULL}" in
-NULL)
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "  Something is wrong.DHCP server not found..." 5 63
-;;
-*)
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "  Network card $CARD was DHCP configured..." 5 63
-;;
-esac
-;;
-1)
-IP_TMP=`/usr/bin/mktemp -t ip`
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --inputbox "Enter network card IP." 7 50  \
-2>${IP_TMP}
-IP=`cat $IP_TMP`
-rm /tmp/ip*
-MASK_TMP=`/usr/bin/mktemp -t mask`
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --inputbox "Enter network's mask." 7 50  \
-2>${MASK_TMP}
-MASK=`cat $MASK_TMP`
-ifconfig $CARD delete > /dev/null 2>&1
-ifconfig $CARD $IP netmask $MASK > /dev/null 2>&1
-RETVAL=$?
-if [ $RETVAL = 0 ]; then
-        $DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "  Network card $CARD is configured..." 5 50
-	echo "ifconfig_$CARD=\"inet $IP  netmask $MASK\"" >> /etc/rc.conf 
-	else
-	$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "  Something is wrong.Please redo configuration..." 6 59
-fi
-esac
-rm /tmp/mask*
-}
-
-CONFIG_ROUTE() {
-ROUTE_TMP=`/usr/bin/mktemp -t route`
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --inputbox "Please enter default route." 7 50  \
-2>${ROUTE_TMP}
-ROUTE=`cat $ROUTE_TMP`
-route delete default  > /dev/null 2>&1
-route add default $ROUTE  > /dev/null 2>&1
-RETVAL=$?
-if [ $RETVAL = 0 ]; then
-        $DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "     Default route is configured..." 5 50
-		else
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox " Couldn't add default route...Please redo configuration..." 5 66
-fi
-echo "defaultrouter=\"$ROUTE\"" >> /etc/rc.conf
-rm /tmp/route*
-}
-
-CONFIG_RES() {
-DNS_TMP=`/usr/bin/mktemp -t dns`
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --inputbox "Enter nameserver IP." 7 63  \
-2>${DNS_TMP}
-DNS=`cat $DNS_TMP`
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --yesno "Is correct nameserver's IP $DNS ?" 5 63
-case $? in
-1)
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox " Please redo configuration..." 5 63
-;;
-0)
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "Since nameserver's IP is correct i'll write'it in resolv.conf." 7 66
-echo "nameserver $DNS ">> /etc/resolv.conf
-esac
-rm /tmp/dns*
-}
-
-TEMP=`/usr/bin/mktemp -t checklist`
-menu() {
-        $DIALOG --title "RoFreeSBIE Live CD Network Configuration Tool. " --menu "  " 13 63 6 \
-                C "Config network card." \
-                R "Config add or change default route." \
-		E "Config resolv.conf." \
-                A "Config network card, default route and resolv.conf." \
-		D "Delete default route." \
-		Q "Quit" \
-        2> $TEMP
-        case `cat $TEMP` in
-                C)
-                     CONFIG_CARD				
-                     ;;
-                R)
-	             CONFIG_ROUTE
-	             ;;
-                E)
-		     CONFIG_RES
-		     ;;
-		A)
-		      CONFIG_CARD
-		      CONFIG_ROUTE
-		      CONFIG_RES
-		      ;;
-	        D)
-	              route delete default > /dev/null 2>&1 
-	              rm /tmp/checklist* > /dev/null 2>&1
-		      ;;	           
-		Q)
-                rm ./netcards > /dev/null 2>&1
-		rm /tmp/checklist* > /dev/null 2>&1     
-		exit 0       
-                      ;;
-		*)
-                rm ./netcards > /dev/null 2>&1
-		rm /tmp/checklist* > /dev/null 2>&1
-                exit 1        
-        esac
-        menu        
-	rm ./netcards > /dev/null 2>&1
-	rm /tmp/checklist* > /dev/null 2>&1
-}
-rm ./netcards > /dev/null 2>&1
-echo >> ./netcards
-echo "     Choose network card and type it in the next box." >> ./netcards
-echo >> ./netcards
- $DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --yesno "  
-          Proceed with network card configuration ? " 7 63
-case $? in
-1)
-rm ./netcards > /dev/null 2>&1
-exit ;;
-0)
-for i in `ls /dev/net| grep -v lo| grep -v plip `
-do
-echo "          FreeBSD has detected network card $i" >> ./netcards
-done
-if [ $i = "" ] ;then
-$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "FreeBSD hasn't detected any network card...Exiting..." 6 63
-exit
-fi
-esac
-
-menu
-rm ./netcards > /dev/null 2>&1
-rm /tmp/checklist* > /dev/null 2>&1
+#!/bin/sh
+#
+# This code was developed by Angelescu Ovidiu.
+#As the licence says, here is the copyright note
+#
+# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at gmail.com>
+# All Rights Reserved.
+#
+# THIS SOFTWARE IS PROVIDED BY ANGELESCU OVIDIU ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT ANGELESCU OVIDIU BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
+##########################################
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
+export PATH
+HOME=/root
+export HOME
+TERM=${TERM:-cons25}
+export TERM
+cd /scripts/cardDetect
+
+XDIALOG_HIGH_DIALOG_COMPAT=1
+export XDIALOG_HIGH_DIALOG_COMPAT
+
+DIALOG="dialog"
+[ -n "$DISPLAY" ] && [ -x /usr/X11R6/bin/Xdialog ] && DIALOG="Xdialog"
+
+CONFIG_CARD() {
+CARD_TMP=`/usr/bin/mktemp -t card`
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --textbox ./netcards 11 63
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --inputbox "Enter what network card you want to configure." 7 63  \
+2>${CARD_TMP}
+CARD=`cat $CARD_TMP`
+rm /tmp/card*
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --yesno "Do you want DHCP configuration of network card?" 5 63
+case $? in
+0)
+echo "ifconfig_$CARD=\"DHCP\"" >> /etc/rc.conf
+/etc/rc.d/netif restart > /dev/null 2>&1
+CONF=`ifconfig $CARD | grep netmask`
+case "${CONF:-NULL}" in
+NULL)
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "  Something is wrong.DHCP server not found..." 5 63
+;;
+*)
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "  Network card $CARD was DHCP configured..." 5 63
+;;
+esac
+;;
+1)
+IP_TMP=`/usr/bin/mktemp -t ip`
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --inputbox "Enter network card IP." 7 50  \
+2>${IP_TMP}
+IP=`cat $IP_TMP`
+rm /tmp/ip*
+MASK_TMP=`/usr/bin/mktemp -t mask`
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --inputbox "Enter network's mask." 7 50  \
+2>${MASK_TMP}
+MASK=`cat $MASK_TMP`
+ifconfig $CARD delete > /dev/null 2>&1
+ifconfig $CARD $IP netmask $MASK > /dev/null 2>&1
+RETVAL=$?
+if [ $RETVAL = 0 ]; then
+        $DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "  Network card $CARD is configured..." 5 50
+	echo "ifconfig_$CARD=\"inet $IP  netmask $MASK\"" >> /etc/rc.conf 
+	else
+	$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "  Something is wrong.Please redo configuration..." 6 59
+fi
+esac
+rm /tmp/mask*
+}
+
+CONFIG_ROUTE() {
+ROUTE_TMP=`/usr/bin/mktemp -t route`
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --inputbox "Please enter default route." 7 50  \
+2>${ROUTE_TMP}
+ROUTE=`cat $ROUTE_TMP`
+route delete default  > /dev/null 2>&1
+route add default $ROUTE  > /dev/null 2>&1
+RETVAL=$?
+if [ $RETVAL = 0 ]; then
+        $DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "     Default route is configured..." 5 50
+		else
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox " Couldn't add default route...Please redo configuration..." 5 66
+fi
+echo "defaultrouter=\"$ROUTE\"" >> /etc/rc.conf
+rm /tmp/route*
+}
+
+CONFIG_RES() {
+DNS_TMP=`/usr/bin/mktemp -t dns`
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --inputbox "Enter nameserver IP." 7 63  \
+2>${DNS_TMP}
+DNS=`cat $DNS_TMP`
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --yesno "Is correct nameserver's IP $DNS ?" 5 63
+case $? in
+1)
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox " Please redo configuration..." 5 63
+;;
+0)
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "Since nameserver's IP is correct i'll write'it in resolv.conf." 7 66
+echo "nameserver $DNS ">> /etc/resolv.conf
+esac
+rm /tmp/dns*
+}
+
+TEMP=`/usr/bin/mktemp -t checklist`
+menu() {
+        $DIALOG --title "RoFreeSBIE Live CD Network Configuration Tool. " --menu "  " 13 63 6 \
+                C "Config network card." \
+                R "Config add or change default route." \
+		E "Config resolv.conf." \
+                A "Config network card, default route and resolv.conf." \
+		D "Delete default route." \
+		Q "Quit" \
+        2> $TEMP
+        case `cat $TEMP` in
+                C)
+                     CONFIG_CARD				
+                     ;;
+                R)
+	             CONFIG_ROUTE
+	             ;;
+                E)
+		     CONFIG_RES
+		     ;;
+		A)
+		      CONFIG_CARD
+		      CONFIG_ROUTE
+		      CONFIG_RES
+		      ;;
+	        D)
+	              route delete default > /dev/null 2>&1 
+	              rm /tmp/checklist* > /dev/null 2>&1
+		      ;;	           
+		Q)
+                rm ./netcards > /dev/null 2>&1
+		rm /tmp/checklist* > /dev/null 2>&1     
+		exit 0       
+                      ;;
+		*)
+                rm ./netcards > /dev/null 2>&1
+		rm /tmp/checklist* > /dev/null 2>&1
+                exit 1        
+        esac
+        menu        
+	rm ./netcards > /dev/null 2>&1
+	rm /tmp/checklist* > /dev/null 2>&1
+}
+rm ./netcards > /dev/null 2>&1
+echo >> ./netcards
+echo "     Choose network card and type it in the next box." >> ./netcards
+echo >> ./netcards
+ $DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --yesno "  
+          Proceed with network card configuration ? " 7 63
+case $? in
+1)
+rm ./netcards > /dev/null 2>&1
+exit ;;
+0)
+for i in `ls /dev/net| grep -v lo| grep -v plip `
+do
+echo "          FreeBSD has detected network card $i" >> ./netcards
+done
+if [ $i = "" ] ;then
+$DIALOG --title " RoFreeSBIE Live CD Network Configuration Tool. " --msgbox "FreeBSD hasn't detected any network card...Exiting..." 6 63
+exit
+fi
+esac
+
+menu
+rm ./netcards > /dev/null 2>&1
+rm /tmp/checklist* > /dev/null 2>&1

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/nvidia_card.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/nvidia_card.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/nvidia_card.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,55 +1,55 @@
-#!/bin/sh
-#
-# Name    : Nvidia driver XFree86 configuration script
-# Version : 0.1
-# Author Angelescu Ovidiu (mrhsaacdoH at gmail.com)
-#
-
-XFREE_CONF="/etc/X11/XF86Config"
-XFREE_FCONF="/etc/X11/XF86ConfigI"
-DEV_NV=`sed -n '/^Section "Device"$/,/^EndSection$/ p' $XFREE_CONF | awk '{print $2}' | grep nVidia`
-
-case $1 in
-
-enable)
-if [ $DEV_NV = "\"nVidia" ] ; then
-echo "Nvidia Graphic Card found ....."
-echo "Loading Nvidia Kernel Driver..."
-if [ -e /root/.disable ] ; then
-kldload nvidia > /dev/null 2>&1
-rm -f /var/nvidia/* > /dev/null 2>&1
-tar -zpxPf /scripts/cardDetect/nvidia_on.tgz -C / > /dev/null 2>&1
-mv /root/.disable /root/.enable
-XFREE_FCONF=`sed -e 's/Load  "dri"/#Load  "dri"/' -i.orig $XFREE_CONF`
-NV_NOTKNOWN=`sed -n '/^Section "Device"$/,/^EndSection$/ p' $XFREE_CONF | awk '{print $2}' | grep vesa`
-if [ $NV_NOTKNOWN = "\"vesa\"" ] ; then
-XFREEF_CONF=` sed -e 's/vesa/nvidia/' -i.nvi $XFREE_CONF`
-else
-XFREEF_CONF=` sed -e 's/nv/nvidia/' -i.nvi $XFREE_CONF`
-fi
-rm -f $XFREE_CONF.nvi > /dev/null 2>&1
-else
-exit
-fi
-fi
-;;
-disable)
-if [ -e /root/.enable ] ; then
-rm -f $XFREE_CONF > /dev/null 2>&1
-mv /etc/X11/XF86Config.orig /etc/X11/XF86Config > /dev/null 2>&1
-kldunload nvidia
-rm -f /var/nvidia/* > /dev/null 2>&1
-tar -zpxPf /scripts/cardDetect/nvidia_off.tgz -C / > /dev/null 2>&1
-mv /root/.enable /root/.disable
-else
-exit
-fi
-;;
-*)
-echo "usage: `basename $0` {enable|disable}" >&2
-     exit 64
-;;
-esac
-
-
-
+#!/bin/sh
+#
+# Name    : Nvidia driver XFree86 configuration script
+# Version : 0.1
+# Author Angelescu Ovidiu (mrhsaacdoH at gmail.com)
+#
+
+XFREE_CONF="/etc/X11/XF86Config"
+XFREE_FCONF="/etc/X11/XF86ConfigI"
+DEV_NV=`sed -n '/^Section "Device"$/,/^EndSection$/ p' $XFREE_CONF | awk '{print $2}' | grep nVidia`
+
+case $1 in
+
+enable)
+if [ $DEV_NV = "\"nVidia" ] ; then
+echo "Nvidia Graphic Card found ....."
+echo "Loading Nvidia Kernel Driver..."
+if [ -e /root/.disable ] ; then
+kldload nvidia > /dev/null 2>&1
+rm -f /var/nvidia/* > /dev/null 2>&1
+tar -zpxPf /scripts/cardDetect/nvidia_on.tgz -C / > /dev/null 2>&1
+mv /root/.disable /root/.enable
+XFREE_FCONF=`sed -e 's/Load  "dri"/#Load  "dri"/' -i.orig $XFREE_CONF`
+NV_NOTKNOWN=`sed -n '/^Section "Device"$/,/^EndSection$/ p' $XFREE_CONF | awk '{print $2}' | grep vesa`
+if [ $NV_NOTKNOWN = "\"vesa\"" ] ; then
+XFREEF_CONF=` sed -e 's/vesa/nvidia/' -i.nvi $XFREE_CONF`
+else
+XFREEF_CONF=` sed -e 's/nv/nvidia/' -i.nvi $XFREE_CONF`
+fi
+rm -f $XFREE_CONF.nvi > /dev/null 2>&1
+else
+exit
+fi
+fi
+;;
+disable)
+if [ -e /root/.enable ] ; then
+rm -f $XFREE_CONF > /dev/null 2>&1
+mv /etc/X11/XF86Config.orig /etc/X11/XF86Config > /dev/null 2>&1
+kldunload nvidia
+rm -f /var/nvidia/* > /dev/null 2>&1
+tar -zpxPf /scripts/cardDetect/nvidia_off.tgz -C / > /dev/null 2>&1
+mv /root/.enable /root/.disable
+else
+exit
+fi
+;;
+*)
+echo "usage: `basename $0` {enable|disable}" >&2
+     exit 64
+;;
+esac
+
+
+

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/rules
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/rules	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/rules	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,35 +1,35 @@
-
-# Force a flushing of the current rules before we reload.
-$fwcmd -f flush
-
-# Check the state of all packets.
-$fwcmd add check-state
-
-# Stop spoofing on the outside interface.
-$fwcmd add deny ip from any to any in via $oif not verrevpath
-
-# Allow all connections that we initiate, and keep their state.
-# but deny established connections that don't have a dynamic rule.
-$fwcmd add allow ip from me to any out via $oif keep-state
-$fwcmd add deny tcp from any to any established in via $oif
-
-# Allow all connections within our network.
-$fwcmd add allow ip from any to any via $iif
-
-# Allow all local traffic.
-$fwcmd add allow all from any to any via lo0
-$fwcmd add deny all from any to 127.0.0.0/8
-$fwcmd add deny ip from 127.0.0.0/8 to any
-
-# Allow internet users to connect to the port 22 and 80.
-# This example specifically allows connections to the sshd and a
-# webserver.
-#$fwcmd add allow tcp from any to me dst-port 22,80 in via $oif setup keep-state
-
-# Allow ICMP packets: remove type 8 if you don't want your host
-# to be pingable.
-$fwcmd add allow icmp from any to any via $oif icmptypes 0,3,8,11,12
-
-# Deny and log all the rest.
-$fwcmd add deny log ip from any to any
-
+
+# Force a flushing of the current rules before we reload.
+$fwcmd -f flush
+
+# Check the state of all packets.
+$fwcmd add check-state
+
+# Stop spoofing on the outside interface.
+$fwcmd add deny ip from any to any in via $oif not verrevpath
+
+# Allow all connections that we initiate, and keep their state.
+# but deny established connections that don't have a dynamic rule.
+$fwcmd add allow ip from me to any out via $oif keep-state
+$fwcmd add deny tcp from any to any established in via $oif
+
+# Allow all connections within our network.
+$fwcmd add allow ip from any to any via $iif
+
+# Allow all local traffic.
+$fwcmd add allow all from any to any via lo0
+$fwcmd add deny all from any to 127.0.0.0/8
+$fwcmd add deny ip from 127.0.0.0/8 to any
+
+# Allow internet users to connect to the port 22 and 80.
+# This example specifically allows connections to the sshd and a
+# webserver.
+#$fwcmd add allow tcp from any to me dst-port 22,80 in via $oif setup keep-state
+
+# Allow ICMP packets: remove type 8 if you don't want your host
+# to be pingable.
+$fwcmd add allow icmp from any to any via $oif icmptypes 0,3,8,11,12
+
+# Deny and log all the rest.
+$fwcmd add deny log ip from any to any
+

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_defines
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_defines	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_defines	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,68 +1,68 @@
-snd_als4000 :    ALS_PCI_ID0 		0x40004005
-snd_aureal :     AU8820_PCI_ID 		0x000112eb
-snd_cmi :        CMI8338A_PCI_ID   	0x010013f6
-snd_cmi :        CMI8338B_PCI_ID   	0x010113f6
-snd_cmi :        CMI8738_PCI_ID    	0x011113f6
-snd_cmi :        CMI8738B_PCI_ID   	0x011213f6
-snd_cs4281 :     CS4281_PCI_ID 		0x60051013
-snd_csa :        CS4610_PCI_ID 		0x60011013
-snd_csa :        CS4614_PCI_ID 		0x60031013
-snd_csa :        CS4615_PCI_ID 		0x60041013
-snd_ds1 :        YAMHA_724_PCI_ID       0x00041073
-snd_ds1 :        YAMHA_724F_PCI_ID      0x000d1073
-snd_ds1 :        YAMHA_734_PCI_ID       0x00051073
-snd_ds1 :        YAMHA_737_PCI_ID       0x00081073
-snd_ds1 :        YAMHA_738_PCI_ID       0x00201073
-snd_ds1 :        YAMHA_738_TEG_PCI_ID   0x00061073
-snd_ds1 :        YAMHA_740_PCI_ID       0x000a1073
-snd_ds1 :        YAMHA_740B_PCI_ID      0x000a1073
-snd_ds1 :        YAMHA_740I_PCI_ID      0x000a1073
-snd_ds1 :        YAMHA_740?_PCI_ID      0x000a1073
-snd_ds1 :        YAMHA_740C_PCI_ID      0x000c1073
-snd_ds1 :        YAMHA_744_PCI_ID       0x00101073
-snd_ds1 :        YAMHA_754_PCI_ID       0x00121073
-snd_emu10k1 : 	 EMU10K1_PCI_ID		0x00021102	
-snd_emu10k1 : 	 EMU10K2_PCI_ID		0x00041102	
-snd_emu10k1 : 	 EMU10K2_PCI_ID		0x00071102	
-snd_es137x :     ES1370_PCI_ID 		0x50001274
-snd_es137x :     ES1371_PCI_ID 		0x13711274
-snd_es137x :     ES1371_PCI_ID2 	0x13713274
-snd_es137x :     CT5880_PCI_ID 		0x58801274
-snd_es137x :     CT4730_PCI_ID 		0x89381102
-snd_fm801 :      FORTEMEDIA1_PCI_ID     0x08011319
-snd_fm801 :      FORTEMEDIA2_PCI_ID     0x08021319
-snd_maestro :    MAESTRO_1_PCI_ID	0x01001285
-snd_maestro :    MAESTRO_2_PCI_ID	0x1968125d
-snd_maestro :    MAESTRO_2E_PCI_ID	0x1978125d
-snd_maestro :    MAESTRO_PCI_ID	        0x803c1033
-snd_maestro :    MAESTRO_PCI_ID		0x80581033
-snd_maestro3 :   MAESTRO3_PCI_ID        0x1988125d
-snd_maestro3 :   MAESTRO3_PCI_ID        0x1998125d
-snd_maestro3 :   MAESTRO3_PCI_ID        0x199a125d
-snd_neomagic :   NM256AV_PCI_ID 	0x800510c8
-snd_neomagic :   NM256ZX_PCI_ID 	0x800610c8
-snd_t4dwave :    TDX_PCI_ID 		0x20001023
-snd_t4dwave :    TNX_PCI_ID 		0x20011023
-snd_t4dwave :    ALI_PCI_ID		0x545110b9
-snd_t4dwave :    SPA_PCI_ID		0x70181039
-snd_via8233 :    VIA8233_PCI_ID 	0x30591106
-snd_via82c686 :  VIA_PCI_ID 		0x30581106
-snd_vibes :      SV_PCI_ID		0xca005333
-snd_ich   :      SIS7012ID             	0x70121039      
-snd_ich   :      ICH4ID         	0x24c58086        
-snd_ich   :      ICH4ID                 0x24158086                      
-snd_ich	  :	 ICH5ID                 0x24d58086                      
-snd_ich   :      ICH6ID                 0x266e8086
-snd_ich   :      ICH3_ID		0x24858086
-snd_ich   :      ICH2_ID		0x24458086
-snd_ich   :      ICH_ID			0x24258086
-snd_ich   :      INTEL_443MX_ID 	0x71958086												
-snd_ich   :      NVIDIA_NF_ID	        0x01b110de
-snd_ich   :      NVIDIA_NF2_ID		0x006a10de
-snd_ich   :      NVIDIA_NF2_400_ID	0x008a10de
-snd_ich   :      NVIDIA_NF3_ID		0x00da10de		
-snd_ich   :      NVIDIA_NF3_250_ID	0x00ea10de	
-snd_ich   :      NVIDIA_NF4_ID		0x005910de
-snd_ich   :      AMD_768_PCI_ID         0x74451022
-snd_ich   :      AMD_8111_PCI_ID	0x746d1022
-snd_solo  :      ESS_SOLO_PCI_ID	0x1969125d
+snd_als4000 :    ALS_PCI_ID0 		0x40004005
+snd_aureal :     AU8820_PCI_ID 		0x000112eb
+snd_cmi :        CMI8338A_PCI_ID   	0x010013f6
+snd_cmi :        CMI8338B_PCI_ID   	0x010113f6
+snd_cmi :        CMI8738_PCI_ID    	0x011113f6
+snd_cmi :        CMI8738B_PCI_ID   	0x011213f6
+snd_cs4281 :     CS4281_PCI_ID 		0x60051013
+snd_csa :        CS4610_PCI_ID 		0x60011013
+snd_csa :        CS4614_PCI_ID 		0x60031013
+snd_csa :        CS4615_PCI_ID 		0x60041013
+snd_ds1 :        YAMHA_724_PCI_ID       0x00041073
+snd_ds1 :        YAMHA_724F_PCI_ID      0x000d1073
+snd_ds1 :        YAMHA_734_PCI_ID       0x00051073
+snd_ds1 :        YAMHA_737_PCI_ID       0x00081073
+snd_ds1 :        YAMHA_738_PCI_ID       0x00201073
+snd_ds1 :        YAMHA_738_TEG_PCI_ID   0x00061073
+snd_ds1 :        YAMHA_740_PCI_ID       0x000a1073
+snd_ds1 :        YAMHA_740B_PCI_ID      0x000a1073
+snd_ds1 :        YAMHA_740I_PCI_ID      0x000a1073
+snd_ds1 :        YAMHA_740?_PCI_ID      0x000a1073
+snd_ds1 :        YAMHA_740C_PCI_ID      0x000c1073
+snd_ds1 :        YAMHA_744_PCI_ID       0x00101073
+snd_ds1 :        YAMHA_754_PCI_ID       0x00121073
+snd_emu10k1 : 	 EMU10K1_PCI_ID		0x00021102	
+snd_emu10k1 : 	 EMU10K2_PCI_ID		0x00041102	
+snd_emu10k1 : 	 EMU10K2_PCI_ID		0x00071102	
+snd_es137x :     ES1370_PCI_ID 		0x50001274
+snd_es137x :     ES1371_PCI_ID 		0x13711274
+snd_es137x :     ES1371_PCI_ID2 	0x13713274
+snd_es137x :     CT5880_PCI_ID 		0x58801274
+snd_es137x :     CT4730_PCI_ID 		0x89381102
+snd_fm801 :      FORTEMEDIA1_PCI_ID     0x08011319
+snd_fm801 :      FORTEMEDIA2_PCI_ID     0x08021319
+snd_maestro :    MAESTRO_1_PCI_ID	0x01001285
+snd_maestro :    MAESTRO_2_PCI_ID	0x1968125d
+snd_maestro :    MAESTRO_2E_PCI_ID	0x1978125d
+snd_maestro :    MAESTRO_PCI_ID	        0x803c1033
+snd_maestro :    MAESTRO_PCI_ID		0x80581033
+snd_maestro3 :   MAESTRO3_PCI_ID        0x1988125d
+snd_maestro3 :   MAESTRO3_PCI_ID        0x1998125d
+snd_maestro3 :   MAESTRO3_PCI_ID        0x199a125d
+snd_neomagic :   NM256AV_PCI_ID 	0x800510c8
+snd_neomagic :   NM256ZX_PCI_ID 	0x800610c8
+snd_t4dwave :    TDX_PCI_ID 		0x20001023
+snd_t4dwave :    TNX_PCI_ID 		0x20011023
+snd_t4dwave :    ALI_PCI_ID		0x545110b9
+snd_t4dwave :    SPA_PCI_ID		0x70181039
+snd_via8233 :    VIA8233_PCI_ID 	0x30591106
+snd_via82c686 :  VIA_PCI_ID 		0x30581106
+snd_vibes :      SV_PCI_ID		0xca005333
+snd_ich   :      SIS7012ID             	0x70121039      
+snd_ich   :      ICH4ID         	0x24c58086        
+snd_ich   :      ICH4ID                 0x24158086                      
+snd_ich	  :	 ICH5ID                 0x24d58086                      
+snd_ich   :      ICH6ID                 0x266e8086
+snd_ich   :      ICH3_ID		0x24858086
+snd_ich   :      ICH2_ID		0x24458086
+snd_ich   :      ICH_ID			0x24258086
+snd_ich   :      INTEL_443MX_ID 	0x71958086												
+snd_ich   :      NVIDIA_NF_ID	        0x01b110de
+snd_ich   :      NVIDIA_NF2_ID		0x006a10de
+snd_ich   :      NVIDIA_NF2_400_ID	0x008a10de
+snd_ich   :      NVIDIA_NF3_ID		0x00da10de		
+snd_ich   :      NVIDIA_NF3_250_ID	0x00ea10de	
+snd_ich   :      NVIDIA_NF4_ID		0x005910de
+snd_ich   :      AMD_768_PCI_ID         0x74451022
+snd_ich   :      AMD_8111_PCI_ID	0x746d1022
+snd_solo  :      ESS_SOLO_PCI_ID	0x1969125d

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_detect.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_detect.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_detect.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,52 +1,52 @@
-#!/bin/sh
-#
-# This code was developed by Angelescu Ovidiu and modified by Lubomir Kundrak
-#As the licence says, here is the copyright note
-#
-# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at gmail.com>
-# Copyright 2006 Lubomir Kundrak <lkundrak at skosi.org>
-# All Rights Reserved.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANYEXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
-# AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-##########################################
-
-PATH_ORIG=/PCBSD/cardDetect
-FILE_1=${PATH_ORIG}/sound_defines
-STR_ID=`pciconf -l | sed -n 's/.*class=0x040100.*chip=\([^ ]*\).*/\1/p'`
-
-if [ -n "$STR_ID" ]
-then
-    VENDOR_ID=`echo ${PCICONF} | awk '{ print(substr($0,7,4)); }'`
-    CARD=`zgrep $STR_ID ${FILE_1} | awk '{print $1}'`
-else
-    echo "Unable to locate the sound card and match an appropriate driver."
-    echo "Maybe you have an ISA sound card, that must be configured manualy."
-    echo "All sound drivers will be given opportiunity to probe for cards."
-    CARD=snd_driver
-fi
-
-if [ ! -n "$CARD" ]
-then
-    echo "No known driver matched your sound card."
-    echo "Maybe you have an sound card, that is too new."
-    echo "All sound drivers will be given opportiunity to probe for cards."
-    CARD=snd_driver
-fi
-
-if [ "$VENDOR_ID" = "8086" ]
-then
-    echo "It looks like you have an Intel ICH sound Card."
-    CARD=snd_ich
-fi
-
-echo "Loading $CARD audio driver..."
-kldload $CARD
+#!/bin/sh
+#
+# This code was developed by Angelescu Ovidiu and modified by Lubomir Kundrak
+#As the licence says, here is the copyright note
+#
+# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at gmail.com>
+# Copyright 2006 Lubomir Kundrak <lkundrak at skosi.org>
+# All Rights Reserved.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANYEXPRESS OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+##########################################
+
+PATH_ORIG=/PCBSD/cardDetect
+FILE_1=${PATH_ORIG}/sound_defines
+STR_ID=`pciconf -l | sed -n 's/.*class=0x040100.*chip=\([^ ]*\).*/\1/p'`
+
+if [ -n "$STR_ID" ]
+then
+    VENDOR_ID=`echo ${PCICONF} | awk '{ print(substr($0,7,4)); }'`
+    CARD=`zgrep $STR_ID ${FILE_1} | awk '{print $1}'`
+else
+    echo "Unable to locate the sound card and match an appropriate driver."
+    echo "Maybe you have an ISA sound card, that must be configured manualy."
+    echo "All sound drivers will be given opportiunity to probe for cards."
+    CARD=snd_driver
+fi
+
+if [ ! -n "$CARD" ]
+then
+    echo "No known driver matched your sound card."
+    echo "Maybe you have an sound card, that is too new."
+    echo "All sound drivers will be given opportiunity to probe for cards."
+    CARD=snd_driver
+fi
+
+if [ "$VENDOR_ID" = "8086" ]
+then
+    echo "It looks like you have an Intel ICH sound Card."
+    CARD=snd_ich
+fi
+
+echo "Loading $CARD audio driver..."
+kldload $CARD

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/tv_cardtypes
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/tv_cardtypes	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/tv_cardtypes	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,37 +1,37 @@
-
-        Note (FreeBSD support only Bt8x8 based cards)
-
-
-In FreeBSD each TvCard has assigned a number.
-Some unlisted cards may work with one of those models.
-If something goes wrong you will have picture but no sound.
-Please choose your's model card number and type it in next box.
-
-
-Card Type		                        Model Card Number
-
-
-Pinnacle/Miro TV                                        1
-Hauppauge WinCast/TV                                    2
-STB TV/PCI                                              3
-Intel Smart Video III/VideoLogic Captivator PCI         4
-IMS TV Turbo                                            5
-AVer Media TV/FM                                        6
-MMAC Osprey                                             7
-NEC PK-UG-X017 ,PixelView PlayTv Pro                    8
-I/O DATA GV-BCTV2/PCI                                   9
-FlyVideo                                                10
-Zoltrix                                                 11
-KISS TV/FM PCI                                          12
-Video Highway Xtreme                                    13
-Askey/Dynalink Magic TView                              14
-Leadtek Winfast TV 2000                                 15
-TerraTVplus                                             16
-I/O DATA GV-BCTV3/PCI                                   17
-AOpen VA1000                                            18
-Pinnacle PCTV Rave                                      19
-PixelView PlayTV Pak                                    20
-Terratek Value                                          21
-PixelView PlayTv Pro Rev-4C                             22
-Leadtek Winfast TV 2000 XP RM Edition                   23
+
+        Note (FreeBSD support only Bt8x8 based cards)
+
+
+In FreeBSD each TvCard has assigned a number.
+Some unlisted cards may work with one of those models.
+If something goes wrong you will have picture but no sound.
+Please choose your's model card number and type it in next box.
+
+
+Card Type		                        Model Card Number
+
+
+Pinnacle/Miro TV                                        1
+Hauppauge WinCast/TV                                    2
+STB TV/PCI                                              3
+Intel Smart Video III/VideoLogic Captivator PCI         4
+IMS TV Turbo                                            5
+AVer Media TV/FM                                        6
+MMAC Osprey                                             7
+NEC PK-UG-X017 ,PixelView PlayTv Pro                    8
+I/O DATA GV-BCTV2/PCI                                   9
+FlyVideo                                                10
+Zoltrix                                                 11
+KISS TV/FM PCI                                          12
+Video Highway Xtreme                                    13
+Askey/Dynalink Magic TView                              14
+Leadtek Winfast TV 2000                                 15
+TerraTVplus                                             16
+I/O DATA GV-BCTV3/PCI                                   17
+AOpen VA1000                                            18
+Pinnacle PCTV Rave                                      19
+PixelView PlayTV Pak                                    20
+Terratek Value                                          21
+PixelView PlayTv Pro Rev-4C                             22
+Leadtek Winfast TV 2000 XP RM Edition                   23
 	
\ No newline at end of file

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/tv_tunertypes
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/tv_tunertypes	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/tv_tunertypes	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,28 +1,28 @@
-
-       Now you must to choose a tuner for your's tvcard.
-
-
-A Tv Card type is equiped from factory with diferent tuner types.
-If something goes wrong you will have sound but no picture.
-Please choose your's model tuner number and type it in next box.
-
-
-Tuner Type		                        Model Tuner Number
-
-NO_TUNER (only for capture cards)                       0 
-Temic NTSC                                              1
-Temic PAL                                               2
-Temic SECAM                                             3
-Philips NTSC                                            4
-Philips PAL                                             5
-Philips SECAM                                           6
-Temic PAL I                                             7
-Philips PAL I                                           8
-Philips FR1236 NTSC FM                                  9
-Philips FR1216 PAL FM                                   10
-Philips FR1236 SECAM FM                                 11
-ALPS TSCH5 NTSC FM                                      12
-ALPS TSBH1 NTSC                                         13
-MT2032                                                  14
-LG TPI8PSB12P PAL                                       15
-Philips FI1216 (Winfast TV 2000 XP tuner)               16
+
+       Now you must to choose a tuner for your's tvcard.
+
+
+A Tv Card type is equiped from factory with diferent tuner types.
+If something goes wrong you will have sound but no picture.
+Please choose your's model tuner number and type it in next box.
+
+
+Tuner Type		                        Model Tuner Number
+
+NO_TUNER (only for capture cards)                       0 
+Temic NTSC                                              1
+Temic PAL                                               2
+Temic SECAM                                             3
+Philips NTSC                                            4
+Philips PAL                                             5
+Philips SECAM                                           6
+Temic PAL I                                             7
+Philips PAL I                                           8
+Philips FR1236 NTSC FM                                  9
+Philips FR1216 PAL FM                                   10
+Philips FR1236 SECAM FM                                 11
+ALPS TSCH5 NTSC FM                                      12
+ALPS TSBH1 NTSC                                         13
+MT2032                                                  14
+LG TPI8PSB12P PAL                                       15
+Philips FI1216 (Winfast TV 2000 XP tuner)               16

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/tvcard_config.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/tvcard_config.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/tvcard_config.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,111 +1,111 @@
-#!/bin/sh
-#
-# This code was developed by Angelescu Ovidiu.
-#As the licence says, here is the copyright note
-#
-# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at gmail.com>
-# All Rights Reserved.
-#
-# THIS SOFTWARE IS PROVIDED BY ANGELESCU OVIDIU ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT ANGELESCU OVIDIU BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-# DAMAGE.
-##########################################
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
-export PATH
-HOME=/root
-export HOME
-TERM=${TERM:-cons25}
-export TERM
-cd /scripts/cardDetect
-
-XDIALOG_HIGH_DIALOG_COMPAT=1
-export XDIALOG_HIGH_DIALOG_COMPAT
-
-DIALOG="dialog"
-[ -n "$DISPLAY" ] && [ -x /usr/X11R6/bin/Xdialog ] && DIALOG="Xdialog"
-
-XAWTV_CONF=/root/.xawtv
-
-CHOOSE_CARD() {
-#Alege tipul de TvCard 
-TVCARD_TMP=`/usr/bin/mktemp -t tvcard`
-$DIALOG --title "RoFreeSBIE Live CD TvCard Configuration tool." \
---yesno "  
-               Proceed with TvCard configuration ? 
-	                                            " 7 70
-case $? in
-1) rm /tmp/tvcard*  > /dev/null 2>&1 
-exit ;;
-0) $DIALOG --title "RoFreeSBIE Live CD TvCard Configuration tool." \
---textbox ./tv_cardtypes 25 68
-$DIALOG --title "RoFreeSBIE Live CD Tuner Configuration tool." --clear \
---inputbox "Enter your's Tv Card model number." 9 50 \
-"" 2> ${TVCARD_TMP}
-TVCARD=`cat ${TVCARD_TMP}`
-TVCARD_SET="YES"
-if [ $TVCARD -lt "24" ] ; then
-cp /etc/sysctl.conf /etc/sysctl.conf.old
-cat /etc/sysctl.conf.old | grep -v hw.bt848 > /etc/sysctl.conf
-echo "hw.bt848.card=$TVCARD" >> /etc/sysctl.conf 
-sysctl hw.bt848.card=$TVCARD > /dev/null 2>&1
-if [ $TVCARD = "23" ] ; then
-CONFIGURED=`cat $XAWTV_CONF | grep line1`
-case ${CONFIGURED:-NULL} in
-NULL)
-XAWTV_CONF=`sed -e 's/mixer = line/mixer = line1/' -i.orig $XAWTV_CONF`
-chown root $XAWTV_CONF
-chgrp root $XAWTV_CONF
-;;
-*)
-;;
-esac
-fi
-fi
-rm /tmp/tvcard*  > /dev/null 2>&1 ;;
-esac
-}
-
-CHOOSE_TUNER() {
-$DIALOG --title "RoFreeSBIE Live CD Tuner Configuration tool." --clear \
---textbox ./tv_tunertypes 22 70
-$DIALOG --title "RoFreeSBIE Live CD Tuner Configuration tool." --clear \
---inputbox "Enter your's model tuner number." 9 50 \
-"" 2> ${TVCARD_TMP}
-TVCARD=`cat ${TVCARD_TMP}`
-if [ $TVCARD -lt "17" ] ; then
-echo "hw.bt848.tuner=$TVCARD" >> /etc/sysctl.conf 
-sysctl hw.bt848.tuner=$TVCARD > /dev/null 2>&1
-fi
-rm /tmp/tvcard*  > /dev/null 2>&1 
-}
-
-COMPAT() {
-#Verifica daca avem chipset brooktree (conexant) 8x8 si daca nu iese
-havecard=`ls /dev | grep bktr | head -n 1`
-if [ "$havecard" != "bktr" ] ; then
-$DIALOG --title "RoFreeSBIE Live CD TvCard Configuration tool." \
---infobox "
-Your's TvCard chipset is incompatible with FreeBSD.
- 
-        This program will exit in 3 seconds.
- " 7 66
-sleep 3
-exit
-else	
-CHOOSE_CARD
-CHOOSE_TUNER
-rm /tmp/tvcard*  > /dev/null 2>&1
-fi
-}
-
+#!/bin/sh
+#
+# This code was developed by Angelescu Ovidiu.
+#As the licence says, here is the copyright note
+#
+# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at gmail.com>
+# All Rights Reserved.
+#
+# THIS SOFTWARE IS PROVIDED BY ANGELESCU OVIDIU ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT ANGELESCU OVIDIU BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
+##########################################
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
+export PATH
+HOME=/root
+export HOME
+TERM=${TERM:-cons25}
+export TERM
+cd /scripts/cardDetect
+
+XDIALOG_HIGH_DIALOG_COMPAT=1
+export XDIALOG_HIGH_DIALOG_COMPAT
+
+DIALOG="dialog"
+[ -n "$DISPLAY" ] && [ -x /usr/X11R6/bin/Xdialog ] && DIALOG="Xdialog"
+
+XAWTV_CONF=/root/.xawtv
+
+CHOOSE_CARD() {
+#Alege tipul de TvCard 
+TVCARD_TMP=`/usr/bin/mktemp -t tvcard`
+$DIALOG --title "RoFreeSBIE Live CD TvCard Configuration tool." \
+--yesno "  
+               Proceed with TvCard configuration ? 
+	                                            " 7 70
+case $? in
+1) rm /tmp/tvcard*  > /dev/null 2>&1 
+exit ;;
+0) $DIALOG --title "RoFreeSBIE Live CD TvCard Configuration tool." \
+--textbox ./tv_cardtypes 25 68
+$DIALOG --title "RoFreeSBIE Live CD Tuner Configuration tool." --clear \
+--inputbox "Enter your's Tv Card model number." 9 50 \
+"" 2> ${TVCARD_TMP}
+TVCARD=`cat ${TVCARD_TMP}`
+TVCARD_SET="YES"
+if [ $TVCARD -lt "24" ] ; then
+cp /etc/sysctl.conf /etc/sysctl.conf.old
+cat /etc/sysctl.conf.old | grep -v hw.bt848 > /etc/sysctl.conf
+echo "hw.bt848.card=$TVCARD" >> /etc/sysctl.conf 
+sysctl hw.bt848.card=$TVCARD > /dev/null 2>&1
+if [ $TVCARD = "23" ] ; then
+CONFIGURED=`cat $XAWTV_CONF | grep line1`
+case ${CONFIGURED:-NULL} in
+NULL)
+XAWTV_CONF=`sed -e 's/mixer = line/mixer = line1/' -i.orig $XAWTV_CONF`
+chown root $XAWTV_CONF
+chgrp root $XAWTV_CONF
+;;
+*)
+;;
+esac
+fi
+fi
+rm /tmp/tvcard*  > /dev/null 2>&1 ;;
+esac
+}
+
+CHOOSE_TUNER() {
+$DIALOG --title "RoFreeSBIE Live CD Tuner Configuration tool." --clear \
+--textbox ./tv_tunertypes 22 70
+$DIALOG --title "RoFreeSBIE Live CD Tuner Configuration tool." --clear \
+--inputbox "Enter your's model tuner number." 9 50 \
+"" 2> ${TVCARD_TMP}
+TVCARD=`cat ${TVCARD_TMP}`
+if [ $TVCARD -lt "17" ] ; then
+echo "hw.bt848.tuner=$TVCARD" >> /etc/sysctl.conf 
+sysctl hw.bt848.tuner=$TVCARD > /dev/null 2>&1
+fi
+rm /tmp/tvcard*  > /dev/null 2>&1 
+}
+
+COMPAT() {
+#Verifica daca avem chipset brooktree (conexant) 8x8 si daca nu iese
+havecard=`ls /dev | grep bktr | head -n 1`
+if [ "$havecard" != "bktr" ] ; then
+$DIALOG --title "RoFreeSBIE Live CD TvCard Configuration tool." \
+--infobox "
+Your's TvCard chipset is incompatible with FreeBSD.
+ 
+        This program will exit in 3 seconds.
+ " 7 66
+sleep 3
+exit
+else	
+CHOOSE_CARD
+CHOOSE_TUNER
+rm /tmp/tvcard*  > /dev/null 2>&1
+fi
+}
+
 COMPAT
\ No newline at end of file

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/usertvcard_config.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/usertvcard_config.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/usertvcard_config.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,49 +1,49 @@
-#!/bin/sh
-#
-# This code was developed by Angelescu Ovidiu.
-#As the licence says, here is the copyright note
-#
-# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at gmail.com>
-# All Rights Reserved.
-#
-# THIS SOFTWARE IS PROVIDED BY ANGELESCU OVIDIU ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT ANGELESCU OVIDIU BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-# DAMAGE.
-##########################################
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
-export PATH
-HOME=/root
-export HOME
-TERM=${TERM:-cons25}
-export TERM
-cd /scripts/cardDetect
-
-XDIALOG_HIGH_DIALOG_COMPAT=1
-export XDIALOG_HIGH_DIALOG_COMPAT
-
-DIALOG="dialog"
-[ -n "$DISPLAY" ] && [ -x /usr/X11R6/bin/Xdialog ] && DIALOG="Xdialog"
-
-whoiam=`/usr/bin/whoami`
-if [ $whoiam = 'root' ] ; then
-homedir=/root
-else
-whoiam=`cat /var/log/messages | tail -n1 | awk '{print $6}'`
-homedir=`printf /home/$whoiam `
-fi
-XAWTV_CONF=$homedir/.xawtv
-sudo ./tvcard_config.sh
-cp /root/.xawtv $XAWTV_CONF
-chown $whoiam $XAWTV_CONF
-chgrp $whoiam $XAWTV_CONF
-
+#!/bin/sh
+#
+# This code was developed by Angelescu Ovidiu.
+#As the licence says, here is the copyright note
+#
+# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at gmail.com>
+# All Rights Reserved.
+#
+# THIS SOFTWARE IS PROVIDED BY ANGELESCU OVIDIU ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT ANGELESCU OVIDIU BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
+##########################################
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
+export PATH
+HOME=/root
+export HOME
+TERM=${TERM:-cons25}
+export TERM
+cd /scripts/cardDetect
+
+XDIALOG_HIGH_DIALOG_COMPAT=1
+export XDIALOG_HIGH_DIALOG_COMPAT
+
+DIALOG="dialog"
+[ -n "$DISPLAY" ] && [ -x /usr/X11R6/bin/Xdialog ] && DIALOG="Xdialog"
+
+whoiam=`/usr/bin/whoami`
+if [ $whoiam = 'root' ] ; then
+homedir=/root
+else
+whoiam=`cat /var/log/messages | tail -n1 | awk '{print $6}'`
+homedir=`printf /home/$whoiam `
+fi
+XAWTV_CONF=$homedir/.xawtv
+sudo ./tvcard_config.sh
+cp /root/.xawtv $XAWTV_CONF
+chown $whoiam $XAWTV_CONF
+chgrp $whoiam $XAWTV_CONF
+

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/verific_sunet.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/verific_sunet.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/verific_sunet.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,31 +1,31 @@
-#!/bin/sh
-#
-# This code was developed by Angelescu Ovidiu.
-#As the licence says, here is the copyright note
-#
-# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at yahoo.com>
-# All Rights Reserved.
-#
-# THIS SOFTWARE IS PROVIDED BY ANGELESCU OVIDIU ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT ANGELESCU OVIDIU BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-# DAMAGE.
-##########################################
-
-ISLOADED=`kldstat | grep snd | awk '{ print($5); }'| awk '{ print(substr($0,1,3)); }'`
-case "${ISLOADED:-NULL}" in
-     snd)
-          echo "Sound Driver is already loaded ..."
-	  exit ;;
-     NULL)
-          /scripts/cardDetect/sound_detect.sh ;;
-esac
+#!/bin/sh
+#
+# This code was developed by Angelescu Ovidiu.
+#As the licence says, here is the copyright note
+#
+# Copyright 2004 2005 Angelescu Ovidiu <mrhsaacdoh at yahoo.com>
+# All Rights Reserved.
+#
+# THIS SOFTWARE IS PROVIDED BY ANGELESCU OVIDIU ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT ANGELESCU OVIDIU BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+# DAMAGE.
+##########################################
+
+ISLOADED=`kldstat | grep snd | awk '{ print($5); }'| awk '{ print(substr($0,1,3)); }'`
+case "${ISLOADED:-NULL}" in
+     snd)
+          echo "Sound Driver is already loaded ..."
+	  exit ;;
+     NULL)
+          /scripts/cardDetect/sound_detect.sh ;;
+esac
 			      
\ No newline at end of file

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/videocard_dri.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/videocard_dri.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/videocard_dri.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,39 +1,39 @@
-#!/bin/sh
-#
-# Name    : Nvidia driver XFree86 configuration script
-# Version : 0.1
-# Author Angelescu Ovidiu (mrhsaacdoH at gmail.com)
-#
-
-XFREE_CONF="/etc/X11/XF86Config"
-ENABLED=`cat $XFREE_CONF | grep dri | awk '{print $1}'`
-echo $ENABLED
-case $1 in
-
-enable)
-if [ $ENABLED = "#Load" ] ; then
-echo "DRI is disabled ....."
-if [ -e /root/.disable ] ; then
-XFREE_CONF=`sed -e 's/#Load  "dri"/Load  "dri"/' -i.orig $XFREE_CONF`
-mv -f /root/.disable /root/.enable
-else
-exit
-fi
-fi
-;;
-disable)
-if [ -e /root/.enable ] ; then
-mv /etc/X11/XF86Config.orig /etc/X11/XF86Config > /dev/null 2>&1
-mv -f /root/.enable /root/.disable
-else
-exit
-fi
-;;
-*)
-echo "usage: `basename $0` {enable|disable}" >&2
-     exit 64
-;;
-esac
-
-
-
+#!/bin/sh
+#
+# Name    : Nvidia driver XFree86 configuration script
+# Version : 0.1
+# Author Angelescu Ovidiu (mrhsaacdoH at gmail.com)
+#
+
+XFREE_CONF="/etc/X11/XF86Config"
+ENABLED=`cat $XFREE_CONF | grep dri | awk '{print $1}'`
+echo $ENABLED
+case $1 in
+
+enable)
+if [ $ENABLED = "#Load" ] ; then
+echo "DRI is disabled ....."
+if [ -e /root/.disable ] ; then
+XFREE_CONF=`sed -e 's/#Load  "dri"/Load  "dri"/' -i.orig $XFREE_CONF`
+mv -f /root/.disable /root/.enable
+else
+exit
+fi
+fi
+;;
+disable)
+if [ -e /root/.enable ] ; then
+mv /etc/X11/XF86Config.orig /etc/X11/XF86Config > /dev/null 2>&1
+mv -f /root/.enable /root/.disable
+else
+exit
+fi
+;;
+*)
+echo "usage: `basename $0` {enable|disable}" >&2
+     exit 64
+;;
+esac
+
+
+

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/x_config.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/x_config.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/x_config.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,198 +1,198 @@
-#!/bin/sh
-#
-# Name    : XFree86 autoconfiguration script
-# Version : 0.1
-# Author  : Sergei Mozhaisky (techniX)
-# Adapted for RoFreeSBIE CD by Angelescu Ovidiu
-
-XFREE_CONF="/etc/X11/XF86Config"
-XFREE_NEWCONF="/xorg.conf.new"
-XFREE_TMPCONF="/PCBSD/cardDetect/XF86Config.default"
-XFREE_VMWARE="/PCBSD/cardDetect/XF86Config.vmware"
-
-if [ -f ${XFREE_CONF} ]; then
-	echo "Found config file \"${XFREE_CONF}\" - skiping autoconfiguration."
-	exit
-fi
-
-echo -n "Autoconfiguring X Server..."
-
-VMWARE=`pciconf -lv | grep -i vmware`
-if [ "${VMWARE}" != "" ]; then
-	cp ${XFREE_VMWARE} ${XFREE_NEWCONF}
-else
-        # configuring X automatically
-	/usr/X11R6/bin/X -configure >/dev/null 2>&1
-fi
-
-X_MON=`/usr/bin/sed -n '/^Section "Monitor"$/,/^EndSection$/ p' $XFREE_NEWCONF`
-echo "$X_MON" > /tmp/mon
-MON_DET=`cat /tmp/mon | grep VendorName | awk  '{print (substr($2,2,7))}'`
-rm -f /tmp/mon
-if [ "$MON_DET" = "Monitor" ] ; then 
-X_MON='
-Section "Monitor"
-	Identifier   "Monitor0"
-	ModelName    "Unprobed Monitor (no DDC)"
-
-        #Info: All lines begining with # are comments
-	#Info: Uncomment the the desired lines by removing
-        # the  # sign  in front of them.
-	#Warning: Dont forget to comment the unused lines
-	# by adding a # sign in front of them
-        
-#	HorizSync    28.0 - 60.0 # Warning: This is for very old Monitors
-	HorizSync    28.0 - 78.0 # Warning: This may fry olders Monitors
-#	HorizSync    28.0 - 96.0 # Warning: This may fry old Monitors
-         
-                    #Info: TFT default or very old CRT Monitors
-#        VertRefresh  50.0 - 60.0 # Extreme conservative. Will flicker.
-                    
-	            #Info: TFT Monitors or olders CRT Monitors
-	VertRefresh  50.0 - 76.0 # Very conservative. May flicker.
-
-		    #Info: Only for CRT monitors
-#	VertRefresh  50.0 - 100.0 # Not conservative. It will not flicker.
-
-	#  Default modes distilled from
-	#      "VESA and Industry Standards and Guide for Computer Display Monitor
-	#       Timing", version 1.0, revision 0.8, adopted September 17, 1998.
-	#  $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.4 1999/11/18 16:52:17 tsi Exp $
-	# 640x350 @ 85Hz (VESA) hsync: 37.9kHz
-	ModeLine "640x350"    31.5  640  672  736  832    350  382  385  445 +hsync -vsync
-	# 640x400 @ 85Hz (VESA) hsync: 37.9kHz
-	ModeLine "640x400"    31.5  640  672  736  832    400  401  404  445 -hsync +vsync
-	# 720x400 @ 85Hz (VESA) hsync: 37.9kHz
-	ModeLine "720x400"    35.5  720  756  828  936    400  401  404  446 -hsync +vsync
-	# 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
-	ModeLine "640x480"    25.2  640  656  752  800    480  490  492  525 -hsync -vsync
-	# 640x480 @ 72Hz (VESA) hsync: 37.9kHz
-	ModeLine "640x480"    31.5  640  664  704  832    480  489  491  520 -hsync -vsync
-	# 640x480 @ 75Hz (VESA) hsync: 37.5kHz
-	ModeLine "640x480"    31.5  640  656  720  840    480  481  484  500 -hsync -vsync
-	# 640x480 @ 85Hz (VESA) hsync: 43.3kHz
-	ModeLine "640x480"    36.0  640  696  752  832    480  481  484  509 -hsync -vsync
-	# 800x600 @ 56Hz (VESA) hsync: 35.2kHz
-	ModeLine "800x600"    36.0  800  824  896 1024    600  601  603  625 +hsync +vsync
-	# 800x600 @ 60Hz (VESA) hsync: 37.9kHz
-	ModeLine "800x600"    40.0  800  840  968 1056    600  601  605  628 +hsync +vsync
-	# 800x600 @ 72Hz (VESA) hsync: 48.1kHz
-	ModeLine "800x600"    50.0  800  856  976 1040    600  637  643  666 +hsync +vsync
-	# 800x600 @ 75Hz (VESA) hsync: 46.9kHz
-	ModeLine "800x600"    49.5  800  816  896 1056    600  601  604  625 +hsync +vsync
-	# 800x600 @ 85Hz (VESA) hsync: 53.7kHz
-	ModeLine "800x600"    56.3  800  832  896 1048    600  601  604  631 +hsync +vsync
-	# 1024x768i @ 43Hz (industry standard) hsync: 35.5kHz
-	ModeLine "1024x768"   44.9 1024 1032 1208 1264    768  768  776  817 +hsync +vsync Interlace
-	# 1024x768 @ 60Hz (VESA) hsync: 48.4kHz
-	ModeLine "1024x768"   65.0 1024 1048 1184 1344    768  771  777  806 -hsync -vsync
-	# 1024x768 @ 70Hz (VESA) hsync: 56.5kHz
-	ModeLine "1024x768"   75.0 1024 1048 1184 1328    768  771  777  806 -hsync -vsync
-	# 1024x768 @ 75Hz (VESA) hsync: 60.0kHz
-	ModeLine "1024x768"   78.8 1024 1040 1136 1312    768  769  772  800 +hsync +vsync
-	# 1024x768 @ 85Hz (VESA) hsync: 68.7kHz
-	ModeLine "1024x768"   94.5 1024 1072 1168 1376    768  769  772  808 +hsync +vsync
-	# 1152x864 @ 75Hz (VESA) hsync: 67.5kHz
-	ModeLine "1152x864"  108.0 1152 1216 1344 1600    864  865  868  900 +hsync +vsync
-	# 1280x960 @ 60Hz (VESA) hsync: 60.0kHz
-	ModeLine "1280x960"  108.0 1280 1376 1488 1800    960  961  964 1000 +hsync +vsync
-	# 1280x960 @ 85Hz (VESA) hsync: 85.9kHz
-	ModeLine "1280x960"  148.5 1280 1344 1504 1728    960  961  964 1011 +hsync +vsync
-	# 1280x1024 @ 60Hz (VESA) hsync: 64.0kHz
-	ModeLine "1280x1024" 108.0 1280 1328 1440 1688   1024 1025 1028 1066 +hsync +vsync
-	# 1280x1024 @ 75Hz (VESA) hsync: 80.0kHz
-	ModeLine "1280x1024" 135.0 1280 1296 1440 1688   1024 1025 1028 1066 +hsync +vsync
-	# 1280x1024 @ 85Hz (VESA) hsync: 91.1kHz
-	ModeLine "1280x1024" 157.5 1280 1344 1504 1728   1024 1025 1028 1072 +hsync +vsync
-	# 1600x1200 @ 60Hz (VESA) hsync: 75.0kHz
-	ModeLine "1600x1200" 162.0 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-	# 1600x1200 @ 65Hz (VESA) hsync: 81.3kHz
-	ModeLine "1600x1200" 175.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-	# 1600x1200 @ 70Hz (VESA) hsync: 87.5kHz
-	ModeLine "1600x1200" 189.0 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-	# 1600x1200 @ 75Hz (VESA) hsync: 93.8kHz
-	ModeLine "1600x1200" 202.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-	# 1600x1200 @ 85Hz (VESA) hsync: 106.3kHz
-	ModeLine "1600x1200" 229.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-	# 1792x1344 @ 60Hz (VESA) hsync: 83.6kHz
-	ModeLine "1792x1344" 204.8 1792 1920 2120 2448   1344 1345 1348 1394 -hsync +vsync
-	# 1792x1344 @ 75Hz (VESA) hsync: 106.3kHz
-	ModeLine "1792x1344" 261.0 1792 1888 2104 2456   1344 1345 1348 1417 -hsync +vsync
-	# 1856x1392 @ 60Hz (VESA) hsync: 86.3kHz
-	ModeLine "1856x1392" 218.3 1856 1952 2176 2528   1392 1393 1396 1439 -hsync +vsync
-	# 1856x1392 @ 75Hz (VESA) hsync: 112.5kHz
-	ModeLine "1856x1392" 288.0 1856 1984 2208 2560   1392 1393 1396 1500 -hsync +vsync
-	# 1920x1440 @ 60Hz (VESA) hsync: 90.0kHz
-	ModeLine "1920x1440" 234.0 1920 2048 2256 2600   1440 1441 1444 1500 -hsync +vsync
-	# 1920x1440 @ 75Hz (VESA) hsync: 112.5kHz
-	ModeLine "1920x1440" 297.0 1920 2064 2288 2640   1440 1441 1444 1500 -hsync +vsync
-	# Additional modelines
-	ModeLine "1800x1440"  230    1800 1896 2088 2392  1440 1441 1444 1490 +HSync +VSync
-	ModeLine "1800x1440"  250    1800 1896 2088 2392  1440 1441 1444 1490 +HSync +VSync
-	# Extended modelines with GTF timings
-	# 640x480 @ 100.00 Hz (GTF) hsync: 50.90 kHz; pclk: 43.16 MHz
-	ModeLine "640x480"  43.16  640 680 744 848  480 481 484 509  -HSync +Vsync
-	# 768x576 @ 60.00 Hz (GTF) hsync: 35.82 kHz; pclk: 34.96 MHz
-	ModeLine "768x576"  34.96  768 792 872 976  576 577 580 597  -HSync +Vsync
-	# 768x576 @ 72.00 Hz (GTF) hsync: 43.27 kHz; pclk: 42.93 MHz
-	ModeLine "768x576"  42.93  768 800 880 992  576 577 580 601  -HSync +Vsync
-	# 768x576 @ 75.00 Hz (GTF) hsync: 45.15 kHz; pclk: 45.51 MHz
-	ModeLine "768x576"  45.51  768 808 888 1008  576 577 580 602  -HSync +Vsync
-	# 768x576 @ 85.00 Hz (GTF) hsync: 51.42 kHz; pclk: 51.84 MHz
-	ModeLine "768x576"  51.84  768 808 888 1008  576 577 580 605  -HSync +Vsync
-	# 768x576 @ 100.00 Hz (GTF) hsync: 61.10 kHz; pclk: 62.57 MHz
-	ModeLine "768x576"  62.57  768 816 896 1024  576 577 580 611  -HSync +Vsync
-	# 800x600 @ 100.00 Hz (GTF) hsync: 63.60 kHz; pclk: 68.18 MHz
-	ModeLine "800x600"  68.18  800 848 936 1072  600 601 604 636  -HSync +Vsync
-	# 1024x768 @ 100.00 Hz (GTF) hsync: 81.40 kHz; pclk: 113.31 MHz
-	ModeLine "1024x768"  113.31  1024 1096 1208 1392  768 769 772 814  -HSync +Vsync
-	# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz
-	ModeLine "1152x864"  81.62  1152 1216 1336 1520  864 865 868 895  -HSync +Vsync
-	# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz
-	ModeLine "1152x864"  119.65  1152 1224 1352 1552  864 865 868 907  -HSync +Vsync
-	# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz
-	ModeLine "1152x864"  143.47  1152 1232 1360 1568  864 865 868 915  -HSync +Vsync
-	# 1280x960 @ 72.00 Hz (GTF) hsync: 72.07 kHz; pclk: 124.54 MHz
-	ModeLine "1280x960"  124.54  1280 1368 1504 1728  960 961 964 1001  -HSync +Vsync
-	# 1280x960 @ 75.00 Hz (GTF) hsync: 75.15 kHz; pclk: 129.86 MHz
-	ModeLine "1280x960"  129.86  1280 1368 1504 1728  960 961 964 1002  -HSync +Vsync
-	# 1280x960 @ 100.00 Hz (GTF) hsync: 101.70 kHz; pclk: 178.99 MHz
-	ModeLine "1280x960"  178.99  1280 1376 1520 1760  960 961 964 1017  -HSync +Vsync
-	# 1280x1024 @ 100.00 Hz (GTF) hsync: 108.50 kHz; pclk: 190.96 MHz
-	ModeLine "1280x1024"  190.96  1280 1376 1520 1760  1024 1025 1028 1085  -HSync +Vsync
-	# 1400x1050 @ 60.00 Hz (GTF) hsync: 65.22 kHz; pclk: 122.61 MHz
-	ModeLine "1400x1050"  122.61  1400 1488 1640 1880  1050 1051 1054 1087  -HSync +Vsync
-	# 1400x1050 @ 72.00 Hz (GTF) hsync: 78.77 kHz; pclk: 149.34 MHz
-	ModeLine "1400x1050"  149.34  1400 1496 1648 1896  1050 1051 1054 1094  -HSync +Vsync
-	# 1400x1050 @ 75.00 Hz (GTF) hsync: 82.20 kHz; pclk: 155.85 MHz
-	ModeLine "1400x1050"  155.85  1400 1496 1648 1896  1050 1051 1054 1096  -HSync +Vsync
-	# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz
-	ModeLine "1400x1050"  179.26  1400 1504 1656 1912  1050 1051 1054 1103  -HSync +Vsync
-	# 1400x1050 @ 100.00 Hz (GTF) hsync: 111.20 kHz; pclk: 214.39 MHz
-	ModeLine "1400x1050"  214.39  1400 1512 1664 1928  1050 1051 1054 1112  -HSync +Vsync
-	# 1600x1200 @ 100.00 Hz (GTF) hsync: 127.10 kHz; pclk: 280.64 MHz
-	ModeLine "1600x1200"  280.64  1600 1728 1904 2208  1200 1201 1204 1271  -HSync +Vsync
-EndSection
-'
-fi
-
-X_DEV=`/usr/bin/sed -n '/^Section "Device"$/,/^EndSection$/ p' $XFREE_NEWCONF`
-
-case "${X_DEV:-NULL}" in
-    NULL)
-X_DEV='
-Section "Device"
-        Identifier      "Card0"
-	Driver          "vesa"
-EndSection
-'
-;;
-esac
-
-cp $XFREE_TMPCONF $XFREE_CONF
-printf "$X_MON\n\n" >> $XFREE_CONF
-printf "$X_DEV\n\n" >> $XFREE_CONF
-/usr/bin/touch /root/.disable
-rm $XFREE_NEWCONF
-echo "done."
-
+#!/bin/sh
+#
+# Name    : XFree86 autoconfiguration script
+# Version : 0.1
+# Author  : Sergei Mozhaisky (techniX)
+# Adapted for RoFreeSBIE CD by Angelescu Ovidiu
+
+XFREE_CONF="/etc/X11/XF86Config"
+XFREE_NEWCONF="/xorg.conf.new"
+XFREE_TMPCONF="/PCBSD/cardDetect/XF86Config.default"
+XFREE_VMWARE="/PCBSD/cardDetect/XF86Config.vmware"
+
+if [ -f ${XFREE_CONF} ]; then
+	echo "Found config file \"${XFREE_CONF}\" - skiping autoconfiguration."
+	exit
+fi
+
+echo -n "Autoconfiguring X Server..."
+
+VMWARE=`pciconf -lv | grep -i vmware`
+if [ "${VMWARE}" != "" ]; then
+	cp ${XFREE_VMWARE} ${XFREE_NEWCONF}
+else
+        # configuring X automatically
+	/usr/X11R6/bin/X -configure >/dev/null 2>&1
+fi
+
+X_MON=`/usr/bin/sed -n '/^Section "Monitor"$/,/^EndSection$/ p' $XFREE_NEWCONF`
+echo "$X_MON" > /tmp/mon
+MON_DET=`cat /tmp/mon | grep VendorName | awk  '{print (substr($2,2,7))}'`
+rm -f /tmp/mon
+if [ "$MON_DET" = "Monitor" ] ; then 
+X_MON='
+Section "Monitor"
+	Identifier   "Monitor0"
+	ModelName    "Unprobed Monitor (no DDC)"
+
+        #Info: All lines begining with # are comments
+	#Info: Uncomment the the desired lines by removing
+        # the  # sign  in front of them.
+	#Warning: Dont forget to comment the unused lines
+	# by adding a # sign in front of them
+        
+#	HorizSync    28.0 - 60.0 # Warning: This is for very old Monitors
+	HorizSync    28.0 - 78.0 # Warning: This may fry olders Monitors
+#	HorizSync    28.0 - 96.0 # Warning: This may fry old Monitors
+         
+                    #Info: TFT default or very old CRT Monitors
+#        VertRefresh  50.0 - 60.0 # Extreme conservative. Will flicker.
+                    
+	            #Info: TFT Monitors or olders CRT Monitors
+	VertRefresh  50.0 - 76.0 # Very conservative. May flicker.
+
+		    #Info: Only for CRT monitors
+#	VertRefresh  50.0 - 100.0 # Not conservative. It will not flicker.
+
+	#  Default modes distilled from
+	#      "VESA and Industry Standards and Guide for Computer Display Monitor
+	#       Timing", version 1.0, revision 0.8, adopted September 17, 1998.
+	#  $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.4 1999/11/18 16:52:17 tsi Exp $
+	# 640x350 @ 85Hz (VESA) hsync: 37.9kHz
+	ModeLine "640x350"    31.5  640  672  736  832    350  382  385  445 +hsync -vsync
+	# 640x400 @ 85Hz (VESA) hsync: 37.9kHz
+	ModeLine "640x400"    31.5  640  672  736  832    400  401  404  445 -hsync +vsync
+	# 720x400 @ 85Hz (VESA) hsync: 37.9kHz
+	ModeLine "720x400"    35.5  720  756  828  936    400  401  404  446 -hsync +vsync
+	# 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
+	ModeLine "640x480"    25.2  640  656  752  800    480  490  492  525 -hsync -vsync
+	# 640x480 @ 72Hz (VESA) hsync: 37.9kHz
+	ModeLine "640x480"    31.5  640  664  704  832    480  489  491  520 -hsync -vsync
+	# 640x480 @ 75Hz (VESA) hsync: 37.5kHz
+	ModeLine "640x480"    31.5  640  656  720  840    480  481  484  500 -hsync -vsync
+	# 640x480 @ 85Hz (VESA) hsync: 43.3kHz
+	ModeLine "640x480"    36.0  640  696  752  832    480  481  484  509 -hsync -vsync
+	# 800x600 @ 56Hz (VESA) hsync: 35.2kHz
+	ModeLine "800x600"    36.0  800  824  896 1024    600  601  603  625 +hsync +vsync
+	# 800x600 @ 60Hz (VESA) hsync: 37.9kHz
+	ModeLine "800x600"    40.0  800  840  968 1056    600  601  605  628 +hsync +vsync
+	# 800x600 @ 72Hz (VESA) hsync: 48.1kHz
+	ModeLine "800x600"    50.0  800  856  976 1040    600  637  643  666 +hsync +vsync
+	# 800x600 @ 75Hz (VESA) hsync: 46.9kHz
+	ModeLine "800x600"    49.5  800  816  896 1056    600  601  604  625 +hsync +vsync
+	# 800x600 @ 85Hz (VESA) hsync: 53.7kHz
+	ModeLine "800x600"    56.3  800  832  896 1048    600  601  604  631 +hsync +vsync
+	# 1024x768i @ 43Hz (industry standard) hsync: 35.5kHz
+	ModeLine "1024x768"   44.9 1024 1032 1208 1264    768  768  776  817 +hsync +vsync Interlace
+	# 1024x768 @ 60Hz (VESA) hsync: 48.4kHz
+	ModeLine "1024x768"   65.0 1024 1048 1184 1344    768  771  777  806 -hsync -vsync
+	# 1024x768 @ 70Hz (VESA) hsync: 56.5kHz
+	ModeLine "1024x768"   75.0 1024 1048 1184 1328    768  771  777  806 -hsync -vsync
+	# 1024x768 @ 75Hz (VESA) hsync: 60.0kHz
+	ModeLine "1024x768"   78.8 1024 1040 1136 1312    768  769  772  800 +hsync +vsync
+	# 1024x768 @ 85Hz (VESA) hsync: 68.7kHz
+	ModeLine "1024x768"   94.5 1024 1072 1168 1376    768  769  772  808 +hsync +vsync
+	# 1152x864 @ 75Hz (VESA) hsync: 67.5kHz
+	ModeLine "1152x864"  108.0 1152 1216 1344 1600    864  865  868  900 +hsync +vsync
+	# 1280x960 @ 60Hz (VESA) hsync: 60.0kHz
+	ModeLine "1280x960"  108.0 1280 1376 1488 1800    960  961  964 1000 +hsync +vsync
+	# 1280x960 @ 85Hz (VESA) hsync: 85.9kHz
+	ModeLine "1280x960"  148.5 1280 1344 1504 1728    960  961  964 1011 +hsync +vsync
+	# 1280x1024 @ 60Hz (VESA) hsync: 64.0kHz
+	ModeLine "1280x1024" 108.0 1280 1328 1440 1688   1024 1025 1028 1066 +hsync +vsync
+	# 1280x1024 @ 75Hz (VESA) hsync: 80.0kHz
+	ModeLine "1280x1024" 135.0 1280 1296 1440 1688   1024 1025 1028 1066 +hsync +vsync
+	# 1280x1024 @ 85Hz (VESA) hsync: 91.1kHz
+	ModeLine "1280x1024" 157.5 1280 1344 1504 1728   1024 1025 1028 1072 +hsync +vsync
+	# 1600x1200 @ 60Hz (VESA) hsync: 75.0kHz
+	ModeLine "1600x1200" 162.0 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
+	# 1600x1200 @ 65Hz (VESA) hsync: 81.3kHz
+	ModeLine "1600x1200" 175.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
+	# 1600x1200 @ 70Hz (VESA) hsync: 87.5kHz
+	ModeLine "1600x1200" 189.0 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
+	# 1600x1200 @ 75Hz (VESA) hsync: 93.8kHz
+	ModeLine "1600x1200" 202.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
+	# 1600x1200 @ 85Hz (VESA) hsync: 106.3kHz
+	ModeLine "1600x1200" 229.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
+	# 1792x1344 @ 60Hz (VESA) hsync: 83.6kHz
+	ModeLine "1792x1344" 204.8 1792 1920 2120 2448   1344 1345 1348 1394 -hsync +vsync
+	# 1792x1344 @ 75Hz (VESA) hsync: 106.3kHz
+	ModeLine "1792x1344" 261.0 1792 1888 2104 2456   1344 1345 1348 1417 -hsync +vsync
+	# 1856x1392 @ 60Hz (VESA) hsync: 86.3kHz
+	ModeLine "1856x1392" 218.3 1856 1952 2176 2528   1392 1393 1396 1439 -hsync +vsync
+	# 1856x1392 @ 75Hz (VESA) hsync: 112.5kHz
+	ModeLine "1856x1392" 288.0 1856 1984 2208 2560   1392 1393 1396 1500 -hsync +vsync
+	# 1920x1440 @ 60Hz (VESA) hsync: 90.0kHz
+	ModeLine "1920x1440" 234.0 1920 2048 2256 2600   1440 1441 1444 1500 -hsync +vsync
+	# 1920x1440 @ 75Hz (VESA) hsync: 112.5kHz
+	ModeLine "1920x1440" 297.0 1920 2064 2288 2640   1440 1441 1444 1500 -hsync +vsync
+	# Additional modelines
+	ModeLine "1800x1440"  230    1800 1896 2088 2392  1440 1441 1444 1490 +HSync +VSync
+	ModeLine "1800x1440"  250    1800 1896 2088 2392  1440 1441 1444 1490 +HSync +VSync
+	# Extended modelines with GTF timings
+	# 640x480 @ 100.00 Hz (GTF) hsync: 50.90 kHz; pclk: 43.16 MHz
+	ModeLine "640x480"  43.16  640 680 744 848  480 481 484 509  -HSync +Vsync
+	# 768x576 @ 60.00 Hz (GTF) hsync: 35.82 kHz; pclk: 34.96 MHz
+	ModeLine "768x576"  34.96  768 792 872 976  576 577 580 597  -HSync +Vsync
+	# 768x576 @ 72.00 Hz (GTF) hsync: 43.27 kHz; pclk: 42.93 MHz
+	ModeLine "768x576"  42.93  768 800 880 992  576 577 580 601  -HSync +Vsync
+	# 768x576 @ 75.00 Hz (GTF) hsync: 45.15 kHz; pclk: 45.51 MHz
+	ModeLine "768x576"  45.51  768 808 888 1008  576 577 580 602  -HSync +Vsync
+	# 768x576 @ 85.00 Hz (GTF) hsync: 51.42 kHz; pclk: 51.84 MHz
+	ModeLine "768x576"  51.84  768 808 888 1008  576 577 580 605  -HSync +Vsync
+	# 768x576 @ 100.00 Hz (GTF) hsync: 61.10 kHz; pclk: 62.57 MHz
+	ModeLine "768x576"  62.57  768 816 896 1024  576 577 580 611  -HSync +Vsync
+	# 800x600 @ 100.00 Hz (GTF) hsync: 63.60 kHz; pclk: 68.18 MHz
+	ModeLine "800x600"  68.18  800 848 936 1072  600 601 604 636  -HSync +Vsync
+	# 1024x768 @ 100.00 Hz (GTF) hsync: 81.40 kHz; pclk: 113.31 MHz
+	ModeLine "1024x768"  113.31  1024 1096 1208 1392  768 769 772 814  -HSync +Vsync
+	# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz
+	ModeLine "1152x864"  81.62  1152 1216 1336 1520  864 865 868 895  -HSync +Vsync
+	# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz
+	ModeLine "1152x864"  119.65  1152 1224 1352 1552  864 865 868 907  -HSync +Vsync
+	# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz
+	ModeLine "1152x864"  143.47  1152 1232 1360 1568  864 865 868 915  -HSync +Vsync
+	# 1280x960 @ 72.00 Hz (GTF) hsync: 72.07 kHz; pclk: 124.54 MHz
+	ModeLine "1280x960"  124.54  1280 1368 1504 1728  960 961 964 1001  -HSync +Vsync
+	# 1280x960 @ 75.00 Hz (GTF) hsync: 75.15 kHz; pclk: 129.86 MHz
+	ModeLine "1280x960"  129.86  1280 1368 1504 1728  960 961 964 1002  -HSync +Vsync
+	# 1280x960 @ 100.00 Hz (GTF) hsync: 101.70 kHz; pclk: 178.99 MHz
+	ModeLine "1280x960"  178.99  1280 1376 1520 1760  960 961 964 1017  -HSync +Vsync
+	# 1280x1024 @ 100.00 Hz (GTF) hsync: 108.50 kHz; pclk: 190.96 MHz
+	ModeLine "1280x1024"  190.96  1280 1376 1520 1760  1024 1025 1028 1085  -HSync +Vsync
+	# 1400x1050 @ 60.00 Hz (GTF) hsync: 65.22 kHz; pclk: 122.61 MHz
+	ModeLine "1400x1050"  122.61  1400 1488 1640 1880  1050 1051 1054 1087  -HSync +Vsync
+	# 1400x1050 @ 72.00 Hz (GTF) hsync: 78.77 kHz; pclk: 149.34 MHz
+	ModeLine "1400x1050"  149.34  1400 1496 1648 1896  1050 1051 1054 1094  -HSync +Vsync
+	# 1400x1050 @ 75.00 Hz (GTF) hsync: 82.20 kHz; pclk: 155.85 MHz
+	ModeLine "1400x1050"  155.85  1400 1496 1648 1896  1050 1051 1054 1096  -HSync +Vsync
+	# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz
+	ModeLine "1400x1050"  179.26  1400 1504 1656 1912  1050 1051 1054 1103  -HSync +Vsync
+	# 1400x1050 @ 100.00 Hz (GTF) hsync: 111.20 kHz; pclk: 214.39 MHz
+	ModeLine "1400x1050"  214.39  1400 1512 1664 1928  1050 1051 1054 1112  -HSync +Vsync
+	# 1600x1200 @ 100.00 Hz (GTF) hsync: 127.10 kHz; pclk: 280.64 MHz
+	ModeLine "1600x1200"  280.64  1600 1728 1904 2208  1200 1201 1204 1271  -HSync +Vsync
+EndSection
+'
+fi
+
+X_DEV=`/usr/bin/sed -n '/^Section "Device"$/,/^EndSection$/ p' $XFREE_NEWCONF`
+
+case "${X_DEV:-NULL}" in
+    NULL)
+X_DEV='
+Section "Device"
+        Identifier      "Card0"
+	Driver          "vesa"
+EndSection
+'
+;;
+esac
+
+cp $XFREE_TMPCONF $XFREE_CONF
+printf "$X_MON\n\n" >> $XFREE_CONF
+printf "$X_DEV\n\n" >> $XFREE_CONF
+/usr/bin/touch /root/.disable
+rm $XFREE_NEWCONF
+echo "done."
+

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/xfree_layout.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/xfree_layout.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/xfree_layout.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,45 +1,45 @@
-#!/bin/sh
-
-LAYOUT_DIR="/usr/X11R6/lib/X11/xkb/rules/"
-if [ -e $LAYOUT_DIR/xorg.lst ]; then
-	LAYOUT_FILE="xorg.lst"
-else
-	LAYOUT_FILE="xfree86.lst"
-fi
-DIALOG_FILE="/root/layout_dialog.sh"
-XF86_CFG="/etc/X11/XF86Config"
-XF86_TMP_CFG="/tmp/XF86Config"
-
-if [ -e ${LAYOUT_DIR}${LAYOUT_FILE} ]; then
-    cp ${LAYOUT_DIR}${LAYOUT_FILE} .
-else
-    echo "Problems with XFree86 sources"
-    exit -1
-fi
-
-rm -f $DIALOG_FILE
-
-echo "dialog --title \"FreeBSD Live CD XFree86 Layout\" \
-    --menu \"Choose your preferred keyboard layout\" 22 50 15 \\" >> ${DIALOG_FILE}
-
-awk '{
-if ($1 == "!") {
-    if ($2 == "layout") {
-        getline;
-        while ($0 != "!" && $0 != "") {
-            print $1 "\t\"" $2 "\" \\";
-            getline;
-        }
-    }
-}
-}' $LAYOUT_FILE >> ${DIALOG_FILE}
-rm $LAYOUT_FILE
-echo "2> /root/.choose" >> ${DIALOG_FILE}
-sh ${DIALOG_FILE}
-rm -f ${DIALOG_FILE}
-LAYOUT=`cat /root/.choose`
-echo "Detected $LAYOUT"
-rm -f /root/.choose
-cp ${XF86_CFG} ${XF86_TMP_CFG}
-sed "s/\"us\"/\"${LAYOUT}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
-rm -f ${XF86_TMP_CFG}
+#!/bin/sh
+
+LAYOUT_DIR="/usr/X11R6/lib/X11/xkb/rules/"
+if [ -e $LAYOUT_DIR/xorg.lst ]; then
+	LAYOUT_FILE="xorg.lst"
+else
+	LAYOUT_FILE="xfree86.lst"
+fi
+DIALOG_FILE="/root/layout_dialog.sh"
+XF86_CFG="/etc/X11/XF86Config"
+XF86_TMP_CFG="/tmp/XF86Config"
+
+if [ -e ${LAYOUT_DIR}${LAYOUT_FILE} ]; then
+    cp ${LAYOUT_DIR}${LAYOUT_FILE} .
+else
+    echo "Problems with XFree86 sources"
+    exit -1
+fi
+
+rm -f $DIALOG_FILE
+
+echo "dialog --title \"FreeBSD Live CD XFree86 Layout\" \
+    --menu \"Choose your preferred keyboard layout\" 22 50 15 \\" >> ${DIALOG_FILE}
+
+awk '{
+if ($1 == "!") {
+    if ($2 == "layout") {
+        getline;
+        while ($0 != "!" && $0 != "") {
+            print $1 "\t\"" $2 "\" \\";
+            getline;
+        }
+    }
+}
+}' $LAYOUT_FILE >> ${DIALOG_FILE}
+rm $LAYOUT_FILE
+echo "2> /root/.choose" >> ${DIALOG_FILE}
+sh ${DIALOG_FILE}
+rm -f ${DIALOG_FILE}
+LAYOUT=`cat /root/.choose`
+echo "Detected $LAYOUT"
+rm -f /root/.choose
+cp ${XF86_CFG} ${XF86_TMP_CFG}
+sed "s/\"us\"/\"${LAYOUT}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
+rm -f ${XF86_TMP_CFG}

Modified: pcbsd/trunk/system-overlay/PCBSD/conf/PCBSDv1.3
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/conf/PCBSDv1.3	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/conf/PCBSDv1.3	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,322 +1,322 @@
-#
-# GENERIC -- Generic kernel configuration file for FreeBSD/i386
-#
-# For more information on this file, please read the handbook section on
-# Kernel Configuration Files:
-#
-#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
-#
-# The handbook is also available locally in /usr/share/doc/handbook
-# if you've installed the doc distribution, otherwise always see the
-# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
-# latest information.
-#
-# An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../conf/NOTES and NOTES files.
-# If you are in doubt as to the purpose or necessity of a line, check first
-# in NOTES.
-#
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.7.2.2 2006/05/01 00:15:12 scottl Exp $
-
-machine		i386
-cpu		I486_CPU
-cpu		I586_CPU
-cpu		I686_CPU
-ident		PCBSD
-
-# To statically compile in device wiring instead of /boot/device.hints
-#hints		"GENERIC.hints"		# Default places to look for devices.
-
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-
-options 	SCHED_4BSD		# 4BSD scheduler
-options 	PREEMPTION		# Enable kernel thread preemption
-options 	INET			# InterNETworking
-options 	INET6			# IPv6 communications protocols
-options 	FFS			# Berkeley Fast Filesystem
-options 	SOFTUPDATES		# Enable FFS soft updates support
-options 	UFS_ACL			# Support for access control lists
-options 	UFS_DIRHASH		# Improve performance on big directories
-options 	MD_ROOT			# MD is a potential root device
-options 	NFSCLIENT		# Network Filesystem Client
-options 	NFSSERVER		# Network Filesystem Server
-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
-options 	MSDOSFS			# MSDOS Filesystem
-options 	CD9660			# ISO 9660 Filesystem
-options		LIBICONV		# Various options for forigen langs
-options 	LIBMCHAIN
-options		CD9660_ICONV
-options		MSDOSFS_ICONV
-options		MSDOSFS_LARGE
-options		NTFS
-options 	NTFS_ICONV
-options		UDF
-options		UDF_ICONV
-options 	PROCFS			# Process filesystem (requires PSEUDOFS)
-options 	PSEUDOFS		# Pseudo-filesystem framework
-options 	GEOM_GPT		# GUID Partition Tables.
-options 	GEOM_UZIP		# Read-only compressed disks
-options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
-options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
-options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
-options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
-options 	KTRACE			# ktrace(1) support
-options 	SYSVSHM			# SYSV-style shared memory
-options 	SYSVMSG			# SYSV-style message queues
-options 	SYSVSEM			# SYSV-style semaphores
-options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
-options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~128k to driver.
-options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~215k to driver.
-options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
-
-device		apic			# I/O APIC
-
-# Bus support.
-device		isa
-#device		eisa
-device		pci
-
-# Floppy drives
-device		fdc
-
-# ATA and ATAPI devices
-device		ata
-device		atadisk		# ATA disk drives
-device		ataraid		# ATA RAID drives
-device		atapicd		# ATAPI CDROM drives
-device		atapifd		# ATAPI floppy drives
-device		atapist		# ATAPI tape drives
-#options 	ATA_STATIC_ID	# Static device numbering
-device		atapicam	# Atapi CAM Support
-
-# SCSI Controllers
-device		ahb		# EISA AHA1742 family
-device		ahc		# AHA2940 and onboard AIC7xxx devices
-device		ahd		# AHA39320/29320 and onboard AIC79xx devices
-device		amd		# AMD 53C974 (Tekram DC-390(T))
-device		isp		# Qlogic family
-#device 	ispfw		# Firmware for QLogic HBAs- normally a module
-device		mpt		# LSI-Logic MPT-Fusion
-#device		ncr		# NCR/Symbios Logic
-device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
-device		trm		# Tekram DC395U/UW/F DC315U adapters
-
-device		adv		# Advansys SCSI adapters
-device		adw		# Advansys wide SCSI adapters
-device		aha		# Adaptec 154x SCSI adapters
-device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
-device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
-
-device		ncv		# NCR 53C500
-device		nsp		# Workbit Ninja SCSI-3
-device		stg		# TMC 18C30/18C50
-
-# SCSI peripherals
-device		scbus		# SCSI bus (required for SCSI)
-device		ch		# SCSI media changers
-device		da		# Direct Access (disks)
-device		sa		# Sequential Access (tape etc)
-device		cd		# CD
-device		pass		# Passthrough device (direct SCSI access)
-device		ses		# SCSI Environmental Services (and SAF-TE)
-
-# RAID controllers interfaced to the SCSI subsystem
-device		amr		# AMI MegaRAID
-device		arcmsr		# Areca SATA II RAID
-device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
-device		ciss		# Compaq Smart RAID 5*
-device		dpt		# DPT Smartcache III, IV - See NOTES for options
-device		hptmv		# Highpoint RocketRAID 182x
-device		rr232x		# Highpoint RocketRAID 232x
-device		iir		# Intel Integrated RAID
-device		ips		# IBM (Adaptec) ServeRAID
-device		mly		# Mylex AcceleRAID/eXtremeRAID
-device		twa		# 3ware 9000 series PATA/SATA RAID
-
-# RAID controllers
-device		aac		# Adaptec FSA RAID
-device		aacp		# SCSI passthrough for aac (requires CAM)
-device		ida		# Compaq Smart RAID
-device		mfi		# LSI MegaRAID SAS
-device		mlx		# Mylex DAC960 family
-device		pst		# Promise Supertrak SX6000
-device		twe		# 3ware ATA RAID
-
-# atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc		# AT keyboard controller
-device		atkbd		# AT keyboard
-device		psm		# PS/2 mouse
-
-device		kbdmux		# keyboard multiplexer
-
-device		vga		# VGA video card driver
-
-device		splash		# Splash screen and screen saver support
-
-# syscons is the default console driver, resembling an SCO console
-device		sc
-
-# Enable this for the pcvt (VT220 compatible) console driver
-#device		vt
-#options 	XSERVER		# support for X server on a vt console
-#options 	FAT_CURSOR	# start with block cursor
-
-device		agp		# support several AGP chipsets
-
-# Power management support (see NOTES for more options)
-#device		apm
-# Add suspend/resume support for the i8254.
-device		pmtimer
-
-# PCCARD (PCMCIA) support
-# PCMCIA and cardbus bridge support
-device		cbb		# cardbus (yenta) bridge
-device		pccard		# PC Card (16-bit) bus
-device		cardbus		# CardBus (32-bit) bus
-
-# Serial (COM) ports
-device		sio		# 8250, 16[45]50 based serial ports
-
-# Parallel port
-device		ppc
-device		ppbus		# Parallel port bus (required)
-device		lpt		# Printer
-device		plip		# TCP/IP over parallel
-device		ppi		# Parallel port interface device
-#device		vpo		# Requires scbus and da
-
-# If you've got a "dumb" serial or parallel PCI card that is
-# supported by the puc(4) glue driver, uncomment the following
-# line to enable it (connects to the sio and/or ppc drivers):
-#device		puc
-
-# PCI Ethernet NICs.
-device		de		# DEC/Intel DC21x4x (``Tulip'')
-device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
-device		ixgb		# Intel PRO/10GbE Ethernet Card
-device		txp		# 3Com 3cR990 (``Typhoon'')
-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
-
-# PCI Ethernet NICs that use the common MII bus controller code.
-# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
-device		miibus		# MII bus support
-device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
-device		bfe		# Broadcom BCM440x 10/100 Ethernet
-device		bge		# Broadcom BCM570xx Gigabit Ethernet
-device		dc		# DEC/Intel 21143 and various workalikes
-device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
-device		lge		# Level 1 LXT1001 gigabit Ethernet
-device		nge		# NatSemi DP83820 gigabit Ethernet
-device		nve		# nVidia nForce MCP on-board Ethernet Networking
-device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
-device		re		# RealTek 8139C+/8169/8169S/8110S
-device		rl		# RealTek 8129/8139
-device		sf		# Adaptec AIC-6915 (``Starfire'')
-device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
-device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-device		ste		# Sundance ST201 (D-Link DFE-550TX)
-device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
-device		tl		# Texas Instruments ThunderLAN
-device		tx		# SMC EtherPower II (83c170 ``EPIC'')
-device		vge		# VIA VT612x gigabit Ethernet
-device		vr		# VIA Rhine, Rhine II
-device		wb		# Winbond W89C840F
-device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
-
-# ISA Ethernet NICs.  pccard NICs included.
-device		cs		# Crystal Semiconductor CS89x0 NIC
-# 'device ed' requires 'device miibus'
-device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
-device		ex		# Intel EtherExpress Pro/10 and Pro/10+
-device		ep		# Etherlink III based cards
-device		fe		# Fujitsu MB8696x based cards
-device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
-device		lnc		# NE2100, NE32-VL Lance Ethernet cards
-device		sn		# SMC's 9000 series of Ethernet chips
-device		xe		# Xircom pccard Ethernet
-
-# Wireless NIC cards
-device		wlan		# 802.11 support
-device		an		# Aironet 4500/4800 802.11 wireless NICs.
-device		awi		# BayStack 660 and others
-device		ral		# Ralink Technology RT2500 wireless NICs.
-device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-#device		wl		# Older non 802.11 Wavelan wireless NIC.
-
-# Pseudo devices.
-device		loop		# Network loopback
-device		random		# Entropy device
-device		ether		# Ethernet support
-device		sl		# Kernel SLIP
-device		ppp		# Kernel PPP
-device		tun		# Packet tunnel.
-device		pty		# Pseudo-ttys (telnet etc)
-device		md		# Memory "disks"
-device		gif		# IPv6 and IPv4 tunneling
-device		faith		# IPv6-to-IPv4 relaying (translation)
-
-# The `bpf' device enables the Berkeley Packet Filter.
-# Be aware of the administrative consequences of enabling this!
-# Note that 'bpf' is required for DHCP.
-device		bpf		# Berkeley packet filter
-
-# USB support
-device		uhci		# UHCI PCI->USB interface
-device		ohci		# OHCI PCI->USB interface
-device		ehci		# EHCI PCI->USB interface (USB 2.0)
-device		usb		# USB Bus (required)
-#device		udbp		# USB Double Bulk Pipe devices
-device		ugen		# Generic
-device		uhid		# "Human Interface Devices"
-device		ukbd		# Keyboard
-device		ulpt		# Printer
-device		umass		# Disks/Mass storage - Requires scbus and da
-device		ums		# Mouse
-device		ural		# Ralink Technology RT2500USB wireless NICs
-device		urio		# Diamond Rio 500 MP3 player
-device		uscanner	# Scanners
-# USB Ethernet, requires miibus
-device		aue		# ADMtek USB Ethernet
-device		axe		# ASIX Electronics USB Ethernet
-device		cdce		# Generic USB over Ethernet
-device		cue		# CATC USB Ethernet
-device		kue		# Kawasaki LSI USB Ethernet
-device		rue		# RealTek RTL8150 USB Ethernet
-
-# FireWire support
-device		firewire	# FireWire bus code
-device		sbp		# SCSI over FireWire (Requires scbus and da)
-device		fwe		# Ethernet over FireWire (non-standard!)
-
-
-# Direct Rendering modules for 3d accelleration
-device 		drm		# DRM Core Module
-device 		mach64drm	# ATI Rage Pro
-device		mgadrm		# AGP Matrox G200
-device		r128drm         # ATI Rage 128
-device		radeondrm       # ATI Radeon
-device		sisdrm		# SIS 300/305
-device		i915drm		# Intel i830 through i915
-device		savagedrm	# S3 Savage 3D, Savage 4
-device		tdfxdrm		# 3dfx Voodoo 3/4/5 and Banshee
-
-options 	VESA		# Vesa Support for Splash
-options		SC_PIXEL_MODE	# add support for the raster tex
-
-options 	HZ=1000
-options 	DEVICE_POLLING
-
-device 		pf
-device 		pflog
-device 		pfsync
-
-options		ALTQ
-options		ALTQ_CBQ
-options		ALTQ_RED
-options		ALTQ_RIO
-options		ALTQ_HFSC
-options		ALTQ_CDNR
-options		ALTQ_PRIQ
+#
+# GENERIC -- Generic kernel configuration file for FreeBSD/i386
+#
+# For more information on this file, please read the handbook section on
+# Kernel Configuration Files:
+#
+#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
+# in NOTES.
+#
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.7.2.2 2006/05/01 00:15:12 scottl Exp $
+
+machine		i386
+cpu		I486_CPU
+cpu		I586_CPU
+cpu		I686_CPU
+ident		PCBSD
+
+# To statically compile in device wiring instead of /boot/device.hints
+#hints		"GENERIC.hints"		# Default places to look for devices.
+
+#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+
+options 	SCHED_4BSD		# 4BSD scheduler
+options 	PREEMPTION		# Enable kernel thread preemption
+options 	INET			# InterNETworking
+options 	INET6			# IPv6 communications protocols
+options 	FFS			# Berkeley Fast Filesystem
+options 	SOFTUPDATES		# Enable FFS soft updates support
+options 	UFS_ACL			# Support for access control lists
+options 	UFS_DIRHASH		# Improve performance on big directories
+options 	MD_ROOT			# MD is a potential root device
+options 	NFSCLIENT		# Network Filesystem Client
+options 	NFSSERVER		# Network Filesystem Server
+options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	MSDOSFS			# MSDOS Filesystem
+options 	CD9660			# ISO 9660 Filesystem
+options		LIBICONV		# Various options for forigen langs
+options 	LIBMCHAIN
+options		CD9660_ICONV
+options		MSDOSFS_ICONV
+options		MSDOSFS_LARGE
+options		NTFS
+options 	NTFS_ICONV
+options		UDF
+options		UDF_ICONV
+options 	PROCFS			# Process filesystem (requires PSEUDOFS)
+options 	PSEUDOFS		# Pseudo-filesystem framework
+options 	GEOM_GPT		# GUID Partition Tables.
+options 	GEOM_UZIP		# Read-only compressed disks
+options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
+options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
+options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
+options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
+options 	KTRACE			# ktrace(1) support
+options 	SYSVSHM			# SYSV-style shared memory
+options 	SYSVMSG			# SYSV-style message queues
+options 	SYSVSEM			# SYSV-style semaphores
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
+					# output.  Adds ~128k to driver.
+options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
+					# output.  Adds ~215k to driver.
+options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
+
+device		apic			# I/O APIC
+
+# Bus support.
+device		isa
+#device		eisa
+device		pci
+
+# Floppy drives
+device		fdc
+
+# ATA and ATAPI devices
+device		ata
+device		atadisk		# ATA disk drives
+device		ataraid		# ATA RAID drives
+device		atapicd		# ATAPI CDROM drives
+device		atapifd		# ATAPI floppy drives
+device		atapist		# ATAPI tape drives
+#options 	ATA_STATIC_ID	# Static device numbering
+device		atapicam	# Atapi CAM Support
+
+# SCSI Controllers
+device		ahb		# EISA AHA1742 family
+device		ahc		# AHA2940 and onboard AIC7xxx devices
+device		ahd		# AHA39320/29320 and onboard AIC79xx devices
+device		amd		# AMD 53C974 (Tekram DC-390(T))
+device		isp		# Qlogic family
+#device 	ispfw		# Firmware for QLogic HBAs- normally a module
+device		mpt		# LSI-Logic MPT-Fusion
+#device		ncr		# NCR/Symbios Logic
+device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
+device		trm		# Tekram DC395U/UW/F DC315U adapters
+
+device		adv		# Advansys SCSI adapters
+device		adw		# Advansys wide SCSI adapters
+device		aha		# Adaptec 154x SCSI adapters
+device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
+device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
+
+device		ncv		# NCR 53C500
+device		nsp		# Workbit Ninja SCSI-3
+device		stg		# TMC 18C30/18C50
+
+# SCSI peripherals
+device		scbus		# SCSI bus (required for SCSI)
+device		ch		# SCSI media changers
+device		da		# Direct Access (disks)
+device		sa		# Sequential Access (tape etc)
+device		cd		# CD
+device		pass		# Passthrough device (direct SCSI access)
+device		ses		# SCSI Environmental Services (and SAF-TE)
+
+# RAID controllers interfaced to the SCSI subsystem
+device		amr		# AMI MegaRAID
+device		arcmsr		# Areca SATA II RAID
+device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
+device		ciss		# Compaq Smart RAID 5*
+device		dpt		# DPT Smartcache III, IV - See NOTES for options
+device		hptmv		# Highpoint RocketRAID 182x
+device		rr232x		# Highpoint RocketRAID 232x
+device		iir		# Intel Integrated RAID
+device		ips		# IBM (Adaptec) ServeRAID
+device		mly		# Mylex AcceleRAID/eXtremeRAID
+device		twa		# 3ware 9000 series PATA/SATA RAID
+
+# RAID controllers
+device		aac		# Adaptec FSA RAID
+device		aacp		# SCSI passthrough for aac (requires CAM)
+device		ida		# Compaq Smart RAID
+device		mfi		# LSI MegaRAID SAS
+device		mlx		# Mylex DAC960 family
+device		pst		# Promise Supertrak SX6000
+device		twe		# 3ware ATA RAID
+
+# atkbdc0 controls both the keyboard and the PS/2 mouse
+device		atkbdc		# AT keyboard controller
+device		atkbd		# AT keyboard
+device		psm		# PS/2 mouse
+
+device		kbdmux		# keyboard multiplexer
+
+device		vga		# VGA video card driver
+
+device		splash		# Splash screen and screen saver support
+
+# syscons is the default console driver, resembling an SCO console
+device		sc
+
+# Enable this for the pcvt (VT220 compatible) console driver
+#device		vt
+#options 	XSERVER		# support for X server on a vt console
+#options 	FAT_CURSOR	# start with block cursor
+
+device		agp		# support several AGP chipsets
+
+# Power management support (see NOTES for more options)
+#device		apm
+# Add suspend/resume support for the i8254.
+device		pmtimer
+
+# PCCARD (PCMCIA) support
+# PCMCIA and cardbus bridge support
+device		cbb		# cardbus (yenta) bridge
+device		pccard		# PC Card (16-bit) bus
+device		cardbus		# CardBus (32-bit) bus
+
+# Serial (COM) ports
+device		sio		# 8250, 16[45]50 based serial ports
+
+# Parallel port
+device		ppc
+device		ppbus		# Parallel port bus (required)
+device		lpt		# Printer
+device		plip		# TCP/IP over parallel
+device		ppi		# Parallel port interface device
+#device		vpo		# Requires scbus and da
+
+# If you've got a "dumb" serial or parallel PCI card that is
+# supported by the puc(4) glue driver, uncomment the following
+# line to enable it (connects to the sio and/or ppc drivers):
+#device		puc
+
+# PCI Ethernet NICs.
+device		de		# DEC/Intel DC21x4x (``Tulip'')
+device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
+device		ixgb		# Intel PRO/10GbE Ethernet Card
+device		txp		# 3Com 3cR990 (``Typhoon'')
+device		vx		# 3Com 3c590, 3c595 (``Vortex'')
+
+# PCI Ethernet NICs that use the common MII bus controller code.
+# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
+device		miibus		# MII bus support
+device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
+device		bfe		# Broadcom BCM440x 10/100 Ethernet
+device		bge		# Broadcom BCM570xx Gigabit Ethernet
+device		dc		# DEC/Intel 21143 and various workalikes
+device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
+device		lge		# Level 1 LXT1001 gigabit Ethernet
+device		nge		# NatSemi DP83820 gigabit Ethernet
+device		nve		# nVidia nForce MCP on-board Ethernet Networking
+device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
+device		re		# RealTek 8139C+/8169/8169S/8110S
+device		rl		# RealTek 8129/8139
+device		sf		# Adaptec AIC-6915 (``Starfire'')
+device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
+device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
+device		ste		# Sundance ST201 (D-Link DFE-550TX)
+device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
+device		tl		# Texas Instruments ThunderLAN
+device		tx		# SMC EtherPower II (83c170 ``EPIC'')
+device		vge		# VIA VT612x gigabit Ethernet
+device		vr		# VIA Rhine, Rhine II
+device		wb		# Winbond W89C840F
+device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
+
+# ISA Ethernet NICs.  pccard NICs included.
+device		cs		# Crystal Semiconductor CS89x0 NIC
+# 'device ed' requires 'device miibus'
+device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
+device		ex		# Intel EtherExpress Pro/10 and Pro/10+
+device		ep		# Etherlink III based cards
+device		fe		# Fujitsu MB8696x based cards
+device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
+device		lnc		# NE2100, NE32-VL Lance Ethernet cards
+device		sn		# SMC's 9000 series of Ethernet chips
+device		xe		# Xircom pccard Ethernet
+
+# Wireless NIC cards
+device		wlan		# 802.11 support
+device		an		# Aironet 4500/4800 802.11 wireless NICs.
+device		awi		# BayStack 660 and others
+device		ral		# Ralink Technology RT2500 wireless NICs.
+device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
+#device		wl		# Older non 802.11 Wavelan wireless NIC.
+
+# Pseudo devices.
+device		loop		# Network loopback
+device		random		# Entropy device
+device		ether		# Ethernet support
+device		sl		# Kernel SLIP
+device		ppp		# Kernel PPP
+device		tun		# Packet tunnel.
+device		pty		# Pseudo-ttys (telnet etc)
+device		md		# Memory "disks"
+device		gif		# IPv6 and IPv4 tunneling
+device		faith		# IPv6-to-IPv4 relaying (translation)
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device		bpf		# Berkeley packet filter
+
+# USB support
+device		uhci		# UHCI PCI->USB interface
+device		ohci		# OHCI PCI->USB interface
+device		ehci		# EHCI PCI->USB interface (USB 2.0)
+device		usb		# USB Bus (required)
+#device		udbp		# USB Double Bulk Pipe devices
+device		ugen		# Generic
+device		uhid		# "Human Interface Devices"
+device		ukbd		# Keyboard
+device		ulpt		# Printer
+device		umass		# Disks/Mass storage - Requires scbus and da
+device		ums		# Mouse
+device		ural		# Ralink Technology RT2500USB wireless NICs
+device		urio		# Diamond Rio 500 MP3 player
+device		uscanner	# Scanners
+# USB Ethernet, requires miibus
+device		aue		# ADMtek USB Ethernet
+device		axe		# ASIX Electronics USB Ethernet
+device		cdce		# Generic USB over Ethernet
+device		cue		# CATC USB Ethernet
+device		kue		# Kawasaki LSI USB Ethernet
+device		rue		# RealTek RTL8150 USB Ethernet
+
+# FireWire support
+device		firewire	# FireWire bus code
+device		sbp		# SCSI over FireWire (Requires scbus and da)
+device		fwe		# Ethernet over FireWire (non-standard!)
+
+
+# Direct Rendering modules for 3d accelleration
+device 		drm		# DRM Core Module
+device 		mach64drm	# ATI Rage Pro
+device		mgadrm		# AGP Matrox G200
+device		r128drm         # ATI Rage 128
+device		radeondrm       # ATI Radeon
+device		sisdrm		# SIS 300/305
+device		i915drm		# Intel i830 through i915
+device		savagedrm	# S3 Savage 3D, Savage 4
+device		tdfxdrm		# 3dfx Voodoo 3/4/5 and Banshee
+
+options 	VESA		# Vesa Support for Splash
+options		SC_PIXEL_MODE	# add support for the raster tex
+
+options 	HZ=1000
+options 	DEVICE_POLLING
+
+device 		pf
+device 		pflog
+device 		pfsync
+
+options		ALTQ
+options		ALTQ_CBQ
+options		ALTQ_RED
+options		ALTQ_RIO
+options		ALTQ_HFSC
+options		ALTQ_CDNR
+options		ALTQ_PRIQ

Modified: pcbsd/trunk/system-overlay/PCBSD/conf/PCBSDv1.3-SMP
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/conf/PCBSDv1.3-SMP	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/conf/PCBSDv1.3-SMP	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,325 +1,325 @@
-#
-# GENERIC -- Generic kernel configuration file for FreeBSD/i386
-#
-# For more information on this file, please read the handbook section on
-# Kernel Configuration Files:
-#
-#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
-#
-# The handbook is also available locally in /usr/share/doc/handbook
-# if you've installed the doc distribution, otherwise always see the
-# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
-# latest information.
-#
-# An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../conf/NOTES and NOTES files.
-# If you are in doubt as to the purpose or necessity of a line, check first
-# in NOTES.
-#
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.7.2.2 2006/05/01 00:15:12 scottl Exp $
-
-machine		i386
-cpu		I486_CPU
-cpu		I586_CPU
-cpu		I686_CPU
-ident		PCBSD
-
-# To statically compile in device wiring instead of /boot/device.hints
-#hints		"GENERIC.hints"		# Default places to look for devices.
-
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-
-options 	SCHED_4BSD		# 4BSD scheduler
-options 	PREEMPTION		# Enable kernel thread preemption
-options 	INET			# InterNETworking
-options 	INET6			# IPv6 communications protocols
-options 	FFS			# Berkeley Fast Filesystem
-options 	SOFTUPDATES		# Enable FFS soft updates support
-options 	UFS_ACL			# Support for access control lists
-options 	UFS_DIRHASH		# Improve performance on big directories
-options 	MD_ROOT			# MD is a potential root device
-options 	NFSCLIENT		# Network Filesystem Client
-options 	NFSSERVER		# Network Filesystem Server
-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
-options 	MSDOSFS			# MSDOS Filesystem
-options 	CD9660			# ISO 9660 Filesystem
-options		LIBICONV
-options		LIBMCHAIN
-options		CD9660_ICONV
-options		MSDOSFS_ICONV
-options		MSDOSFS_LARGE
-options		NTFS
-options		NTFS_ICONV
-options		UDF
-options		UDF_ICONV
-options 	PROCFS			# Process filesystem (requires PSEUDOFS)
-options 	PSEUDOFS		# Pseudo-filesystem framework
-options 	GEOM_GPT		# GUID Partition Tables.
-options		GEOM_UZIP		# Read-only compressed disks
-options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
-options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
-options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
-options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
-options 	KTRACE			# ktrace(1) support
-options 	SYSVSHM			# SYSV-style shared memory
-options 	SYSVMSG			# SYSV-style message queues
-options 	SYSVSEM			# SYSV-style semaphores
-options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
-options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~128k to driver.
-options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~215k to driver.
-options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
-
-device		apic			# I/O APIC
-
-# Bus support.
-device		isa
-#device		eisa
-device		pci
-
-# Floppy drives
-device		fdc
-
-# ATA and ATAPI devices
-device		ata
-device		atadisk		# ATA disk drives
-device		ataraid		# ATA RAID drives
-device		atapicd		# ATAPI CDROM drives
-device		atapifd		# ATAPI floppy drives
-device		atapist		# ATAPI tape drives
-#options 	ATA_STATIC_ID	# Static device numbering
-device		atapicam	# Atapi CAM Support
-
-# SCSI Controllers
-device		ahb		# EISA AHA1742 family
-device		ahc		# AHA2940 and onboard AIC7xxx devices
-device		ahd		# AHA39320/29320 and onboard AIC79xx devices
-device		amd		# AMD 53C974 (Tekram DC-390(T))
-device		isp		# Qlogic family
-#device 	ispfw		# Firmware for QLogic HBAs- normally a module
-device		mpt		# LSI-Logic MPT-Fusion
-#device		ncr		# NCR/Symbios Logic
-device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
-device		trm		# Tekram DC395U/UW/F DC315U adapters
-
-device		adv		# Advansys SCSI adapters
-device		adw		# Advansys wide SCSI adapters
-device		aha		# Adaptec 154x SCSI adapters
-device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
-device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
-
-device		ncv		# NCR 53C500
-device		nsp		# Workbit Ninja SCSI-3
-device		stg		# TMC 18C30/18C50
-
-# SCSI peripherals
-device		scbus		# SCSI bus (required for SCSI)
-device		ch		# SCSI media changers
-device		da		# Direct Access (disks)
-device		sa		# Sequential Access (tape etc)
-device		cd		# CD
-device		pass		# Passthrough device (direct SCSI access)
-device		ses		# SCSI Environmental Services (and SAF-TE)
-
-# RAID controllers interfaced to the SCSI subsystem
-device		amr		# AMI MegaRAID
-device		arcmsr		# Areca SATA II RAID
-device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
-device		ciss		# Compaq Smart RAID 5*
-device		dpt		# DPT Smartcache III, IV - See NOTES for options
-device		hptmv		# Highpoint RocketRAID 182x
-device		rr232x		# Highpoint RocketRAID 232x
-device		iir		# Intel Integrated RAID
-device		ips		# IBM (Adaptec) ServeRAID
-device		mly		# Mylex AcceleRAID/eXtremeRAID
-device		twa		# 3ware 9000 series PATA/SATA RAID
-
-# RAID controllers
-device		aac		# Adaptec FSA RAID
-device		aacp		# SCSI passthrough for aac (requires CAM)
-device		ida		# Compaq Smart RAID
-device		mfi		# LSI MegaRAID SAS
-device		mlx		# Mylex DAC960 family
-device		pst		# Promise Supertrak SX6000
-device		twe		# 3ware ATA RAID
-
-# atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc		# AT keyboard controller
-device		atkbd		# AT keyboard
-device		psm		# PS/2 mouse
-
-device		kbdmux		# keyboard multiplexer
-
-device		vga		# VGA video card driver
-
-device		splash		# Splash screen and screen saver support
-
-# syscons is the default console driver, resembling an SCO console
-device		sc
-
-# Enable this for the pcvt (VT220 compatible) console driver
-#device		vt
-#options 	XSERVER		# support for X server on a vt console
-#options 	FAT_CURSOR	# start with block cursor
-
-device		agp		# support several AGP chipsets
-
-# Power management support (see NOTES for more options)
-#device		apm
-# Add suspend/resume support for the i8254.
-device		pmtimer
-
-# PCCARD (PCMCIA) support
-# PCMCIA and cardbus bridge support
-device		cbb		# cardbus (yenta) bridge
-device		pccard		# PC Card (16-bit) bus
-device		cardbus		# CardBus (32-bit) bus
-
-# Serial (COM) ports
-device		sio		# 8250, 16[45]50 based serial ports
-
-# Parallel port
-device		ppc
-device		ppbus		# Parallel port bus (required)
-device		lpt		# Printer
-device		plip		# TCP/IP over parallel
-device		ppi		# Parallel port interface device
-#device		vpo		# Requires scbus and da
-
-# If you've got a "dumb" serial or parallel PCI card that is
-# supported by the puc(4) glue driver, uncomment the following
-# line to enable it (connects to the sio and/or ppc drivers):
-#device		puc
-
-# PCI Ethernet NICs.
-device		de		# DEC/Intel DC21x4x (``Tulip'')
-device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
-device		ixgb		# Intel PRO/10GbE Ethernet Card
-device		txp		# 3Com 3cR990 (``Typhoon'')
-device		vx		# 3Com 3c590, 3c595 (``Vortex'')
-
-# PCI Ethernet NICs that use the common MII bus controller code.
-# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
-device		miibus		# MII bus support
-device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
-device		bfe		# Broadcom BCM440x 10/100 Ethernet
-device		bge		# Broadcom BCM570xx Gigabit Ethernet
-device		dc		# DEC/Intel 21143 and various workalikes
-device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
-device		lge		# Level 1 LXT1001 gigabit Ethernet
-device		nge		# NatSemi DP83820 gigabit Ethernet
-device		nve		# nVidia nForce MCP on-board Ethernet Networking
-device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
-device		re		# RealTek 8139C+/8169/8169S/8110S
-device		rl		# RealTek 8129/8139
-device		sf		# Adaptec AIC-6915 (``Starfire'')
-device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
-device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-device		ste		# Sundance ST201 (D-Link DFE-550TX)
-device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
-device		tl		# Texas Instruments ThunderLAN
-device		tx		# SMC EtherPower II (83c170 ``EPIC'')
-device		vge		# VIA VT612x gigabit Ethernet
-device		vr		# VIA Rhine, Rhine II
-device		wb		# Winbond W89C840F
-device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
-
-# ISA Ethernet NICs.  pccard NICs included.
-device		cs		# Crystal Semiconductor CS89x0 NIC
-# 'device ed' requires 'device miibus'
-device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
-device		ex		# Intel EtherExpress Pro/10 and Pro/10+
-device		ep		# Etherlink III based cards
-device		fe		# Fujitsu MB8696x based cards
-device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
-device		lnc		# NE2100, NE32-VL Lance Ethernet cards
-device		sn		# SMC's 9000 series of Ethernet chips
-device		xe		# Xircom pccard Ethernet
-
-# Wireless NIC cards
-device		wlan		# 802.11 support
-device		an		# Aironet 4500/4800 802.11 wireless NICs.
-device		awi		# BayStack 660 and others
-device		ral		# Ralink Technology RT2500 wireless NICs.
-device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-#device		wl		# Older non 802.11 Wavelan wireless NIC.
-
-# Pseudo devices.
-device		loop		# Network loopback
-device		random		# Entropy device
-device		ether		# Ethernet support
-device		sl		# Kernel SLIP
-device		ppp		# Kernel PPP
-device		tun		# Packet tunnel.
-device		pty		# Pseudo-ttys (telnet etc)
-device		md		# Memory "disks"
-device		gif		# IPv6 and IPv4 tunneling
-device		faith		# IPv6-to-IPv4 relaying (translation)
-
-# The `bpf' device enables the Berkeley Packet Filter.
-# Be aware of the administrative consequences of enabling this!
-# Note that 'bpf' is required for DHCP.
-device		bpf		# Berkeley packet filter
-
-# USB support
-device		uhci		# UHCI PCI->USB interface
-device		ohci		# OHCI PCI->USB interface
-device		ehci		# EHCI PCI->USB interface (USB 2.0)
-device		usb		# USB Bus (required)
-#device		udbp		# USB Double Bulk Pipe devices
-device		ugen		# Generic
-device		uhid		# "Human Interface Devices"
-device		ukbd		# Keyboard
-device		ulpt		# Printer
-device		umass		# Disks/Mass storage - Requires scbus and da
-device		ums		# Mouse
-device		ural		# Ralink Technology RT2500USB wireless NICs
-device		urio		# Diamond Rio 500 MP3 player
-device		uscanner	# Scanners
-# USB Ethernet, requires miibus
-device		aue		# ADMtek USB Ethernet
-device		axe		# ASIX Electronics USB Ethernet
-device		cdce		# Generic USB over Ethernet
-device		cue		# CATC USB Ethernet
-device		kue		# Kawasaki LSI USB Ethernet
-device		rue		# RealTek RTL8150 USB Ethernet
-
-# FireWire support
-device		firewire	# FireWire bus code
-device		sbp		# SCSI over FireWire (Requires scbus and da)
-device		fwe		# Ethernet over FireWire (non-standard!)
-
-
-# Direct Rendering modules for 3d accelleration
-device 		drm		# DRM Core Module
-device 		mach64drm	# ATI Rage Pro
-device		mgadrm		# AGP Matrox G200
-device		r128drm         # ATI Rage 128
-device		radeondrm       # ATI Radeon
-device		sisdrm		# SIS 300/305
-device		i915drm		# Intel i830 through i915
-device		savagedrm	# S3 Savage 3D, Savage 4
-device		tdfxdrm		# 3dfx Voodoo 3/4/5 and Banshee
-
-options 	VESA		# Vesa Support for Splash
-options		SC_PIXEL_MODE	# add support for the raster tex
-
-options 	HZ=1000
-options 	DEVICE_POLLING
-
-device 		pf
-device 		pflog
-device 		pfsync
-
-options		ALTQ
-options		ALTQ_CBQ
-options		ALTQ_RED
-options		ALTQ_RIO
-options		ALTQ_HFSC
-options		ALTQ_CDNR
-options		ALTQ_PRIQ
-options		ALTQ_NOPCC
-
-options		SMP
+#
+# GENERIC -- Generic kernel configuration file for FreeBSD/i386
+#
+# For more information on this file, please read the handbook section on
+# Kernel Configuration Files:
+#
+#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
+# in NOTES.
+#
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.7.2.2 2006/05/01 00:15:12 scottl Exp $
+
+machine		i386
+cpu		I486_CPU
+cpu		I586_CPU
+cpu		I686_CPU
+ident		PCBSD
+
+# To statically compile in device wiring instead of /boot/device.hints
+#hints		"GENERIC.hints"		# Default places to look for devices.
+
+#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+
+options 	SCHED_4BSD		# 4BSD scheduler
+options 	PREEMPTION		# Enable kernel thread preemption
+options 	INET			# InterNETworking
+options 	INET6			# IPv6 communications protocols
+options 	FFS			# Berkeley Fast Filesystem
+options 	SOFTUPDATES		# Enable FFS soft updates support
+options 	UFS_ACL			# Support for access control lists
+options 	UFS_DIRHASH		# Improve performance on big directories
+options 	MD_ROOT			# MD is a potential root device
+options 	NFSCLIENT		# Network Filesystem Client
+options 	NFSSERVER		# Network Filesystem Server
+options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	MSDOSFS			# MSDOS Filesystem
+options 	CD9660			# ISO 9660 Filesystem
+options		LIBICONV
+options		LIBMCHAIN
+options		CD9660_ICONV
+options		MSDOSFS_ICONV
+options		MSDOSFS_LARGE
+options		NTFS
+options		NTFS_ICONV
+options		UDF
+options		UDF_ICONV
+options 	PROCFS			# Process filesystem (requires PSEUDOFS)
+options 	PSEUDOFS		# Pseudo-filesystem framework
+options 	GEOM_GPT		# GUID Partition Tables.
+options		GEOM_UZIP		# Read-only compressed disks
+options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
+options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
+options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
+options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
+options 	KTRACE			# ktrace(1) support
+options 	SYSVSHM			# SYSV-style shared memory
+options 	SYSVMSG			# SYSV-style message queues
+options 	SYSVSEM			# SYSV-style semaphores
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
+					# output.  Adds ~128k to driver.
+options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
+					# output.  Adds ~215k to driver.
+options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
+
+device		apic			# I/O APIC
+
+# Bus support.
+device		isa
+#device		eisa
+device		pci
+
+# Floppy drives
+device		fdc
+
+# ATA and ATAPI devices
+device		ata
+device		atadisk		# ATA disk drives
+device		ataraid		# ATA RAID drives
+device		atapicd		# ATAPI CDROM drives
+device		atapifd		# ATAPI floppy drives
+device		atapist		# ATAPI tape drives
+#options 	ATA_STATIC_ID	# Static device numbering
+device		atapicam	# Atapi CAM Support
+
+# SCSI Controllers
+device		ahb		# EISA AHA1742 family
+device		ahc		# AHA2940 and onboard AIC7xxx devices
+device		ahd		# AHA39320/29320 and onboard AIC79xx devices
+device		amd		# AMD 53C974 (Tekram DC-390(T))
+device		isp		# Qlogic family
+#device 	ispfw		# Firmware for QLogic HBAs- normally a module
+device		mpt		# LSI-Logic MPT-Fusion
+#device		ncr		# NCR/Symbios Logic
+device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
+device		trm		# Tekram DC395U/UW/F DC315U adapters
+
+device		adv		# Advansys SCSI adapters
+device		adw		# Advansys wide SCSI adapters
+device		aha		# Adaptec 154x SCSI adapters
+device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
+device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
+
+device		ncv		# NCR 53C500
+device		nsp		# Workbit Ninja SCSI-3
+device		stg		# TMC 18C30/18C50
+
+# SCSI peripherals
+device		scbus		# SCSI bus (required for SCSI)
+device		ch		# SCSI media changers
+device		da		# Direct Access (disks)
+device		sa		# Sequential Access (tape etc)
+device		cd		# CD
+device		pass		# Passthrough device (direct SCSI access)
+device		ses		# SCSI Environmental Services (and SAF-TE)
+
+# RAID controllers interfaced to the SCSI subsystem
+device		amr		# AMI MegaRAID
+device		arcmsr		# Areca SATA II RAID
+device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
+device		ciss		# Compaq Smart RAID 5*
+device		dpt		# DPT Smartcache III, IV - See NOTES for options
+device		hptmv		# Highpoint RocketRAID 182x
+device		rr232x		# Highpoint RocketRAID 232x
+device		iir		# Intel Integrated RAID
+device		ips		# IBM (Adaptec) ServeRAID
+device		mly		# Mylex AcceleRAID/eXtremeRAID
+device		twa		# 3ware 9000 series PATA/SATA RAID
+
+# RAID controllers
+device		aac		# Adaptec FSA RAID
+device		aacp		# SCSI passthrough for aac (requires CAM)
+device		ida		# Compaq Smart RAID
+device		mfi		# LSI MegaRAID SAS
+device		mlx		# Mylex DAC960 family
+device		pst		# Promise Supertrak SX6000
+device		twe		# 3ware ATA RAID
+
+# atkbdc0 controls both the keyboard and the PS/2 mouse
+device		atkbdc		# AT keyboard controller
+device		atkbd		# AT keyboard
+device		psm		# PS/2 mouse
+
+device		kbdmux		# keyboard multiplexer
+
+device		vga		# VGA video card driver
+
+device		splash		# Splash screen and screen saver support
+
+# syscons is the default console driver, resembling an SCO console
+device		sc
+
+# Enable this for the pcvt (VT220 compatible) console driver
+#device		vt
+#options 	XSERVER		# support for X server on a vt console
+#options 	FAT_CURSOR	# start with block cursor
+
+device		agp		# support several AGP chipsets
+
+# Power management support (see NOTES for more options)
+#device		apm
+# Add suspend/resume support for the i8254.
+device		pmtimer
+
+# PCCARD (PCMCIA) support
+# PCMCIA and cardbus bridge support
+device		cbb		# cardbus (yenta) bridge
+device		pccard		# PC Card (16-bit) bus
+device		cardbus		# CardBus (32-bit) bus
+
+# Serial (COM) ports
+device		sio		# 8250, 16[45]50 based serial ports
+
+# Parallel port
+device		ppc
+device		ppbus		# Parallel port bus (required)
+device		lpt		# Printer
+device		plip		# TCP/IP over parallel
+device		ppi		# Parallel port interface device
+#device		vpo		# Requires scbus and da
+
+# If you've got a "dumb" serial or parallel PCI card that is
+# supported by the puc(4) glue driver, uncomment the following
+# line to enable it (connects to the sio and/or ppc drivers):
+#device		puc
+
+# PCI Ethernet NICs.
+device		de		# DEC/Intel DC21x4x (``Tulip'')
+device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
+device		ixgb		# Intel PRO/10GbE Ethernet Card
+device		txp		# 3Com 3cR990 (``Typhoon'')
+device		vx		# 3Com 3c590, 3c595 (``Vortex'')
+
+# PCI Ethernet NICs that use the common MII bus controller code.
+# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
+device		miibus		# MII bus support
+device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
+device		bfe		# Broadcom BCM440x 10/100 Ethernet
+device		bge		# Broadcom BCM570xx Gigabit Ethernet
+device		dc		# DEC/Intel 21143 and various workalikes
+device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
+device		lge		# Level 1 LXT1001 gigabit Ethernet
+device		nge		# NatSemi DP83820 gigabit Ethernet
+device		nve		# nVidia nForce MCP on-board Ethernet Networking
+device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
+device		re		# RealTek 8139C+/8169/8169S/8110S
+device		rl		# RealTek 8129/8139
+device		sf		# Adaptec AIC-6915 (``Starfire'')
+device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
+device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
+device		ste		# Sundance ST201 (D-Link DFE-550TX)
+device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
+device		tl		# Texas Instruments ThunderLAN
+device		tx		# SMC EtherPower II (83c170 ``EPIC'')
+device		vge		# VIA VT612x gigabit Ethernet
+device		vr		# VIA Rhine, Rhine II
+device		wb		# Winbond W89C840F
+device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
+
+# ISA Ethernet NICs.  pccard NICs included.
+device		cs		# Crystal Semiconductor CS89x0 NIC
+# 'device ed' requires 'device miibus'
+device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
+device		ex		# Intel EtherExpress Pro/10 and Pro/10+
+device		ep		# Etherlink III based cards
+device		fe		# Fujitsu MB8696x based cards
+device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
+device		lnc		# NE2100, NE32-VL Lance Ethernet cards
+device		sn		# SMC's 9000 series of Ethernet chips
+device		xe		# Xircom pccard Ethernet
+
+# Wireless NIC cards
+device		wlan		# 802.11 support
+device		an		# Aironet 4500/4800 802.11 wireless NICs.
+device		awi		# BayStack 660 and others
+device		ral		# Ralink Technology RT2500 wireless NICs.
+device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
+#device		wl		# Older non 802.11 Wavelan wireless NIC.
+
+# Pseudo devices.
+device		loop		# Network loopback
+device		random		# Entropy device
+device		ether		# Ethernet support
+device		sl		# Kernel SLIP
+device		ppp		# Kernel PPP
+device		tun		# Packet tunnel.
+device		pty		# Pseudo-ttys (telnet etc)
+device		md		# Memory "disks"
+device		gif		# IPv6 and IPv4 tunneling
+device		faith		# IPv6-to-IPv4 relaying (translation)
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device		bpf		# Berkeley packet filter
+
+# USB support
+device		uhci		# UHCI PCI->USB interface
+device		ohci		# OHCI PCI->USB interface
+device		ehci		# EHCI PCI->USB interface (USB 2.0)
+device		usb		# USB Bus (required)
+#device		udbp		# USB Double Bulk Pipe devices
+device		ugen		# Generic
+device		uhid		# "Human Interface Devices"
+device		ukbd		# Keyboard
+device		ulpt		# Printer
+device		umass		# Disks/Mass storage - Requires scbus and da
+device		ums		# Mouse
+device		ural		# Ralink Technology RT2500USB wireless NICs
+device		urio		# Diamond Rio 500 MP3 player
+device		uscanner	# Scanners
+# USB Ethernet, requires miibus
+device		aue		# ADMtek USB Ethernet
+device		axe		# ASIX Electronics USB Ethernet
+device		cdce		# Generic USB over Ethernet
+device		cue		# CATC USB Ethernet
+device		kue		# Kawasaki LSI USB Ethernet
+device		rue		# RealTek RTL8150 USB Ethernet
+
+# FireWire support
+device		firewire	# FireWire bus code
+device		sbp		# SCSI over FireWire (Requires scbus and da)
+device		fwe		# Ethernet over FireWire (non-standard!)
+
+
+# Direct Rendering modules for 3d accelleration
+device 		drm		# DRM Core Module
+device 		mach64drm	# ATI Rage Pro
+device		mgadrm		# AGP Matrox G200
+device		r128drm         # ATI Rage 128
+device		radeondrm       # ATI Radeon
+device		sisdrm		# SIS 300/305
+device		i915drm		# Intel i830 through i915
+device		savagedrm	# S3 Savage 3D, Savage 4
+device		tdfxdrm		# 3dfx Voodoo 3/4/5 and Banshee
+
+options 	VESA		# Vesa Support for Splash
+options		SC_PIXEL_MODE	# add support for the raster tex
+
+options 	HZ=1000
+options 	DEVICE_POLLING
+
+device 		pf
+device 		pflog
+device 		pfsync
+
+options		ALTQ
+options		ALTQ_CBQ
+options		ALTQ_RED
+options		ALTQ_RIO
+options		ALTQ_HFSC
+options		ALTQ_CDNR
+options		ALTQ_PRIQ
+options		ALTQ_NOPCC
+
+options		SMP

Modified: pcbsd/trunk/system-overlay/PCBSD/sound/snd_card_ids.txt
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/sound/snd_card_ids.txt	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/sound/snd_card_ids.txt	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,16 +1,16 @@
-#$Id: snd_card_ids.txt,v 1.3 2005/02/01 18:13:46 rionda Exp $
-snd_als4000:0x40004005
-snd_aureal:0x000112eb
-snd_cmi:0x011213f6,0x011113f6,0x010113f6,0x010013f6
-snd_cs4281:0x60051013
-snd_csa:0x60041013,0x60031013,0x60011013
-snd_emu10k1:0x70021102,0x00041102,0x00021102
-snd_es137x:0x89381102,0x58801274,0x13713274,0x13711274,0x50001274
-snd_ich:0x746d1022,0x74451022,0x00ea10de,0x00da10de,0x008a10de,0x006a10de,0x01b110de,0x24858086,0x24458086,0x24258086,0x24158086,0x71958086,0x266e8086,0x24d58086,0x24c58086,0x70121039
-snd_maestro:0x803c1033,0x80581033,0x1978125d,0x1968125d,0x01001285
-snd_neomagic:0x800610c8,0x800510c8
-snd_solo:0x1969125d
-snd_t4dwave:0x70181039,0x545110b9,0x20011023,0x20001023
-snd_via8233:0x30591106
-snd_via82c686:0x30581106
-snd_vibes:0xca005333
+#$Id: snd_card_ids.txt,v 1.3 2005/02/01 18:13:46 rionda Exp $
+snd_als4000:0x40004005
+snd_aureal:0x000112eb
+snd_cmi:0x011213f6,0x011113f6,0x010113f6,0x010013f6
+snd_cs4281:0x60051013
+snd_csa:0x60041013,0x60031013,0x60011013
+snd_emu10k1:0x70021102,0x00041102,0x00021102
+snd_es137x:0x89381102,0x58801274,0x13713274,0x13711274,0x50001274
+snd_ich:0x746d1022,0x74451022,0x00ea10de,0x00da10de,0x008a10de,0x006a10de,0x01b110de,0x24858086,0x24458086,0x24258086,0x24158086,0x71958086,0x266e8086,0x24d58086,0x24c58086,0x70121039
+snd_maestro:0x803c1033,0x80581033,0x1978125d,0x1968125d,0x01001285
+snd_neomagic:0x800610c8,0x800510c8
+snd_solo:0x1969125d
+snd_t4dwave:0x70181039,0x545110b9,0x20011023,0x20001023
+snd_via8233:0x30591106
+snd_via82c686:0x30581106
+snd_vibes:0xca005333

Modified: pcbsd/trunk/system-overlay/PCBSD/sound/sound_detect.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/sound/sound_detect.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/PCBSD/sound/sound_detect.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,6 +1,6 @@
-#!/bin/sh
-#
-# Detect the audio card and load the appropriate driver
-#
-# $Id: sound_detect.sh,v 1.3 2004/11/10 18:41:12 drizzt Exp $
-
+#!/bin/sh
+#
+# Detect the audio card and load the appropriate driver
+#
+# $Id: sound_detect.sh,v 1.3 2004/11/10 18:41:12 drizzt Exp $
+

Modified: pcbsd/trunk/system-overlay/Programs/.config/ProgList
===================================================================
--- pcbsd/trunk/system-overlay/Programs/.config/ProgList	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/Programs/.config/ProgList	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,3 +1,3 @@
-# PC-BSD - Install Config File
-# Please do not edit this file manually!
-#######################
+# PC-BSD - Install Config File
+# Please do not edit this file manually!
+#######################

Modified: pcbsd/trunk/system-overlay/sbin/mount_auto
===================================================================
--- pcbsd/trunk/system-overlay/sbin/mount_auto	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/sbin/mount_auto	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,11 +1,11 @@
-#!/bin/sh
-#        Name: mount_auto
-#      Author: Tanner Schultz
-#        Date: 12-16-05
-#     License: Public domain
-# Description: Throws a bunch of fstypes at it to see what sticks.
-#              Currently supported filesystems are UFS, msdos, ntfs,
-#              ext2, reiserfs, cd9660, udf
-##########################################################################
-
-mount -C UTF-8 -t ufs $@ 2> /dev/null || mount_msdosfs -C UTF-8 $@ 2> /dev/null || mount_ntfs -C UTF-8 -o ro $@ 2> /dev/null || mount_ext2fs -C UTF-8 $@ 2> /dev/null || mount_cd9660 -C UTF-8 $@ 2> /dev/null || mount_udf -C UTF-8 $@ 2> /dev/null || echo "mount: Insufficient permissions, unknown filesystem, or media not inserted" >&2
+#!/bin/sh
+#        Name: mount_auto
+#      Author: Tanner Schultz
+#        Date: 12-16-05
+#     License: Public domain
+# Description: Throws a bunch of fstypes at it to see what sticks.
+#              Currently supported filesystems are UFS, msdos, ntfs,
+#              ext2, reiserfs, cd9660, udf
+##########################################################################
+
+mount -C UTF-8 -t ufs $@ 2> /dev/null || mount_msdosfs -C UTF-8 $@ 2> /dev/null || mount_ntfs -C UTF-8 -o ro $@ 2> /dev/null || mount_ext2fs -C UTF-8 $@ 2> /dev/null || mount_cd9660 -C UTF-8 $@ 2> /dev/null || mount_udf -C UTF-8 $@ 2> /dev/null || echo "mount: Insufficient permissions, unknown filesystem, or media not inserted" >&2

Modified: pcbsd/trunk/system-overlay/usr/X11R6/etc/fonts/alias.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/X11R6/etc/fonts/alias.conf	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/X11R6/etc/fonts/alias.conf	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,189 +1,189 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!--  PC-BSD - Fonts configurations v.07112006-->
-
-<!--		Default fonts for generic families		-->
-
-<alias>
-	<family>cursive</family>
-	<accept>
-		<family>URW</family>
-	</accept>
-</alias>
-
-<alias>
-	<family>fantasy</family>
-	<prefer>
-		<family>Comic Sans MS</family>
-		<family>URW</family>
-	</prefer>
-</alias>
-
-<alias>
-	<family>monospace</family>
-	<prefer>
-		<family>Courier New</family>
-		<family>Fixed [Misc]</family>
-		<family>Nimbus</family>
-	</prefer>
-</alias>
-
-<alias>
-	<family>sans-serif</family>
-	<prefer>
-		<family>Arial</family>
-		<family>Luxi Sans</family>
-		<family>Nimbus Sans L</family>
-	</prefer>
-</alias>
-
-<alias>
-	<family>serif</family>
-	<prefer>
-		<family>Times New Roman</family>
-		<family>Nimbus Roman No9 L</family>
-		<family>OmegaSerif88591</family>
-		<family>OmegaSerif88592</family>
-		<family>OmegaSerif88593</family>
-		<family>OmegaSerif88594</family>
-		<family>OmegaSerif88595</family>
-		<family>OmegaSerifVISCII</family>
-	</prefer>
-</alias>
-
-<!--		Alias for common fonts in case they're not found		-->
-
-<alias>
-	<family>Arial</family>
-	<accept>
-		<family>sans-serif</family>
-	</accept>
-</alias>
-
-<alias>
-	<family>Comic Sans MS</family>
-	<accept>
-		<family>URW</family>
-	</accept>
-</alias>
-
-<alias>
-	<family>Courier New</family>
-	<accept>
-		<family>monospace</family>
-	</accept>
-</alias>
-
-<alias>
-	<family>Courier</family>
-	<prefer>
-		<family>monospace</family>
-	</prefer>
-</alias>
-
-<alias>
-	<family>Georgia</family>
-	<accept>
-		<family>serif</family>
-	</accept>
-</alias>
-
-<alias>
-	<family>Garamond</family>
-	<accept>
-		<family>serif</family>
-	</accept>
-</alias>
-
-<alias>
-	<family>Helvetica</family>
-	<prefer>
-		<family>sans-serif</family>
-	</prefer>
-</alias>
-
-<alias>
-	<family>Impact</family>
-	<accept>
-		<family>sans-serif</family>
-	</accept>
-</alias>
-
-<alias>
-	<family>Palatino Linotype</family>
-	<accept>
-		<family>serif</family>
-	</accept>
-</alias>
-
-<alias>
-	<family>Trebuchet MS</family>
-	<accept>
-		<family>sans-serif</family>
-	</accept>
-</alias>
-
-
-<alias>
-	<family>Tahoma</family>
-	<accept>
-		<family>sans-serif</family>
-	</accept>
-</alias>
-
-<alias>
-	<family>Times New Roman</family>
-	<accept>
-		<family>serif</family>
-	</accept>
-</alias>
-
-<alias>
-	<family>Verdana</family>
-	<accept>
-		<family>sans-serif</family>
-	</accept>
-</alias>
-
-<!--		Bitstream Vera Sans Mono is default for monospace. Replace it with something nicer	-->
-
-<alias>
-	<family>Bitstream Vera Sans Mono</family>
-	<prefer>
-		<family>Courier New</family>
-		<family>Nimbus</family>
-		<family>LucidaTypewriter</family>
-	</prefer>
-</alias>
-
-<!--		Bitstream Vera Sans is default for sans-serif. Replace it with something nicer		-->
-<alias>
-	<family>Bitstream Vera Sans</family>
-	<prefer>
-		<family>Arial</family>
-		<family>Luxi Sans</family>
-		<family>Nimbus Sans L</family>
-	</prefer>
-</alias>
-
-<!--		Bitstream Vera Serif is default for serif. Replace it with something nicer		-->
-
-<alias>
-	<family>Bitstream Vera Serif</family>
-	<prefer>
-		<family>Times New Roman</family>
-		<family>Nimbus Roman No9 L</family>
-		<family>OmegaSerif88591</family>
-		<family>OmegaSerif88592</family>
-		<family>OmegaSerif88593</family>
-		<family>OmegaSerif88594</family>
-		<family>OmegaSerif88595</family>
-		<family>OmegaSerifVISCII</family>
-	</prefer>
-</alias>
-
-
-
-</fontconfig>
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!--  PC-BSD - Fonts configurations v.07112006-->
+
+<!--		Default fonts for generic families		-->
+
+<alias>
+	<family>cursive</family>
+	<accept>
+		<family>URW</family>
+	</accept>
+</alias>
+
+<alias>
+	<family>fantasy</family>
+	<prefer>
+		<family>Comic Sans MS</family>
+		<family>URW</family>
+	</prefer>
+</alias>
+
+<alias>
+	<family>monospace</family>
+	<prefer>
+		<family>Courier New</family>
+		<family>Fixed [Misc]</family>
+		<family>Nimbus</family>
+	</prefer>
+</alias>
+
+<alias>
+	<family>sans-serif</family>
+	<prefer>
+		<family>Arial</family>
+		<family>Luxi Sans</family>
+		<family>Nimbus Sans L</family>
+	</prefer>
+</alias>
+
+<alias>
+	<family>serif</family>
+	<prefer>
+		<family>Times New Roman</family>
+		<family>Nimbus Roman No9 L</family>
+		<family>OmegaSerif88591</family>
+		<family>OmegaSerif88592</family>
+		<family>OmegaSerif88593</family>
+		<family>OmegaSerif88594</family>
+		<family>OmegaSerif88595</family>
+		<family>OmegaSerifVISCII</family>
+	</prefer>
+</alias>
+
+<!--		Alias for common fonts in case they're not found		-->
+
+<alias>
+	<family>Arial</family>
+	<accept>
+		<family>sans-serif</family>
+	</accept>
+</alias>
+
+<alias>
+	<family>Comic Sans MS</family>
+	<accept>
+		<family>URW</family>
+	</accept>
+</alias>
+
+<alias>
+	<family>Courier New</family>
+	<accept>
+		<family>monospace</family>
+	</accept>
+</alias>
+
+<alias>
+	<family>Courier</family>
+	<prefer>
+		<family>monospace</family>
+	</prefer>
+</alias>
+
+<alias>
+	<family>Georgia</family>
+	<accept>
+		<family>serif</family>
+	</accept>
+</alias>
+
+<alias>
+	<family>Garamond</family>
+	<accept>
+		<family>serif</family>
+	</accept>
+</alias>
+
+<alias>
+	<family>Helvetica</family>
+	<prefer>
+		<family>sans-serif</family>
+	</prefer>
+</alias>
+
+<alias>
+	<family>Impact</family>
+	<accept>
+		<family>sans-serif</family>
+	</accept>
+</alias>
+
+<alias>
+	<family>Palatino Linotype</family>
+	<accept>
+		<family>serif</family>
+	</accept>
+</alias>
+
+<alias>
+	<family>Trebuchet MS</family>
+	<accept>
+		<family>sans-serif</family>
+	</accept>
+</alias>
+
+
+<alias>
+	<family>Tahoma</family>
+	<accept>
+		<family>sans-serif</family>
+	</accept>
+</alias>
+
+<alias>
+	<family>Times New Roman</family>
+	<accept>
+		<family>serif</family>
+	</accept>
+</alias>
+
+<alias>
+	<family>Verdana</family>
+	<accept>
+		<family>sans-serif</family>
+	</accept>
+</alias>
+
+<!--		Bitstream Vera Sans Mono is default for monospace. Replace it with something nicer	-->
+
+<alias>
+	<family>Bitstream Vera Sans Mono</family>
+	<prefer>
+		<family>Courier New</family>
+		<family>Nimbus</family>
+		<family>LucidaTypewriter</family>
+	</prefer>
+</alias>
+
+<!--		Bitstream Vera Sans is default for sans-serif. Replace it with something nicer		-->
+<alias>
+	<family>Bitstream Vera Sans</family>
+	<prefer>
+		<family>Arial</family>
+		<family>Luxi Sans</family>
+		<family>Nimbus Sans L</family>
+	</prefer>
+</alias>
+
+<!--		Bitstream Vera Serif is default for serif. Replace it with something nicer		-->
+
+<alias>
+	<family>Bitstream Vera Serif</family>
+	<prefer>
+		<family>Times New Roman</family>
+		<family>Nimbus Roman No9 L</family>
+		<family>OmegaSerif88591</family>
+		<family>OmegaSerif88592</family>
+		<family>OmegaSerif88593</family>
+		<family>OmegaSerif88594</family>
+		<family>OmegaSerif88595</family>
+		<family>OmegaSerifVISCII</family>
+	</prefer>
+</alias>
+
+
+
+</fontconfig>

Modified: pcbsd/trunk/system-overlay/usr/X11R6/share/fluxbox/init
===================================================================
--- pcbsd/trunk/system-overlay/usr/X11R6/share/fluxbox/init	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/X11R6/share/fluxbox/init	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,40 +1,40 @@
-session.screen0.slit.placement:	BottomRight
-session.screen0.slit.direction:	Vertical
-session.screen0.slit.onTop:	False
-session.screen0.slit.autoHide:	False
-session.screen0.tab.placement:	Top
-session.screen0.tab.alignment:	Left
-session.screen0.tab.rotatevertical:	True
-session.screen0.toolbar.onTop:	False
-session.screen0.toolbar.autoHide:	False
-session.screen0.toolbar.placement:	BottomCenter
-session.screen0.toolbar.widthPercent:	66
-session.screen0.workspaceNames:	one,two,three,four
-session.screen0.strftimeFormat:	%k:%M
-session.screen0.focusNewWindows:	True
-session.screen0.focusModel:	ClickToFocus
-session.screen0.fullMaximization:	False
-session.screen0.edgeSnapThreshold:	0
-session.screen0.rowPlacementDirection:	LeftToRight
-session.screen0.workspaces:	4
-session.screen0.focusLastWindow:	True
-session.screen0.colPlacementDirection:	TopToBottom
-session.screen0.windowPlacement:	RowSmartPlacement
-session.screen0.tab.width:	64
-session.screen0.tab.height:	16
-session.screen0.showwindowposition: true
-session.screen0.rootCommand: ~/.fluxbox/startup
-session.opaqueMove:	False
-session.autoRaiseDelay:	250
-session.menuFile:	~/.fluxbox/menu
-session.cacheLife:	5
-session.styleFile:	/usr/X11R6/share/fluxbox/styles/Clean
-session.keyFile: ~/.fluxbox/keys
-session.colorsPerChannel:	4
-session.doubleClickInterval:	250
-session.cacheMax:	200
-session.imageDither:	True
-session.iconbar: true
-session.titlebar.left: Stick
-session.titlebar.right: Minimize Maximize Close
-
+session.screen0.slit.placement:	BottomRight
+session.screen0.slit.direction:	Vertical
+session.screen0.slit.onTop:	False
+session.screen0.slit.autoHide:	False
+session.screen0.tab.placement:	Top
+session.screen0.tab.alignment:	Left
+session.screen0.tab.rotatevertical:	True
+session.screen0.toolbar.onTop:	False
+session.screen0.toolbar.autoHide:	False
+session.screen0.toolbar.placement:	BottomCenter
+session.screen0.toolbar.widthPercent:	66
+session.screen0.workspaceNames:	one,two,three,four
+session.screen0.strftimeFormat:	%k:%M
+session.screen0.focusNewWindows:	True
+session.screen0.focusModel:	ClickToFocus
+session.screen0.fullMaximization:	False
+session.screen0.edgeSnapThreshold:	0
+session.screen0.rowPlacementDirection:	LeftToRight
+session.screen0.workspaces:	4
+session.screen0.focusLastWindow:	True
+session.screen0.colPlacementDirection:	TopToBottom
+session.screen0.windowPlacement:	RowSmartPlacement
+session.screen0.tab.width:	64
+session.screen0.tab.height:	16
+session.screen0.showwindowposition: true
+session.screen0.rootCommand: ~/.fluxbox/startup
+session.opaqueMove:	False
+session.autoRaiseDelay:	250
+session.menuFile:	~/.fluxbox/menu
+session.cacheLife:	5
+session.styleFile:	/usr/X11R6/share/fluxbox/styles/Clean
+session.keyFile: ~/.fluxbox/keys
+session.colorsPerChannel:	4
+session.doubleClickInterval:	250
+session.cacheMax:	200
+session.imageDither:	True
+session.iconbar: true
+session.titlebar.left: Stick
+session.titlebar.right: Minimize Maximize Close
+

Modified: pcbsd/trunk/system-overlay/usr/X11R6/share/fluxbox/styles/Clean
===================================================================
--- pcbsd/trunk/system-overlay/usr/X11R6/share/fluxbox/styles/Clean	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/X11R6/share/fluxbox/styles/Clean	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,117 +1,117 @@
-# "Clean"
-# A Fluxbox theme by: skypher of perplexity
-# 2001
-
-toolbar:			Interlaced
-toolbar.color:			rgb:CC/CC/CC
-
-toolbar.button:				Raised
-toolbar.button.color:		rgb:CC/CC/CC
-toolbar.button.picColor:	rgb:10/10/10
-
-toolbar.button.pressed:		Sunken
-toolbar.button.pressed.color:	rgb:80/80/80
-
-toolbar.clock:				Raised
-toolbar.clock.color:		rgb:CC/CC/CC
-toolbar.clock.textColor:	rgb:10/10/10
-
-toolbar.label:				Raised
-toolbar.label.color:		rgb:CC/CC/CC
-toolbar.label.textColor:	rgb:10/10/10
-
-toolbar.windowLabel:		Raised
-toolbar.windowLabel.color:	rgb:CC/CC/CC
-toolbar.windowLabel.textColor:	rgb:10/10/10
-
-toolbar.justify:		right
-
-menu.title:			Raised Gradient Horizontal Interlaced
-menu.title.color:		rgb:90/BB/CC
-menu.title.colorTo:		rgb:CA/CD/CF
-menu.title.textColor:		rgb:10/10/10
-menu.title.justify:		Right
-
-menu.frame:			Gradient PipeCross
-menu.frame.color:		rgb:CC/CC/CD
-menu.frame.colorTo:		rgb:CA/CD/CE
-menu.frame.textColor:		rgb:10/10/10
-menu.frame.justify:		Right
-
-menu.hilite:			Raised
-menu.hilite.color:		rgb:40/40/40
-menu.hilite.textColor:		rgb:CC/CC/CC
-
-menu.bullet:			Diamond
-menu.bullet.position:		Right
-
-
-window.title.focus:		Raised Interlaced
-window.title.focus.color:	rgb:CC/CC/CD
-
-window.title.unfocus:		Flat Solid
-window.title.unfocus.color:	rgb:BE/BE/BE
-
-window.label.focus:		Solid Interlaced Flat
-window.label.focus.color:	rgb:CA/CA/CB
-window.label.focus.textColor:	rgb:10/10/10
-
-window.label.unfocus:		Flat Solid
-window.label.unfocus.color:	rgb:BE/BE/BE
-window.label.unfocus.textColor:	rgb:09/09/09
-
-window.button.focus:		Raised Bevel1 Solid
-window.button.focus.color:	rgb:CC/CC/CC
-window.button.focus.picColor:	rgb:10/10/10
-
-window.button.unfocus:		Flat Solid
-window.button.unfocus.color:	rgb:CA/CA/CA
-window.button.unfocus.picColor:	rgb:09/09/09
-
-window.button.pressed:		Sunken Bevel1 Solid
-window.button.pressed.color:	rgb:80/80/80
-
-window.frame.focus:		Flat
-window.frame.focus.color:	rgb:CC/CC/CC
-window.frame.unfocus:		Flat
-window.frame.unfocus.color:	rgb:BE/BE/BE
-
-window.handle.focus:		Raised Solid
-window.handle.focus.color:	rgb:CC/CC/CC
-window.handle.unfocus:		Flat Solid
-window.handle.unfocus.color:	rgb:BC/BC/BC
-
-window.grip.focus:		Raised Gradient Diagonal Interlaced
-window.grip.focus.color:	rgb:9B/9B/9B
-window.grip.focus.colorTo:	rgb:80/80/80
-window.grip.unfocus:		Raised Gradient Diagonal
-window.grip.unfocus.color:	rgb:9B/9B/9B
-window.grip.unfocus.colorTo:	rgb:80/80/80
-
-! ----------- tab - explicit for fluxbox, the best wm out there[tm] (;
-window.tab.justify:	                Right
-window.tab.label.unfocus:	        Flat Solid
-window.tab.label.unfocus.color:	   rgb:AC/AC/AC
-window.tab.label.unfocus.textColor:	black
-window.tab.label.focus:	        Raised Solid
-window.tab.label.focus.color:	  rgb:CC/CC/CC
-window.tab.label.focus.textColor:	black
-window.tab.borderWidth:	1
-window.tab.borderColor:	rgb:10/10/10
-! ----------- (fluxbox.sourceforge.net)
-window.tab.font:	               -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
-
-window.justify:			Right
-
-toolbar.font: -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
-window.font: -misc-8x8\ system\ font-medium-r-normal--9-90-100-100-m-100-iso8859-*
-menu.title.font:  -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
-menu.frame.font:                -*-lucida-medium-r-normal-*-10-100-*-*-*-*-iso8859-*
-
-borderColor:			rgb:10/10/10
-
-bevelWidth:			1
-borderWidth:			1
-handleWidth:			2
-
-rootCommand:	xv -root -quit -max /usr/local/share/wallpapers/pcbsd-default.png
+# "Clean"
+# A Fluxbox theme by: skypher of perplexity
+# 2001
+
+toolbar:			Interlaced
+toolbar.color:			rgb:CC/CC/CC
+
+toolbar.button:				Raised
+toolbar.button.color:		rgb:CC/CC/CC
+toolbar.button.picColor:	rgb:10/10/10
+
+toolbar.button.pressed:		Sunken
+toolbar.button.pressed.color:	rgb:80/80/80
+
+toolbar.clock:				Raised
+toolbar.clock.color:		rgb:CC/CC/CC
+toolbar.clock.textColor:	rgb:10/10/10
+
+toolbar.label:				Raised
+toolbar.label.color:		rgb:CC/CC/CC
+toolbar.label.textColor:	rgb:10/10/10
+
+toolbar.windowLabel:		Raised
+toolbar.windowLabel.color:	rgb:CC/CC/CC
+toolbar.windowLabel.textColor:	rgb:10/10/10
+
+toolbar.justify:		right
+
+menu.title:			Raised Gradient Horizontal Interlaced
+menu.title.color:		rgb:90/BB/CC
+menu.title.colorTo:		rgb:CA/CD/CF
+menu.title.textColor:		rgb:10/10/10
+menu.title.justify:		Right
+
+menu.frame:			Gradient PipeCross
+menu.frame.color:		rgb:CC/CC/CD
+menu.frame.colorTo:		rgb:CA/CD/CE
+menu.frame.textColor:		rgb:10/10/10
+menu.frame.justify:		Right
+
+menu.hilite:			Raised
+menu.hilite.color:		rgb:40/40/40
+menu.hilite.textColor:		rgb:CC/CC/CC
+
+menu.bullet:			Diamond
+menu.bullet.position:		Right
+
+
+window.title.focus:		Raised Interlaced
+window.title.focus.color:	rgb:CC/CC/CD
+
+window.title.unfocus:		Flat Solid
+window.title.unfocus.color:	rgb:BE/BE/BE
+
+window.label.focus:		Solid Interlaced Flat
+window.label.focus.color:	rgb:CA/CA/CB
+window.label.focus.textColor:	rgb:10/10/10
+
+window.label.unfocus:		Flat Solid
+window.label.unfocus.color:	rgb:BE/BE/BE
+window.label.unfocus.textColor:	rgb:09/09/09
+
+window.button.focus:		Raised Bevel1 Solid
+window.button.focus.color:	rgb:CC/CC/CC
+window.button.focus.picColor:	rgb:10/10/10
+
+window.button.unfocus:		Flat Solid
+window.button.unfocus.color:	rgb:CA/CA/CA
+window.button.unfocus.picColor:	rgb:09/09/09
+
+window.button.pressed:		Sunken Bevel1 Solid
+window.button.pressed.color:	rgb:80/80/80
+
+window.frame.focus:		Flat
+window.frame.focus.color:	rgb:CC/CC/CC
+window.frame.unfocus:		Flat
+window.frame.unfocus.color:	rgb:BE/BE/BE
+
+window.handle.focus:		Raised Solid
+window.handle.focus.color:	rgb:CC/CC/CC
+window.handle.unfocus:		Flat Solid
+window.handle.unfocus.color:	rgb:BC/BC/BC
+
+window.grip.focus:		Raised Gradient Diagonal Interlaced
+window.grip.focus.color:	rgb:9B/9B/9B
+window.grip.focus.colorTo:	rgb:80/80/80
+window.grip.unfocus:		Raised Gradient Diagonal
+window.grip.unfocus.color:	rgb:9B/9B/9B
+window.grip.unfocus.colorTo:	rgb:80/80/80
+
+! ----------- tab - explicit for fluxbox, the best wm out there[tm] (;
+window.tab.justify:	                Right
+window.tab.label.unfocus:	        Flat Solid
+window.tab.label.unfocus.color:	   rgb:AC/AC/AC
+window.tab.label.unfocus.textColor:	black
+window.tab.label.focus:	        Raised Solid
+window.tab.label.focus.color:	  rgb:CC/CC/CC
+window.tab.label.focus.textColor:	black
+window.tab.borderWidth:	1
+window.tab.borderColor:	rgb:10/10/10
+! ----------- (fluxbox.sourceforge.net)
+window.tab.font:	               -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
+
+window.justify:			Right
+
+toolbar.font: -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
+window.font: -misc-8x8\ system\ font-medium-r-normal--9-90-100-100-m-100-iso8859-*
+menu.title.font:  -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
+menu.frame.font:                -*-lucida-medium-r-normal-*-10-100-*-*-*-*-iso8859-*
+
+borderColor:			rgb:10/10/10
+
+bevelWidth:			1
+borderWidth:			1
+handleWidth:			2
+
+rootCommand:	xv -root -quit -max /usr/local/share/wallpapers/pcbsd-default.png

Modified: pcbsd/trunk/system-overlay/usr/local/bin/startkde
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/bin/startkde	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/bin/startkde	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,347 +1,347 @@
-#!/bin/sh
-#
-#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.3 )
-#
-
-# When the X server dies we get a HUP signal from xinit. We must ignore it
-# because we still need to do some cleanup.
-trap 'echo GOT SIGHUP' HUP
-
-# Check if a KDE session already is running
-if kcheckrunning >/dev/null 2>&1; then
-	echo "KDE seems to be already running on this display."
-	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
-	exit 1
-fi
-
-# Set the background to plain grey.
-# The standard X background is nasty, causing moire effects and exploding
-# people's heads. We use colours from the standard KDE palette for those with
-# palettised displays.
-if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
-  xv -root -quit -max /usr/local/share/wallpapers/pcbsd-default.png
-fi
-
-# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
-unset DYLD_FORCE_FLAT_NAMESPACE
-
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
-  case $PATH in
-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-    *) PATH=$bindir:$PATH; export PATH;;
-  esac
-fi
-
-# Boot sequence:
-#
-# kdeinit is used to fork off processes which improves memory usage
-# and startup time.
-#
-# * kdeinit starts the dcopserver and klauncher first.
-# * Then kded is started. kded is responsible for keeping the sycoca
-#   database up to date. When an up to date database is present it goes
-#   into the background and the startup continues.
-# * Then kdeinit starts kcminit. kcminit performs initialisation of
-#   certain devices according to the user's settings
-#
-# * Then ksmserver is started which takes control of the rest of the startup sequence
-
-# The user's personal KDE directory is usually ~/.kde, but this setting
-# may be overridden by setting KDEHOME.
-
-kdehome=$HOME/.kde
-test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
-
-# see kstartupconfig source for usage
-mkdir -m 700 -p $kdehome
-mkdir -m 700 -p $kdehome/share
-mkdir -m 700 -p $kdehome/share/config
-cat >$kdehome/share/config/startupconfigkeys <<EOF
-kcminputrc Mouse cursorTheme ''
-kcminputrc Mouse cursorSize ''
-kpersonalizerrc General FirstLogin true
-ksplashrc KSplash Theme Default
-kcmrandrrc Display ApplyOnStartup false
-kcmrandrrc [Screen0]
-kcmrandrrc [Screen1]
-kcmrandrrc [Screen2]
-kcmrandrrc [Screen3]
-EOF
-kstartupconfig
-if test $? -ne 0; then
-    xmessage -geometry 500x100 "Could not start kstartupconfig. Check your installation."
-fi
-. $kdehome/share/config/startupconfig
-
-# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
-    kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
-    if test $? -eq 10; then
-        export XCURSOR_THEME=default
-    elif test -n "$kcminputrc_mouse_cursortheme"; then
-        export XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
-    fi
-    if test -n "$kcminputrc_mouse_cursorsize"; then
-        export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
-    fi
-fi
-
-if test "$kcmrandrrc_display_applyonstartup" = "true"; then
-    # 4 screens is hopefully enough
-    for scrn in 0 1 2 3; do
-        args=
-        width="\$kcmrandrrc_screen${scrn}_width" ; eval "width=$width"
-        height="\$kcmrandrrc_screen${scrn}_height" ; eval "height=$height"
-        if test -n "${width}" -a -n "${height}"; then
-            args="$args -s ${width}x${height}"
-        fi
-        refresh="\$kcmrandrrc_screen${scrn}_refresh" ; eval "refresh=$refresh"
-        if test -n "${refresh}"; then
-            args="$args -r ${refresh}"
-        fi
-        rotation="\$kcmrandrrc_screen${scrn}_rotation" ; eval "rotation=$rotation"
-        if test -n "${rotation}"; then
-            case "${rotation}" in
-                0)
-                    args="$args -o 0"
-                    ;;
-                90)
-                    args="$args -o 1"
-                    ;;
-                180)
-                    args="$args -o 2"
-                    ;;
-                270)
-                    args="$args -o 3"
-                    ;;
-            esac
-        fi
-        reflectx="\$kcmrandrrc_screen${scrn}_reflectx" ; eval "reflectx=$reflectx"
-        if test "${refrectx}" = "true"; then
-            args="$args -x"
-        fi
-        reflecty="\$kcmrandrrc_screen${scrn}_reflecty" ; eval "reflecty=$reflecty"
-        if test "${refrecty}" = "true"; then
-            args="$args -y"
-        fi
-        if test -n "$args"; then
-            xrandr $args
-        fi
-    done
-fi
-
-# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
-# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
-#
-# This is where you can define environment variables that will be available to
-# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
-# or eval `gpg-agent --daemon`.
-# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
-#
-# (see end of this file).
-# For anything else (that doesn't set env vars, or that needs a window manager),
-# better use the Autostart folder.
-
-exepath=`kde-config --path exe | tr : '\n'`
-
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
-  for file in "$prefix"*.sh; do
-    test -r "$file" && . "$file"
-  done
-done
-
-# Activate the kde font directories.
-#
-# There are 4 directories that may be used for supplying fonts for KDE.
-#
-# There are two system directories. These belong to the administrator.
-# There are two user directories, where the user may add her own fonts.
-#
-# The 'override' versions are for fonts that should come first in the list,
-# i.e. if you have a font in your 'override' directory, it will be used in
-# preference to any other.
-#
-# The preference order looks like this:
-# user override, system override, X, user, system
-#
-# Where X is the original font database that was set up before this script
-# runs.
-
-usr_odir=$HOME/.fonts/kde-override
-usr_fdir=$HOME/.fonts
-
-# Add any user-installed font directories to the X font path
-kde_fontpaths=$usr_fdir/fontpaths
-do_usr_fdir=1
-do_usr_odir=1
-if test -r "$kde_fontpaths" ; then
-    savifs=$IFS
-    IFS="
-"
-    for fpath in `grep -v '^[ 	]*#' < "$kde_fontpaths"` ; do
-        rfpath=`echo $fpath | sed "s:^~:$HOME:g"`
-        if test -s "$rfpath"/fonts.dir; then
-            xset fp+ "$rfpath"
-            if test "$rfpath" = "$usr_fdir"; then
-                do_usr_fdir=0
-            fi
-            if test "$rfpath" = "$usr_odir"; then
-                do_usr_odir=0
-            fi
-        fi
-    done
-    IFS=$savifs
-fi
-
-if test -n "$KDEDIRS"; then
-  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
-  sys_odir=$kdedirs_first/share/fonts/override
-  sys_fdir=$kdedirs_first/share/fonts
-else
-  sys_odir=$KDEDIR/share/fonts/override
-  sys_fdir=$KDEDIR/share/fonts
-fi
-
-# We run mkfontdir on the user's font dirs (if we have permission) to pick
-# up any new fonts they may have installed. If mkfontdir fails, we still
-# add the user's dirs to the font path, as they might simply have been made
-# read-only by the administrator, for whatever reason.
-
-# Only do usr_fdir and usr_odir if they are *not* listed in fontpaths
-test -d "$sys_odir" && xset +fp "$sys_odir"
-test $do_usr_odir -eq 1 && test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
-test $do_usr_fdir -eq 1 && test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
-
-# Ask X11 to rebuild its font list.
-xset fp rehash
-
-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
-# from some users that they're confused and don't know what to do. This is
-# especially necessary on slow machines, where starting KDE takes one or two
-# minutes until anything appears on the screen.
-#
-# If the user has overwritten fonts, the cursor font may be different now
-# so don't move this up.
-#
-xsetroot -cursor_name left_ptr
-
-# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
-if test -n "$GS_LIB" ; then
-    GS_LIB=$usr_fdir:$GS_LIB
-    export GS_LIB
-else
-    GS_LIB=$usr_fdir
-    export GS_LIB
-fi
-
-# Link "tmp" resource to directory in /tmp
-# Creates a directory /tmp/kde-$USER and links $KDEHOME/tmp-$HOSTNAME to it.
-lnusertemp tmp >/dev/null
-
-# Link "socket" resource to directory in /tmp
-# Creates a directory /tmp/ksocket-$USER and links $KDEHOME/socket-$HOSTNAME to it.
-lnusertemp socket >/dev/null
-
-# Link "cache" resource to directory in /var/tmp
-# Creates a directory /var/tmp/kdecache-$USER and links $KDEHOME/cache-$HOSTNAME to it.
-lnusertemp cache >/dev/null
-
-# In case of dcop sockets left by a previous session, cleanup
-dcopserver_shutdown
-
-echo 'startkde: Starting up...'  1>&2
-
-# run KPersonalizer before the session, if this is the first login
-if test "$kpersonalizerrc_general_firstlogin" = "true"; then
-    # start only dcopserver, don't start whole kdeinit (takes too long)
-    echo 'startkde: Running kpersonalizer...'  1>&2
-    dcopserver
-    kwin --lock &
-    kpersonalizer --before-session
-    # handle kpersonalizer restarts (language change)
-    while test $? -eq 1; do
-        kpersonalizer --r --before-session
-    done
-    dcopquit kwin
-    dcopserver_shutdown --wait
-fi
-
-# the splashscreen and progress indicator
-case "$ksplashrc_ksplash_theme" in 
-  None)
-     ;; # nothing
-  Simple)
-     ksplashsimple 
-     ;;
-  *)
-     ksplash --nodcop
-     ;;
-esac
-
-# certain features such as Konqueror preloading work only with full KDE running
-KDE_FULL_SESSION=true
-export KDE_FULL_SESSION
-
-# We set LD_BIND_NOW to increase the efficiency of kdeinit.
-# kdeinit unsets this variable before loading applications.
-LD_BIND_NOW=true kdeinit --new-startup +kcminit_startup
-if test $? -ne 0; then
-  # Startup error
-  echo 'startkde: Could not start kdeinit. Check your installation.'  1>&2
-  xmessage -geometry 500x100 "Could not start kdeinit. Check your installation."
-fi
-
-# If the session should be locked from the start (locked autologin),
-# lock now and do the rest of the KDE startup underneath the locker.
-if test -n "$DESKTOP_LOCKED"; then
-  unset DESKTOP_LOCKED # Won't need it any more
-  kwrapper kdesktop_lock --forcelock &
-  # Give it some time for starting up. This is somewhat unclean; some
-  # notification would be better.
-  sleep 1
-fi
-
-# finally, give the session control to the session manager
-# see kdebase/ksmserver for the description of the rest of the startup sequence
-# if the KDEWM environment variable has been set, then it will be used as KDE's
-# window manager instead of kwin.
-# if KDEWM is not set, ksmserver will ensure kwin is started.
-# kwrapper is used to reduce startup time and memory usage
-# kwrapper does not return usefull error codes such as the exit code of ksmserver.
-# We only check for 255 which means that the ksmserver process could not be 
-# started, any problems thereafter, e.g. ksmserver failing to initialize, 
-# will remain undetected.
-test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
-kwrapper ksmserver $KDEWM 
-if test $? -eq 255; then
-  # Startup error
-  echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
-  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
-fi
-
-# wait if there's any crashhandler shown
-while dcop | grep -q ^drkonqi- ; do
-    sleep 5
-done
-
-echo 'startkde: Shutting down...'  1>&2
-
-# Clean up
-kdeinit_shutdown
-dcopserver_shutdown --wait
-artsshell -q terminate
-
-echo 'startkde: Running shutdown scripts...'  1>&2
-
-# Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
-  for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
-    test -x "$prefix$file" && "$prefix$file"
-  done
-done
-
-echo 'startkde: Done.'  1>&2
+#!/bin/sh
+#
+#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.3 )
+#
+
+# When the X server dies we get a HUP signal from xinit. We must ignore it
+# because we still need to do some cleanup.
+trap 'echo GOT SIGHUP' HUP
+
+# Check if a KDE session already is running
+if kcheckrunning >/dev/null 2>&1; then
+	echo "KDE seems to be already running on this display."
+	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
+	exit 1
+fi
+
+# Set the background to plain grey.
+# The standard X background is nasty, causing moire effects and exploding
+# people's heads. We use colours from the standard KDE palette for those with
+# palettised displays.
+if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
+  xsetroot -solid "#000000"
+  xv -root -quit -max /usr/local/share/wallpapers/pcbsd-default.png
+fi
+
+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+unset DYLD_FORCE_FLAT_NAMESPACE
+
+# in case we have been started with full pathname spec without being in PATH
+bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+if [ -n "$bindir" ]; then
+  case $PATH in
+    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+    *) PATH=$bindir:$PATH; export PATH;;
+  esac
+fi
+
+# Boot sequence:
+#
+# kdeinit is used to fork off processes which improves memory usage
+# and startup time.
+#
+# * kdeinit starts the dcopserver and klauncher first.
+# * Then kded is started. kded is responsible for keeping the sycoca
+#   database up to date. When an up to date database is present it goes
+#   into the background and the startup continues.
+# * Then kdeinit starts kcminit. kcminit performs initialisation of
+#   certain devices according to the user's settings
+#
+# * Then ksmserver is started which takes control of the rest of the startup sequence
+
+# The user's personal KDE directory is usually ~/.kde, but this setting
+# may be overridden by setting KDEHOME.
+
+kdehome=$HOME/.kde
+test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
+
+# see kstartupconfig source for usage
+mkdir -m 700 -p $kdehome
+mkdir -m 700 -p $kdehome/share
+mkdir -m 700 -p $kdehome/share/config
+cat >$kdehome/share/config/startupconfigkeys <<EOF
+kcminputrc Mouse cursorTheme ''
+kcminputrc Mouse cursorSize ''
+kpersonalizerrc General FirstLogin true
+ksplashrc KSplash Theme Default
+kcmrandrrc Display ApplyOnStartup false
+kcmrandrrc [Screen0]
+kcmrandrrc [Screen1]
+kcmrandrrc [Screen2]
+kcmrandrrc [Screen3]
+EOF
+kstartupconfig
+if test $? -ne 0; then
+    xmessage -geometry 500x100 "Could not start kstartupconfig. Check your installation."
+fi
+. $kdehome/share/config/startupconfig
+
+# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+    kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+    if test $? -eq 10; then
+        export XCURSOR_THEME=default
+    elif test -n "$kcminputrc_mouse_cursortheme"; then
+        export XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
+    fi
+    if test -n "$kcminputrc_mouse_cursorsize"; then
+        export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
+    fi
+fi
+
+if test "$kcmrandrrc_display_applyonstartup" = "true"; then
+    # 4 screens is hopefully enough
+    for scrn in 0 1 2 3; do
+        args=
+        width="\$kcmrandrrc_screen${scrn}_width" ; eval "width=$width"
+        height="\$kcmrandrrc_screen${scrn}_height" ; eval "height=$height"
+        if test -n "${width}" -a -n "${height}"; then
+            args="$args -s ${width}x${height}"
+        fi
+        refresh="\$kcmrandrrc_screen${scrn}_refresh" ; eval "refresh=$refresh"
+        if test -n "${refresh}"; then
+            args="$args -r ${refresh}"
+        fi
+        rotation="\$kcmrandrrc_screen${scrn}_rotation" ; eval "rotation=$rotation"
+        if test -n "${rotation}"; then
+            case "${rotation}" in
+                0)
+                    args="$args -o 0"
+                    ;;
+                90)
+                    args="$args -o 1"
+                    ;;
+                180)
+                    args="$args -o 2"
+                    ;;
+                270)
+                    args="$args -o 3"
+                    ;;
+            esac
+        fi
+        reflectx="\$kcmrandrrc_screen${scrn}_reflectx" ; eval "reflectx=$reflectx"
+        if test "${refrectx}" = "true"; then
+            args="$args -x"
+        fi
+        reflecty="\$kcmrandrrc_screen${scrn}_reflecty" ; eval "reflecty=$reflecty"
+        if test "${refrecty}" = "true"; then
+            args="$args -y"
+        fi
+        if test -n "$args"; then
+            xrandr $args
+        fi
+    done
+fi
+
+# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
+# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
+#
+# This is where you can define environment variables that will be available to
+# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
+# or eval `gpg-agent --daemon`.
+# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
+#
+# (see end of this file).
+# For anything else (that doesn't set env vars, or that needs a window manager),
+# better use the Autostart folder.
+
+exepath=`kde-config --path exe | tr : '\n'`
+
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
+  for file in "$prefix"*.sh; do
+    test -r "$file" && . "$file"
+  done
+done
+
+# Activate the kde font directories.
+#
+# There are 4 directories that may be used for supplying fonts for KDE.
+#
+# There are two system directories. These belong to the administrator.
+# There are two user directories, where the user may add her own fonts.
+#
+# The 'override' versions are for fonts that should come first in the list,
+# i.e. if you have a font in your 'override' directory, it will be used in
+# preference to any other.
+#
+# The preference order looks like this:
+# user override, system override, X, user, system
+#
+# Where X is the original font database that was set up before this script
+# runs.
+
+usr_odir=$HOME/.fonts/kde-override
+usr_fdir=$HOME/.fonts
+
+# Add any user-installed font directories to the X font path
+kde_fontpaths=$usr_fdir/fontpaths
+do_usr_fdir=1
+do_usr_odir=1
+if test -r "$kde_fontpaths" ; then
+    savifs=$IFS
+    IFS="
+"
+    for fpath in `grep -v '^[ 	]*#' < "$kde_fontpaths"` ; do
+        rfpath=`echo $fpath | sed "s:^~:$HOME:g"`
+        if test -s "$rfpath"/fonts.dir; then
+            xset fp+ "$rfpath"
+            if test "$rfpath" = "$usr_fdir"; then
+                do_usr_fdir=0
+            fi
+            if test "$rfpath" = "$usr_odir"; then
+                do_usr_odir=0
+            fi
+        fi
+    done
+    IFS=$savifs
+fi
+
+if test -n "$KDEDIRS"; then
+  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
+  sys_odir=$kdedirs_first/share/fonts/override
+  sys_fdir=$kdedirs_first/share/fonts
+else
+  sys_odir=$KDEDIR/share/fonts/override
+  sys_fdir=$KDEDIR/share/fonts
+fi
+
+# We run mkfontdir on the user's font dirs (if we have permission) to pick
+# up any new fonts they may have installed. If mkfontdir fails, we still
+# add the user's dirs to the font path, as they might simply have been made
+# read-only by the administrator, for whatever reason.
+
+# Only do usr_fdir and usr_odir if they are *not* listed in fontpaths
+test -d "$sys_odir" && xset +fp "$sys_odir"
+test $do_usr_odir -eq 1 && test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
+test $do_usr_fdir -eq 1 && test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
+test -d "$sys_fdir" && xset fp+ "$sys_fdir"
+
+# Ask X11 to rebuild its font list.
+xset fp rehash
+
+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+# from some users that they're confused and don't know what to do. This is
+# especially necessary on slow machines, where starting KDE takes one or two
+# minutes until anything appears on the screen.
+#
+# If the user has overwritten fonts, the cursor font may be different now
+# so don't move this up.
+#
+xsetroot -cursor_name left_ptr
+
+# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
+if test -n "$GS_LIB" ; then
+    GS_LIB=$usr_fdir:$GS_LIB
+    export GS_LIB
+else
+    GS_LIB=$usr_fdir
+    export GS_LIB
+fi
+
+# Link "tmp" resource to directory in /tmp
+# Creates a directory /tmp/kde-$USER and links $KDEHOME/tmp-$HOSTNAME to it.
+lnusertemp tmp >/dev/null
+
+# Link "socket" resource to directory in /tmp
+# Creates a directory /tmp/ksocket-$USER and links $KDEHOME/socket-$HOSTNAME to it.
+lnusertemp socket >/dev/null
+
+# Link "cache" resource to directory in /var/tmp
+# Creates a directory /var/tmp/kdecache-$USER and links $KDEHOME/cache-$HOSTNAME to it.
+lnusertemp cache >/dev/null
+
+# In case of dcop sockets left by a previous session, cleanup
+dcopserver_shutdown
+
+echo 'startkde: Starting up...'  1>&2
+
+# run KPersonalizer before the session, if this is the first login
+if test "$kpersonalizerrc_general_firstlogin" = "true"; then
+    # start only dcopserver, don't start whole kdeinit (takes too long)
+    echo 'startkde: Running kpersonalizer...'  1>&2
+    dcopserver
+    kwin --lock &
+    kpersonalizer --before-session
+    # handle kpersonalizer restarts (language change)
+    while test $? -eq 1; do
+        kpersonalizer --r --before-session
+    done
+    dcopquit kwin
+    dcopserver_shutdown --wait
+fi
+
+# the splashscreen and progress indicator
+case "$ksplashrc_ksplash_theme" in 
+  None)
+     ;; # nothing
+  Simple)
+     ksplashsimple 
+     ;;
+  *)
+     ksplash --nodcop
+     ;;
+esac
+
+# certain features such as Konqueror preloading work only with full KDE running
+KDE_FULL_SESSION=true
+export KDE_FULL_SESSION
+
+# We set LD_BIND_NOW to increase the efficiency of kdeinit.
+# kdeinit unsets this variable before loading applications.
+LD_BIND_NOW=true kdeinit --new-startup +kcminit_startup
+if test $? -ne 0; then
+  # Startup error
+  echo 'startkde: Could not start kdeinit. Check your installation.'  1>&2
+  xmessage -geometry 500x100 "Could not start kdeinit. Check your installation."
+fi
+
+# If the session should be locked from the start (locked autologin),
+# lock now and do the rest of the KDE startup underneath the locker.
+if test -n "$DESKTOP_LOCKED"; then
+  unset DESKTOP_LOCKED # Won't need it any more
+  kwrapper kdesktop_lock --forcelock &
+  # Give it some time for starting up. This is somewhat unclean; some
+  # notification would be better.
+  sleep 1
+fi
+
+# finally, give the session control to the session manager
+# see kdebase/ksmserver for the description of the rest of the startup sequence
+# if the KDEWM environment variable has been set, then it will be used as KDE's
+# window manager instead of kwin.
+# if KDEWM is not set, ksmserver will ensure kwin is started.
+# kwrapper is used to reduce startup time and memory usage
+# kwrapper does not return usefull error codes such as the exit code of ksmserver.
+# We only check for 255 which means that the ksmserver process could not be 
+# started, any problems thereafter, e.g. ksmserver failing to initialize, 
+# will remain undetected.
+test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
+kwrapper ksmserver $KDEWM 
+if test $? -eq 255; then
+  # Startup error
+  echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
+  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
+fi
+
+# wait if there's any crashhandler shown
+while dcop | grep -q ^drkonqi- ; do
+    sleep 5
+done
+
+echo 'startkde: Shutting down...'  1>&2
+
+# Clean up
+kdeinit_shutdown
+dcopserver_shutdown --wait
+artsshell -q terminate
+
+echo 'startkde: Running shutdown scripts...'  1>&2
+
+# Run scripts found in $KDEDIRS/shutdown
+for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
+  for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
+    test -x "$prefix$file" && "$prefix$file"
+  done
+done
+
+echo 'startkde: Done.'  1>&2

Modified: pcbsd/trunk/system-overlay/usr/local/etc/denyhosts.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/etc/denyhosts.conf	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/etc/denyhosts.conf	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,619 +1,619 @@
-       ############ THESE SETTINGS ARE REQUIRED ############
-
-########################################################################
-#
-# SECURE_LOG: the log file that contains sshd logging info
-# if you are not sure, grep "sshd:" /var/log/*
-#
-# The file to process can be overridden with the --file command line
-# argument
-#
-# Redhat or Fedora Core:
-#SECURE_LOG = /var/log/secure
-#
-# Mandrake, FreeBSD or OpenBSD: 
-SECURE_LOG = /var/log/auth.log
-#
-# SuSE:
-#SECURE_LOG = /var/log/messages
-#
-# Mac OS X (v10.4 or greater - 
-#   also refer to:   http://www.denyhosts.net/faq.html#macos
-#SECURE_LOG = /private/var/log/asl.log
-#
-# Mac OS X (v10.3 or earlier):
-#SECURE_LOG=/private/var/log/system.log
-#
-########################################################################
-
-########################################################################
-#
-# HOSTS_DENY: the file which contains restricted host access information
-#
-# Most operating systems:
-HOSTS_DENY = /etc/hosts.deniedssh
-#
-# Some BSD (FreeBSD) Unixes:
-#HOSTS_DENY = /etc/hosts.allow
-#
-# Another possibility (also see the next option):
-#HOSTS_DENY = /etc/hosts.evil
-#######################################################################
-
-
-########################################################################
-#
-# PURGE_DENY: removed HOSTS_DENY entries that are older than this time
-#             when DenyHosts is invoked with the --purge flag
-#
-#      format is: i[dhwmy]
-#      Where 'i' is an integer (eg. 7) 
-#            'm' = minutes
-#            'h' = hours
-#            'd' = days
-#            'w' = weeks
-#            'y' = years
-#
-# 20 Minute Purge
-PURGE_DENY = 20m
-# never purge:
-#PURGE_DENY = 
-#
-# purge entries older than 1 week
-#PURGE_DENY = 1w
-#
-# purge entries older than 5 days
-#PURGE_DENY = 5d
-#######################################################################
-
-#######################################################################
-#
-# PURGE_THRESHOLD: defines the maximum times a host will be purged.  
-# Once this value has been exceeded then this host will not be purged. 
-# Setting this parameter to 0 (the default) disables this feature.
-#
-# default: a denied host can be purged/re-added indefinitely
-#PURGE_THRESHOLD = 0
-#
-# a denied host will be purged at most 2 times. 
-#PURGE_THRESHOLD = 2 
-#
-#######################################################################
-
-
-#######################################################################
-#
-# BLOCK_SERVICE: the service name that should be blocked in HOSTS_DENY
-# 
-# man 5 hosts_access for details
-#
-# eg.   sshd: 127.0.0.1  # will block sshd logins from 127.0.0.1
-#
-# To block all services for the offending host:
-#BLOCK_SERVICE = ALL
-# To block only sshd:
-BLOCK_SERVICE  = sshd
-# To only record the offending host and nothing else (if using
-# an auxilary file to list the hosts).  Refer to: 
-# http://denyhosts.sourceforge.net/faq.html#aux
-#BLOCK_SERVICE =    
-#
-#######################################################################
-
-
-#######################################################################
-#
-# DENY_THRESHOLD_INVALID: block each host after the number of failed login 
-# attempts has exceeded this value.  This value applies to invalid
-# user login attempts (eg. non-existent user accounts)
-#
-DENY_THRESHOLD_INVALID = 5
-#
-#######################################################################
-
-#######################################################################
-#
-# DENY_THRESHOLD_VALID: block each host after the number of failed 
-# login attempts has exceeded this value.  This value applies to valid
-# user login attempts (eg. user accounts that exist in /etc/passwd) except
-# for the "root" user
-#
-DENY_THRESHOLD_VALID = 10
-#
-#######################################################################
-
-#######################################################################
-#
-# DENY_THRESHOLD_ROOT: block each host after the number of failed 
-# login attempts has exceeded this value.  This value applies to 
-# "root" user login attempts only.
-#
-DENY_THRESHOLD_ROOT = 1
-#
-#######################################################################
-
-
-#######################################################################
-#
-# DENY_THRESHOLD_RESTRICTED: block each host after the number of failed 
-# login attempts has exceeded this value.  This value applies to 
-# usernames that appear in the WORK_DIR/restricted-usernames file only.
-#
-DENY_THRESHOLD_RESTRICTED = 1
-#
-#######################################################################
-
-
-#######################################################################
-#
-# WORK_DIR: the path that DenyHosts will use for writing data to
-# (it will be created if it does not already exist).  
-#
-# Note: it is recommended that you use an absolute pathname
-# for this value (eg. /home/foo/denyhosts/data)
-#
-WORK_DIR = /usr/local/share/denyhosts/data
-#
-#######################################################################
-
-#######################################################################
-#
-# SUSPICIOUS_LOGIN_REPORT_ALLOWED_HOSTS
-#
-# SUSPICIOUS_LOGIN_REPORT_ALLOWED_HOSTS=YES|NO
-# If set to YES, if a suspicious login attempt results from an allowed-host
-# then it is considered suspicious.  If this is NO, then suspicious logins 
-# from allowed-hosts will not be reported.  All suspicious logins from 
-# ip addresses that are not in allowed-hosts will always be reported.
-#
-SUSPICIOUS_LOGIN_REPORT_ALLOWED_HOSTS=YES
-######################################################################
-
-######################################################################
-#
-# HOSTNAME_LOOKUP
-#
-# HOSTNAME_LOOKUP=YES|NO
-# If set to YES, for each IP address that is reported by Denyhosts,
-# the corresponding hostname will be looked up and reported as well
-# (if available).
-#
-HOSTNAME_LOOKUP=NO
-#
-######################################################################
-
-
-######################################################################
-#
-# LOCK_FILE
-#
-# LOCK_FILE=/path/denyhosts
-# If this file exists when DenyHosts is run, then DenyHosts will exit
-# immediately.  Otherwise, this file will be created upon invocation
-# and deleted upon exit.  This ensures that only one instance is
-# running at a time.
-#
-# Redhat/Fedora:
-#LOCK_FILE = /var/lock/subsys/denyhosts
-#
-# Debian (and FreeBSD)
-LOCK_FILE = /var/run/denyhosts.pid
-#
-# Misc
-#LOCK_FILE = /tmp/denyhosts.lock
-#
-######################################################################
-
-
-       ############ THESE SETTINGS ARE OPTIONAL ############
-
-
-#######################################################################
-#
-# ADMIN_EMAIL: if you would like to receive emails regarding newly
-# restricted hosts and suspicious logins, set this address to 
-# match your email address.  If you do not want to receive these reports
-# leave this field blank (or run with the --noemail option)
-#
-ADMIN_EMAIL = 
-#
-#######################################################################
-
-#######################################################################
-#
-# SMTP_HOST and SMTP_PORT: if DenyHosts is configured to email 
-# reports (see ADMIN_EMAIL) then these settings specify the 
-# email server address (SMTP_HOST) and the server port (SMTP_PORT)
-# 
-#
-SMTP_HOST = localhost
-SMTP_PORT = 25
-#
-#######################################################################
-
-#######################################################################
-# 
-# SMTP_USERNAME and SMTP_PASSWORD: set these parameters if your 
-# smtp email server requires authentication
-#
-#SMTP_USERNAME=foo
-#SMTP_PASSWORD=bar
-#
-######################################################################
-
-#######################################################################
-#
-# SMTP_FROM: you can specify the "From:" address in messages sent
-# from DenyHosts when it reports thwarted abuse attempts
-#
-SMTP_FROM = DenyHosts <nobody at localhost>
-#
-#######################################################################
-
-#######################################################################
-#
-# SMTP_SUBJECT: you can specify the "Subject:" of messages sent
-# by DenyHosts when it reports thwarted abuse attempts
-SMTP_SUBJECT = DenyHosts Report
-#
-######################################################################
-
-######################################################################
-#
-# SMTP_DATE_FORMAT: specifies the format used for the "Date:" header
-# when sending email messages.
-#
-# for possible values for this parameter refer to: man strftime
-#
-# the default:
-#
-#SMTP_DATE_FORMAT = %a, %d %b %Y %H:%M:%S %z
-#
-######################################################################
-
-######################################################################
-#
-# SYSLOG_REPORT
-#
-# SYSLOG_REPORT=YES|NO
-# If set to yes, when denied hosts are recorded the report data
-# will be sent to syslog (syslog must be present on your system).
-# The default is: NO
-#
-#SYSLOG_REPORT=NO
-#
-#SYSLOG_REPORT=YES
-#
-######################################################################
-
-######################################################################
-#
-# ALLOWED_HOSTS_HOSTNAME_LOOKUP
-#
-# ALLOWED_HOSTS_HOSTNAME_LOOKUP=YES|NO
-# If set to YES, for each entry in the WORK_DIR/allowed-hosts file,
-# the hostname will be looked up.  If your versions of tcp_wrappers
-# and sshd sometimes log hostnames in addition to ip addresses
-# then you may wish to specify this option.
-# 
-#ALLOWED_HOSTS_HOSTNAME_LOOKUP=NO
-#
-######################################################################
-
-###################################################################### 
-# 
-# AGE_RESET_VALID: Specifies the period of time between failed login
-# attempts that, when exceeded will result in the failed count for 
-# this host to be reset to 0.  This value applies to login attempts 
-# to all valid users (those within /etc/passwd) with the 
-# exception of root.  If not defined, this count will never
-# be reset.
-#
-# See the comments in the PURGE_DENY section (above) 
-# for details on specifying this value or for complete details 
-# refer to:  http://denyhosts.sourceforge.net/faq.html#timespec
-#
-AGE_RESET_VALID=5d
-#
-######################################################################
-
-###################################################################### 
-# 
-# AGE_RESET_ROOT: Specifies the period of time between failed login
-# attempts that, when exceeded will result in the failed count for 
-# this host to be reset to 0.  This value applies to all login 
-# attempts to the "root" user account.  If not defined,
-# this count will never be reset.
-#
-# See the comments in the PURGE_DENY section (above) 
-# for details on specifying this value or for complete details 
-# refer to:  http://denyhosts.sourceforge.net/faq.html#timespec
-#
-AGE_RESET_ROOT=25d
-#
-######################################################################
-
-###################################################################### 
-# 
-# AGE_RESET_RESTRICTED: Specifies the period of time between failed login
-# attempts that, when exceeded will result in the failed count for 
-# this host to be reset to 0.  This value applies to all login 
-# attempts to entries found in the WORK_DIR/restricted-usernames file.  
-# If not defined, the count will never be reset.
-#
-# See the comments in the PURGE_DENY section (above) 
-# for details on specifying this value or for complete details 
-# refer to:  http://denyhosts.sourceforge.net/faq.html#timespec
-#
-AGE_RESET_RESTRICTED=25d
-#
-######################################################################
-
-
-###################################################################### 
-# 
-# AGE_RESET_INVALID: Specifies the period of time between failed login
-# attempts that, when exceeded will result in the failed count for 
-# this host to be reset to 0.  This value applies to login attempts 
-# made to any invalid username (those that do not appear 
-# in /etc/passwd).  If not defined, count will never be reset.
-#
-# See the comments in the PURGE_DENY section (above) 
-# for details on specifying this value or for complete details 
-# refer to:  http://denyhosts.sourceforge.net/faq.html#timespec
-#
-AGE_RESET_INVALID=10d
-#
-######################################################################
-
-
-######################################################################
-#
-# RESET_ON_SUCCESS: If this parameter is set to "yes" then the
-# failed count for the respective ip address will be reset to 0
-# if the login is successful.  
-#
-# The default is RESET_ON_SUCCESS = no
-#
-#RESET_ON_SUCCESS = yes
-#
-#####################################################################
-
-
-######################################################################
-#
-# PLUGIN_DENY: If set, this value should point to an executable
-# program that will be invoked when a host is added to the
-# HOSTS_DENY file.  This executable will be passed the host
-# that will be added as it's only argument.
-#
-#PLUGIN_DENY=/usr/bin/true
-#
-######################################################################
-
-
-######################################################################
-#
-# PLUGIN_PURGE: If set, this value should point to an executable
-# program that will be invoked when a host is removed from the
-# HOSTS_DENY file.  This executable will be passed the host
-# that is to be purged as it's only argument.
-#
-#PLUGIN_PURGE=/usr/bin/true
-#
-######################################################################
-
-######################################################################
-#
-# USERDEF_FAILED_ENTRY_REGEX: if set, this value should contain
-# a regular expression that can be used to identify additional
-# hackers for your particular ssh configuration.  This functionality
-# extends the built-in regular expressions that DenyHosts uses.
-# This parameter can be specified multiple times.
-# See this faq entry for more details:
-#    http://denyhosts.sf.net/faq.html#userdef_regex
-#
-#USERDEF_FAILED_ENTRY_REGEX=
-#
-#
-######################################################################
-
-
-
-
-   ######### THESE SETTINGS ARE SPECIFIC TO DAEMON MODE  ##########
-
-
-
-#######################################################################
-#
-# DAEMON_LOG: when DenyHosts is run in daemon mode (--daemon flag)
-# this is the logfile that DenyHosts uses to report it's status.
-# To disable logging, leave blank.  (default is: /var/log/denyhosts)
-#
-DAEMON_LOG = /var/log/denyhosts
-#
-# disable logging:
-#DAEMON_LOG = 
-#
-######################################################################
-
-#######################################################################
-# 
-# DAEMON_LOG_TIME_FORMAT: when DenyHosts is run in daemon mode 
-# (--daemon flag) this specifies the timestamp format of 
-# the DAEMON_LOG messages (default is the ISO8061 format:
-# ie. 2005-07-22 10:38:01,745)
-#
-# for possible values for this parameter refer to: man strftime
-#
-# Jan 1 13:05:59   
-#DAEMON_LOG_TIME_FORMAT = %b %d %H:%M:%S
-#
-# Jan 1 01:05:59 
-#DAEMON_LOG_TIME_FORMAT = %b %d %I:%M:%S
-#
-###################################################################### 
-
-#######################################################################
-# 
-# DAEMON_LOG_MESSAGE_FORMAT: when DenyHosts is run in daemon mode 
-# (--daemon flag) this specifies the message format of each logged
-# entry.  By default the following format is used:
-#
-# %(asctime)s - %(name)-12s: %(levelname)-8s %(message)s
-#
-# Where the "%(asctime)s" portion is expanded to the format
-# defined by DAEMON_LOG_TIME_FORMAT
-#
-# This string is passed to python's logging.Formatter contstuctor.
-# For details on the possible format types please refer to:
-# http://docs.python.org/lib/node357.html
-#
-# This is the default:
-#DAEMON_LOG_MESSAGE_FORMAT = %(asctime)s - %(name)-12s: %(levelname)-8s %(message)s
-#
-#
-###################################################################### 
-
- 
-#######################################################################
-#
-# DAEMON_SLEEP: when DenyHosts is run in daemon mode (--daemon flag)
-# this is the amount of time DenyHosts will sleep between polling
-# the SECURE_LOG.  See the comments in the PURGE_DENY section (above)
-# for details on specifying this value or for complete details
-# refer to:    http://denyhosts.sourceforge.net/faq.html#timespec
-# 
-#
-DAEMON_SLEEP = 30s
-#
-#######################################################################
-
-#######################################################################
-#
-# DAEMON_PURGE: How often should DenyHosts, when run in daemon mode,
-# run the purge mechanism to expire old entries in HOSTS_DENY
-# This has no effect if PURGE_DENY is blank.
-#
-DAEMON_PURGE = 10m 
-#
-#######################################################################
-
-
-   #########   THESE SETTINGS ARE SPECIFIC TO     ##########
-   #########       DAEMON SYNCHRONIZATION         ##########
-
-
-#######################################################################
-#
-# Synchronization mode allows the DenyHosts daemon the ability
-# to periodically send and receive denied host data such that 
-# DenyHosts daemons worldwide can automatically inform one
-# another regarding banned hosts.   This mode is disabled by
-# default, you must uncomment SYNC_SERVER to enable this mode.
-#
-# for more information, please refer to: 
-#        http:/denyhosts.sourceforge.net/faq.html#sync 
-#
-#######################################################################
-
-
-#######################################################################
-#
-# SYNC_SERVER: The central server that communicates with DenyHost
-# daemons.  Currently, denyhosts.net is the only available server
-# however, in the future, it may be possible for organizations to
-# install their own server for internal network synchronization
-#
-# To disable synchronization (the default), do nothing. 
-#
-# To enable synchronization, you must uncomment the following line:
-#SYNC_SERVER = http://xmlrpc.denyhosts.net:9911
-#
-#######################################################################
-
-#######################################################################
-#
-# SYNC_INTERVAL: the interval of time to perform synchronizations if
-# SYNC_SERVER has been uncommented.  The default is 1 hour.
-# 
-#SYNC_INTERVAL = 1h
-#
-#######################################################################
-
-
-#######################################################################
-#
-# SYNC_UPLOAD: allow your DenyHosts daemon to transmit hosts that have
-# been denied?  This option only applies if SYNC_SERVER has
-# been uncommented.
-# The default is SYNC_UPLOAD = yes
-#
-#SYNC_UPLOAD = no
-#SYNC_UPLOAD = yes
-#
-#######################################################################
-
-
-#######################################################################
-#
-# SYNC_DOWNLOAD: allow your DenyHosts daemon to receive hosts that have
-# been denied by others?  This option only applies if SYNC_SERVER has
-# been uncommented.
-# The default is SYNC_DOWNLOAD = yes
-#
-#SYNC_DOWNLOAD = no
-#SYNC_DOWNLOAD = yes
-#
-#
-#
-#######################################################################
-
-#######################################################################
-#
-# SYNC_DOWNLOAD_THRESHOLD: If SYNC_DOWNLOAD is enabled this paramter
-# filters the returned hosts to those that have been blocked this many
-# times by others.  That is, if set to 1, then if a single DenyHosts
-# server has denied an ip address then you will receive the denied host.
-# 
-# See also SYNC_DOWNLOAD_RESILIENCY
-#
-#SYNC_DOWNLOAD_THRESHOLD = 10
-#
-# The default is SYNC_DOWNLOAD_THRESHOLD = 3 
-#
-#SYNC_DOWNLOAD_THRESHOLD = 3
-#
-#######################################################################
-
-#######################################################################
-#
-# SYNC_DOWNLOAD_RESILIENCY:  If SYNC_DOWNLOAD is enabled then the
-# value specified for this option limits the downloaded data
-# to this resiliency period or greater.
-#
-# Resiliency is defined as the timespan between a hackers first known 
-# attack and it's most recent attack.  Example:
-# 
-# If the centralized   denyhosts.net server records an attack at 2 PM 
-# and then again at 5 PM, specifying a SYNC_DOWNLOAD_RESILIENCY = 4h 
-# will not download this ip address.
-#
-# However, if the attacker is recorded again at 6:15 PM then the 
-# ip address will be downloaded by your DenyHosts instance.  
-#
-# This value is used in conjunction with the SYNC_DOWNLOAD_THRESHOLD 
-# and only hosts that satisfy both values will be downloaded.  
-# This value has no effect if SYNC_DOWNLOAD_THRESHOLD = 1 
-#
-# The default is SYNC_DOWNLOAD_RESILIENCY = 5h (5 hours)
-#
-# Only obtain hackers that have been at it for 2 days or more:
-#SYNC_DOWNLOAD_RESILIENCY = 2d
-#
-# Only obtain hackers that have been at it for 5 hours or more:
-#SYNC_DOWNLOAD_RESILIENCY = 5h
-#
-#######################################################################
-
+       ############ THESE SETTINGS ARE REQUIRED ############
+
+########################################################################
+#
+# SECURE_LOG: the log file that contains sshd logging info
+# if you are not sure, grep "sshd:" /var/log/*
+#
+# The file to process can be overridden with the --file command line
+# argument
+#
+# Redhat or Fedora Core:
+#SECURE_LOG = /var/log/secure
+#
+# Mandrake, FreeBSD or OpenBSD: 
+SECURE_LOG = /var/log/auth.log
+#
+# SuSE:
+#SECURE_LOG = /var/log/messages
+#
+# Mac OS X (v10.4 or greater - 
+#   also refer to:   http://www.denyhosts.net/faq.html#macos
+#SECURE_LOG = /private/var/log/asl.log
+#
+# Mac OS X (v10.3 or earlier):
+#SECURE_LOG=/private/var/log/system.log
+#
+########################################################################
+
+########################################################################
+#
+# HOSTS_DENY: the file which contains restricted host access information
+#
+# Most operating systems:
+HOSTS_DENY = /etc/hosts.deniedssh
+#
+# Some BSD (FreeBSD) Unixes:
+#HOSTS_DENY = /etc/hosts.allow
+#
+# Another possibility (also see the next option):
+#HOSTS_DENY = /etc/hosts.evil
+#######################################################################
+
+
+########################################################################
+#
+# PURGE_DENY: removed HOSTS_DENY entries that are older than this time
+#             when DenyHosts is invoked with the --purge flag
+#
+#      format is: i[dhwmy]
+#      Where 'i' is an integer (eg. 7) 
+#            'm' = minutes
+#            'h' = hours
+#            'd' = days
+#            'w' = weeks
+#            'y' = years
+#
+# 20 Minute Purge
+PURGE_DENY = 20m
+# never purge:
+#PURGE_DENY = 
+#
+# purge entries older than 1 week
+#PURGE_DENY = 1w
+#
+# purge entries older than 5 days
+#PURGE_DENY = 5d
+#######################################################################
+
+#######################################################################
+#
+# PURGE_THRESHOLD: defines the maximum times a host will be purged.  
+# Once this value has been exceeded then this host will not be purged. 
+# Setting this parameter to 0 (the default) disables this feature.
+#
+# default: a denied host can be purged/re-added indefinitely
+#PURGE_THRESHOLD = 0
+#
+# a denied host will be purged at most 2 times. 
+#PURGE_THRESHOLD = 2 
+#
+#######################################################################
+
+
+#######################################################################
+#
+# BLOCK_SERVICE: the service name that should be blocked in HOSTS_DENY
+# 
+# man 5 hosts_access for details
+#
+# eg.   sshd: 127.0.0.1  # will block sshd logins from 127.0.0.1
+#
+# To block all services for the offending host:
+#BLOCK_SERVICE = ALL
+# To block only sshd:
+BLOCK_SERVICE  = sshd
+# To only record the offending host and nothing else (if using
+# an auxilary file to list the hosts).  Refer to: 
+# http://denyhosts.sourceforge.net/faq.html#aux
+#BLOCK_SERVICE =    
+#
+#######################################################################
+
+
+#######################################################################
+#
+# DENY_THRESHOLD_INVALID: block each host after the number of failed login 
+# attempts has exceeded this value.  This value applies to invalid
+# user login attempts (eg. non-existent user accounts)
+#
+DENY_THRESHOLD_INVALID = 5
+#
+#######################################################################
+
+#######################################################################
+#
+# DENY_THRESHOLD_VALID: block each host after the number of failed 
+# login attempts has exceeded this value.  This value applies to valid
+# user login attempts (eg. user accounts that exist in /etc/passwd) except
+# for the "root" user
+#
+DENY_THRESHOLD_VALID = 10
+#
+#######################################################################
+
+#######################################################################
+#
+# DENY_THRESHOLD_ROOT: block each host after the number of failed 
+# login attempts has exceeded this value.  This value applies to 
+# "root" user login attempts only.
+#
+DENY_THRESHOLD_ROOT = 1
+#
+#######################################################################
+
+
+#######################################################################
+#
+# DENY_THRESHOLD_RESTRICTED: block each host after the number of failed 
+# login attempts has exceeded this value.  This value applies to 
+# usernames that appear in the WORK_DIR/restricted-usernames file only.
+#
+DENY_THRESHOLD_RESTRICTED = 1
+#
+#######################################################################
+
+
+#######################################################################
+#
+# WORK_DIR: the path that DenyHosts will use for writing data to
+# (it will be created if it does not already exist).  
+#
+# Note: it is recommended that you use an absolute pathname
+# for this value (eg. /home/foo/denyhosts/data)
+#
+WORK_DIR = /usr/local/share/denyhosts/data
+#
+#######################################################################
+
+#######################################################################
+#
+# SUSPICIOUS_LOGIN_REPORT_ALLOWED_HOSTS
+#
+# SUSPICIOUS_LOGIN_REPORT_ALLOWED_HOSTS=YES|NO
+# If set to YES, if a suspicious login attempt results from an allowed-host
+# then it is considered suspicious.  If this is NO, then suspicious logins 
+# from allowed-hosts will not be reported.  All suspicious logins from 
+# ip addresses that are not in allowed-hosts will always be reported.
+#
+SUSPICIOUS_LOGIN_REPORT_ALLOWED_HOSTS=YES
+######################################################################
+
+######################################################################
+#
+# HOSTNAME_LOOKUP
+#
+# HOSTNAME_LOOKUP=YES|NO
+# If set to YES, for each IP address that is reported by Denyhosts,
+# the corresponding hostname will be looked up and reported as well
+# (if available).
+#
+HOSTNAME_LOOKUP=NO
+#
+######################################################################
+
+
+######################################################################
+#
+# LOCK_FILE
+#
+# LOCK_FILE=/path/denyhosts
+# If this file exists when DenyHosts is run, then DenyHosts will exit
+# immediately.  Otherwise, this file will be created upon invocation
+# and deleted upon exit.  This ensures that only one instance is
+# running at a time.
+#
+# Redhat/Fedora:
+#LOCK_FILE = /var/lock/subsys/denyhosts
+#
+# Debian (and FreeBSD)
+LOCK_FILE = /var/run/denyhosts.pid
+#
+# Misc
+#LOCK_FILE = /tmp/denyhosts.lock
+#
+######################################################################
+
+
+       ############ THESE SETTINGS ARE OPTIONAL ############
+
+
+#######################################################################
+#
+# ADMIN_EMAIL: if you would like to receive emails regarding newly
+# restricted hosts and suspicious logins, set this address to 
+# match your email address.  If you do not want to receive these reports
+# leave this field blank (or run with the --noemail option)
+#
+ADMIN_EMAIL = 
+#
+#######################################################################
+
+#######################################################################
+#
+# SMTP_HOST and SMTP_PORT: if DenyHosts is configured to email 
+# reports (see ADMIN_EMAIL) then these settings specify the 
+# email server address (SMTP_HOST) and the server port (SMTP_PORT)
+# 
+#
+SMTP_HOST = localhost
+SMTP_PORT = 25
+#
+#######################################################################
+
+#######################################################################
+# 
+# SMTP_USERNAME and SMTP_PASSWORD: set these parameters if your 
+# smtp email server requires authentication
+#
+#SMTP_USERNAME=foo
+#SMTP_PASSWORD=bar
+#
+######################################################################
+
+#######################################################################
+#
+# SMTP_FROM: you can specify the "From:" address in messages sent
+# from DenyHosts when it reports thwarted abuse attempts
+#
+SMTP_FROM = DenyHosts <nobody at localhost>
+#
+#######################################################################
+
+#######################################################################
+#
+# SMTP_SUBJECT: you can specify the "Subject:" of messages sent
+# by DenyHosts when it reports thwarted abuse attempts
+SMTP_SUBJECT = DenyHosts Report
+#
+######################################################################
+
+######################################################################
+#
+# SMTP_DATE_FORMAT: specifies the format used for the "Date:" header
+# when sending email messages.
+#
+# for possible values for this parameter refer to: man strftime
+#
+# the default:
+#
+#SMTP_DATE_FORMAT = %a, %d %b %Y %H:%M:%S %z
+#
+######################################################################
+
+######################################################################
+#
+# SYSLOG_REPORT
+#
+# SYSLOG_REPORT=YES|NO
+# If set to yes, when denied hosts are recorded the report data
+# will be sent to syslog (syslog must be present on your system).
+# The default is: NO
+#
+#SYSLOG_REPORT=NO
+#
+#SYSLOG_REPORT=YES
+#
+######################################################################
+
+######################################################################
+#
+# ALLOWED_HOSTS_HOSTNAME_LOOKUP
+#
+# ALLOWED_HOSTS_HOSTNAME_LOOKUP=YES|NO
+# If set to YES, for each entry in the WORK_DIR/allowed-hosts file,
+# the hostname will be looked up.  If your versions of tcp_wrappers
+# and sshd sometimes log hostnames in addition to ip addresses
+# then you may wish to specify this option.
+# 
+#ALLOWED_HOSTS_HOSTNAME_LOOKUP=NO
+#
+######################################################################
+
+###################################################################### 
+# 
+# AGE_RESET_VALID: Specifies the period of time between failed login
+# attempts that, when exceeded will result in the failed count for 
+# this host to be reset to 0.  This value applies to login attempts 
+# to all valid users (those within /etc/passwd) with the 
+# exception of root.  If not defined, this count will never
+# be reset.
+#
+# See the comments in the PURGE_DENY section (above) 
+# for details on specifying this value or for complete details 
+# refer to:  http://denyhosts.sourceforge.net/faq.html#timespec
+#
+AGE_RESET_VALID=5d
+#
+######################################################################
+
+###################################################################### 
+# 
+# AGE_RESET_ROOT: Specifies the period of time between failed login
+# attempts that, when exceeded will result in the failed count for 
+# this host to be reset to 0.  This value applies to all login 
+# attempts to the "root" user account.  If not defined,
+# this count will never be reset.
+#
+# See the comments in the PURGE_DENY section (above) 
+# for details on specifying this value or for complete details 
+# refer to:  http://denyhosts.sourceforge.net/faq.html#timespec
+#
+AGE_RESET_ROOT=25d
+#
+######################################################################
+
+###################################################################### 
+# 
+# AGE_RESET_RESTRICTED: Specifies the period of time between failed login
+# attempts that, when exceeded will result in the failed count for 
+# this host to be reset to 0.  This value applies to all login 
+# attempts to entries found in the WORK_DIR/restricted-usernames file.  
+# If not defined, the count will never be reset.
+#
+# See the comments in the PURGE_DENY section (above) 
+# for details on specifying this value or for complete details 
+# refer to:  http://denyhosts.sourceforge.net/faq.html#timespec
+#
+AGE_RESET_RESTRICTED=25d
+#
+######################################################################
+
+
+###################################################################### 
+# 
+# AGE_RESET_INVALID: Specifies the period of time between failed login
+# attempts that, when exceeded will result in the failed count for 
+# this host to be reset to 0.  This value applies to login attempts 
+# made to any invalid username (those that do not appear 
+# in /etc/passwd).  If not defined, count will never be reset.
+#
+# See the comments in the PURGE_DENY section (above) 
+# for details on specifying this value or for complete details 
+# refer to:  http://denyhosts.sourceforge.net/faq.html#timespec
+#
+AGE_RESET_INVALID=10d
+#
+######################################################################
+
+
+######################################################################
+#
+# RESET_ON_SUCCESS: If this parameter is set to "yes" then the
+# failed count for the respective ip address will be reset to 0
+# if the login is successful.  
+#
+# The default is RESET_ON_SUCCESS = no
+#
+#RESET_ON_SUCCESS = yes
+#
+#####################################################################
+
+
+######################################################################
+#
+# PLUGIN_DENY: If set, this value should point to an executable
+# program that will be invoked when a host is added to the
+# HOSTS_DENY file.  This executable will be passed the host
+# that will be added as it's only argument.
+#
+#PLUGIN_DENY=/usr/bin/true
+#
+######################################################################
+
+
+######################################################################
+#
+# PLUGIN_PURGE: If set, this value should point to an executable
+# program that will be invoked when a host is removed from the
+# HOSTS_DENY file.  This executable will be passed the host
+# that is to be purged as it's only argument.
+#
+#PLUGIN_PURGE=/usr/bin/true
+#
+######################################################################
+
+######################################################################
+#
+# USERDEF_FAILED_ENTRY_REGEX: if set, this value should contain
+# a regular expression that can be used to identify additional
+# hackers for your particular ssh configuration.  This functionality
+# extends the built-in regular expressions that DenyHosts uses.
+# This parameter can be specified multiple times.
+# See this faq entry for more details:
+#    http://denyhosts.sf.net/faq.html#userdef_regex
+#
+#USERDEF_FAILED_ENTRY_REGEX=
+#
+#
+######################################################################
+
+
+
+
+   ######### THESE SETTINGS ARE SPECIFIC TO DAEMON MODE  ##########
+
+
+
+#######################################################################
+#
+# DAEMON_LOG: when DenyHosts is run in daemon mode (--daemon flag)
+# this is the logfile that DenyHosts uses to report it's status.
+# To disable logging, leave blank.  (default is: /var/log/denyhosts)
+#
+DAEMON_LOG = /var/log/denyhosts
+#
+# disable logging:
+#DAEMON_LOG = 
+#
+######################################################################
+
+#######################################################################
+# 
+# DAEMON_LOG_TIME_FORMAT: when DenyHosts is run in daemon mode 
+# (--daemon flag) this specifies the timestamp format of 
+# the DAEMON_LOG messages (default is the ISO8061 format:
+# ie. 2005-07-22 10:38:01,745)
+#
+# for possible values for this parameter refer to: man strftime
+#
+# Jan 1 13:05:59   
+#DAEMON_LOG_TIME_FORMAT = %b %d %H:%M:%S
+#
+# Jan 1 01:05:59 
+#DAEMON_LOG_TIME_FORMAT = %b %d %I:%M:%S
+#
+###################################################################### 
+
+#######################################################################
+# 
+# DAEMON_LOG_MESSAGE_FORMAT: when DenyHosts is run in daemon mode 
+# (--daemon flag) this specifies the message format of each logged
+# entry.  By default the following format is used:
+#
+# %(asctime)s - %(name)-12s: %(levelname)-8s %(message)s
+#
+# Where the "%(asctime)s" portion is expanded to the format
+# defined by DAEMON_LOG_TIME_FORMAT
+#
+# This string is passed to python's logging.Formatter contstuctor.
+# For details on the possible format types please refer to:
+# http://docs.python.org/lib/node357.html
+#
+# This is the default:
+#DAEMON_LOG_MESSAGE_FORMAT = %(asctime)s - %(name)-12s: %(levelname)-8s %(message)s
+#
+#
+###################################################################### 
+
+ 
+#######################################################################
+#
+# DAEMON_SLEEP: when DenyHosts is run in daemon mode (--daemon flag)
+# this is the amount of time DenyHosts will sleep between polling
+# the SECURE_LOG.  See the comments in the PURGE_DENY section (above)
+# for details on specifying this value or for complete details
+# refer to:    http://denyhosts.sourceforge.net/faq.html#timespec
+# 
+#
+DAEMON_SLEEP = 30s
+#
+#######################################################################
+
+#######################################################################
+#
+# DAEMON_PURGE: How often should DenyHosts, when run in daemon mode,
+# run the purge mechanism to expire old entries in HOSTS_DENY
+# This has no effect if PURGE_DENY is blank.
+#
+DAEMON_PURGE = 10m 
+#
+#######################################################################
+
+
+   #########   THESE SETTINGS ARE SPECIFIC TO     ##########
+   #########       DAEMON SYNCHRONIZATION         ##########
+
+
+#######################################################################
+#
+# Synchronization mode allows the DenyHosts daemon the ability
+# to periodically send and receive denied host data such that 
+# DenyHosts daemons worldwide can automatically inform one
+# another regarding banned hosts.   This mode is disabled by
+# default, you must uncomment SYNC_SERVER to enable this mode.
+#
+# for more information, please refer to: 
+#        http:/denyhosts.sourceforge.net/faq.html#sync 
+#
+#######################################################################
+
+
+#######################################################################
+#
+# SYNC_SERVER: The central server that communicates with DenyHost
+# daemons.  Currently, denyhosts.net is the only available server
+# however, in the future, it may be possible for organizations to
+# install their own server for internal network synchronization
+#
+# To disable synchronization (the default), do nothing. 
+#
+# To enable synchronization, you must uncomment the following line:
+#SYNC_SERVER = http://xmlrpc.denyhosts.net:9911
+#
+#######################################################################
+
+#######################################################################
+#
+# SYNC_INTERVAL: the interval of time to perform synchronizations if
+# SYNC_SERVER has been uncommented.  The default is 1 hour.
+# 
+#SYNC_INTERVAL = 1h
+#
+#######################################################################
+
+
+#######################################################################
+#
+# SYNC_UPLOAD: allow your DenyHosts daemon to transmit hosts that have
+# been denied?  This option only applies if SYNC_SERVER has
+# been uncommented.
+# The default is SYNC_UPLOAD = yes
+#
+#SYNC_UPLOAD = no
+#SYNC_UPLOAD = yes
+#
+#######################################################################
+
+
+#######################################################################
+#
+# SYNC_DOWNLOAD: allow your DenyHosts daemon to receive hosts that have
+# been denied by others?  This option only applies if SYNC_SERVER has
+# been uncommented.
+# The default is SYNC_DOWNLOAD = yes
+#
+#SYNC_DOWNLOAD = no
+#SYNC_DOWNLOAD = yes
+#
+#
+#
+#######################################################################
+
+#######################################################################
+#
+# SYNC_DOWNLOAD_THRESHOLD: If SYNC_DOWNLOAD is enabled this paramter
+# filters the returned hosts to those that have been blocked this many
+# times by others.  That is, if set to 1, then if a single DenyHosts
+# server has denied an ip address then you will receive the denied host.
+# 
+# See also SYNC_DOWNLOAD_RESILIENCY
+#
+#SYNC_DOWNLOAD_THRESHOLD = 10
+#
+# The default is SYNC_DOWNLOAD_THRESHOLD = 3 
+#
+#SYNC_DOWNLOAD_THRESHOLD = 3
+#
+#######################################################################
+
+#######################################################################
+#
+# SYNC_DOWNLOAD_RESILIENCY:  If SYNC_DOWNLOAD is enabled then the
+# value specified for this option limits the downloaded data
+# to this resiliency period or greater.
+#
+# Resiliency is defined as the timespan between a hackers first known 
+# attack and it's most recent attack.  Example:
+# 
+# If the centralized   denyhosts.net server records an attack at 2 PM 
+# and then again at 5 PM, specifying a SYNC_DOWNLOAD_RESILIENCY = 4h 
+# will not download this ip address.
+#
+# However, if the attacker is recorded again at 6:15 PM then the 
+# ip address will be downloaded by your DenyHosts instance.  
+#
+# This value is used in conjunction with the SYNC_DOWNLOAD_THRESHOLD 
+# and only hosts that satisfy both values will be downloaded.  
+# This value has no effect if SYNC_DOWNLOAD_THRESHOLD = 1 
+#
+# The default is SYNC_DOWNLOAD_RESILIENCY = 5h (5 hours)
+#
+# Only obtain hackers that have been at it for 2 days or more:
+#SYNC_DOWNLOAD_RESILIENCY = 2d
+#
+# Only obtain hackers that have been at it for 5 hours or more:
+#SYNC_DOWNLOAD_RESILIENCY = 5h
+#
+#######################################################################
+

Modified: pcbsd/trunk/system-overlay/usr/local/etc/periodic/monthly/300.statistics
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/etc/periodic/monthly/300.statistics	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/etc/periodic/monthly/300.statistics	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,320 +1,320 @@
-#!/bin/sh -
-#
-# $FreeBSD: ports/sysutils/bsdstats/files/300.statistics,v 1.33 2006/10/04 04:51:41 scrappy Exp $
-#
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
-    . /etc/defaults/periodic.conf
-    source_periodic_confs
-    periodic_conf=/etc/periodic.conf
-else
-    . /etc/rc.conf	# For systems without periodic.conf, use rc.conf
-    if [ -r /etc/rc.conf.local ] 
-    then
-        . /etc/rc.conf.local
-    fi
-    periodic_conf=/etc/rc.conf.local
-fi
-
-oldmask=$(umask)
-umask 066
-
-version="4.7"
-checkin_server=${monthly_statistics_checkin_server:-"rpt.bsdstats.org"}
-bsdstats_log=${monthly_statistics_logfile:-"/var/log/bsdstats"}
-id_token_file='/var/db/bsdstats'
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
-export PATH
-
-unset HTTP_USER_AGENT
-
-IFS="
-"
-
-random () {
-  jot -r 1 0 900
-}
-
-# RFC 2396
-uri_escape () {
-    echo ${1+$@} | sed -e '
-        s/%/%25/g
-        s/;/%3b/g
-        s,/,%2f,g
-        s/?/%3f/g
-        s/:/%3a/g
-        s/@/%40/g
-        s/&/%26/g
-        s/=/%3d/g
-        s/+/%2b/g
-        s/\$/%24/g
-        s/,/%2c/g
-        s/ /%20/g
-        '
-}
-
-do_fetch () {
-    url="http://$checkin_server/scripts/$1"
-    case $(uname) in
-	FreeBSD )	
-		/usr/bin/fetch -q -o - "$url"
-		;;
-	* )
-		/usr/bin/ftp -V -o - "$url"
-		;;
-    esac
-}
-
-check_dns () {
-    if [ `dig bsdstats.org txt | grep TXT | grep UP | wc -l` = 0 ] 
-    then
-      echo "DNS not reachable, Network Down?"
-      exit
-    fi
-}
-send_devices () {
-    case $(uname) in
-	FreeBSD )
-	    for line in `/usr/sbin/pciconf -l | /usr/bin/grep -v none`
-	    do
-	      DRIVER=`echo $line | awk -F\@ '{print $1}'`
-	      DEV=`echo $line | awk '{print $4}' | cut -c8-15`
-	      CLASS=`echo $line | awk '{print $2}' | cut -c9-14`
-	      query_string=$query_string`echo \&dev[]=$DRIVER:$DEV:$CLASS`
-	    done
-
-	    report_devices
-	    ;;
-	* )
-	    # Not supported
-	    ;;
-    esac
-}
-
-report_devices () {
-      do_fetch report_devices.php?token=$TOKEN\&key=$KEY$query_string | { 
-          local IFS
-          IFS='=
-'
-
-           while read var val
-             do
-             case $var in
-                 STATUS)
-                     if [ $val = "OK" ]
-                     then
-                       echo "[`date`] System Devices reported"
-                     else
-                       echo "[`date`] System Devices not reported, exiting"
-                       exit
-                     fi
-                 ;;
-                 *)
-                     echo "[`date`] Error with fetch to server"
-                     exit
-                 ;;
-                 esac
-           done  
-       } >> $bsdstats_log
-}
-
-get_id_token () {
-    if [ -f $id_token_file ]
-    then
-      if [ `cat /var/db/bsdstats | wc -l` -lt 3 ] 
-      then
-        rm $id_token_file
-      fi
-    fi
-
-    if [ ! -f $id_token_file -o ! -s $id_token_file ] ;
-    then
-       IDTOKEN=$(uri_escape $( openssl rand -base64 32 ) )
-       
-       idf=$( mktemp "$id_token_file.XXXXXX" )  && \
-       chown root:wheel $idf          && \
-       chmod 600 $idf
-
-       do_fetch getid.php?key=$IDTOKEN | {
-          local IFS
-          IFS='=
-'
-
-	   while read var val 
-	     do  
-	     case $var in
-		 KEY)
-                     echo "KEY=$val"
-		 ;;
-		 TOKEN)
-                     echo "TOKEN=$val"
-		 ;;
-		 *)
-                 ;;
-		 esac
-	   done
-           echo "VERSION=$version"
-       } > $idf                                  && \
-
-       mv $idf $id_token_file
-       if [ ! -s $id_token_file ] ;
-       then
-    	  echo "Nothing returned from $checkin_server"
-	  exit 1
-       fi
-    fi
-    . $id_token_file
-    KEY=$( uri_escape $KEY )
-    TOKEN=$( uri_escape $TOKEN )
-}
-
-
-enable_token () {
-      do_fetch enable_token.php?key=$TOKEN\&token=$KEY | {
-          local IFS
-          IFS='=
-'
-
-           while read var val
-             do
-             case $var in
-                 STATUS)
-                     if [ $val = "OK" ]
-                     then
-                       echo "[`date`] System enabled"
-                     else
-                       echo "[`date`] System not enabled, exiting"
-                       exit
-                     fi
-                 ;;
-                 *)
-                     echo "[`date`] Error with fetch to server"
-                     exit
-                 ;;
-                 esac
-           done  
-       } >> $bsdstats_log
-}
-
-disable_token () {
-      do_fetch disable_token.php?key=$TOKEN\&token=$KEY | {
-          local IFS
-          IFS='=
-'
-
-           while read var val
-             do
-             case $var in
-                 STATUS)
-                     if [ $val = "OK" ]
-                     then
-                       echo "[`date`] System disabled"
-                     else
-                       echo "[`date`] System not disabled, exiting"
-                       exit
-                     fi
-                 ;;
-                 *)
-                     echo "[`date`] Error with fetch to server"
-                     exit
-                 ;;
-                 esac
-           done  
-       } >> $bsdstats_log
-}
-
-report_system () {
-      do_fetch report_system.php?token=$TOKEN\&key=$KEY\&rel=$REL\&arch=$ARCH\&opsys=$OS | {
-          local IFS
-          IFS='=
-'
-
-           while read var val
-             do
-             case $var in
-                 STATUS)
-                     if [ $val = "OK" ]
-                     then
-                       echo "[`date`] System reported"
-                     else
-                       echo "[`date`] System report failed, exiting"
-                       exit
-                     fi
-                 ;;
-                 *)
-                     echo "[`date`] Error with fetch to server"
-                     exit
-                 ;;
-                 esac
-           done  
-       } >> $bsdstats_log
-}
-
-report_cpu () {
-    do_fetch report_cpu.php?token=$TOKEN\&key=$KEY\&cpus=$count\&vendor=$VEN\&cpu_type=$DEV | {
-          local IFS
-          IFS='=
-'
-
-           while read var val
-             do
-             case $var in
-                 STATUS)
-                     if [ $val = "OK" ]
-                     then
-                       echo "[`date`] System CPU reported"
-                     else
-                       echo "[`date`] System CPU report failed, exiting"
-                       exit
-                     fi
-                 ;;
-                 *)
-                     echo "[`date`] Error with fetch to server"
-                     exit
-                 ;;
-                 esac
-           done  
-       } >> $bsdstats_log
-}
-case "$monthly_statistics_enable" in
-    [Yy][Ee][Ss])
-      check_dns
-      HN=`/bin/hostname`
-      REL=`/usr/local/bin/PBReg get /PC-BSD/Version`
-      ARCH=`/usr/bin/uname -m`
-      OS="PC-BSD"
-      get_id_token
-      sleep `random`
-      enable_token
-      report_system
-      echo "Posting monthly OS statistics to $checkin_server"
-      case "$monthly_statistics_report_devices" in
-          [Yy][Ee][Ss])
-              send_devices
-              echo "Posting monthly device statistics to $checkin_server"
-              line=$( sysctl -n hw.model )
-              VEN=$( echo $line | cut -d ' ' -f 1 )
-              DEV=$( uri_escape $( echo $line | cut -d ' ' -f 2- ) )
-              count=$( sysctl -n hw.ncpu )
-              report_cpu
-              echo "Posting monthly CPU statistics to $checkin_server"
-             ;;
-          *) 
-             echo "Posting monthly device/CPU statistics disabled"
-             echo "    set monthly_statistics_report_devices=\"YES\" in $periodic_conf"
-             ;;
-      esac
-      disable_token
-      ;;
-    *) 
-      echo "Posting monthly OS statistics disabled"
-      echo "    set monthly_statistics_enable=\"YES\" in $periodic_conf"
-    ;;
-esac
-
-umask $oldmask
-exit $rc
+#!/bin/sh -
+#
+# $FreeBSD: ports/sysutils/bsdstats/files/300.statistics,v 1.33 2006/10/04 04:51:41 scrappy Exp $
+#
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]
+then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+    periodic_conf=/etc/periodic.conf
+else
+    . /etc/rc.conf	# For systems without periodic.conf, use rc.conf
+    if [ -r /etc/rc.conf.local ] 
+    then
+        . /etc/rc.conf.local
+    fi
+    periodic_conf=/etc/rc.conf.local
+fi
+
+oldmask=$(umask)
+umask 066
+
+version="4.7"
+checkin_server=${monthly_statistics_checkin_server:-"rpt.bsdstats.org"}
+bsdstats_log=${monthly_statistics_logfile:-"/var/log/bsdstats"}
+id_token_file='/var/db/bsdstats'
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
+export PATH
+
+unset HTTP_USER_AGENT
+
+IFS="
+"
+
+random () {
+  jot -r 1 0 900
+}
+
+# RFC 2396
+uri_escape () {
+    echo ${1+$@} | sed -e '
+        s/%/%25/g
+        s/;/%3b/g
+        s,/,%2f,g
+        s/?/%3f/g
+        s/:/%3a/g
+        s/@/%40/g
+        s/&/%26/g
+        s/=/%3d/g
+        s/+/%2b/g
+        s/\$/%24/g
+        s/,/%2c/g
+        s/ /%20/g
+        '
+}
+
+do_fetch () {
+    url="http://$checkin_server/scripts/$1"
+    case $(uname) in
+	FreeBSD )	
+		/usr/bin/fetch -q -o - "$url"
+		;;
+	* )
+		/usr/bin/ftp -V -o - "$url"
+		;;
+    esac
+}
+
+check_dns () {
+    if [ `dig bsdstats.org txt | grep TXT | grep UP | wc -l` = 0 ] 
+    then
+      echo "DNS not reachable, Network Down?"
+      exit
+    fi
+}
+send_devices () {
+    case $(uname) in
+	FreeBSD )
+	    for line in `/usr/sbin/pciconf -l | /usr/bin/grep -v none`
+	    do
+	      DRIVER=`echo $line | awk -F\@ '{print $1}'`
+	      DEV=`echo $line | awk '{print $4}' | cut -c8-15`
+	      CLASS=`echo $line | awk '{print $2}' | cut -c9-14`
+	      query_string=$query_string`echo \&dev[]=$DRIVER:$DEV:$CLASS`
+	    done
+
+	    report_devices
+	    ;;
+	* )
+	    # Not supported
+	    ;;
+    esac
+}
+
+report_devices () {
+      do_fetch report_devices.php?token=$TOKEN\&key=$KEY$query_string | { 
+          local IFS
+          IFS='=
+'
+
+           while read var val
+             do
+             case $var in
+                 STATUS)
+                     if [ $val = "OK" ]
+                     then
+                       echo "[`date`] System Devices reported"
+                     else
+                       echo "[`date`] System Devices not reported, exiting"
+                       exit
+                     fi
+                 ;;
+                 *)
+                     echo "[`date`] Error with fetch to server"
+                     exit
+                 ;;
+                 esac
+           done  
+       } >> $bsdstats_log
+}
+
+get_id_token () {
+    if [ -f $id_token_file ]
+    then
+      if [ `cat /var/db/bsdstats | wc -l` -lt 3 ] 
+      then
+        rm $id_token_file
+      fi
+    fi
+
+    if [ ! -f $id_token_file -o ! -s $id_token_file ] ;
+    then
+       IDTOKEN=$(uri_escape $( openssl rand -base64 32 ) )
+       
+       idf=$( mktemp "$id_token_file.XXXXXX" )  && \
+       chown root:wheel $idf          && \
+       chmod 600 $idf
+
+       do_fetch getid.php?key=$IDTOKEN | {
+          local IFS
+          IFS='=
+'
+
+	   while read var val 
+	     do  
+	     case $var in
+		 KEY)
+                     echo "KEY=$val"
+		 ;;
+		 TOKEN)
+                     echo "TOKEN=$val"
+		 ;;
+		 *)
+                 ;;
+		 esac
+	   done
+           echo "VERSION=$version"
+       } > $idf                                  && \
+
+       mv $idf $id_token_file
+       if [ ! -s $id_token_file ] ;
+       then
+    	  echo "Nothing returned from $checkin_server"
+	  exit 1
+       fi
+    fi
+    . $id_token_file
+    KEY=$( uri_escape $KEY )
+    TOKEN=$( uri_escape $TOKEN )
+}
+
+
+enable_token () {
+      do_fetch enable_token.php?key=$TOKEN\&token=$KEY | {
+          local IFS
+          IFS='=
+'
+
+           while read var val
+             do
+             case $var in
+                 STATUS)
+                     if [ $val = "OK" ]
+                     then
+                       echo "[`date`] System enabled"
+                     else
+                       echo "[`date`] System not enabled, exiting"
+                       exit
+                     fi
+                 ;;
+                 *)
+                     echo "[`date`] Error with fetch to server"
+                     exit
+                 ;;
+                 esac
+           done  
+       } >> $bsdstats_log
+}
+
+disable_token () {
+      do_fetch disable_token.php?key=$TOKEN\&token=$KEY | {
+          local IFS
+          IFS='=
+'
+
+           while read var val
+             do
+             case $var in
+                 STATUS)
+                     if [ $val = "OK" ]
+                     then
+                       echo "[`date`] System disabled"
+                     else
+                       echo "[`date`] System not disabled, exiting"
+                       exit
+                     fi
+                 ;;
+                 *)
+                     echo "[`date`] Error with fetch to server"
+                     exit
+                 ;;
+                 esac
+           done  
+       } >> $bsdstats_log
+}
+
+report_system () {
+      do_fetch report_system.php?token=$TOKEN\&key=$KEY\&rel=$REL\&arch=$ARCH\&opsys=$OS | {
+          local IFS
+          IFS='=
+'
+
+           while read var val
+             do
+             case $var in
+                 STATUS)
+                     if [ $val = "OK" ]
+                     then
+                       echo "[`date`] System reported"
+                     else
+                       echo "[`date`] System report failed, exiting"
+                       exit
+                     fi
+                 ;;
+                 *)
+                     echo "[`date`] Error with fetch to server"
+                     exit
+                 ;;
+                 esac
+           done  
+       } >> $bsdstats_log
+}
+
+report_cpu () {
+    do_fetch report_cpu.php?token=$TOKEN\&key=$KEY\&cpus=$count\&vendor=$VEN\&cpu_type=$DEV | {
+          local IFS
+          IFS='=
+'
+
+           while read var val
+             do
+             case $var in
+                 STATUS)
+                     if [ $val = "OK" ]
+                     then
+                       echo "[`date`] System CPU reported"
+                     else
+                       echo "[`date`] System CPU report failed, exiting"
+                       exit
+                     fi
+                 ;;
+                 *)
+                     echo "[`date`] Error with fetch to server"
+                     exit
+                 ;;
+                 esac
+           done  
+       } >> $bsdstats_log
+}
+case "$monthly_statistics_enable" in
+    [Yy][Ee][Ss])
+      check_dns
+      HN=`/bin/hostname`
+      REL=`/usr/local/bin/PBReg get /PC-BSD/Version`
+      ARCH=`/usr/bin/uname -m`
+      OS="PC-BSD"
+      get_id_token
+      sleep `random`
+      enable_token
+      report_system
+      echo "Posting monthly OS statistics to $checkin_server"
+      case "$monthly_statistics_report_devices" in
+          [Yy][Ee][Ss])
+              send_devices
+              echo "Posting monthly device statistics to $checkin_server"
+              line=$( sysctl -n hw.model )
+              VEN=$( echo $line | cut -d ' ' -f 1 )
+              DEV=$( uri_escape $( echo $line | cut -d ' ' -f 2- ) )
+              count=$( sysctl -n hw.ncpu )
+              report_cpu
+              echo "Posting monthly CPU statistics to $checkin_server"
+             ;;
+          *) 
+             echo "Posting monthly device/CPU statistics disabled"
+             echo "    set monthly_statistics_report_devices=\"YES\" in $periodic_conf"
+             ;;
+      esac
+      disable_token
+      ;;
+    *) 
+      echo "Posting monthly OS statistics disabled"
+      echo "    set monthly_statistics_enable=\"YES\" in $periodic_conf"
+    ;;
+esac
+
+umask $oldmask
+exit $rc

Modified: pcbsd/trunk/system-overlay/usr/local/etc/rc.d/denyhosts.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/etc/rc.d/denyhosts.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/etc/rc.d/denyhosts.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,23 +1,23 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/security/denyhosts/files/denyhosts.in,v 1.1 2006/05/19 23:47:45 mnag Exp $
-#
-# PROVIDE: denyhosts
-# REQUIRE: DAEMON
-#
-
-. /etc/rc.subr
-
-name="denyhosts"
-rcvar=${name}_enable
-
-command="/usr/local/bin/denyhosts.py"
-command_interpreter="/usr/local/bin/python"
-command_args="--config /usr/local/etc/denyhosts.conf --daemon"
-pidfile="/var/run/${name}.pid"
-
-load_rc_config $name
-
-: ${denyhosts_enable="NO"}
-
-run_rc_command "$1"
+#!/bin/sh
+#
+# $FreeBSD: ports/security/denyhosts/files/denyhosts.in,v 1.1 2006/05/19 23:47:45 mnag Exp $
+#
+# PROVIDE: denyhosts
+# REQUIRE: DAEMON
+#
+
+. /etc/rc.subr
+
+name="denyhosts"
+rcvar=${name}_enable
+
+command="/usr/local/bin/denyhosts.py"
+command_interpreter="/usr/local/bin/python"
+command_args="--config /usr/local/etc/denyhosts.conf --daemon"
+pidfile="/var/run/${name}.pid"
+
+load_rc_config $name
+
+: ${denyhosts_enable="NO"}
+
+run_rc_command "$1"

Modified: pcbsd/trunk/system-overlay/usr/local/etc/rc.d/norefresh_fstab
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/etc/rc.d/norefresh_fstab	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/etc/rc.d/norefresh_fstab	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,20 +1,20 @@
-#!/bin/sh
-#        Name: norefresh_fstab
-#      Author: Tanner Schultz
-#        Date: 12-13-05
-#     License: Public domain
-# Description: Ensures that refresh_fstab will is disabled until after
-#              devd has attached all the devices available at boot.
-#              This prevents unreasonably long boot times.
-##########################################################################
-
-# PROVIDE: norefresh_fstab 
-# REQUIRE: mountcritlocal
-# BEFORE: devd
-# KEYWORD: nojail
-
-#let refresh_fstab know that its not ok to do its thing yet
-#this will be cleared by cleartmp, by which time it should be ok
-echo "Disableing refresh_fstab."
-touch /tmp/NOREFRESH_FSTAB
-
+#!/bin/sh
+#        Name: norefresh_fstab
+#      Author: Tanner Schultz
+#        Date: 12-13-05
+#     License: Public domain
+# Description: Ensures that refresh_fstab will is disabled until after
+#              devd has attached all the devices available at boot.
+#              This prevents unreasonably long boot times.
+##########################################################################
+
+# PROVIDE: norefresh_fstab 
+# REQUIRE: mountcritlocal
+# BEFORE: devd
+# KEYWORD: nojail
+
+#let refresh_fstab know that its not ok to do its thing yet
+#this will be cleared by cleartmp, by which time it should be ok
+echo "Disableing refresh_fstab."
+touch /tmp/NOREFRESH_FSTAB
+

Modified: pcbsd/trunk/system-overlay/usr/local/etc/rc.d/pf_rules
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/etc/rc.d/pf_rules	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/etc/rc.d/pf_rules	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,73 +1,73 @@
-#!/bin/sh
-# Revision 0.14 Sat Nov 18 12:23:10 EET 2006
-#
-# Copyright (c) 2006 Dominique Goncalves
-# Copyright (c) 2006 Andrei Kolu 
-# Modified 2006 Kris Moore (PC-BSD Software)
-#
-# See COPYING for licence terms.
-#
-# Create a basic pf.conf.
-# Block everything by default,
-# Allow everything on lo0,
-# Do not create rules on some interface ie: plip0,
-# Allow all tcp and udp connections to outside with keep state flags,
-# Allow icmp on all interfaces.
-#
-# PROVIDE: pf_rules
-# REQUIRE: netif
-# BEFORE: pf
-
-. /etc/rc.subr
-
-name="pf_rules"
-rcvar=`set_rcvar`
-start_cmd="create_rules"
-required_files="$pf_rules"
-create_rules ()
-{
-        echo "Creating $pf_rules."
-        echo "set skip on lo0" > $pf_rules
-	echo "set block-policy return" >> $pf_rules
-	#echo "set loginterface rl0" >> $pf_rules
-	echo "scrub in all" >> $pf_rules
-        echo "block in log" >> $pf_rules
-	echo "antispoof quick for lo0 inet" >> $pf_rules
-	# block anything coming from source we have no back routes for
-	echo "block in from no-route to any" >> $pf_rules
-    	# Allow all outgoing traffic
-        echo "pass out keep state" >> $pf_rules
-        echo 'table <blacklist> persist file "/etc/blacklist"'  >> $pf_rules
-        echo "pass inet proto icmp from any to any" >> $pf_rules
-	#############################################################
-	# Ports from 49152 to 65535 is needed for SMB and other connectivity
-	echo "pass in proto {tcp,udp} from any to any port 49152:65535 keep state" >> $pf_rules
-       for inf in `ifconfig -l` ; do
-                if `echo $inf | egrep -v 'lo|plip|gif|tun|pfsync' 1>/dev/null` ; then
-			# Check if we have a /etc/pf.inports file, and open those ports 
-                        if [ -e "/etc/pf.inports" ]
- 			then
- 			  for PORT in `cat /etc/pf.inports | grep "^udp: " | cut -d " " -f 2`
-			  do
-			    echo "pass in quick on $inf proto udp from any to ($inf) port $PORT keep state" >> $pf_rules
-			  done
-			fi
-                        if [ -e "/etc/pf.inports" ]
- 			then
- 			  for PORT in `cat /etc/pf.inports | grep "^tcp: " | cut -d " " -f 2`
-			  do
-                            echo "pass in quick on $inf proto tcp from any to ($inf) port $PORT keep state" >> $pf_rules
-			  done
-			fi
-			
-			# Deny all from our blacklist
-                        echo "block on $inf from <blacklist> to any" >> $pf_rules
-                fi
-        done
-	# restart PF firewall
-	pfctl -f /etc/pf.conf
-}
-
-
-load_rc_config $name
-run_rc_command "$1" 
+#!/bin/sh
+# Revision 0.14 Sat Nov 18 12:23:10 EET 2006
+#
+# Copyright (c) 2006 Dominique Goncalves
+# Copyright (c) 2006 Andrei Kolu 
+# Modified 2006 Kris Moore (PC-BSD Software)
+#
+# See COPYING for licence terms.
+#
+# Create a basic pf.conf.
+# Block everything by default,
+# Allow everything on lo0,
+# Do not create rules on some interface ie: plip0,
+# Allow all tcp and udp connections to outside with keep state flags,
+# Allow icmp on all interfaces.
+#
+# PROVIDE: pf_rules
+# REQUIRE: netif
+# BEFORE: pf
+
+. /etc/rc.subr
+
+name="pf_rules"
+rcvar=`set_rcvar`
+start_cmd="create_rules"
+required_files="$pf_rules"
+create_rules ()
+{
+        echo "Creating $pf_rules."
+        echo "set skip on lo0" > $pf_rules
+	echo "set block-policy return" >> $pf_rules
+	#echo "set loginterface rl0" >> $pf_rules
+	echo "scrub in all" >> $pf_rules
+        echo "block in log" >> $pf_rules
+	echo "antispoof quick for lo0 inet" >> $pf_rules
+	# block anything coming from source we have no back routes for
+	echo "block in from no-route to any" >> $pf_rules
+    	# Allow all outgoing traffic
+        echo "pass out keep state" >> $pf_rules
+        echo 'table <blacklist> persist file "/etc/blacklist"'  >> $pf_rules
+        echo "pass inet proto icmp from any to any" >> $pf_rules
+	#############################################################
+	# Ports from 49152 to 65535 is needed for SMB and other connectivity
+	echo "pass in proto {tcp,udp} from any to any port 49152:65535 keep state" >> $pf_rules
+       for inf in `ifconfig -l` ; do
+                if `echo $inf | egrep -v 'lo|plip|gif|tun|pfsync' 1>/dev/null` ; then
+			# Check if we have a /etc/pf.inports file, and open those ports 
+                        if [ -e "/etc/pf.inports" ]
+ 			then
+ 			  for PORT in `cat /etc/pf.inports | grep "^udp: " | cut -d " " -f 2`
+			  do
+			    echo "pass in quick on $inf proto udp from any to ($inf) port $PORT keep state" >> $pf_rules
+			  done
+			fi
+                        if [ -e "/etc/pf.inports" ]
+ 			then
+ 			  for PORT in `cat /etc/pf.inports | grep "^tcp: " | cut -d " " -f 2`
+			  do
+                            echo "pass in quick on $inf proto tcp from any to ($inf) port $PORT keep state" >> $pf_rules
+			  done
+			fi
+			
+			# Deny all from our blacklist
+                        echo "block on $inf from <blacklist> to any" >> $pf_rules
+                fi
+        done
+	# restart PF firewall
+	pfctl -f /etc/pf.conf
+}
+
+
+load_rc_config $name
+run_rc_command "$1" 

Modified: pcbsd/trunk/system-overlay/usr/local/etc/rc.d/refresh_fstab
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/etc/rc.d/refresh_fstab	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/etc/rc.d/refresh_fstab	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,23 +1,23 @@
-#!/bin/sh
-#        Name: refresh_fstab
-#      Author: Tanner Schultz
-#        Date: 12-13-2005
-#     License: Public domain
-# Description: Reenables refresh_fstab after devd has finished booting.
-#              And get autorunCD.sh going for all CD-ROMs
-##########################################################################
-
-# PROVIDE: refresh_fstab 
-# REQUIRE: devd cleartmp norefresh_fstab 
-# BEFORE: 
-# KEYWORD: nojail
-
-#refresh fstab
-#echo "Reenableing refresh_fstab."
-rm /tmp/NOREFRESH_FSTAB 2> /dev/null
-
-if [ -f "/PCBSD/conf/enable_refresh_fstab" ]
-then
-echo "Refreshing fstab"
-/PCBSD/Scripts/refresh_fstab.sh
-fi
+#!/bin/sh
+#        Name: refresh_fstab
+#      Author: Tanner Schultz
+#        Date: 12-13-2005
+#     License: Public domain
+# Description: Reenables refresh_fstab after devd has finished booting.
+#              And get autorunCD.sh going for all CD-ROMs
+##########################################################################
+
+# PROVIDE: refresh_fstab 
+# REQUIRE: devd cleartmp norefresh_fstab 
+# BEFORE: 
+# KEYWORD: nojail
+
+#refresh fstab
+#echo "Reenableing refresh_fstab."
+rm /tmp/NOREFRESH_FSTAB 2> /dev/null
+
+if [ -f "/PCBSD/conf/enable_refresh_fstab" ]
+then
+echo "Refreshing fstab"
+/PCBSD/Scripts/refresh_fstab.sh
+fi

Modified: pcbsd/trunk/system-overlay/usr/local/etc/xdg/menus/applications-kmenuedit.menu
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/etc/xdg/menus/applications-kmenuedit.menu	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/etc/xdg/menus/applications-kmenuedit.menu	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,77 +1,77 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-<Menu>
- <Layout>
-  <Merge type="menus" />
-  <Menuname>Development</Menuname>
-  <Menuname>Games</Menuname>
-  <Menuname>Graphics</Menuname>
-  <Menuname>Internet</Menuname>
-  <Menuname>Multimedia</Menuname>
-  <Menuname>Office</Menuname>
-  <Menuname>My Programs</Menuname>
-  <Menuname>Science</Menuname>
-  <Menuname>System</Menuname>
-  <Menuname>Utilities</Menuname>
-  <Menuname>Wine</Menuname>
-  <Menuname>Applications</Menuname>
-  <Merge type="files" />
-  <Filename>kde-Kfind.desktop</Filename>
-  <Filename>kde-Help.desktop</Filename>
- </Layout>
- <Menu>
-  <Name>Games</Name>
-  <Layout>
-   <Merge type="menus" />
-   <Menuname>Arcade</Menuname>
-   <Menuname>Board</Menuname>
-   <Menuname>Card</Menuname>
-   <Menuname>Edutainment</Menuname>
-   <Menuname>Kidsgames</Menuname>
-   <Menuname>TacticStrategy</Menuname>
-   <Menuname>Toys</Menuname>
-  </Layout>
-  <Menu>
-   <Name>Edutainment</Name>
-   <NotDeleted/>
-  </Menu>
- </Menu>
- <Menu>
-  <Name>Utilities</Name>
-  <Layout>
-   <Merge type="menus" />
-   <Menuname>Accessibility</Menuname>
-   <Menuname>Desktop</Menuname>
-   <Menuname>Editors</Menuname>
-   <Menuname>File</Menuname>
-   <Menuname>PIM</Menuname>
-   <Menuname>Peripherals</Menuname>
-   <Menuname>XUtilities</Menuname>
-   <Separator/>
-   <Menuname>Settingsmenu</Menuname>
-   <Menuname>More</Menuname>
-  </Layout>
-  <Menu>
-   <Name>Settingsmenu</Name>
-   <NotDeleted/>
-  </Menu>
- </Menu>
- <Exclude>
-  <Filename>kde-KControl.desktop</Filename>
-  <Filename>kde-Home.desktop</Filename>
- </Exclude>
- <Move>
-  <Old>Settingsmenu</Old>
-  <New>Utilities/Settingsmenu</New>
- </Move>
- <Move>
-  <Old>Edutainment</Old>
-  <New>Games/Edutainment</New>
- </Move>
- <Menu>
-  <Name>.hidden</Name>
-  <Include>
-   <Filename>kde-KControl.desktop</Filename>
-   <Filename>kde-Home.desktop</Filename>
-  </Include>
- </Menu>
-</Menu>
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+<Menu>
+ <Layout>
+  <Merge type="menus" />
+  <Menuname>Development</Menuname>
+  <Menuname>Games</Menuname>
+  <Menuname>Graphics</Menuname>
+  <Menuname>Internet</Menuname>
+  <Menuname>Multimedia</Menuname>
+  <Menuname>Office</Menuname>
+  <Menuname>My Programs</Menuname>
+  <Menuname>Science</Menuname>
+  <Menuname>System</Menuname>
+  <Menuname>Utilities</Menuname>
+  <Menuname>Wine</Menuname>
+  <Menuname>Applications</Menuname>
+  <Merge type="files" />
+  <Filename>kde-Kfind.desktop</Filename>
+  <Filename>kde-Help.desktop</Filename>
+ </Layout>
+ <Menu>
+  <Name>Games</Name>
+  <Layout>
+   <Merge type="menus" />
+   <Menuname>Arcade</Menuname>
+   <Menuname>Board</Menuname>
+   <Menuname>Card</Menuname>
+   <Menuname>Edutainment</Menuname>
+   <Menuname>Kidsgames</Menuname>
+   <Menuname>TacticStrategy</Menuname>
+   <Menuname>Toys</Menuname>
+  </Layout>
+  <Menu>
+   <Name>Edutainment</Name>
+   <NotDeleted/>
+  </Menu>
+ </Menu>
+ <Menu>
+  <Name>Utilities</Name>
+  <Layout>
+   <Merge type="menus" />
+   <Menuname>Accessibility</Menuname>
+   <Menuname>Desktop</Menuname>
+   <Menuname>Editors</Menuname>
+   <Menuname>File</Menuname>
+   <Menuname>PIM</Menuname>
+   <Menuname>Peripherals</Menuname>
+   <Menuname>XUtilities</Menuname>
+   <Separator/>
+   <Menuname>Settingsmenu</Menuname>
+   <Menuname>More</Menuname>
+  </Layout>
+  <Menu>
+   <Name>Settingsmenu</Name>
+   <NotDeleted/>
+  </Menu>
+ </Menu>
+ <Exclude>
+  <Filename>kde-KControl.desktop</Filename>
+  <Filename>kde-Home.desktop</Filename>
+ </Exclude>
+ <Move>
+  <Old>Settingsmenu</Old>
+  <New>Utilities/Settingsmenu</New>
+ </Move>
+ <Move>
+  <Old>Edutainment</Old>
+  <New>Games/Edutainment</New>
+ </Move>
+ <Menu>
+  <Name>.hidden</Name>
+  <Include>
+   <Filename>kde-KControl.desktop</Filename>
+   <Filename>kde-Home.desktop</Filename>
+  </Include>
+ </Menu>
+</Menu>

Modified: pcbsd/trunk/system-overlay/usr/local/share/applnk/My Programs/.directory
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/share/applnk/My Programs/.directory	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/share/applnk/My Programs/.directory	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,3 +1,3 @@
-[Desktop Entry]
-Icon=window_list
-Name=PBI Programs
+[Desktop Entry]
+Icon=window_list
+Name=PBI Programs

Modified: pcbsd/trunk/system-overlay/usr/local/share/apps/kdm/sessions/fluxbox.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/share/apps/kdm/sessions/fluxbox.desktop	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/share/apps/kdm/sessions/fluxbox.desktop	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,72 +1,72 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
-Exec=fluxbox
-TryExec=fluxbox
-Name=Fluxbox
-Name[bn]=ফ্লাক্সবক্স
-Name[cy]=Llif-flwch (Fluxbox)
-Name[eo]=Fluujo
-Name[hi]=फ्ल्क्स-बाक्स
-Name[pa]=ਫਕਸਬਕਸ
-Name[rw]=AgasandukuUmujyoumwe
-Name[ta]=ப்ளக்ஸ் பெட்டி
-Name[tg]=Қуттии Flux
-Comment=A highly configurable and low resource window manager based on Blackbox
-Comment[af]='n Baie konfigureerbare en lae hulpbron intensiewe venster bestuurder, wat op Blackbox gebaseer is.
-Comment[ar]=مدير نوافذ قابل للإعداد بشكل كبير ويستخدم القليل من موارد الجهاز وهو مبني Blackbox
-Comment[bn]=ব্ল্যাকবক্স ভিত্তিক একটি উইণ্ডো ম্যানেজার, যা নানাভাবে কনফিগার করা যায়, কিন্তু খুবই কম রিসোর্স ব্যবহার করে
-Comment[bs]=Visoko prilagodljiv window manager sa malim zauzećem resursa baziran na Blackbox-u
-Comment[ca]=Un gestor de finestres altament configurable i que necessita pocs recursos basat en Blackbox
-Comment[cs]=Vysoce přizpůsobitelný a nízkoúrovňový správce oken založený na Blackboxu
-Comment[cy]=Trefnydd ffenestri hawdd ei ffurfweddu ac ysgafn ei ddefnydd adnoddau, wedi'i seilio ar Ddu-flwch (Blackbox)
-Comment[da]=En meget indstillelig vindueshåndtering med lavt ressourceforbrug baseret på Blackbox
-Comment[de]=Sehr flexibler, aber ressourcenschonender Fenstermanager, der auf Blackbox basiert
-Comment[el]=Ένας ιδιαίτερα παραμετροποιήσιμος και με μικρή κατανάλωση πόρων διαχειριστής παραθύρων βασισμένος στον Blackbox
-Comment[eo]=Fenestroadministrilo devenigita de Negrujo
-Comment[es]=Un administrador de ventanas basado en Blackbox muy configurable y con poco consumo de recursos
-Comment[et]=Väga hästi kohandatav ja vähenõudlik aknahaldur, mille aluseks on Blackbox
-Comment[eu]=Blackbox-en oinarritutako leiho kudeatzaile zeharo konfiguragarria, eta errekurtso gutxi kontsumitzen dituena
-Comment[fi]=Blackboxiin pohjautuva erittäin muokattava ja vähäisen resurssitarpeen omaava ikkunaohjelma
-Comment[fr]=Un gestionnaire de fenêtres très configurable et utilisant peu de ressources, basé sur Blackbox
-Comment[fy]=In tige ynstelbere lichtgewicht finstersmanager basearre op Blackbox
-Comment[gl]=Un xestor de fiestras moi configurábel e lixeiro baseado en Blackbox
-Comment[he]=מנהל חלונות בעל הגדרות רבות הצורך משאבים מעטים ומבוסס עלBlackbox
-Comment[hi]=ब्लेक-बाक्स आधारित, अत्यंत कॉन्फ़िगरेबल तथा कम साधन चाहने वाला विंडो प्रबंधक
-Comment[hr]=Visoko konfigurabilan upravitelj prozora, male potrošnje resursa, zasnovan na Blackbox-u
-Comment[hu]=Egy Blackbox-alapú ablakkezelő, alacsony erőforrásigénnyel, sokféle beállítási lehetőséggel
-Comment[is]=Öflugur gluggastjóri sem notar lítið af auðlindum vélarinnar sem er byggður á Blackbox
-Comment[it]= Un window manager molto configurabile e che utilizza poche risorse basato su Blackbox
-Comment[ja]=Blackbox ベースの高度な設定が可能でリソースにやさしいウィンドウマネージャ
-Comment[km]=កម្មវិធី​គ្រប់គ្រង​បង្អួច​ដែល​អាច​កំណត់​រចនាសម្ព័ន្ធ​បាន​ខ្ពស់ និង​ប្រើ​ធនធាន​តិច ដែល​ផ្អែក​លើ Blackbox
-Comment[lt]=Daug konfigūravimo parinkčių turinti ir mažai resursų naudojanti langų tvarkyklė, paremta Blackbox
-Comment[lv]=Plaši konfigurējams un resursus taupošs logu menedžeris bāzēts uz Blackbox
-Comment[mk]=Високо конфигурабилен менаџер на прозорци со мали побарувања на ресурси базиран на Blackbox
-Comment[mn]=Хар хайрцаг дээр суурилсан маш бага нөөц хэрэглэдэг тохируулах чадвар өндөр цонхны удирдагч
-Comment[mt]=Window manager ħafif u konfigurabbli ibbażat fuq BlackBox
-Comment[nb]=En lite ressurskrevende og svært fleksibel vindusbehandler basert på Blackbox
-Comment[nds]=En Finsterpleger, de wenig Ressourcen bruukt, man bannig vele Instellen hett. Opbuut op Blackbox
-Comment[nl]=Een zeer configureerbare lichtgewicht windowmanager gebaseerd op Blackbox.
-Comment[nn]=Ein lite ressurskrevjande og svært fleksibel vindaugssjef basert på Blackbox
-Comment[pa]=ਇੱਕ ਬਿਲਕੁੱਲ ਹਲਕਾ ਤੇ ਜਿਆਦਾ ਸੋਧਯੋਗ ਫਾਇਲ਼ ਮੈਨੇਜਰ
-Comment[pl]=Menedżer okien oparty na Blackbox o dużych możliwościach konfiguracji i niskich wymaganiach
-Comment[pt]=Um gestor de janelas bastante configurável e que usa poucos recursos, baseado no Blackbox
-Comment[pt_BR]=Um gerenciador de janelas altamente configurável e com baixo uso de recursos, baseado no Blackbox
-Comment[ro]=Un manager de ferestre foarte configurabil şi mic, bazat pe Blackbox
-Comment[ru]=Настраиваемый оконный менеджер, основанный на Blackbox
-Comment[rw]=Mugenga dirishya mbonezwa mu buryo buhanitse kandi bikorana bike ishingiye ku Gasandukumukara
-Comment[se]=Lásegieđahalli vuođđoduvvon Blackbox:as, hui heivehahtti ja geavaha unnán resurssaid
-Comment[sk]=Veľmi konfigurovateľný a nenáročný správca okien založený na Blackbox
-Comment[sl]=Visoko nastavljiv in učinkovit okenski upravitelj na osnovi Blackboxa
-Comment[sr]=Врло подесив и незахтеван менаџер прозора заснован на Blackbox-у
-Comment[sr at Latn]=Vrlo podesiv i nezahtevan menadžer prozora zasnovan na Blackbox-u
-Comment[sv]=Mycket anpassningsbar fönsterhanterare med litet resursbehov baserad på Blackbox
-Comment[ta]=கறுப்புபெட்டி சார்ந்த அமைக்கக்கூடிய குறைந்த வள சாளர மேளாளர்
-Comment[tg]=Танзимшудаи баланд ва захираи ками мудири тиреза дар асоси Blackbox
-Comment[th]=ระบบจัดการหน้าต่างที่สามารถปรับแต่งได้อย่างละ เอียด และใช้ทรัพยากรน้อย สร้างบนพื้นฐานของ Blackbox
-Comment[tr]=Blackbox temelli, kolayca özelleştirilebilir düşük kaynaklı bir pencere yöneticisi
-Comment[tt]=Blackbox asılında qorılğan, yaqşı caylana torğan täräcä-idäräçe
-Comment[uk]=Дуже гнучкий та невибагливий для ресурсів менеджер вікон, заснований на Blackbox
-Comment[vi]=Một trình quản lý cửa sổ rất dễ cấu hình và đòi hỏi ít tài nguyên dựa trên Blackbox
-Comment[zh_CN]=基于 BlackBox 可深入配置且占用资源较少的窗口管理器
-Comment[zh_TW]=一個基於 Blackbox 且高可組態及低資源的視窗管理程式
+[Desktop Entry]
+Encoding=UTF-8
+Type=XSession
+Exec=fluxbox
+TryExec=fluxbox
+Name=Fluxbox
+Name[bn]=ফ্লাক্সবক্স
+Name[cy]=Llif-flwch (Fluxbox)
+Name[eo]=Fluujo
+Name[hi]=फ्ल्क्स-बाक्स
+Name[pa]=ਫਕਸਬਕਸ
+Name[rw]=AgasandukuUmujyoumwe
+Name[ta]=ப்ளக்ஸ் பெட்டி
+Name[tg]=Қуттии Flux
+Comment=A highly configurable and low resource window manager based on Blackbox
+Comment[af]='n Baie konfigureerbare en lae hulpbron intensiewe venster bestuurder, wat op Blackbox gebaseer is.
+Comment[ar]=مدير نوافذ قابل للإعداد بشكل كبير ويستخدم القليل من موارد الجهاز وهو مبني Blackbox
+Comment[bn]=ব্ল্যাকবক্স ভিত্তিক একটি উইণ্ডো ম্যানেজার, যা নানাভাবে কনফিগার করা যায়, কিন্তু খুবই কম রিসোর্স ব্যবহার করে
+Comment[bs]=Visoko prilagodljiv window manager sa malim zauzećem resursa baziran na Blackbox-u
+Comment[ca]=Un gestor de finestres altament configurable i que necessita pocs recursos basat en Blackbox
+Comment[cs]=Vysoce přizpůsobitelný a nízkoúrovňový správce oken založený na Blackboxu
+Comment[cy]=Trefnydd ffenestri hawdd ei ffurfweddu ac ysgafn ei ddefnydd adnoddau, wedi'i seilio ar Ddu-flwch (Blackbox)
+Comment[da]=En meget indstillelig vindueshåndtering med lavt ressourceforbrug baseret på Blackbox
+Comment[de]=Sehr flexibler, aber ressourcenschonender Fenstermanager, der auf Blackbox basiert
+Comment[el]=Ένας ιδιαίτερα παραμετροποιήσιμος και με μικρή κατανάλωση πόρων διαχειριστής παραθύρων βασισμένος στον Blackbox
+Comment[eo]=Fenestroadministrilo devenigita de Negrujo
+Comment[es]=Un administrador de ventanas basado en Blackbox muy configurable y con poco consumo de recursos
+Comment[et]=Väga hästi kohandatav ja vähenõudlik aknahaldur, mille aluseks on Blackbox
+Comment[eu]=Blackbox-en oinarritutako leiho kudeatzaile zeharo konfiguragarria, eta errekurtso gutxi kontsumitzen dituena
+Comment[fi]=Blackboxiin pohjautuva erittäin muokattava ja vähäisen resurssitarpeen omaava ikkunaohjelma
+Comment[fr]=Un gestionnaire de fenêtres très configurable et utilisant peu de ressources, basé sur Blackbox
+Comment[fy]=In tige ynstelbere lichtgewicht finstersmanager basearre op Blackbox
+Comment[gl]=Un xestor de fiestras moi configurábel e lixeiro baseado en Blackbox
+Comment[he]=מנהל חלונות בעל הגדרות רבות הצורך משאבים מעטים ומבוסס עלBlackbox
+Comment[hi]=ब्लेक-बाक्स आधारित, अत्यंत कॉन्फ़िगरेबल तथा कम साधन चाहने वाला विंडो प्रबंधक
+Comment[hr]=Visoko konfigurabilan upravitelj prozora, male potrošnje resursa, zasnovan na Blackbox-u
+Comment[hu]=Egy Blackbox-alapú ablakkezelő, alacsony erőforrásigénnyel, sokféle beállítási lehetőséggel
+Comment[is]=Öflugur gluggastjóri sem notar lítið af auðlindum vélarinnar sem er byggður á Blackbox
+Comment[it]= Un window manager molto configurabile e che utilizza poche risorse basato su Blackbox
+Comment[ja]=Blackbox ベースの高度な設定が可能でリソースにやさしいウィンドウマネージャ
+Comment[km]=កម្មវិធី​គ្រប់គ្រង​បង្អួច​ដែល​អាច​កំណត់​រចនាសម្ព័ន្ធ​បាន​ខ្ពស់ និង​ប្រើ​ធនធាន​តិច ដែល​ផ្អែក​លើ Blackbox
+Comment[lt]=Daug konfigūravimo parinkčių turinti ir mažai resursų naudojanti langų tvarkyklė, paremta Blackbox
+Comment[lv]=Plaši konfigurējams un resursus taupošs logu menedžeris bāzēts uz Blackbox
+Comment[mk]=Високо конфигурабилен менаџер на прозорци со мали побарувања на ресурси базиран на Blackbox
+Comment[mn]=Хар хайрцаг дээр суурилсан маш бага нөөц хэрэглэдэг тохируулах чадвар өндөр цонхны удирдагч
+Comment[mt]=Window manager ħafif u konfigurabbli ibbażat fuq BlackBox
+Comment[nb]=En lite ressurskrevende og svært fleksibel vindusbehandler basert på Blackbox
+Comment[nds]=En Finsterpleger, de wenig Ressourcen bruukt, man bannig vele Instellen hett. Opbuut op Blackbox
+Comment[nl]=Een zeer configureerbare lichtgewicht windowmanager gebaseerd op Blackbox.
+Comment[nn]=Ein lite ressurskrevjande og svært fleksibel vindaugssjef basert på Blackbox
+Comment[pa]=ਇੱਕ ਬਿਲਕੁੱਲ ਹਲਕਾ ਤੇ ਜਿਆਦਾ ਸੋਧਯੋਗ ਫਾਇਲ਼ ਮੈਨੇਜਰ
+Comment[pl]=Menedżer okien oparty na Blackbox o dużych możliwościach konfiguracji i niskich wymaganiach
+Comment[pt]=Um gestor de janelas bastante configurável e que usa poucos recursos, baseado no Blackbox
+Comment[pt_BR]=Um gerenciador de janelas altamente configurável e com baixo uso de recursos, baseado no Blackbox
+Comment[ro]=Un manager de ferestre foarte configurabil şi mic, bazat pe Blackbox
+Comment[ru]=Настраиваемый оконный менеджер, основанный на Blackbox
+Comment[rw]=Mugenga dirishya mbonezwa mu buryo buhanitse kandi bikorana bike ishingiye ku Gasandukumukara
+Comment[se]=Lásegieđahalli vuođđoduvvon Blackbox:as, hui heivehahtti ja geavaha unnán resurssaid
+Comment[sk]=Veľmi konfigurovateľný a nenáročný správca okien založený na Blackbox
+Comment[sl]=Visoko nastavljiv in učinkovit okenski upravitelj na osnovi Blackboxa
+Comment[sr]=Врло подесив и незахтеван менаџер прозора заснован на Blackbox-у
+Comment[sr at Latn]=Vrlo podesiv i nezahtevan menadžer prozora zasnovan na Blackbox-u
+Comment[sv]=Mycket anpassningsbar fönsterhanterare med litet resursbehov baserad på Blackbox
+Comment[ta]=கறுப்புபெட்டி சார்ந்த அமைக்கக்கூடிய குறைந்த வள சாளர மேளாளர்
+Comment[tg]=Танзимшудаи баланд ва захираи ками мудири тиреза дар асоси Blackbox
+Comment[th]=ระบบจัดการหน้าต่างที่สามารถปรับแต่งได้อย่างละ เอียด และใช้ทรัพยากรน้อย สร้างบนพื้นฐานของ Blackbox
+Comment[tr]=Blackbox temelli, kolayca özelleştirilebilir düşük kaynaklı bir pencere yöneticisi
+Comment[tt]=Blackbox asılında qorılğan, yaqşı caylana torğan täräcä-idäräçe
+Comment[uk]=Дуже гнучкий та невибагливий для ресурсів менеджер вікон, заснований на Blackbox
+Comment[vi]=Một trình quản lý cửa sổ rất dễ cấu hình và đòi hỏi ít tài nguyên dựa trên Blackbox
+Comment[zh_CN]=基于 BlackBox 可深入配置且占用资源较少的窗口管理器
+Comment[zh_TW]=一個基於 Blackbox 且高可組態及低資源的視窗管理程式

Modified: pcbsd/trunk/system-overlay/usr/local/share/apps/kthememanager/themes/PC-BSD/PC-BSD.xml
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/share/apps/kthememanager/themes/PC-BSD/PC-BSD.xml	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/share/apps/kthememanager/themes/PC-BSD/PC-BSD.xml	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,155 +1,155 @@
-<!DOCTYPE ktheme>
-<ktheme version="1" >
-  <general>
-    <author value="Charles" />
-    <email value="" />
-    <homepage value="" />
-    <comment value="" />
-    <version value="0.1" />
-  </general>
-  <desktop number="0" common="1" >
-    <mode id="Flat" />
-    <color1 rgb="#003082" />
-    <color2 rgb="#6c8bb9" />
-    <blending mode="NoBlending" balance="100" reverse="0" />
-    <pattern name="" />
-    <wallpaper mode="Scaled" url="" />
-  </desktop>
-  <screensaver name="KLines-saver.desktop" />
-  <icons name="nuvola" >
-    <Animated value="1" object="desktop" />
-    <DoublePixels value="0" object="desktop" />
-    <Size value="48" object="desktop" />
-    <ActiveEffect name="togamma" object="desktop" />
-    <ActiveSemiTransparent value="0" object="desktop" />
-    <ActiveValue value="1" object="desktop" />
-    <DefaultColor rgb="#9080f8" object="desktop" />
-    <DefaultColor2 rgb="#000000" object="desktop" />
-    <DefaultEffect name="none" object="desktop" />
-    <DefaultSemiTransparent value="0" object="desktop" />
-    <DefaultValue value="1" object="desktop" />
-    <DisabledColor rgb="#22ca00" object="desktop" />
-    <DisabledColor2 rgb="#000000" object="desktop" />
-    <DisabledEffect name="togray" object="desktop" />
-    <DisabledSemiTransparent value="1" object="desktop" />
-    <DisabledValue value="1" object="desktop" />
-    <Animated value="0" object="mainToolbar" />
-    <DoublePixels value="0" object="mainToolbar" />
-    <Size value="22" object="mainToolbar" />
-    <ActiveColor rgb="#a99cff" object="mainToolbar" />
-    <ActiveColor2 rgb="#000000" object="mainToolbar" />
-    <ActiveEffect name="none" object="mainToolbar" />
-    <ActiveSemiTransparent value="0" object="mainToolbar" />
-    <ActiveValue value="1" object="mainToolbar" />
-    <DefaultColor rgb="#9080f8" object="mainToolbar" />
-    <DefaultColor2 rgb="#000000" object="mainToolbar" />
-    <DefaultEffect name="none" object="mainToolbar" />
-    <DefaultSemiTransparent value="0" object="mainToolbar" />
-    <DefaultValue value="1" object="mainToolbar" />
-    <DisabledColor rgb="#22ca00" object="mainToolbar" />
-    <DisabledColor2 rgb="#000000" object="mainToolbar" />
-    <DisabledEffect name="togray" object="mainToolbar" />
-    <DisabledSemiTransparent value="1" object="mainToolbar" />
-    <DisabledValue value="1" object="mainToolbar" />
-    <Animated value="0" object="panel" />
-    <DoublePixels value="0" object="panel" />
-    <Size value="32" object="panel" />
-    <ActiveEffect name="togamma" object="panel" />
-    <ActiveSemiTransparent value="0" object="panel" />
-    <ActiveValue value="1" object="panel" />
-    <DefaultColor rgb="#9080f8" object="panel" />
-    <DefaultColor2 rgb="#000000" object="panel" />
-    <DefaultEffect name="none" object="panel" />
-    <DefaultSemiTransparent value="0" object="panel" />
-    <DefaultValue value="1" object="panel" />
-    <DisabledColor rgb="#22ca00" object="panel" />
-    <DisabledColor2 rgb="#000000" object="panel" />
-    <DisabledEffect name="togray" object="panel" />
-    <DisabledSemiTransparent value="1" object="panel" />
-    <DisabledValue value="1" object="panel" />
-    <Animated value="0" object="small" />
-    <DoublePixels value="0" object="small" />
-    <Size value="16" object="small" />
-    <ActiveColor rgb="#a99cff" object="small" />
-    <ActiveColor2 rgb="#000000" object="small" />
-    <ActiveEffect name="none" object="small" />
-    <ActiveSemiTransparent value="0" object="small" />
-    <ActiveValue value="1" object="small" />
-    <DefaultColor rgb="#9080f8" object="small" />
-    <DefaultColor2 rgb="#000000" object="small" />
-    <DefaultEffect name="none" object="small" />
-    <DefaultSemiTransparent value="0" object="small" />
-    <DefaultValue value="1" object="small" />
-    <DisabledColor rgb="#22ca00" object="small" />
-    <DisabledColor2 rgb="#000000" object="small" />
-    <DisabledEffect name="togray" object="small" />
-    <DisabledSemiTransparent value="1" object="small" />
-    <DisabledValue value="1" object="small" />
-    <Animated value="0" object="toolbar" />
-    <DoublePixels value="0" object="toolbar" />
-    <Size value="22" object="toolbar" />
-    <ActiveColor rgb="#a99cff" object="toolbar" />
-    <ActiveColor2 rgb="#000000" object="toolbar" />
-    <ActiveEffect name="none" object="toolbar" />
-    <ActiveSemiTransparent value="0" object="toolbar" />
-    <ActiveValue value="1" object="toolbar" />
-    <DefaultColor rgb="#9080f8" object="toolbar" />
-    <DefaultColor2 rgb="#000000" object="toolbar" />
-    <DefaultEffect name="none" object="toolbar" />
-    <DefaultSemiTransparent value="0" object="toolbar" />
-    <DefaultValue value="1" object="toolbar" />
-    <DisabledColor rgb="#22ca00" object="toolbar" />
-    <DisabledColor2 rgb="#000000" object="toolbar" />
-    <DisabledEffect name="togray" object="toolbar" />
-    <DisabledSemiTransparent value="1" object="toolbar" />
-    <DisabledValue value="1" object="toolbar" />
-  </icons>
-  <sounds/>
-  <colors contrast="7" >
-    <background rgb="#efede1" object="global" />
-    <selectBackground rgb="#2e88db" object="global" />
-    <foreground rgb="#000000" object="global" />
-    <windowForeground rgb="#000000" object="global" />
-    <windowBackground rgb="#ffffff" object="global" />
-    <selectForeground rgb="#ffffff" object="global" />
-    <buttonBackground rgb="#fdfcf5" object="global" />
-    <buttonForeground rgb="#000000" object="global" />
-    <linkColor rgb="#0000ee" object="global" />
-    <visitedLinkColor rgb="#52188b" object="global" />
-    <alternateBackground rgb="#eef6ff" object="global" />
-    <activeForeground rgb="#ffffff" object="kwin" />
-    <inactiveBackground rgb="#6a94ba" object="kwin" />
-    <inactiveBlend rgb="#9daaba" object="kwin" />
-    <activeBackground rgb="#005fb8" object="kwin" />
-    <activeBlend rgb="#397bb8" object="kwin" />
-    <inactiveForeground rgb="#dddddd" object="kwin" />
-    <activeTitleBtnBg rgb="#7f9ec8" object="kwin" />
-    <inactiveTitleBtnBg rgb="#a7b5c7" object="kwin" />
-    <frame rgb="#efefef" object="kwin" />
-    <inactiveFrame rgb="#efefef" object="kwin" />
-    <handle rgb="#efefef" object="kwin" />
-    <inactiveHandle rgb="#efefef" object="kwin" />
-  </colors>
-  <cursors name="" />
-  <wm type="builtin" name="kwin3_plastik" >
-    <border size="1" />
-  </wm>
-  <konqueror>
-    <wallpaper url="" />
-    <bgcolor rgb="#000000" />
-  </konqueror>
-  <panel>
-    <background colorize="0" url="" />
-    <transparent value="0" />
-  </panel>
-  <widgets name="Plastik" />
-  <fonts>
-    <font value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
-    <fixed value="Monospace,12,-1,5,50,0,0,0,0,0" object="General" />
-    <toolBarFont value="Sans Serif,11,-1,5,50,0,0,0,0,0" object="General" />
-    <menuFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
-    <activeFont value="Sans Serif,12,-1,5,75,0,0,0,0,0" object="WM" />
-    <taskbarFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
-    <StandardFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="FMSettings" />
-  </fonts>
-</ktheme>
+<!DOCTYPE ktheme>
+<ktheme version="1" >
+  <general>
+    <author value="Charles" />
+    <email value="" />
+    <homepage value="" />
+    <comment value="" />
+    <version value="0.1" />
+  </general>
+  <desktop number="0" common="1" >
+    <mode id="Flat" />
+    <color1 rgb="#003082" />
+    <color2 rgb="#6c8bb9" />
+    <blending mode="NoBlending" balance="100" reverse="0" />
+    <pattern name="" />
+    <wallpaper mode="Scaled" url="" />
+  </desktop>
+  <screensaver name="KLines-saver.desktop" />
+  <icons name="nuvola" >
+    <Animated value="1" object="desktop" />
+    <DoublePixels value="0" object="desktop" />
+    <Size value="48" object="desktop" />
+    <ActiveEffect name="togamma" object="desktop" />
+    <ActiveSemiTransparent value="0" object="desktop" />
+    <ActiveValue value="1" object="desktop" />
+    <DefaultColor rgb="#9080f8" object="desktop" />
+    <DefaultColor2 rgb="#000000" object="desktop" />
+    <DefaultEffect name="none" object="desktop" />
+    <DefaultSemiTransparent value="0" object="desktop" />
+    <DefaultValue value="1" object="desktop" />
+    <DisabledColor rgb="#22ca00" object="desktop" />
+    <DisabledColor2 rgb="#000000" object="desktop" />
+    <DisabledEffect name="togray" object="desktop" />
+    <DisabledSemiTransparent value="1" object="desktop" />
+    <DisabledValue value="1" object="desktop" />
+    <Animated value="0" object="mainToolbar" />
+    <DoublePixels value="0" object="mainToolbar" />
+    <Size value="22" object="mainToolbar" />
+    <ActiveColor rgb="#a99cff" object="mainToolbar" />
+    <ActiveColor2 rgb="#000000" object="mainToolbar" />
+    <ActiveEffect name="none" object="mainToolbar" />
+    <ActiveSemiTransparent value="0" object="mainToolbar" />
+    <ActiveValue value="1" object="mainToolbar" />
+    <DefaultColor rgb="#9080f8" object="mainToolbar" />
+    <DefaultColor2 rgb="#000000" object="mainToolbar" />
+    <DefaultEffect name="none" object="mainToolbar" />
+    <DefaultSemiTransparent value="0" object="mainToolbar" />
+    <DefaultValue value="1" object="mainToolbar" />
+    <DisabledColor rgb="#22ca00" object="mainToolbar" />
+    <DisabledColor2 rgb="#000000" object="mainToolbar" />
+    <DisabledEffect name="togray" object="mainToolbar" />
+    <DisabledSemiTransparent value="1" object="mainToolbar" />
+    <DisabledValue value="1" object="mainToolbar" />
+    <Animated value="0" object="panel" />
+    <DoublePixels value="0" object="panel" />
+    <Size value="32" object="panel" />
+    <ActiveEffect name="togamma" object="panel" />
+    <ActiveSemiTransparent value="0" object="panel" />
+    <ActiveValue value="1" object="panel" />
+    <DefaultColor rgb="#9080f8" object="panel" />
+    <DefaultColor2 rgb="#000000" object="panel" />
+    <DefaultEffect name="none" object="panel" />
+    <DefaultSemiTransparent value="0" object="panel" />
+    <DefaultValue value="1" object="panel" />
+    <DisabledColor rgb="#22ca00" object="panel" />
+    <DisabledColor2 rgb="#000000" object="panel" />
+    <DisabledEffect name="togray" object="panel" />
+    <DisabledSemiTransparent value="1" object="panel" />
+    <DisabledValue value="1" object="panel" />
+    <Animated value="0" object="small" />
+    <DoublePixels value="0" object="small" />
+    <Size value="16" object="small" />
+    <ActiveColor rgb="#a99cff" object="small" />
+    <ActiveColor2 rgb="#000000" object="small" />
+    <ActiveEffect name="none" object="small" />
+    <ActiveSemiTransparent value="0" object="small" />
+    <ActiveValue value="1" object="small" />
+    <DefaultColor rgb="#9080f8" object="small" />
+    <DefaultColor2 rgb="#000000" object="small" />
+    <DefaultEffect name="none" object="small" />
+    <DefaultSemiTransparent value="0" object="small" />
+    <DefaultValue value="1" object="small" />
+    <DisabledColor rgb="#22ca00" object="small" />
+    <DisabledColor2 rgb="#000000" object="small" />
+    <DisabledEffect name="togray" object="small" />
+    <DisabledSemiTransparent value="1" object="small" />
+    <DisabledValue value="1" object="small" />
+    <Animated value="0" object="toolbar" />
+    <DoublePixels value="0" object="toolbar" />
+    <Size value="22" object="toolbar" />
+    <ActiveColor rgb="#a99cff" object="toolbar" />
+    <ActiveColor2 rgb="#000000" object="toolbar" />
+    <ActiveEffect name="none" object="toolbar" />
+    <ActiveSemiTransparent value="0" object="toolbar" />
+    <ActiveValue value="1" object="toolbar" />
+    <DefaultColor rgb="#9080f8" object="toolbar" />
+    <DefaultColor2 rgb="#000000" object="toolbar" />
+    <DefaultEffect name="none" object="toolbar" />
+    <DefaultSemiTransparent value="0" object="toolbar" />
+    <DefaultValue value="1" object="toolbar" />
+    <DisabledColor rgb="#22ca00" object="toolbar" />
+    <DisabledColor2 rgb="#000000" object="toolbar" />
+    <DisabledEffect name="togray" object="toolbar" />
+    <DisabledSemiTransparent value="1" object="toolbar" />
+    <DisabledValue value="1" object="toolbar" />
+  </icons>
+  <sounds/>
+  <colors contrast="7" >
+    <background rgb="#efede1" object="global" />
+    <selectBackground rgb="#2e88db" object="global" />
+    <foreground rgb="#000000" object="global" />
+    <windowForeground rgb="#000000" object="global" />
+    <windowBackground rgb="#ffffff" object="global" />
+    <selectForeground rgb="#ffffff" object="global" />
+    <buttonBackground rgb="#fdfcf5" object="global" />
+    <buttonForeground rgb="#000000" object="global" />
+    <linkColor rgb="#0000ee" object="global" />
+    <visitedLinkColor rgb="#52188b" object="global" />
+    <alternateBackground rgb="#eef6ff" object="global" />
+    <activeForeground rgb="#ffffff" object="kwin" />
+    <inactiveBackground rgb="#6a94ba" object="kwin" />
+    <inactiveBlend rgb="#9daaba" object="kwin" />
+    <activeBackground rgb="#005fb8" object="kwin" />
+    <activeBlend rgb="#397bb8" object="kwin" />
+    <inactiveForeground rgb="#dddddd" object="kwin" />
+    <activeTitleBtnBg rgb="#7f9ec8" object="kwin" />
+    <inactiveTitleBtnBg rgb="#a7b5c7" object="kwin" />
+    <frame rgb="#efefef" object="kwin" />
+    <inactiveFrame rgb="#efefef" object="kwin" />
+    <handle rgb="#efefef" object="kwin" />
+    <inactiveHandle rgb="#efefef" object="kwin" />
+  </colors>
+  <cursors name="" />
+  <wm type="builtin" name="kwin3_plastik" >
+    <border size="1" />
+  </wm>
+  <konqueror>
+    <wallpaper url="" />
+    <bgcolor rgb="#000000" />
+  </konqueror>
+  <panel>
+    <background colorize="0" url="" />
+    <transparent value="0" />
+  </panel>
+  <widgets name="Plastik" />
+  <fonts>
+    <font value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
+    <fixed value="Monospace,12,-1,5,50,0,0,0,0,0" object="General" />
+    <toolBarFont value="Sans Serif,11,-1,5,50,0,0,0,0,0" object="General" />
+    <menuFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
+    <activeFont value="Sans Serif,12,-1,5,75,0,0,0,0,0" object="WM" />
+    <taskbarFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
+    <StandardFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="FMSettings" />
+  </fonts>
+</ktheme>

Modified: pcbsd/trunk/system-overlay/usr/local/share/config/kdm/backgroundrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/share/config/kdm/backgroundrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/share/config/kdm/backgroundrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,18 +1,18 @@
-[Desktop0]
-BackgroundMode=Flat
-BlendBalance=100
-BlendMode=NoBlending
-ChangeInterval=60
-Color1=0,0,200
-Color2=192,192,192
-CurrentWallpaper=0
-LastChange=0
-MinOptimizationDepth=1
-MultiWallpaperMode=NoMulti
-Pattern=fish
-Program=
-ReverseBlending=false
-UseSHM=false
-Wallpaper=pcbsd-default.png
-WallpaperList=
-WallpaperMode=Scaled
+[Desktop0]
+BackgroundMode=Flat
+BlendBalance=100
+BlendMode=NoBlending
+ChangeInterval=60
+Color1=0,0,200
+Color2=192,192,192
+CurrentWallpaper=0
+LastChange=0
+MinOptimizationDepth=1
+MultiWallpaperMode=NoMulti
+Pattern=fish
+Program=
+ReverseBlending=false
+UseSHM=false
+Wallpaper=pcbsd-default.png
+WallpaperList=
+WallpaperMode=Scaled

Modified: pcbsd/trunk/system-overlay/usr/local/share/config/kdm/kdmrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/share/config/kdm/kdmrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/share/config/kdm/kdmrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,566 +1,566 @@
-# KDM master configuration file
-#
-# Definition: the greeter is the login dialog, i.e., the part of KDM
-# which the user sees.
-#
-# You can configure every X-display individually.
-# Every display has a display name, which consists of a host name
-# (which is empty for local displays specified in {Static|Reserve}Servers),
-# a colon, and a display number. Additionally, a display belongs to a
-# display class (which can be ignored in most cases; the control center
-# does not support this feature at all).
-# Sections with display-specific settings have the formal syntax
-# "[X-" host [":" number [ "_" class ]] "-" sub-section "]"
-# You can use the "*" wildcard for host, number, and class. You may omit
-# trailing components; they are assumed to be "*" then.
-# The host part may be a domain specification like ".inf.tu-dresden.de".
-# It may also be "+", which means non-empty, i.e. remote displays only.
-# From which section a setting is actually taken is determined by these
-# rules:
-# - an exact match takes precedence over a partial match (for the host part),
-#   which in turn takes precedence over a wildcard ("+" taking precedence
-#   over "*")
-# - precedence decreases from left to right for equally exact matches
-# Example: display name "myhost:0", class "dpy".
-# [X-myhost:0_dpy] precedes
-# [X-myhost:0_*] (same as [X-myhost:0]) precedes
-# [X-myhost:*_dpy] precedes
-# [X-myhost:*_*] (same as [X-myhost]) precedes
-# [X-+:0_dpy] precedes
-# [X-*:0_dpy] precedes
-# [X-*:0_*] (same as [X-*:0]) precedes
-# [X-*:*_*] (same as [X-*])
-# These sections do NOT match this display:
-# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]
-# If a setting is not found in any matching section, the default is used.
-#
-# Every comment applies to the following section or key. Note that all
-# comments will be lost if you change this file with the kcontrol frontend.
-# The defaults refer to KDM's built-in values, not anything set in this file.
-#
-# Special characters need to be backslash-escaped (leading and trailing
-# spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the
-# backslash itself (\\)).
-# In lists, fields are separated with commas without whitespace in between.
-# Some command strings are subject to simplified sh-style word splitting:
-# single quotes (') and double quotes (") have the usual meaning; the backslash
-# quotes everything (not only special characters). Note that the backslashes
-# need to be doubled because of the two levels of quoting.
-
-[General]
-# This option exists solely for the purpose of a clean automatic upgrade.
-# Do not even think about changing it!
-ConfigVersion=2.3
-# List of permanent displays. Displays with a hostname are foreign. A display
-# class may be specified separated by an underscore.
-# Default is ":0"
-StaticServers=:0
-# List of on-demand displays. See StaticServers for syntax.
-# Default is ""
-ReserveServers=:1,:2,:3
-# Where KDM should store its PID (do not store if empty).
-# Default is ""
-PidFile=/var/run/kdm.pid
-# Whether KDM should lock the PID file to prevent having multiple KDM
-# instances running at once. Do not change unless you are brave.
-# Default is true
-#LockPidFile=false
-# Where to store authorization files.
-# Default is "/var/run/xauth"
-#AuthDir=/tmp
-# Whether KDM should automatically re-read configuration files, if it
-# finds them having changed.
-# Default is true
-#AutoRescan=false
-# Additional environment variables KDM should pass on to all programs it runs.
-# LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
-# otherwise, it should not be necessary very often.
-# Default is ""
-#ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
-# A file KDM should read entropy from.
-# Default is "/dev/mem"
-#RandomFile=
-# A UNIX domain socket KDM should read entropy from.
-# Default is ""
-#PrngdSocket=/tmp/entropy
-# A TCP socket on localhost KDM should read entropy from.
-# Default is 0
-#PrngdPort=4840
-# A character device KDM should read entropy from.
-# Empty means use the system's preferred entropy device.
-# Default is ""
-#RandomDevice=/dev/altrandom
-# Where the command FiFos should be created; make it empty to disable
-# them.
-# Default is "/var/run/xdmctl"
-#FifoDir=/tmp
-# The group to which the global command FiFo should belong;
-# can be either a name or a numerical ID.
-# Default is 0
-#FifoGroup=xdmctl
-# The directory in which KDM should store persistent working data.
-# Default is "/var/lib/kdm"
-#DataDir=
-# The directory in which KDM should store users' .dmrc files. This is only
-# needed if the home directories are not readable before actually logging in
-# (like with AFS).
-# Default is ""
-#DmrcDir=/nfs-shared/var/dmrcs
-
-[Xdmcp]
-# Whether KDM should listen to incoming XDMCP requests.
-# Default is true
-Enable=false
-# The UDP port on which KDM should listen for XDMCP requests. Do not change.
-# Default is 177
-#Port=177
-# File with the private keys of X-terminals. Required for XDM authentication.
-# Default is ""
-#KeyFile=/usr/local/share/config/kdm/kdmkeys
-# XDMCP access control file in the usual XDM-Xaccess format.
-# Default is "/usr/local/share/config/kdm/Xaccess"
-Xaccess=/usr/local/share/config/kdm/Xaccess
-# Number of seconds to wait for display to respond after the user has
-# selected a host from the chooser.
-# Default is 15
-#ChoiceTimeout=10
-# Strip domain name from remote display names if it is equal to the local
-# domain.
-# Default is true
-#RemoveDomainname=false
-# Use the numeric IP address of the incoming connection on multihomed hosts
-# instead of the host name.
-# Default is false
-#SourceAddress=true
-# The program which is invoked to dynamically generate replies to XDMCP
-# DirectQuery or BroadcastQuery requests.
-# If empty, no program is invoked and "Willing to manage" is sent.
-# Default is ""
-Willing=/usr/local/share/config/kdm/Xwilling
-
-[Shutdown]
-# The command (subject to word splitting) to run to halt the system.
-# Default is "/sbin/shutdown -h now"
-HaltCmd=/sbin/shutdown -p now
-# The command (subject to word splitting) to run to reboot the system.
-# Default is "/sbin/shutdown -r now"
-RebootCmd=/sbin/reboot
-# Whether it is allowed to shut down the system via the global command FiFo.
-# Default is false
-#AllowFifo=true
-# Whether it is allowed to abort active sessions when shutting down the
-# system via the global command FiFo.
-# Default is true
-#AllowFifoNow=false
-# The boot manager KDM should use for offering boot options in the
-# shutdown dialog.
-# "None" - no boot manager
-# "Grub" - Grub boot manager
-# "Lilo" - Lilo boot manager (Linux on i386 &amp; x86-64 only)
-# Default is None
-#BootManager=Grub
-
-# Rough estimations about how many seconds KDM will spend at most on
-# - opening a connection to the X-server (OpenTime) if the attempt
-#   - times out: OpenTimeout
-#   - is refused: OpenRepeat * OpenDelay
-# - starting a local X-server (ServerTime):
-#   ServerAttempts * (ServerTimeout + OpenDelay)
-# - starting a display:
-#   - local display: ServerTime + OpenTime
-#   - foreign display: StartAttempts * OpenTime
-#   - XDMCP display: OpenTime (repeated indefinitely by client)
-
-# Core config for all displays
-[X-*-Core]
-# How long to wait before retrying to connect a display.
-# Default is 15
-#OpenDelay=15
-# How long to wait before timing out a display connection attempt.
-# Default is 120
-#OpenTimeout=120
-# How many connection attempts to make during a start attempt. Note that
-# a timeout aborts the entire start attempt.
-# Default is 5
-#OpenRepeat=5
-# Try at most that many times to start a display. If this fails, the display
-# is disabled.
-# Default is 4
-#StartAttempts=4
-# Ping remote display every that many minutes.
-# Default is 5
-#PingInterval=5
-# Wait for a Pong that many minutes.
-# Default is 5
-#PingTimeout=5
-# The name of this X-server's Xauth file.
-# If empty, a random name in the AuthDir directory will be used.
-# Default is ""
-#AuthFile=
-# Specify a file with X-resources for the greeter, chooser and background.
-# The KDE frontend does not use this file, so you do not need it unless you
-# use another background generator than krootimage.
-# Default is ""
-#Resources=
-# The xrdb program to use to read the above specified recources.
-# Subject to word splitting.
-# Default is "/usr/X11R6/bin/xrdb"
-#Xrdb=
-# A program to run before the greeter is shown. Can be used to start an
-# xconsole or an alternative background generator. Subject to word splitting.
-# Default is ""
-Setup=/usr/local/share/config/kdm/Xsetup
-# A program to run before a user session starts. Subject to word splitting.
-# Default is ""
-Startup=/usr/local/share/config/kdm/Xstartup
-# A program to run after a user session exits. Subject to word splitting.
-# Default is ""
-Reset=/usr/local/share/config/kdm/Xreset
-# The program which is run as the user which logs in. It is supposed to
-# interpret the session argument (see SessionsDirs) and start an appropriate
-# session according to it. Subject to word splitting.
-# Default is "/usr/X11R6/bin/xterm -ls -T"
-Session=/usr/local/share/config/kdm/Xsession
-# The program to run if Session fails.
-# Default is "/usr/X11R6/bin/xterm"
-#FailsafeClient=
-# The PATH for the Session program.
-# Default is "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games"
-#UserPath=
-# The PATH for Setup, Startup and Reset, etc.
-# Default is "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
-#SystemPath=
-# The default system shell.
-# Default is "/bin/sh"
-#SystemShell=/bin/bash
-# Where to put the user's X-server authorization file if ~/.Xauthority
-# cannot be created.
-# Default is "/tmp"
-#UserAuthDir=
-# Whether to automatically restart sessions after X-server crashes.
-# Note that enabling this makes circumventing screen lockers other than
-# KDE's built-in one possible!
-# Default is false
-AutoReLogin=false
-# Allow root logins?
-# Default is true
-AllowRootLogin=false
-# Allow to log in, when user has set an empty password?
-# Default is true
-AllowNullPasswd=false
-# Who is allowed to shut down the system. This applies both to the
-# greeter and to the command FiFo.
-# "None" - no "Shutdown..." menu entry is shown at all
-# "Root" - the root password must be entered to shut down
-# "All" - everybody can shut down the machine
-# Default is All
-AllowShutdown=Root
-# Who is allowed to abort active sessions when shutting down.
-# "None" - no forced shutdown is allowed at all
-# "Root" - the root password must be entered to shut down forcibly
-# "All" - everybody can shut down the machine forcibly
-# Default is All
-#AllowSdForceNow=Root
-# The default choice for the shutdown condition/timing.
-# "Schedule" - shut down after all active sessions exit (possibly at once)
-# "TryNow" - shut down, if no active sessions are open; otherwise, do nothing
-# "ForceNow" - shut down unconditionally
-# Default is Schedule
-#DefaultSdMode=ForceNow
-# How to offer shutdown scheduling options:
-# "Never" - not at all
-# "Optional" - as a button in the simple shutdown dialogs
-# "Always" - instead of the simple shutdown dialogs
-# Default is Never
-#ScheduledSd=Optional
-# The directories containing session type definitions in .desktop format.
-# Default is "/usr/local/share/apps/kdm/sessions"
-#SessionsDirs=/etc/X11/sessions,/usr/share/xsessions
-# The file (relative to $HOME) to redirect the session output to. This is
-# a printf format string; one %s will be replaced with the display name.
-# Default is ".xsession-errors"
-ClientLogFile=.xsession-errors-%s
-# Whether KDM's built-in utmp/wtmp/lastlog registration should be used.
-# Default is true
-#UseSessReg=false
-
-# Greeter config for all displays
-[X-*-Greeter]
-# Widget style of the greeter. "" means the built-in default which currently
-# is "Plastik".
-# Default is ""
-GUIStyle=Plastik
-# Widget color scheme of the greeter. "" means the built-in default which
-# currently is yellowish grey with some light blue and yellow elements.
-# Default is ""
-ColorScheme=Plastik
-# What should be shown in the greeter's logo are:
-# "None" - nothing
-# "Logo" - the image specified by LogoPixmap
-# "Clock" - a neat analog clock
-# Default is Clock
-LogoArea=None
-# The image to show when LogoArea=Logo.
-# Default is ""
-LogoPixmap=
-# The relative coordinates (X,Y in percent) of the center of the greeter.
-# Default is "50,50"
-GreeterPos=50,50
-# The screen the greeter should be displayed on in multi-headed and Xinerama
-# setups. The numbering starts with 0. For Xinerama, it corresponds to the
-# listing order in the active ServerLayout section of XF86Config; -1 means
-# to use the upper-left screen, -2 means to use the upper-right screen.
-# Default is 0
-#GreeterScreen=-1
-# The headline in the greeter. The following character pairs are replaced:
-# - %d -> current display
-# - %h -> host name, possibly with domain name
-# - %n -> node name, most probably the host name without domain name
-# - %s -> the operating system
-# - %r -> the operating system's version
-# - %m -> the machine (hardware) type
-# - %% -> a single %
-# Default is "Welcome to %s at %n"
-GreetString=
-# Whether the fonts used in the greeter should be antialiased.
-# Default is false
-AntiAliasing=true
-# The font for the greeter headline.
-# Default is "Serif,20,bold"
-GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0
-# The normal font used in the greeter.
-# Default is "Sans Serif,10"
-StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0
-# The font used for the "Login Failed" message.
-# Default is "Sans Serif,10,bold"
-FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0
-# What to do with the Num Lock modifier for the time the greeter is running:
-# "Off" - turn off
-# "On" - turn on
-# "Keep" - do not change the state
-# Default is Keep
-#NumLock=Off
-# Language and locale to use in the greeter, encoded like $LC_LANG.
-# Default is "en_US"
-Language=en_US
-# Enable autocompletion in the username line edit.
-# Default is false
-UserCompletion=false
-# Enable user list (names along with images) in the greeter.
-# Default is true
-UserList=true
-# User selection for UserCompletion and UserList:
-# "NotHidden" - all users except those listed in HiddenUsers
-# "Selected" - only the users listed in SelectedUsers
-# Default is NotHidden
-ShowUsers=NotHidden
-# For ShowUsers=Selected. @<group> means all users in that group.
-# Default is ""
-SelectedUsers=
-# For ShowUsers=NotHidden. @<group> means all users in that group.
-# Default is ""
-HiddenUsers=
-# Special case of HiddenUsers: users with a non-zero UID less than this number
-# will not be shown as well.
-# Default is 0
-MinShowUID=1000
-# Complement to MinShowUID: users with a UID greater than this number will
-# not be shown as well.
-# Default is 65535
-MaxShowUID=65000
-# If false, the users are listed in the order they appear in /etc/passwd.
-# If true, they are sorted alphabetically.
-# Default is true
-SortUsers=true
-# Specify, where the users' pictures should be taken from.
-# "AdminOnly" - from <FaceDir>/$USER.face[.icon]
-# "PreferAdmin" - prefer <FaceDir>, fallback on $HOME
-# "PreferUser" - ... and the other way round
-# "UserOnly" - from the user's $HOME/.face[.icon]
-# Default is AdminOnly
-FaceSource=PreferAdmin
-# The directory containing the user images if FaceSource is not UserOnly.
-# Default is "/usr/local/share/apps/kdm/faces"
-#FaceDir=/usr/share/faces
-# Specify, if/which user should be preselected for log in.
-# "None" - do not preselect any user
-# "Previous" - the user which successfully logged in last time
-# "Default" - the user specified in the DefaultUser option
-# Default is None
-#PreselectUser=Previous
-# If this is true, the password input line is focused automatically if
-# a user is preselected.
-# Default is false
-#FocusPasswd=true
-# The password input fields cloak the typed in text. Specify, how to do it:
-# "OneStar" - <literal>*</literal> is shown for every typed letter
-# "ThreeStars" - <literal>***</literal> is shown for every typed letter
-# "NoEcho" - nothing is shown at all, the cursor does not move
-# Default is OneStar
-EchoMode=OneStar
-# If true, krootimage will be automatically started by KDM; otherwise, the
-# Setup script should be used to setup the background.
-# Default is true
-UseBackground=true
-# The configuration file to be used by krootimage.
-# Default is "/usr/local/share/config/kdm/backgroundrc"
-BackgroundCfg=/usr/local/share/config/kdm/backgroundrc
-# Hold the X-server grabbed the whole time the greeter is visible. This
-# may be more secure, but it will disable any background and other
-# X-clients started from the Setup script.
-# Default is false
-#GrabServer=true
-# How many seconds to wait for grab to succeed.
-# Default is 3
-#GrabTimeout=3
-# Warn, if display has no X-authorization (local auth cannot be created,
-# XDMCP display wants no auth, or display is foreign from StaticServers).
-# Default is true
-#AuthComplain=false
-# Random seed for forging saved session types, etc. of unknown users.
-# This value should be random but constant across the login domain.
-# Default is 0
-ForgingSeed=1113045471
-# Specify conversation plugins for the login dialog. Each plugin can be
-# specified as a base name (which expands to $kde_modulesdir/kgreet_$base)
-# or as a full pathname.
-# Default is "classic"
-#PluginsLogin=sign
-# Same as PluginsLogin, but for the shutdown dialog.
-# Default is "classic"
-#PluginsShutdown=modern
-# A list of options of the form Key=Value. The conversation plugins can query
-# these settings; it is up to them what possible keys are.
-# Default is ""
-#PluginOptions=SomeKey=randomvalue,Foo=bar
-# Show the "Console Login" action in the greeter (if ServerTTY/ConsoleTTYs
-# is configured).
-# Default is true
-#AllowConsole=false
-# A program to run while the greeter is visible. It is supposed to preload
-# as much as possible of the session that is going to be started (most
-# probably).
-# Default is ""
-Preloader=/usr/local/bin/preloadkde
-# Whether the greeter should be themed.
-# Default is false
-#UseTheme=true
-# The theme to use for the greeter. Can point to either a directory or an XML
-# file.
-# Default is ""
-Theme=/usr/local/share/apps/kdm/themes/circles
-
-# Core config for local displays
-[X-:*-Core]
-# How often to try to run the X-server. Running includes executing it and
-# waiting for it to come up.
-# Default is 1
-#ServerAttempts=1
-# How long to wait for a local X-server to come up.
-# Default is 15
-#ServerTimeout=15
-# The command line to start the X-server, without display number and VT spec.
-# This string is subject to word splitting.
-# Default is "/usr/X11R6/bin/X -br"
-ServerCmd=/usr/X11R6/bin/X
-# Additional arguments for the X-servers for local sessions.
-# This string is subject to word splitting.
-# Default is ""
-ServerArgsLocal=-nolisten tcp
-# Additional arguments for the X-servers for remote sessions.
-# This string is subject to word splitting.
-# Default is ""
-#ServerArgsRemote=
-# Restart instead of resetting the local X-server after session exit.
-# Use it if the server leaks memory etc.
-# Default is false
-#TerminateServer=true
-# The signal needed to reset the local X-server.
-# Default is 1 (SIGHUP)
-#ResetSignal=1
-# The signal needed to terminate the local X-server.
-# Default is 15 (SIGTERM)
-#TermSignal=15
-# Create X-authorizations for local displays.
-# Default is true
-#Authorize=false
-# Which X-authorization mechanisms should be used.
-# Default is "MIT-MAGIC-COOKIE-1"
-#AuthNames=
-# Need to reset the X-server to make it read initial Xauth file.
-# Default is false
-#ResetForAuth=true
-# See above
-AllowNullPasswd=true
-# See above
-AllowShutdown=All
-# Enable password-less logins on this display. USE WITH EXTREME CARE!
-# Default is false
-NoPassEnable=true
-# The users that do not need to provide a password to log in. NEVER list root!
-# "*" means all non-root users. @<group> means all users in that group.
-# Default is ""
-NoPassUsers=
-
-# Greeter config for local displays
-[X-:*-Greeter]
-# See above
-PreselectUser=None
-# See above
-FocusPasswd=true
-# Specify whether the greeter of local displays should start up in host chooser
-# (remote) or login (local) mode and whether it is allowed to switch to the
-# other mode.
-# "LocalOnly" - only local login possible
-# "DefaultLocal" - start up in local mode, but allow switching to remote mode
-# "DefaultRemote" - ... and the other way round
-# "RemoteOnly" - only choice of remote host possible
-# Default is LocalOnly
-LoginMode=DefaultLocal
-# A list of hosts to be automatically added to the remote login menu. The
-# special name "*" means broadcast.
-# Default is "*"
-#ChooserHosts=*,ugly,sky,dino,kiste.local,login.crap.com
-# Show the "Restart X Server"/"Close Connection" action in the greeter.
-# Default is true
-AllowClose=false
-# The user to preselect if PreselectUser=Default.
-# Default is ""
-DefaultUser=
-
-# Core config for 1st local display
-[X-:0-Core]
-# The TTY line (without /dev/) the X-server covers physically.
-# Default is ""
-ServerTTY=
-# Enable automatic login. USE WITH EXTREME CARE!
-# Default is false
-AutoLoginEnable=true
-# If true, auto-login after logout. If false, auto-login is performed only
-# when a display session starts up.
-# Default is false
-#AutoLoginAgain=true
-# The delay in seconds before automatic login kicks in.
-# Default is 0
-#AutoLoginDelay=10
-# The user to log in automatically. NEVER specify root!
-# Default is ""
-AutoLoginUser=
-# The password for the user to log in automatically. This is NOT required
-# unless the user is logged into a NIS or Kerberos domain. If you use this
-# option, you should "chmod 600 kdmrc" for obvious reasons.
-# Default is ""
-#AutoLoginPass=secret!
-# Immediately lock the automatically started session. This works only with
-# KDE sessions.
-# Default is false
-#AutoLoginLocked=true
-# See above
-ClientLogFile=.xsession-errors
-
-# Greeter config for 1st local display
-[X-:0-Greeter]
-# See above
-#PreselectUser=Default
-# See above
-#DefaultUser=johndoe
+# KDM master configuration file
+#
+# Definition: the greeter is the login dialog, i.e., the part of KDM
+# which the user sees.
+#
+# You can configure every X-display individually.
+# Every display has a display name, which consists of a host name
+# (which is empty for local displays specified in {Static|Reserve}Servers),
+# a colon, and a display number. Additionally, a display belongs to a
+# display class (which can be ignored in most cases; the control center
+# does not support this feature at all).
+# Sections with display-specific settings have the formal syntax
+# "[X-" host [":" number [ "_" class ]] "-" sub-section "]"
+# You can use the "*" wildcard for host, number, and class. You may omit
+# trailing components; they are assumed to be "*" then.
+# The host part may be a domain specification like ".inf.tu-dresden.de".
+# It may also be "+", which means non-empty, i.e. remote displays only.
+# From which section a setting is actually taken is determined by these
+# rules:
+# - an exact match takes precedence over a partial match (for the host part),
+#   which in turn takes precedence over a wildcard ("+" taking precedence
+#   over "*")
+# - precedence decreases from left to right for equally exact matches
+# Example: display name "myhost:0", class "dpy".
+# [X-myhost:0_dpy] precedes
+# [X-myhost:0_*] (same as [X-myhost:0]) precedes
+# [X-myhost:*_dpy] precedes
+# [X-myhost:*_*] (same as [X-myhost]) precedes
+# [X-+:0_dpy] precedes
+# [X-*:0_dpy] precedes
+# [X-*:0_*] (same as [X-*:0]) precedes
+# [X-*:*_*] (same as [X-*])
+# These sections do NOT match this display:
+# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]
+# If a setting is not found in any matching section, the default is used.
+#
+# Every comment applies to the following section or key. Note that all
+# comments will be lost if you change this file with the kcontrol frontend.
+# The defaults refer to KDM's built-in values, not anything set in this file.
+#
+# Special characters need to be backslash-escaped (leading and trailing
+# spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the
+# backslash itself (\\)).
+# In lists, fields are separated with commas without whitespace in between.
+# Some command strings are subject to simplified sh-style word splitting:
+# single quotes (') and double quotes (") have the usual meaning; the backslash
+# quotes everything (not only special characters). Note that the backslashes
+# need to be doubled because of the two levels of quoting.
+
+[General]
+# This option exists solely for the purpose of a clean automatic upgrade.
+# Do not even think about changing it!
+ConfigVersion=2.3
+# List of permanent displays. Displays with a hostname are foreign. A display
+# class may be specified separated by an underscore.
+# Default is ":0"
+StaticServers=:0
+# List of on-demand displays. See StaticServers for syntax.
+# Default is ""
+ReserveServers=:1,:2,:3
+# Where KDM should store its PID (do not store if empty).
+# Default is ""
+PidFile=/var/run/kdm.pid
+# Whether KDM should lock the PID file to prevent having multiple KDM
+# instances running at once. Do not change unless you are brave.
+# Default is true
+#LockPidFile=false
+# Where to store authorization files.
+# Default is "/var/run/xauth"
+#AuthDir=/tmp
+# Whether KDM should automatically re-read configuration files, if it
+# finds them having changed.
+# Default is true
+#AutoRescan=false
+# Additional environment variables KDM should pass on to all programs it runs.
+# LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
+# otherwise, it should not be necessary very often.
+# Default is ""
+#ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
+# A file KDM should read entropy from.
+# Default is "/dev/mem"
+#RandomFile=
+# A UNIX domain socket KDM should read entropy from.
+# Default is ""
+#PrngdSocket=/tmp/entropy
+# A TCP socket on localhost KDM should read entropy from.
+# Default is 0
+#PrngdPort=4840
+# A character device KDM should read entropy from.
+# Empty means use the system's preferred entropy device.
+# Default is ""
+#RandomDevice=/dev/altrandom
+# Where the command FiFos should be created; make it empty to disable
+# them.
+# Default is "/var/run/xdmctl"
+#FifoDir=/tmp
+# The group to which the global command FiFo should belong;
+# can be either a name or a numerical ID.
+# Default is 0
+#FifoGroup=xdmctl
+# The directory in which KDM should store persistent working data.
+# Default is "/var/lib/kdm"
+#DataDir=
+# The directory in which KDM should store users' .dmrc files. This is only
+# needed if the home directories are not readable before actually logging in
+# (like with AFS).
+# Default is ""
+#DmrcDir=/nfs-shared/var/dmrcs
+
+[Xdmcp]
+# Whether KDM should listen to incoming XDMCP requests.
+# Default is true
+Enable=false
+# The UDP port on which KDM should listen for XDMCP requests. Do not change.
+# Default is 177
+#Port=177
+# File with the private keys of X-terminals. Required for XDM authentication.
+# Default is ""
+#KeyFile=/usr/local/share/config/kdm/kdmkeys
+# XDMCP access control file in the usual XDM-Xaccess format.
+# Default is "/usr/local/share/config/kdm/Xaccess"
+Xaccess=/usr/local/share/config/kdm/Xaccess
+# Number of seconds to wait for display to respond after the user has
+# selected a host from the chooser.
+# Default is 15
+#ChoiceTimeout=10
+# Strip domain name from remote display names if it is equal to the local
+# domain.
+# Default is true
+#RemoveDomainname=false
+# Use the numeric IP address of the incoming connection on multihomed hosts
+# instead of the host name.
+# Default is false
+#SourceAddress=true
+# The program which is invoked to dynamically generate replies to XDMCP
+# DirectQuery or BroadcastQuery requests.
+# If empty, no program is invoked and "Willing to manage" is sent.
+# Default is ""
+Willing=/usr/local/share/config/kdm/Xwilling
+
+[Shutdown]
+# The command (subject to word splitting) to run to halt the system.
+# Default is "/sbin/shutdown -h now"
+HaltCmd=/sbin/shutdown -p now
+# The command (subject to word splitting) to run to reboot the system.
+# Default is "/sbin/shutdown -r now"
+RebootCmd=/sbin/reboot
+# Whether it is allowed to shut down the system via the global command FiFo.
+# Default is false
+#AllowFifo=true
+# Whether it is allowed to abort active sessions when shutting down the
+# system via the global command FiFo.
+# Default is true
+#AllowFifoNow=false
+# The boot manager KDM should use for offering boot options in the
+# shutdown dialog.
+# "None" - no boot manager
+# "Grub" - Grub boot manager
+# "Lilo" - Lilo boot manager (Linux on i386 &amp; x86-64 only)
+# Default is None
+#BootManager=Grub
+
+# Rough estimations about how many seconds KDM will spend at most on
+# - opening a connection to the X-server (OpenTime) if the attempt
+#   - times out: OpenTimeout
+#   - is refused: OpenRepeat * OpenDelay
+# - starting a local X-server (ServerTime):
+#   ServerAttempts * (ServerTimeout + OpenDelay)
+# - starting a display:
+#   - local display: ServerTime + OpenTime
+#   - foreign display: StartAttempts * OpenTime
+#   - XDMCP display: OpenTime (repeated indefinitely by client)
+
+# Core config for all displays
+[X-*-Core]
+# How long to wait before retrying to connect a display.
+# Default is 15
+#OpenDelay=15
+# How long to wait before timing out a display connection attempt.
+# Default is 120
+#OpenTimeout=120
+# How many connection attempts to make during a start attempt. Note that
+# a timeout aborts the entire start attempt.
+# Default is 5
+#OpenRepeat=5
+# Try at most that many times to start a display. If this fails, the display
+# is disabled.
+# Default is 4
+#StartAttempts=4
+# Ping remote display every that many minutes.
+# Default is 5
+#PingInterval=5
+# Wait for a Pong that many minutes.
+# Default is 5
+#PingTimeout=5
+# The name of this X-server's Xauth file.
+# If empty, a random name in the AuthDir directory will be used.
+# Default is ""
+#AuthFile=
+# Specify a file with X-resources for the greeter, chooser and background.
+# The KDE frontend does not use this file, so you do not need it unless you
+# use another background generator than krootimage.
+# Default is ""
+#Resources=
+# The xrdb program to use to read the above specified recources.
+# Subject to word splitting.
+# Default is "/usr/X11R6/bin/xrdb"
+#Xrdb=
+# A program to run before the greeter is shown. Can be used to start an
+# xconsole or an alternative background generator. Subject to word splitting.
+# Default is ""
+Setup=/usr/local/share/config/kdm/Xsetup
+# A program to run before a user session starts. Subject to word splitting.
+# Default is ""
+Startup=/usr/local/share/config/kdm/Xstartup
+# A program to run after a user session exits. Subject to word splitting.
+# Default is ""
+Reset=/usr/local/share/config/kdm/Xreset
+# The program which is run as the user which logs in. It is supposed to
+# interpret the session argument (see SessionsDirs) and start an appropriate
+# session according to it. Subject to word splitting.
+# Default is "/usr/X11R6/bin/xterm -ls -T"
+Session=/usr/local/share/config/kdm/Xsession
+# The program to run if Session fails.
+# Default is "/usr/X11R6/bin/xterm"
+#FailsafeClient=
+# The PATH for the Session program.
+# Default is "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games"
+#UserPath=
+# The PATH for Setup, Startup and Reset, etc.
+# Default is "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
+#SystemPath=
+# The default system shell.
+# Default is "/bin/sh"
+#SystemShell=/bin/bash
+# Where to put the user's X-server authorization file if ~/.Xauthority
+# cannot be created.
+# Default is "/tmp"
+#UserAuthDir=
+# Whether to automatically restart sessions after X-server crashes.
+# Note that enabling this makes circumventing screen lockers other than
+# KDE's built-in one possible!
+# Default is false
+AutoReLogin=false
+# Allow root logins?
+# Default is true
+AllowRootLogin=false
+# Allow to log in, when user has set an empty password?
+# Default is true
+AllowNullPasswd=false
+# Who is allowed to shut down the system. This applies both to the
+# greeter and to the command FiFo.
+# "None" - no "Shutdown..." menu entry is shown at all
+# "Root" - the root password must be entered to shut down
+# "All" - everybody can shut down the machine
+# Default is All
+AllowShutdown=Root
+# Who is allowed to abort active sessions when shutting down.
+# "None" - no forced shutdown is allowed at all
+# "Root" - the root password must be entered to shut down forcibly
+# "All" - everybody can shut down the machine forcibly
+# Default is All
+#AllowSdForceNow=Root
+# The default choice for the shutdown condition/timing.
+# "Schedule" - shut down after all active sessions exit (possibly at once)
+# "TryNow" - shut down, if no active sessions are open; otherwise, do nothing
+# "ForceNow" - shut down unconditionally
+# Default is Schedule
+#DefaultSdMode=ForceNow
+# How to offer shutdown scheduling options:
+# "Never" - not at all
+# "Optional" - as a button in the simple shutdown dialogs
+# "Always" - instead of the simple shutdown dialogs
+# Default is Never
+#ScheduledSd=Optional
+# The directories containing session type definitions in .desktop format.
+# Default is "/usr/local/share/apps/kdm/sessions"
+#SessionsDirs=/etc/X11/sessions,/usr/share/xsessions
+# The file (relative to $HOME) to redirect the session output to. This is
+# a printf format string; one %s will be replaced with the display name.
+# Default is ".xsession-errors"
+ClientLogFile=.xsession-errors-%s
+# Whether KDM's built-in utmp/wtmp/lastlog registration should be used.
+# Default is true
+#UseSessReg=false
+
+# Greeter config for all displays
+[X-*-Greeter]
+# Widget style of the greeter. "" means the built-in default which currently
+# is "Plastik".
+# Default is ""
+GUIStyle=Plastik
+# Widget color scheme of the greeter. "" means the built-in default which
+# currently is yellowish grey with some light blue and yellow elements.
+# Default is ""
+ColorScheme=Plastik
+# What should be shown in the greeter's logo are:
+# "None" - nothing
+# "Logo" - the image specified by LogoPixmap
+# "Clock" - a neat analog clock
+# Default is Clock
+LogoArea=None
+# The image to show when LogoArea=Logo.
+# Default is ""
+LogoPixmap=
+# The relative coordinates (X,Y in percent) of the center of the greeter.
+# Default is "50,50"
+GreeterPos=50,50
+# The screen the greeter should be displayed on in multi-headed and Xinerama
+# setups. The numbering starts with 0. For Xinerama, it corresponds to the
+# listing order in the active ServerLayout section of XF86Config; -1 means
+# to use the upper-left screen, -2 means to use the upper-right screen.
+# Default is 0
+#GreeterScreen=-1
+# The headline in the greeter. The following character pairs are replaced:
+# - %d -> current display
+# - %h -> host name, possibly with domain name
+# - %n -> node name, most probably the host name without domain name
+# - %s -> the operating system
+# - %r -> the operating system's version
+# - %m -> the machine (hardware) type
+# - %% -> a single %
+# Default is "Welcome to %s at %n"
+GreetString=
+# Whether the fonts used in the greeter should be antialiased.
+# Default is false
+AntiAliasing=true
+# The font for the greeter headline.
+# Default is "Serif,20,bold"
+GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0
+# The normal font used in the greeter.
+# Default is "Sans Serif,10"
+StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0
+# The font used for the "Login Failed" message.
+# Default is "Sans Serif,10,bold"
+FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0
+# What to do with the Num Lock modifier for the time the greeter is running:
+# "Off" - turn off
+# "On" - turn on
+# "Keep" - do not change the state
+# Default is Keep
+#NumLock=Off
+# Language and locale to use in the greeter, encoded like $LC_LANG.
+# Default is "en_US"
+Language=en_US
+# Enable autocompletion in the username line edit.
+# Default is false
+UserCompletion=false
+# Enable user list (names along with images) in the greeter.
+# Default is true
+UserList=true
+# User selection for UserCompletion and UserList:
+# "NotHidden" - all users except those listed in HiddenUsers
+# "Selected" - only the users listed in SelectedUsers
+# Default is NotHidden
+ShowUsers=NotHidden
+# For ShowUsers=Selected. @<group> means all users in that group.
+# Default is ""
+SelectedUsers=
+# For ShowUsers=NotHidden. @<group> means all users in that group.
+# Default is ""
+HiddenUsers=
+# Special case of HiddenUsers: users with a non-zero UID less than this number
+# will not be shown as well.
+# Default is 0
+MinShowUID=1000
+# Complement to MinShowUID: users with a UID greater than this number will
+# not be shown as well.
+# Default is 65535
+MaxShowUID=65000
+# If false, the users are listed in the order they appear in /etc/passwd.
+# If true, they are sorted alphabetically.
+# Default is true
+SortUsers=true
+# Specify, where the users' pictures should be taken from.
+# "AdminOnly" - from <FaceDir>/$USER.face[.icon]
+# "PreferAdmin" - prefer <FaceDir>, fallback on $HOME
+# "PreferUser" - ... and the other way round
+# "UserOnly" - from the user's $HOME/.face[.icon]
+# Default is AdminOnly
+FaceSource=PreferAdmin
+# The directory containing the user images if FaceSource is not UserOnly.
+# Default is "/usr/local/share/apps/kdm/faces"
+#FaceDir=/usr/share/faces
+# Specify, if/which user should be preselected for log in.
+# "None" - do not preselect any user
+# "Previous" - the user which successfully logged in last time
+# "Default" - the user specified in the DefaultUser option
+# Default is None
+#PreselectUser=Previous
+# If this is true, the password input line is focused automatically if
+# a user is preselected.
+# Default is false
+#FocusPasswd=true
+# The password input fields cloak the typed in text. Specify, how to do it:
+# "OneStar" - <literal>*</literal> is shown for every typed letter
+# "ThreeStars" - <literal>***</literal> is shown for every typed letter
+# "NoEcho" - nothing is shown at all, the cursor does not move
+# Default is OneStar
+EchoMode=OneStar
+# If true, krootimage will be automatically started by KDM; otherwise, the
+# Setup script should be used to setup the background.
+# Default is true
+UseBackground=true
+# The configuration file to be used by krootimage.
+# Default is "/usr/local/share/config/kdm/backgroundrc"
+BackgroundCfg=/usr/local/share/config/kdm/backgroundrc
+# Hold the X-server grabbed the whole time the greeter is visible. This
+# may be more secure, but it will disable any background and other
+# X-clients started from the Setup script.
+# Default is false
+#GrabServer=true
+# How many seconds to wait for grab to succeed.
+# Default is 3
+#GrabTimeout=3
+# Warn, if display has no X-authorization (local auth cannot be created,
+# XDMCP display wants no auth, or display is foreign from StaticServers).
+# Default is true
+#AuthComplain=false
+# Random seed for forging saved session types, etc. of unknown users.
+# This value should be random but constant across the login domain.
+# Default is 0
+ForgingSeed=1113045471
+# Specify conversation plugins for the login dialog. Each plugin can be
+# specified as a base name (which expands to $kde_modulesdir/kgreet_$base)
+# or as a full pathname.
+# Default is "classic"
+#PluginsLogin=sign
+# Same as PluginsLogin, but for the shutdown dialog.
+# Default is "classic"
+#PluginsShutdown=modern
+# A list of options of the form Key=Value. The conversation plugins can query
+# these settings; it is up to them what possible keys are.
+# Default is ""
+#PluginOptions=SomeKey=randomvalue,Foo=bar
+# Show the "Console Login" action in the greeter (if ServerTTY/ConsoleTTYs
+# is configured).
+# Default is true
+#AllowConsole=false
+# A program to run while the greeter is visible. It is supposed to preload
+# as much as possible of the session that is going to be started (most
+# probably).
+# Default is ""
+Preloader=/usr/local/bin/preloadkde
+# Whether the greeter should be themed.
+# Default is false
+#UseTheme=true
+# The theme to use for the greeter. Can point to either a directory or an XML
+# file.
+# Default is ""
+Theme=/usr/local/share/apps/kdm/themes/circles
+
+# Core config for local displays
+[X-:*-Core]
+# How often to try to run the X-server. Running includes executing it and
+# waiting for it to come up.
+# Default is 1
+#ServerAttempts=1
+# How long to wait for a local X-server to come up.
+# Default is 15
+#ServerTimeout=15
+# The command line to start the X-server, without display number and VT spec.
+# This string is subject to word splitting.
+# Default is "/usr/X11R6/bin/X -br"
+ServerCmd=/usr/X11R6/bin/X
+# Additional arguments for the X-servers for local sessions.
+# This string is subject to word splitting.
+# Default is ""
+ServerArgsLocal=-nolisten tcp
+# Additional arguments for the X-servers for remote sessions.
+# This string is subject to word splitting.
+# Default is ""
+#ServerArgsRemote=
+# Restart instead of resetting the local X-server after session exit.
+# Use it if the server leaks memory etc.
+# Default is false
+#TerminateServer=true
+# The signal needed to reset the local X-server.
+# Default is 1 (SIGHUP)
+#ResetSignal=1
+# The signal needed to terminate the local X-server.
+# Default is 15 (SIGTERM)
+#TermSignal=15
+# Create X-authorizations for local displays.
+# Default is true
+#Authorize=false
+# Which X-authorization mechanisms should be used.
+# Default is "MIT-MAGIC-COOKIE-1"
+#AuthNames=
+# Need to reset the X-server to make it read initial Xauth file.
+# Default is false
+#ResetForAuth=true
+# See above
+AllowNullPasswd=true
+# See above
+AllowShutdown=All
+# Enable password-less logins on this display. USE WITH EXTREME CARE!
+# Default is false
+NoPassEnable=true
+# The users that do not need to provide a password to log in. NEVER list root!
+# "*" means all non-root users. @<group> means all users in that group.
+# Default is ""
+NoPassUsers=
+
+# Greeter config for local displays
+[X-:*-Greeter]
+# See above
+PreselectUser=None
+# See above
+FocusPasswd=true
+# Specify whether the greeter of local displays should start up in host chooser
+# (remote) or login (local) mode and whether it is allowed to switch to the
+# other mode.
+# "LocalOnly" - only local login possible
+# "DefaultLocal" - start up in local mode, but allow switching to remote mode
+# "DefaultRemote" - ... and the other way round
+# "RemoteOnly" - only choice of remote host possible
+# Default is LocalOnly
+LoginMode=DefaultLocal
+# A list of hosts to be automatically added to the remote login menu. The
+# special name "*" means broadcast.
+# Default is "*"
+#ChooserHosts=*,ugly,sky,dino,kiste.local,login.crap.com
+# Show the "Restart X Server"/"Close Connection" action in the greeter.
+# Default is true
+AllowClose=false
+# The user to preselect if PreselectUser=Default.
+# Default is ""
+DefaultUser=
+
+# Core config for 1st local display
+[X-:0-Core]
+# The TTY line (without /dev/) the X-server covers physically.
+# Default is ""
+ServerTTY=
+# Enable automatic login. USE WITH EXTREME CARE!
+# Default is false
+AutoLoginEnable=true
+# If true, auto-login after logout. If false, auto-login is performed only
+# when a display session starts up.
+# Default is false
+#AutoLoginAgain=true
+# The delay in seconds before automatic login kicks in.
+# Default is 0
+#AutoLoginDelay=10
+# The user to log in automatically. NEVER specify root!
+# Default is ""
+AutoLoginUser=
+# The password for the user to log in automatically. This is NOT required
+# unless the user is logged into a NIS or Kerberos domain. If you use this
+# option, you should "chmod 600 kdmrc" for obvious reasons.
+# Default is ""
+#AutoLoginPass=secret!
+# Immediately lock the automatically started session. This works only with
+# KDE sessions.
+# Default is false
+#AutoLoginLocked=true
+# See above
+ClientLogFile=.xsession-errors
+
+# Greeter config for 1st local display
+[X-:0-Greeter]
+# See above
+#PreselectUser=Default
+# See above
+#DefaultUser=johndoe

Modified: pcbsd/trunk/system-overlay/usr/local/share/config/kdm/kdmrc-asian
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/share/config/kdm/kdmrc-asian	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/share/config/kdm/kdmrc-asian	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,566 +1,566 @@
-# KDM master configuration file
-#
-# Definition: the greeter is the login dialog, i.e., the part of KDM
-# which the user sees.
-#
-# You can configure every X-display individually.
-# Every display has a display name, which consists of a host name
-# (which is empty for local displays specified in {Static|Reserve}Servers),
-# a colon, and a display number. Additionally, a display belongs to a
-# display class (which can be ignored in most cases; the control center
-# does not support this feature at all).
-# Sections with display-specific settings have the formal syntax
-# "[X-" host [":" number [ "_" class ]] "-" sub-section "]"
-# You can use the "*" wildcard for host, number, and class. You may omit
-# trailing components; they are assumed to be "*" then.
-# The host part may be a domain specification like ".inf.tu-dresden.de".
-# It may also be "+", which means non-empty, i.e. remote displays only.
-# From which section a setting is actually taken is determined by these
-# rules:
-# - an exact match takes precedence over a partial match (for the host part),
-#   which in turn takes precedence over a wildcard ("+" taking precedence
-#   over "*")
-# - precedence decreases from left to right for equally exact matches
-# Example: display name "myhost:0", class "dpy".
-# [X-myhost:0_dpy] precedes
-# [X-myhost:0_*] (same as [X-myhost:0]) precedes
-# [X-myhost:*_dpy] precedes
-# [X-myhost:*_*] (same as [X-myhost]) precedes
-# [X-+:0_dpy] precedes
-# [X-*:0_dpy] precedes
-# [X-*:0_*] (same as [X-*:0]) precedes
-# [X-*:*_*] (same as [X-*])
-# These sections do NOT match this display:
-# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]
-# If a setting is not found in any matching section, the default is used.
-#
-# Every comment applies to the following section or key. Note that all
-# comments will be lost if you change this file with the kcontrol frontend.
-# The defaults refer to KDM's built-in values, not anything set in this file.
-#
-# Special characters need to be backslash-escaped (leading and trailing
-# spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the
-# backslash itself (\\)).
-# In lists, fields are separated with commas without whitespace in between.
-# Some command strings are subject to simplified sh-style word splitting:
-# single quotes (') and double quotes (") have the usual meaning; the backslash
-# quotes everything (not only special characters). Note that the backslashes
-# need to be doubled because of the two levels of quoting.
-
-[General]
-# This option exists solely for the purpose of a clean automatic upgrade.
-# Do not even think about changing it!
-ConfigVersion=2.3
-# List of permanent displays. Displays with a hostname are foreign. A display
-# class may be specified separated by an underscore.
-# Default is ":0"
-StaticServers=:0
-# List of on-demand displays. See StaticServers for syntax.
-# Default is ""
-ReserveServers=:1,:2,:3
-# Where KDM should store its PID (do not store if empty).
-# Default is ""
-PidFile=/var/run/kdm.pid
-# Whether KDM should lock the PID file to prevent having multiple KDM
-# instances running at once. Do not change unless you are brave.
-# Default is true
-#LockPidFile=false
-# Where to store authorization files.
-# Default is "/var/run/xauth"
-#AuthDir=/tmp
-# Whether KDM should automatically re-read configuration files, if it
-# finds them having changed.
-# Default is true
-#AutoRescan=false
-# Additional environment variables KDM should pass on to all programs it runs.
-# LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
-# otherwise, it should not be necessary very often.
-# Default is ""
-#ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
-# A file KDM should read entropy from.
-# Default is "/dev/mem"
-#RandomFile=
-# A UNIX domain socket KDM should read entropy from.
-# Default is ""
-#PrngdSocket=/tmp/entropy
-# A TCP socket on localhost KDM should read entropy from.
-# Default is 0
-#PrngdPort=4840
-# A character device KDM should read entropy from.
-# Empty means use the system's preferred entropy device.
-# Default is ""
-#RandomDevice=/dev/altrandom
-# Where the command FiFos should be created; make it empty to disable
-# them.
-# Default is "/var/run/xdmctl"
-#FifoDir=/tmp
-# The group to which the global command FiFo should belong;
-# can be either a name or a numerical ID.
-# Default is 0
-#FifoGroup=xdmctl
-# The directory in which KDM should store persistent working data.
-# Default is "/var/lib/kdm"
-#DataDir=
-# The directory in which KDM should store users' .dmrc files. This is only
-# needed if the home directories are not readable before actually logging in
-# (like with AFS).
-# Default is ""
-#DmrcDir=/nfs-shared/var/dmrcs
-
-[Xdmcp]
-# Whether KDM should listen to incoming XDMCP requests.
-# Default is true
-Enable=false
-# The UDP port on which KDM should listen for XDMCP requests. Do not change.
-# Default is 177
-#Port=177
-# File with the private keys of X-terminals. Required for XDM authentication.
-# Default is ""
-#KeyFile=/usr/local/share/config/kdm/kdmkeys
-# XDMCP access control file in the usual XDM-Xaccess format.
-# Default is "/usr/local/share/config/kdm/Xaccess"
-Xaccess=/usr/local/share/config/kdm/Xaccess
-# Number of seconds to wait for display to respond after the user has
-# selected a host from the chooser.
-# Default is 15
-#ChoiceTimeout=10
-# Strip domain name from remote display names if it is equal to the local
-# domain.
-# Default is true
-#RemoveDomainname=false
-# Use the numeric IP address of the incoming connection on multihomed hosts
-# instead of the host name.
-# Default is false
-#SourceAddress=true
-# The program which is invoked to dynamically generate replies to XDMCP
-# DirectQuery or BroadcastQuery requests.
-# If empty, no program is invoked and "Willing to manage" is sent.
-# Default is ""
-Willing=/usr/local/share/config/kdm/Xwilling
-
-[Shutdown]
-# The command (subject to word splitting) to run to halt the system.
-# Default is "/sbin/shutdown -h now"
-HaltCmd=/sbin/shutdown -p now
-# The command (subject to word splitting) to run to reboot the system.
-# Default is "/sbin/shutdown -r now"
-RebootCmd=/sbin/reboot
-# Whether it is allowed to shut down the system via the global command FiFo.
-# Default is false
-#AllowFifo=true
-# Whether it is allowed to abort active sessions when shutting down the
-# system via the global command FiFo.
-# Default is true
-#AllowFifoNow=false
-# The boot manager KDM should use for offering boot options in the
-# shutdown dialog.
-# "None" - no boot manager
-# "Grub" - Grub boot manager
-# "Lilo" - Lilo boot manager (Linux on i386 &amp; x86-64 only)
-# Default is None
-#BootManager=Grub
-
-# Rough estimations about how many seconds KDM will spend at most on
-# - opening a connection to the X-server (OpenTime) if the attempt
-#   - times out: OpenTimeout
-#   - is refused: OpenRepeat * OpenDelay
-# - starting a local X-server (ServerTime):
-#   ServerAttempts * (ServerTimeout + OpenDelay)
-# - starting a display:
-#   - local display: ServerTime + OpenTime
-#   - foreign display: StartAttempts * OpenTime
-#   - XDMCP display: OpenTime (repeated indefinitely by client)
-
-# Core config for all displays
-[X-*-Core]
-# How long to wait before retrying to connect a display.
-# Default is 15
-#OpenDelay=15
-# How long to wait before timing out a display connection attempt.
-# Default is 120
-#OpenTimeout=120
-# How many connection attempts to make during a start attempt. Note that
-# a timeout aborts the entire start attempt.
-# Default is 5
-#OpenRepeat=5
-# Try at most that many times to start a display. If this fails, the display
-# is disabled.
-# Default is 4
-#StartAttempts=4
-# Ping remote display every that many minutes.
-# Default is 5
-#PingInterval=5
-# Wait for a Pong that many minutes.
-# Default is 5
-#PingTimeout=5
-# The name of this X-server's Xauth file.
-# If empty, a random name in the AuthDir directory will be used.
-# Default is ""
-#AuthFile=
-# Specify a file with X-resources for the greeter, chooser and background.
-# The KDE frontend does not use this file, so you do not need it unless you
-# use another background generator than krootimage.
-# Default is ""
-#Resources=
-# The xrdb program to use to read the above specified recources.
-# Subject to word splitting.
-# Default is "/usr/X11R6/bin/xrdb"
-#Xrdb=
-# A program to run before the greeter is shown. Can be used to start an
-# xconsole or an alternative background generator. Subject to word splitting.
-# Default is ""
-Setup=/usr/local/share/config/kdm/Xsetup
-# A program to run before a user session starts. Subject to word splitting.
-# Default is ""
-Startup=/usr/local/share/config/kdm/Xstartup
-# A program to run after a user session exits. Subject to word splitting.
-# Default is ""
-Reset=/usr/local/share/config/kdm/Xreset
-# The program which is run as the user which logs in. It is supposed to
-# interpret the session argument (see SessionsDirs) and start an appropriate
-# session according to it. Subject to word splitting.
-# Default is "/usr/X11R6/bin/xterm -ls -T"
-Session=/usr/local/share/config/kdm/Xsession
-# The program to run if Session fails.
-# Default is "/usr/X11R6/bin/xterm"
-#FailsafeClient=
-# The PATH for the Session program.
-# Default is "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games"
-#UserPath=
-# The PATH for Setup, Startup and Reset, etc.
-# Default is "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
-#SystemPath=
-# The default system shell.
-# Default is "/bin/sh"
-#SystemShell=/bin/bash
-# Where to put the user's X-server authorization file if ~/.Xauthority
-# cannot be created.
-# Default is "/tmp"
-#UserAuthDir=
-# Whether to automatically restart sessions after X-server crashes.
-# Note that enabling this makes circumventing screen lockers other than
-# KDE's built-in one possible!
-# Default is false
-AutoReLogin=false
-# Allow root logins?
-# Default is true
-AllowRootLogin=true
-# Allow to log in, when user has set an empty password?
-# Default is true
-AllowNullPasswd=false
-# Who is allowed to shut down the system. This applies both to the
-# greeter and to the command FiFo.
-# "None" - no "Shutdown..." menu entry is shown at all
-# "Root" - the root password must be entered to shut down
-# "All" - everybody can shut down the machine
-# Default is All
-AllowShutdown=Root
-# Who is allowed to abort active sessions when shutting down.
-# "None" - no forced shutdown is allowed at all
-# "Root" - the root password must be entered to shut down forcibly
-# "All" - everybody can shut down the machine forcibly
-# Default is All
-#AllowSdForceNow=Root
-# The default choice for the shutdown condition/timing.
-# "Schedule" - shut down after all active sessions exit (possibly at once)
-# "TryNow" - shut down, if no active sessions are open; otherwise, do nothing
-# "ForceNow" - shut down unconditionally
-# Default is Schedule
-#DefaultSdMode=ForceNow
-# How to offer shutdown scheduling options:
-# "Never" - not at all
-# "Optional" - as a button in the simple shutdown dialogs
-# "Always" - instead of the simple shutdown dialogs
-# Default is Never
-#ScheduledSd=Optional
-# The directories containing session type definitions in .desktop format.
-# Default is "/usr/local/share/apps/kdm/sessions"
-#SessionsDirs=/etc/X11/sessions,/usr/share/xsessions
-# The file (relative to $HOME) to redirect the session output to. This is
-# a printf format string; one %s will be replaced with the display name.
-# Default is ".xsession-errors"
-ClientLogFile=.xsession-errors-%s
-# Whether KDM's built-in utmp/wtmp/lastlog registration should be used.
-# Default is true
-#UseSessReg=false
-
-# Greeter config for all displays
-[X-*-Greeter]
-# Widget style of the greeter. "" means the built-in default which currently
-# is "Plastik".
-# Default is ""
-GUIStyle=Plastik
-# Widget color scheme of the greeter. "" means the built-in default which
-# currently is yellowish grey with some light blue and yellow elements.
-# Default is ""
-ColorScheme=Plastik
-# What should be shown in the greeter's logo are:
-# "None" - nothing
-# "Logo" - the image specified by LogoPixmap
-# "Clock" - a neat analog clock
-# Default is Clock
-LogoArea=None
-# The image to show when LogoArea=Logo.
-# Default is ""
-LogoPixmap=
-# The relative coordinates (X,Y in percent) of the center of the greeter.
-# Default is "50,50"
-GreeterPos=50,50
-# The screen the greeter should be displayed on in multi-headed and Xinerama
-# setups. The numbering starts with 0. For Xinerama, it corresponds to the
-# listing order in the active ServerLayout section of XF86Config; -1 means
-# to use the upper-left screen, -2 means to use the upper-right screen.
-# Default is 0
-#GreeterScreen=-1
-# The headline in the greeter. The following character pairs are replaced:
-# - %d -> current display
-# - %h -> host name, possibly with domain name
-# - %n -> node name, most probably the host name without domain name
-# - %s -> the operating system
-# - %r -> the operating system's version
-# - %m -> the machine (hardware) type
-# - %% -> a single %
-# Default is "Welcome to %s at %n"
-GreetString=
-# Whether the fonts used in the greeter should be antialiased.
-# Default is false
-AntiAliasing=true
-# The font for the greeter headline.
-# Default is "Serif,20,bold"
-GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0
-# The normal font used in the greeter.
-# Default is "Sans Serif,10"
-StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0
-# The font used for the "Login Failed" message.
-# Default is "Sans Serif,10,bold"
-FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0
-# What to do with the Num Lock modifier for the time the greeter is running:
-# "Off" - turn off
-# "On" - turn on
-# "Keep" - do not change the state
-# Default is Keep
-#NumLock=Off
-# Language and locale to use in the greeter, encoded like $LC_LANG.
-# Default is "en_US"
-Language=en_US
-# Enable autocompletion in the username line edit.
-# Default is false
-UserCompletion=false
-# Enable user list (names along with images) in the greeter.
-# Default is true
-UserList=true
-# User selection for UserCompletion and UserList:
-# "NotHidden" - all users except those listed in HiddenUsers
-# "Selected" - only the users listed in SelectedUsers
-# Default is NotHidden
-ShowUsers=NotHidden
-# For ShowUsers=Selected. @<group> means all users in that group.
-# Default is ""
-SelectedUsers=
-# For ShowUsers=NotHidden. @<group> means all users in that group.
-# Default is ""
-HiddenUsers=
-# Special case of HiddenUsers: users with a non-zero UID less than this number
-# will not be shown as well.
-# Default is 0
-MinShowUID=1000
-# Complement to MinShowUID: users with a UID greater than this number will
-# not be shown as well.
-# Default is 65535
-MaxShowUID=65000
-# If false, the users are listed in the order they appear in /etc/passwd.
-# If true, they are sorted alphabetically.
-# Default is true
-SortUsers=true
-# Specify, where the users' pictures should be taken from.
-# "AdminOnly" - from <FaceDir>/$USER.face[.icon]
-# "PreferAdmin" - prefer <FaceDir>, fallback on $HOME
-# "PreferUser" - ... and the other way round
-# "UserOnly" - from the user's $HOME/.face[.icon]
-# Default is AdminOnly
-FaceSource=PreferAdmin
-# The directory containing the user images if FaceSource is not UserOnly.
-# Default is "/usr/local/share/apps/kdm/faces"
-#FaceDir=/usr/share/faces
-# Specify, if/which user should be preselected for log in.
-# "None" - do not preselect any user
-# "Previous" - the user which successfully logged in last time
-# "Default" - the user specified in the DefaultUser option
-# Default is None
-#PreselectUser=Previous
-# If this is true, the password input line is focused automatically if
-# a user is preselected.
-# Default is false
-#FocusPasswd=true
-# The password input fields cloak the typed in text. Specify, how to do it:
-# "OneStar" - <literal>*</literal> is shown for every typed letter
-# "ThreeStars" - <literal>***</literal> is shown for every typed letter
-# "NoEcho" - nothing is shown at all, the cursor does not move
-# Default is OneStar
-EchoMode=OneStar
-# If true, krootimage will be automatically started by KDM; otherwise, the
-# Setup script should be used to setup the background.
-# Default is true
-UseBackground=true
-# The configuration file to be used by krootimage.
-# Default is "/usr/local/share/config/kdm/backgroundrc"
-BackgroundCfg=/usr/local/share/config/kdm/backgroundrc
-# Hold the X-server grabbed the whole time the greeter is visible. This
-# may be more secure, but it will disable any background and other
-# X-clients started from the Setup script.
-# Default is false
-#GrabServer=true
-# How many seconds to wait for grab to succeed.
-# Default is 3
-#GrabTimeout=3
-# Warn, if display has no X-authorization (local auth cannot be created,
-# XDMCP display wants no auth, or display is foreign from StaticServers).
-# Default is true
-#AuthComplain=false
-# Random seed for forging saved session types, etc. of unknown users.
-# This value should be random but constant across the login domain.
-# Default is 0
-ForgingSeed=1113045471
-# Specify conversation plugins for the login dialog. Each plugin can be
-# specified as a base name (which expands to $kde_modulesdir/kgreet_$base)
-# or as a full pathname.
-# Default is "classic"
-#PluginsLogin=sign
-# Same as PluginsLogin, but for the shutdown dialog.
-# Default is "classic"
-#PluginsShutdown=modern
-# A list of options of the form Key=Value. The conversation plugins can query
-# these settings; it is up to them what possible keys are.
-# Default is ""
-#PluginOptions=SomeKey=randomvalue,Foo=bar
-# Show the "Console Login" action in the greeter (if ServerTTY/ConsoleTTYs
-# is configured).
-# Default is true
-#AllowConsole=false
-# A program to run while the greeter is visible. It is supposed to preload
-# as much as possible of the session that is going to be started (most
-# probably).
-# Default is ""
-Preloader=/usr/local/bin/preloadkde
-# Whether the greeter should be themed.
-# Default is false
-#UseTheme=true
-# The theme to use for the greeter. Can point to either a directory or an XML
-# file.
-# Default is ""
-Theme=/usr/local/share/apps/kdm/themes/circles
-
-# Core config for local displays
-[X-:*-Core]
-# How often to try to run the X-server. Running includes executing it and
-# waiting for it to come up.
-# Default is 1
-#ServerAttempts=1
-# How long to wait for a local X-server to come up.
-# Default is 15
-#ServerTimeout=15
-# The command line to start the X-server, without display number and VT spec.
-# This string is subject to word splitting.
-# Default is "/usr/X11R6/bin/X -br"
-ServerCmd=/usr/X11R6/bin/X
-# Additional arguments for the X-servers for local sessions.
-# This string is subject to word splitting.
-# Default is ""
-ServerArgsLocal=-nolisten tcp
-# Additional arguments for the X-servers for remote sessions.
-# This string is subject to word splitting.
-# Default is ""
-#ServerArgsRemote=
-# Restart instead of resetting the local X-server after session exit.
-# Use it if the server leaks memory etc.
-# Default is false
-#TerminateServer=true
-# The signal needed to reset the local X-server.
-# Default is 1 (SIGHUP)
-#ResetSignal=1
-# The signal needed to terminate the local X-server.
-# Default is 15 (SIGTERM)
-#TermSignal=15
-# Create X-authorizations for local displays.
-# Default is true
-#Authorize=false
-# Which X-authorization mechanisms should be used.
-# Default is "MIT-MAGIC-COOKIE-1"
-#AuthNames=
-# Need to reset the X-server to make it read initial Xauth file.
-# Default is false
-#ResetForAuth=true
-# See above
-AllowNullPasswd=true
-# See above
-AllowShutdown=All
-# Enable password-less logins on this display. USE WITH EXTREME CARE!
-# Default is false
-NoPassEnable=true
-# The users that do not need to provide a password to log in. NEVER list root!
-# "*" means all non-root users. @<group> means all users in that group.
-# Default is ""
-NoPassUsers=
-
-# Greeter config for local displays
-[X-:*-Greeter]
-# See above
-PreselectUser=None
-# See above
-FocusPasswd=true
-# Specify whether the greeter of local displays should start up in host chooser
-# (remote) or login (local) mode and whether it is allowed to switch to the
-# other mode.
-# "LocalOnly" - only local login possible
-# "DefaultLocal" - start up in local mode, but allow switching to remote mode
-# "DefaultRemote" - ... and the other way round
-# "RemoteOnly" - only choice of remote host possible
-# Default is LocalOnly
-LoginMode=DefaultLocal
-# A list of hosts to be automatically added to the remote login menu. The
-# special name "*" means broadcast.
-# Default is "*"
-#ChooserHosts=*,ugly,sky,dino,kiste.local,login.crap.com
-# Show the "Restart X Server"/"Close Connection" action in the greeter.
-# Default is true
-AllowClose=false
-# The user to preselect if PreselectUser=Default.
-# Default is ""
-DefaultUser=
-
-# Core config for 1st local display
-[X-:0-Core]
-# The TTY line (without /dev/) the X-server covers physically.
-# Default is ""
-ServerTTY=
-# Enable automatic login. USE WITH EXTREME CARE!
-# Default is false
-AutoLoginEnable=true
-# If true, auto-login after logout. If false, auto-login is performed only
-# when a display session starts up.
-# Default is false
-#AutoLoginAgain=true
-# The delay in seconds before automatic login kicks in.
-# Default is 0
-#AutoLoginDelay=10
-# The user to log in automatically. NEVER specify root!
-# Default is ""
-AutoLoginUser=
-# The password for the user to log in automatically. This is NOT required
-# unless the user is logged into a NIS or Kerberos domain. If you use this
-# option, you should "chmod 600 kdmrc" for obvious reasons.
-# Default is ""
-#AutoLoginPass=secret!
-# Immediately lock the automatically started session. This works only with
-# KDE sessions.
-# Default is false
-#AutoLoginLocked=true
-# See above
-ClientLogFile=.xsession-errors
-
-# Greeter config for 1st local display
-[X-:0-Greeter]
-# See above
-#PreselectUser=Default
-# See above
-#DefaultUser=johndoe
+# KDM master configuration file
+#
+# Definition: the greeter is the login dialog, i.e., the part of KDM
+# which the user sees.
+#
+# You can configure every X-display individually.
+# Every display has a display name, which consists of a host name
+# (which is empty for local displays specified in {Static|Reserve}Servers),
+# a colon, and a display number. Additionally, a display belongs to a
+# display class (which can be ignored in most cases; the control center
+# does not support this feature at all).
+# Sections with display-specific settings have the formal syntax
+# "[X-" host [":" number [ "_" class ]] "-" sub-section "]"
+# You can use the "*" wildcard for host, number, and class. You may omit
+# trailing components; they are assumed to be "*" then.
+# The host part may be a domain specification like ".inf.tu-dresden.de".
+# It may also be "+", which means non-empty, i.e. remote displays only.
+# From which section a setting is actually taken is determined by these
+# rules:
+# - an exact match takes precedence over a partial match (for the host part),
+#   which in turn takes precedence over a wildcard ("+" taking precedence
+#   over "*")
+# - precedence decreases from left to right for equally exact matches
+# Example: display name "myhost:0", class "dpy".
+# [X-myhost:0_dpy] precedes
+# [X-myhost:0_*] (same as [X-myhost:0]) precedes
+# [X-myhost:*_dpy] precedes
+# [X-myhost:*_*] (same as [X-myhost]) precedes
+# [X-+:0_dpy] precedes
+# [X-*:0_dpy] precedes
+# [X-*:0_*] (same as [X-*:0]) precedes
+# [X-*:*_*] (same as [X-*])
+# These sections do NOT match this display:
+# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]
+# If a setting is not found in any matching section, the default is used.
+#
+# Every comment applies to the following section or key. Note that all
+# comments will be lost if you change this file with the kcontrol frontend.
+# The defaults refer to KDM's built-in values, not anything set in this file.
+#
+# Special characters need to be backslash-escaped (leading and trailing
+# spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the
+# backslash itself (\\)).
+# In lists, fields are separated with commas without whitespace in between.
+# Some command strings are subject to simplified sh-style word splitting:
+# single quotes (') and double quotes (") have the usual meaning; the backslash
+# quotes everything (not only special characters). Note that the backslashes
+# need to be doubled because of the two levels of quoting.
+
+[General]
+# This option exists solely for the purpose of a clean automatic upgrade.
+# Do not even think about changing it!
+ConfigVersion=2.3
+# List of permanent displays. Displays with a hostname are foreign. A display
+# class may be specified separated by an underscore.
+# Default is ":0"
+StaticServers=:0
+# List of on-demand displays. See StaticServers for syntax.
+# Default is ""
+ReserveServers=:1,:2,:3
+# Where KDM should store its PID (do not store if empty).
+# Default is ""
+PidFile=/var/run/kdm.pid
+# Whether KDM should lock the PID file to prevent having multiple KDM
+# instances running at once. Do not change unless you are brave.
+# Default is true
+#LockPidFile=false
+# Where to store authorization files.
+# Default is "/var/run/xauth"
+#AuthDir=/tmp
+# Whether KDM should automatically re-read configuration files, if it
+# finds them having changed.
+# Default is true
+#AutoRescan=false
+# Additional environment variables KDM should pass on to all programs it runs.
+# LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
+# otherwise, it should not be necessary very often.
+# Default is ""
+#ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
+# A file KDM should read entropy from.
+# Default is "/dev/mem"
+#RandomFile=
+# A UNIX domain socket KDM should read entropy from.
+# Default is ""
+#PrngdSocket=/tmp/entropy
+# A TCP socket on localhost KDM should read entropy from.
+# Default is 0
+#PrngdPort=4840
+# A character device KDM should read entropy from.
+# Empty means use the system's preferred entropy device.
+# Default is ""
+#RandomDevice=/dev/altrandom
+# Where the command FiFos should be created; make it empty to disable
+# them.
+# Default is "/var/run/xdmctl"
+#FifoDir=/tmp
+# The group to which the global command FiFo should belong;
+# can be either a name or a numerical ID.
+# Default is 0
+#FifoGroup=xdmctl
+# The directory in which KDM should store persistent working data.
+# Default is "/var/lib/kdm"
+#DataDir=
+# The directory in which KDM should store users' .dmrc files. This is only
+# needed if the home directories are not readable before actually logging in
+# (like with AFS).
+# Default is ""
+#DmrcDir=/nfs-shared/var/dmrcs
+
+[Xdmcp]
+# Whether KDM should listen to incoming XDMCP requests.
+# Default is true
+Enable=false
+# The UDP port on which KDM should listen for XDMCP requests. Do not change.
+# Default is 177
+#Port=177
+# File with the private keys of X-terminals. Required for XDM authentication.
+# Default is ""
+#KeyFile=/usr/local/share/config/kdm/kdmkeys
+# XDMCP access control file in the usual XDM-Xaccess format.
+# Default is "/usr/local/share/config/kdm/Xaccess"
+Xaccess=/usr/local/share/config/kdm/Xaccess
+# Number of seconds to wait for display to respond after the user has
+# selected a host from the chooser.
+# Default is 15
+#ChoiceTimeout=10
+# Strip domain name from remote display names if it is equal to the local
+# domain.
+# Default is true
+#RemoveDomainname=false
+# Use the numeric IP address of the incoming connection on multihomed hosts
+# instead of the host name.
+# Default is false
+#SourceAddress=true
+# The program which is invoked to dynamically generate replies to XDMCP
+# DirectQuery or BroadcastQuery requests.
+# If empty, no program is invoked and "Willing to manage" is sent.
+# Default is ""
+Willing=/usr/local/share/config/kdm/Xwilling
+
+[Shutdown]
+# The command (subject to word splitting) to run to halt the system.
+# Default is "/sbin/shutdown -h now"
+HaltCmd=/sbin/shutdown -p now
+# The command (subject to word splitting) to run to reboot the system.
+# Default is "/sbin/shutdown -r now"
+RebootCmd=/sbin/reboot
+# Whether it is allowed to shut down the system via the global command FiFo.
+# Default is false
+#AllowFifo=true
+# Whether it is allowed to abort active sessions when shutting down the
+# system via the global command FiFo.
+# Default is true
+#AllowFifoNow=false
+# The boot manager KDM should use for offering boot options in the
+# shutdown dialog.
+# "None" - no boot manager
+# "Grub" - Grub boot manager
+# "Lilo" - Lilo boot manager (Linux on i386 &amp; x86-64 only)
+# Default is None
+#BootManager=Grub
+
+# Rough estimations about how many seconds KDM will spend at most on
+# - opening a connection to the X-server (OpenTime) if the attempt
+#   - times out: OpenTimeout
+#   - is refused: OpenRepeat * OpenDelay
+# - starting a local X-server (ServerTime):
+#   ServerAttempts * (ServerTimeout + OpenDelay)
+# - starting a display:
+#   - local display: ServerTime + OpenTime
+#   - foreign display: StartAttempts * OpenTime
+#   - XDMCP display: OpenTime (repeated indefinitely by client)
+
+# Core config for all displays
+[X-*-Core]
+# How long to wait before retrying to connect a display.
+# Default is 15
+#OpenDelay=15
+# How long to wait before timing out a display connection attempt.
+# Default is 120
+#OpenTimeout=120
+# How many connection attempts to make during a start attempt. Note that
+# a timeout aborts the entire start attempt.
+# Default is 5
+#OpenRepeat=5
+# Try at most that many times to start a display. If this fails, the display
+# is disabled.
+# Default is 4
+#StartAttempts=4
+# Ping remote display every that many minutes.
+# Default is 5
+#PingInterval=5
+# Wait for a Pong that many minutes.
+# Default is 5
+#PingTimeout=5
+# The name of this X-server's Xauth file.
+# If empty, a random name in the AuthDir directory will be used.
+# Default is ""
+#AuthFile=
+# Specify a file with X-resources for the greeter, chooser and background.
+# The KDE frontend does not use this file, so you do not need it unless you
+# use another background generator than krootimage.
+# Default is ""
+#Resources=
+# The xrdb program to use to read the above specified recources.
+# Subject to word splitting.
+# Default is "/usr/X11R6/bin/xrdb"
+#Xrdb=
+# A program to run before the greeter is shown. Can be used to start an
+# xconsole or an alternative background generator. Subject to word splitting.
+# Default is ""
+Setup=/usr/local/share/config/kdm/Xsetup
+# A program to run before a user session starts. Subject to word splitting.
+# Default is ""
+Startup=/usr/local/share/config/kdm/Xstartup
+# A program to run after a user session exits. Subject to word splitting.
+# Default is ""
+Reset=/usr/local/share/config/kdm/Xreset
+# The program which is run as the user which logs in. It is supposed to
+# interpret the session argument (see SessionsDirs) and start an appropriate
+# session according to it. Subject to word splitting.
+# Default is "/usr/X11R6/bin/xterm -ls -T"
+Session=/usr/local/share/config/kdm/Xsession
+# The program to run if Session fails.
+# Default is "/usr/X11R6/bin/xterm"
+#FailsafeClient=
+# The PATH for the Session program.
+# Default is "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games"
+#UserPath=
+# The PATH for Setup, Startup and Reset, etc.
+# Default is "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
+#SystemPath=
+# The default system shell.
+# Default is "/bin/sh"
+#SystemShell=/bin/bash
+# Where to put the user's X-server authorization file if ~/.Xauthority
+# cannot be created.
+# Default is "/tmp"
+#UserAuthDir=
+# Whether to automatically restart sessions after X-server crashes.
+# Note that enabling this makes circumventing screen lockers other than
+# KDE's built-in one possible!
+# Default is false
+AutoReLogin=false
+# Allow root logins?
+# Default is true
+AllowRootLogin=true
+# Allow to log in, when user has set an empty password?
+# Default is true
+AllowNullPasswd=false
+# Who is allowed to shut down the system. This applies both to the
+# greeter and to the command FiFo.
+# "None" - no "Shutdown..." menu entry is shown at all
+# "Root" - the root password must be entered to shut down
+# "All" - everybody can shut down the machine
+# Default is All
+AllowShutdown=Root
+# Who is allowed to abort active sessions when shutting down.
+# "None" - no forced shutdown is allowed at all
+# "Root" - the root password must be entered to shut down forcibly
+# "All" - everybody can shut down the machine forcibly
+# Default is All
+#AllowSdForceNow=Root
+# The default choice for the shutdown condition/timing.
+# "Schedule" - shut down after all active sessions exit (possibly at once)
+# "TryNow" - shut down, if no active sessions are open; otherwise, do nothing
+# "ForceNow" - shut down unconditionally
+# Default is Schedule
+#DefaultSdMode=ForceNow
+# How to offer shutdown scheduling options:
+# "Never" - not at all
+# "Optional" - as a button in the simple shutdown dialogs
+# "Always" - instead of the simple shutdown dialogs
+# Default is Never
+#ScheduledSd=Optional
+# The directories containing session type definitions in .desktop format.
+# Default is "/usr/local/share/apps/kdm/sessions"
+#SessionsDirs=/etc/X11/sessions,/usr/share/xsessions
+# The file (relative to $HOME) to redirect the session output to. This is
+# a printf format string; one %s will be replaced with the display name.
+# Default is ".xsession-errors"
+ClientLogFile=.xsession-errors-%s
+# Whether KDM's built-in utmp/wtmp/lastlog registration should be used.
+# Default is true
+#UseSessReg=false
+
+# Greeter config for all displays
+[X-*-Greeter]
+# Widget style of the greeter. "" means the built-in default which currently
+# is "Plastik".
+# Default is ""
+GUIStyle=Plastik
+# Widget color scheme of the greeter. "" means the built-in default which
+# currently is yellowish grey with some light blue and yellow elements.
+# Default is ""
+ColorScheme=Plastik
+# What should be shown in the greeter's logo are:
+# "None" - nothing
+# "Logo" - the image specified by LogoPixmap
+# "Clock" - a neat analog clock
+# Default is Clock
+LogoArea=None
+# The image to show when LogoArea=Logo.
+# Default is ""
+LogoPixmap=
+# The relative coordinates (X,Y in percent) of the center of the greeter.
+# Default is "50,50"
+GreeterPos=50,50
+# The screen the greeter should be displayed on in multi-headed and Xinerama
+# setups. The numbering starts with 0. For Xinerama, it corresponds to the
+# listing order in the active ServerLayout section of XF86Config; -1 means
+# to use the upper-left screen, -2 means to use the upper-right screen.
+# Default is 0
+#GreeterScreen=-1
+# The headline in the greeter. The following character pairs are replaced:
+# - %d -> current display
+# - %h -> host name, possibly with domain name
+# - %n -> node name, most probably the host name without domain name
+# - %s -> the operating system
+# - %r -> the operating system's version
+# - %m -> the machine (hardware) type
+# - %% -> a single %
+# Default is "Welcome to %s at %n"
+GreetString=
+# Whether the fonts used in the greeter should be antialiased.
+# Default is false
+AntiAliasing=true
+# The font for the greeter headline.
+# Default is "Serif,20,bold"
+GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0
+# The normal font used in the greeter.
+# Default is "Sans Serif,10"
+StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0
+# The font used for the "Login Failed" message.
+# Default is "Sans Serif,10,bold"
+FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0
+# What to do with the Num Lock modifier for the time the greeter is running:
+# "Off" - turn off
+# "On" - turn on
+# "Keep" - do not change the state
+# Default is Keep
+#NumLock=Off
+# Language and locale to use in the greeter, encoded like $LC_LANG.
+# Default is "en_US"
+Language=en_US
+# Enable autocompletion in the username line edit.
+# Default is false
+UserCompletion=false
+# Enable user list (names along with images) in the greeter.
+# Default is true
+UserList=true
+# User selection for UserCompletion and UserList:
+# "NotHidden" - all users except those listed in HiddenUsers
+# "Selected" - only the users listed in SelectedUsers
+# Default is NotHidden
+ShowUsers=NotHidden
+# For ShowUsers=Selected. @<group> means all users in that group.
+# Default is ""
+SelectedUsers=
+# For ShowUsers=NotHidden. @<group> means all users in that group.
+# Default is ""
+HiddenUsers=
+# Special case of HiddenUsers: users with a non-zero UID less than this number
+# will not be shown as well.
+# Default is 0
+MinShowUID=1000
+# Complement to MinShowUID: users with a UID greater than this number will
+# not be shown as well.
+# Default is 65535
+MaxShowUID=65000
+# If false, the users are listed in the order they appear in /etc/passwd.
+# If true, they are sorted alphabetically.
+# Default is true
+SortUsers=true
+# Specify, where the users' pictures should be taken from.
+# "AdminOnly" - from <FaceDir>/$USER.face[.icon]
+# "PreferAdmin" - prefer <FaceDir>, fallback on $HOME
+# "PreferUser" - ... and the other way round
+# "UserOnly" - from the user's $HOME/.face[.icon]
+# Default is AdminOnly
+FaceSource=PreferAdmin
+# The directory containing the user images if FaceSource is not UserOnly.
+# Default is "/usr/local/share/apps/kdm/faces"
+#FaceDir=/usr/share/faces
+# Specify, if/which user should be preselected for log in.
+# "None" - do not preselect any user
+# "Previous" - the user which successfully logged in last time
+# "Default" - the user specified in the DefaultUser option
+# Default is None
+#PreselectUser=Previous
+# If this is true, the password input line is focused automatically if
+# a user is preselected.
+# Default is false
+#FocusPasswd=true
+# The password input fields cloak the typed in text. Specify, how to do it:
+# "OneStar" - <literal>*</literal> is shown for every typed letter
+# "ThreeStars" - <literal>***</literal> is shown for every typed letter
+# "NoEcho" - nothing is shown at all, the cursor does not move
+# Default is OneStar
+EchoMode=OneStar
+# If true, krootimage will be automatically started by KDM; otherwise, the
+# Setup script should be used to setup the background.
+# Default is true
+UseBackground=true
+# The configuration file to be used by krootimage.
+# Default is "/usr/local/share/config/kdm/backgroundrc"
+BackgroundCfg=/usr/local/share/config/kdm/backgroundrc
+# Hold the X-server grabbed the whole time the greeter is visible. This
+# may be more secure, but it will disable any background and other
+# X-clients started from the Setup script.
+# Default is false
+#GrabServer=true
+# How many seconds to wait for grab to succeed.
+# Default is 3
+#GrabTimeout=3
+# Warn, if display has no X-authorization (local auth cannot be created,
+# XDMCP display wants no auth, or display is foreign from StaticServers).
+# Default is true
+#AuthComplain=false
+# Random seed for forging saved session types, etc. of unknown users.
+# This value should be random but constant across the login domain.
+# Default is 0
+ForgingSeed=1113045471
+# Specify conversation plugins for the login dialog. Each plugin can be
+# specified as a base name (which expands to $kde_modulesdir/kgreet_$base)
+# or as a full pathname.
+# Default is "classic"
+#PluginsLogin=sign
+# Same as PluginsLogin, but for the shutdown dialog.
+# Default is "classic"
+#PluginsShutdown=modern
+# A list of options of the form Key=Value. The conversation plugins can query
+# these settings; it is up to them what possible keys are.
+# Default is ""
+#PluginOptions=SomeKey=randomvalue,Foo=bar
+# Show the "Console Login" action in the greeter (if ServerTTY/ConsoleTTYs
+# is configured).
+# Default is true
+#AllowConsole=false
+# A program to run while the greeter is visible. It is supposed to preload
+# as much as possible of the session that is going to be started (most
+# probably).
+# Default is ""
+Preloader=/usr/local/bin/preloadkde
+# Whether the greeter should be themed.
+# Default is false
+#UseTheme=true
+# The theme to use for the greeter. Can point to either a directory or an XML
+# file.
+# Default is ""
+Theme=/usr/local/share/apps/kdm/themes/circles
+
+# Core config for local displays
+[X-:*-Core]
+# How often to try to run the X-server. Running includes executing it and
+# waiting for it to come up.
+# Default is 1
+#ServerAttempts=1
+# How long to wait for a local X-server to come up.
+# Default is 15
+#ServerTimeout=15
+# The command line to start the X-server, without display number and VT spec.
+# This string is subject to word splitting.
+# Default is "/usr/X11R6/bin/X -br"
+ServerCmd=/usr/X11R6/bin/X
+# Additional arguments for the X-servers for local sessions.
+# This string is subject to word splitting.
+# Default is ""
+ServerArgsLocal=-nolisten tcp
+# Additional arguments for the X-servers for remote sessions.
+# This string is subject to word splitting.
+# Default is ""
+#ServerArgsRemote=
+# Restart instead of resetting the local X-server after session exit.
+# Use it if the server leaks memory etc.
+# Default is false
+#TerminateServer=true
+# The signal needed to reset the local X-server.
+# Default is 1 (SIGHUP)
+#ResetSignal=1
+# The signal needed to terminate the local X-server.
+# Default is 15 (SIGTERM)
+#TermSignal=15
+# Create X-authorizations for local displays.
+# Default is true
+#Authorize=false
+# Which X-authorization mechanisms should be used.
+# Default is "MIT-MAGIC-COOKIE-1"
+#AuthNames=
+# Need to reset the X-server to make it read initial Xauth file.
+# Default is false
+#ResetForAuth=true
+# See above
+AllowNullPasswd=true
+# See above
+AllowShutdown=All
+# Enable password-less logins on this display. USE WITH EXTREME CARE!
+# Default is false
+NoPassEnable=true
+# The users that do not need to provide a password to log in. NEVER list root!
+# "*" means all non-root users. @<group> means all users in that group.
+# Default is ""
+NoPassUsers=
+
+# Greeter config for local displays
+[X-:*-Greeter]
+# See above
+PreselectUser=None
+# See above
+FocusPasswd=true
+# Specify whether the greeter of local displays should start up in host chooser
+# (remote) or login (local) mode and whether it is allowed to switch to the
+# other mode.
+# "LocalOnly" - only local login possible
+# "DefaultLocal" - start up in local mode, but allow switching to remote mode
+# "DefaultRemote" - ... and the other way round
+# "RemoteOnly" - only choice of remote host possible
+# Default is LocalOnly
+LoginMode=DefaultLocal
+# A list of hosts to be automatically added to the remote login menu. The
+# special name "*" means broadcast.
+# Default is "*"
+#ChooserHosts=*,ugly,sky,dino,kiste.local,login.crap.com
+# Show the "Restart X Server"/"Close Connection" action in the greeter.
+# Default is true
+AllowClose=false
+# The user to preselect if PreselectUser=Default.
+# Default is ""
+DefaultUser=
+
+# Core config for 1st local display
+[X-:0-Core]
+# The TTY line (without /dev/) the X-server covers physically.
+# Default is ""
+ServerTTY=
+# Enable automatic login. USE WITH EXTREME CARE!
+# Default is false
+AutoLoginEnable=true
+# If true, auto-login after logout. If false, auto-login is performed only
+# when a display session starts up.
+# Default is false
+#AutoLoginAgain=true
+# The delay in seconds before automatic login kicks in.
+# Default is 0
+#AutoLoginDelay=10
+# The user to log in automatically. NEVER specify root!
+# Default is ""
+AutoLoginUser=
+# The password for the user to log in automatically. This is NOT required
+# unless the user is logged into a NIS or Kerberos domain. If you use this
+# option, you should "chmod 600 kdmrc" for obvious reasons.
+# Default is ""
+#AutoLoginPass=secret!
+# Immediately lock the automatically started session. This works only with
+# KDE sessions.
+# Default is false
+#AutoLoginLocked=true
+# See above
+ClientLogFile=.xsession-errors
+
+# Greeter config for 1st local display
+[X-:0-Greeter]
+# See above
+#PreselectUser=Default
+# See above
+#DefaultUser=johndoe

Modified: pcbsd/trunk/system-overlay/usr/local/share/config/kthemestylerc
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/share/config/kthemestylerc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/local/share/config/kthemestylerc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[General]
-themes=PC-BSD
+[General]
+themes=PC-BSD

Modified: pcbsd/trunk/system-overlay/usr/share/config/kdm/kdmrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/config/kdm/kdmrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/config/kdm/kdmrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,566 +1,566 @@
-# KDM master configuration file
-#
-# Definition: the greeter is the login dialog, i.e., the part of KDM
-# which the user sees.
-#
-# You can configure every X-display individually.
-# Every display has a display name, which consists of a host name
-# (which is empty for local displays specified in {Static|Reserve}Servers),
-# a colon, and a display number. Additionally, a display belongs to a
-# display class (which can be ignored in most cases; the control center
-# does not support this feature at all).
-# Sections with display-specific settings have the formal syntax
-# "[X-" host [":" number [ "_" class ]] "-" sub-section "]"
-# You can use the "*" wildcard for host, number, and class. You may omit
-# trailing components; they are assumed to be "*" then.
-# The host part may be a domain specification like ".inf.tu-dresden.de".
-# It may also be "+", which means non-empty, i.e. remote displays only.
-# From which section a setting is actually taken is determined by these
-# rules:
-# - an exact match takes precedence over a partial match (for the host part),
-#   which in turn takes precedence over a wildcard ("+" taking precedence
-#   over "*")
-# - precedence decreases from left to right for equally exact matches
-# Example: display name "myhost:0", class "dpy".
-# [X-myhost:0_dpy] precedes
-# [X-myhost:0_*] (same as [X-myhost:0]) precedes
-# [X-myhost:*_dpy] precedes
-# [X-myhost:*_*] (same as [X-myhost]) precedes
-# [X-+:0_dpy] precedes
-# [X-*:0_dpy] precedes
-# [X-*:0_*] (same as [X-*:0]) precedes
-# [X-*:*_*] (same as [X-*])
-# These sections do NOT match this display:
-# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]
-# If a setting is not found in any matching section, the default is used.
-#
-# Every comment applies to the following section or key. Note that all
-# comments will be lost if you change this file with the kcontrol frontend.
-# The defaults refer to KDM's built-in values, not anything set in this file.
-#
-# Special characters need to be backslash-escaped (leading and trailing
-# spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the
-# backslash itself (\\)).
-# In lists, fields are separated with commas without whitespace in between.
-# Some command strings are subject to simplified sh-style word splitting:
-# single quotes (') and double quotes (") have the usual meaning; the backslash
-# quotes everything (not only special characters). Note that the backslashes
-# need to be doubled because of the two levels of quoting.
-
-[General]
-# This option exists solely for the purpose of a clean automatic upgrade.
-# Do not even think about changing it!
-ConfigVersion=2.3
-# List of permanent displays. Displays with a hostname are foreign. A display
-# class may be specified separated by an underscore.
-# Default is ":0"
-StaticServers=:0
-# List of on-demand displays. See StaticServers for syntax.
-# Default is ""
-ReserveServers=:1,:2,:3
-# Where KDM should store its PID (do not store if empty).
-# Default is ""
-PidFile=/var/run/kdm.pid
-# Whether KDM should lock the PID file to prevent having multiple KDM
-# instances running at once. Do not change unless you are brave.
-# Default is true
-#LockPidFile=false
-# Where to store authorization files.
-# Default is "/var/run/xauth"
-#AuthDir=/tmp
-# Whether KDM should automatically re-read configuration files, if it
-# finds them having changed.
-# Default is true
-#AutoRescan=false
-# Additional environment variables KDM should pass on to all programs it runs.
-# LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
-# otherwise, it should not be necessary very often.
-# Default is ""
-#ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
-# A file KDM should read entropy from.
-# Default is "/dev/mem"
-#RandomFile=
-# A UNIX domain socket KDM should read entropy from.
-# Default is ""
-#PrngdSocket=/tmp/entropy
-# A TCP socket on localhost KDM should read entropy from.
-# Default is 0
-#PrngdPort=4840
-# A character device KDM should read entropy from.
-# Empty means use the system's preferred entropy device.
-# Default is ""
-#RandomDevice=/dev/altrandom
-# Where the command FiFos should be created; make it empty to disable
-# them.
-# Default is "/var/run/xdmctl"
-#FifoDir=/tmp
-# The group to which the global command FiFo should belong;
-# can be either a name or a numerical ID.
-# Default is 0
-#FifoGroup=xdmctl
-# The directory in which KDM should store persistent working data.
-# Default is "/var/lib/kdm"
-#DataDir=
-# The directory in which KDM should store users' .dmrc files. This is only
-# needed if the home directories are not readable before actually logging in
-# (like with AFS).
-# Default is ""
-#DmrcDir=/nfs-shared/var/dmrcs
-
-[Xdmcp]
-# Whether KDM should listen to incoming XDMCP requests.
-# Default is true
-Enable=false
-# The UDP port on which KDM should listen for XDMCP requests. Do not change.
-# Default is 177
-#Port=177
-# File with the private keys of X-terminals. Required for XDM authentication.
-# Default is ""
-#KeyFile=/usr/local/share/config/kdm/kdmkeys
-# XDMCP access control file in the usual XDM-Xaccess format.
-# Default is "/usr/local/share/config/kdm/Xaccess"
-Xaccess=/usr/local/share/config/kdm/Xaccess
-# Number of seconds to wait for display to respond after the user has
-# selected a host from the chooser.
-# Default is 15
-#ChoiceTimeout=10
-# Strip domain name from remote display names if it is equal to the local
-# domain.
-# Default is true
-#RemoveDomainname=false
-# Use the numeric IP address of the incoming connection on multihomed hosts
-# instead of the host name.
-# Default is false
-#SourceAddress=true
-# The program which is invoked to dynamically generate replies to XDMCP
-# DirectQuery or BroadcastQuery requests.
-# If empty, no program is invoked and "Willing to manage" is sent.
-# Default is ""
-Willing=/usr/local/share/config/kdm/Xwilling
-
-[Shutdown]
-# The command (subject to word splitting) to run to halt the system.
-# Default is "/sbin/shutdown -h now"
-HaltCmd=/sbin/shutdown -p now
-# The command (subject to word splitting) to run to reboot the system.
-# Default is "/sbin/shutdown -r now"
-RebootCmd=/sbin/reboot
-# Whether it is allowed to shut down the system via the global command FiFo.
-# Default is false
-#AllowFifo=true
-# Whether it is allowed to abort active sessions when shutting down the
-# system via the global command FiFo.
-# Default is true
-#AllowFifoNow=false
-# The boot manager KDM should use for offering boot options in the
-# shutdown dialog.
-# "None" - no boot manager
-# "Grub" - Grub boot manager
-# "Lilo" - Lilo boot manager (Linux on i386 &amp; x86-64 only)
-# Default is None
-#BootManager=Grub
-
-# Rough estimations about how many seconds KDM will spend at most on
-# - opening a connection to the X-server (OpenTime) if the attempt
-#   - times out: OpenTimeout
-#   - is refused: OpenRepeat * OpenDelay
-# - starting a local X-server (ServerTime):
-#   ServerAttempts * (ServerTimeout + OpenDelay)
-# - starting a display:
-#   - local display: ServerTime + OpenTime
-#   - foreign display: StartAttempts * OpenTime
-#   - XDMCP display: OpenTime (repeated indefinitely by client)
-
-# Core config for all displays
-[X-*-Core]
-# How long to wait before retrying to connect a display.
-# Default is 15
-#OpenDelay=15
-# How long to wait before timing out a display connection attempt.
-# Default is 120
-#OpenTimeout=120
-# How many connection attempts to make during a start attempt. Note that
-# a timeout aborts the entire start attempt.
-# Default is 5
-#OpenRepeat=5
-# Try at most that many times to start a display. If this fails, the display
-# is disabled.
-# Default is 4
-#StartAttempts=4
-# Ping remote display every that many minutes.
-# Default is 5
-#PingInterval=5
-# Wait for a Pong that many minutes.
-# Default is 5
-#PingTimeout=5
-# The name of this X-server's Xauth file.
-# If empty, a random name in the AuthDir directory will be used.
-# Default is ""
-#AuthFile=
-# Specify a file with X-resources for the greeter, chooser and background.
-# The KDE frontend does not use this file, so you do not need it unless you
-# use another background generator than krootimage.
-# Default is ""
-#Resources=
-# The xrdb program to use to read the above specified recources.
-# Subject to word splitting.
-# Default is "/usr/X11R6/bin/xrdb"
-#Xrdb=
-# A program to run before the greeter is shown. Can be used to start an
-# xconsole or an alternative background generator. Subject to word splitting.
-# Default is ""
-Setup=/usr/local/share/config/kdm/Xsetup
-# A program to run before a user session starts. Subject to word splitting.
-# Default is ""
-Startup=/usr/local/share/config/kdm/Xstartup
-# A program to run after a user session exits. Subject to word splitting.
-# Default is ""
-Reset=/usr/local/share/config/kdm/Xreset
-# The program which is run as the user which logs in. It is supposed to
-# interpret the session argument (see SessionsDirs) and start an appropriate
-# session according to it. Subject to word splitting.
-# Default is "/usr/X11R6/bin/xterm -ls -T"
-Session=/usr/local/share/config/kdm/Xsession
-# The program to run if Session fails.
-# Default is "/usr/X11R6/bin/xterm"
-#FailsafeClient=
-# The PATH for the Session program.
-# Default is "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games"
-#UserPath=
-# The PATH for Setup, Startup and Reset, etc.
-# Default is "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
-#SystemPath=
-# The default system shell.
-# Default is "/bin/sh"
-#SystemShell=/bin/bash
-# Where to put the user's X-server authorization file if ~/.Xauthority
-# cannot be created.
-# Default is "/tmp"
-#UserAuthDir=
-# Whether to automatically restart sessions after X-server crashes.
-# Note that enabling this makes circumventing screen lockers other than
-# KDE's built-in one possible!
-# Default is false
-AutoReLogin=false
-# Allow root logins?
-# Default is true
-AllowRootLogin=false
-# Allow to log in, when user has set an empty password?
-# Default is true
-AllowNullPasswd=false
-# Who is allowed to shut down the system. This applies both to the
-# greeter and to the command FiFo.
-# "None" - no "Shutdown..." menu entry is shown at all
-# "Root" - the root password must be entered to shut down
-# "All" - everybody can shut down the machine
-# Default is All
-AllowShutdown=Root
-# Who is allowed to abort active sessions when shutting down.
-# "None" - no forced shutdown is allowed at all
-# "Root" - the root password must be entered to shut down forcibly
-# "All" - everybody can shut down the machine forcibly
-# Default is All
-#AllowSdForceNow=Root
-# The default choice for the shutdown condition/timing.
-# "Schedule" - shut down after all active sessions exit (possibly at once)
-# "TryNow" - shut down, if no active sessions are open; otherwise, do nothing
-# "ForceNow" - shut down unconditionally
-# Default is Schedule
-#DefaultSdMode=ForceNow
-# How to offer shutdown scheduling options:
-# "Never" - not at all
-# "Optional" - as a button in the simple shutdown dialogs
-# "Always" - instead of the simple shutdown dialogs
-# Default is Never
-#ScheduledSd=Optional
-# The directories containing session type definitions in .desktop format.
-# Default is "/usr/local/share/apps/kdm/sessions"
-#SessionsDirs=/etc/X11/sessions,/usr/share/xsessions
-# The file (relative to $HOME) to redirect the session output to. This is
-# a printf format string; one %s will be replaced with the display name.
-# Default is ".xsession-errors"
-ClientLogFile=.xsession-errors-%s
-# Whether KDM's built-in utmp/wtmp/lastlog registration should be used.
-# Default is true
-#UseSessReg=false
-
-# Greeter config for all displays
-[X-*-Greeter]
-# Widget style of the greeter. "" means the built-in default which currently
-# is "Plastik".
-# Default is ""
-GUIStyle=Plastik
-# Widget color scheme of the greeter. "" means the built-in default which
-# currently is yellowish grey with some light blue and yellow elements.
-# Default is ""
-ColorScheme=Plastik
-# What should be shown in the greeter's logo are:
-# "None" - nothing
-# "Logo" - the image specified by LogoPixmap
-# "Clock" - a neat analog clock
-# Default is Clock
-LogoArea=None
-# The image to show when LogoArea=Logo.
-# Default is ""
-LogoPixmap=
-# The relative coordinates (X,Y in percent) of the center of the greeter.
-# Default is "50,50"
-GreeterPos=50,50
-# The screen the greeter should be displayed on in multi-headed and Xinerama
-# setups. The numbering starts with 0. For Xinerama, it corresponds to the
-# listing order in the active ServerLayout section of XF86Config; -1 means
-# to use the upper-left screen, -2 means to use the upper-right screen.
-# Default is 0
-#GreeterScreen=-1
-# The headline in the greeter. The following character pairs are replaced:
-# - %d -> current display
-# - %h -> host name, possibly with domain name
-# - %n -> node name, most probably the host name without domain name
-# - %s -> the operating system
-# - %r -> the operating system's version
-# - %m -> the machine (hardware) type
-# - %% -> a single %
-# Default is "Welcome to %s at %n"
-GreetString=
-# Whether the fonts used in the greeter should be antialiased.
-# Default is false
-AntiAliasing=true
-# The font for the greeter headline.
-# Default is "Serif,20,bold"
-GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0
-# The normal font used in the greeter.
-# Default is "Sans Serif,10"
-StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0
-# The font used for the "Login Failed" message.
-# Default is "Sans Serif,10,bold"
-FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0
-# What to do with the Num Lock modifier for the time the greeter is running:
-# "Off" - turn off
-# "On" - turn on
-# "Keep" - do not change the state
-# Default is Keep
-NumLock=On
-# Language and locale to use in the greeter, encoded like $LC_LANG.
-# Default is "en_US"
-Language=en_US
-# Enable autocompletion in the username line edit.
-# Default is false
-UserCompletion=false
-# Enable user list (names along with images) in the greeter.
-# Default is true
-UserList=true
-# User selection for UserCompletion and UserList:
-# "NotHidden" - all users except those listed in HiddenUsers
-# "Selected" - only the users listed in SelectedUsers
-# Default is NotHidden
-ShowUsers=NotHidden
-# For ShowUsers=Selected. @<group> means all users in that group.
-# Default is ""
-SelectedUsers=
-# For ShowUsers=NotHidden. @<group> means all users in that group.
-# Default is ""
-HiddenUsers=
-# Special case of HiddenUsers: users with a non-zero UID less than this number
-# will not be shown as well.
-# Default is 0
-MinShowUID=1000
-# Complement to MinShowUID: users with a UID greater than this number will
-# not be shown as well.
-# Default is 65535
-MaxShowUID=65000
-# If false, the users are listed in the order they appear in /etc/passwd.
-# If true, they are sorted alphabetically.
-# Default is true
-SortUsers=true
-# Specify, where the users' pictures should be taken from.
-# "AdminOnly" - from <FaceDir>/$USER.face[.icon]
-# "PreferAdmin" - prefer <FaceDir>, fallback on $HOME
-# "PreferUser" - ... and the other way round
-# "UserOnly" - from the user's $HOME/.face[.icon]
-# Default is AdminOnly
-FaceSource=PreferAdmin
-# The directory containing the user images if FaceSource is not UserOnly.
-# Default is "/usr/local/share/apps/kdm/faces"
-#FaceDir=/usr/share/faces
-# Specify, if/which user should be preselected for log in.
-# "None" - do not preselect any user
-# "Previous" - the user which successfully logged in last time
-# "Default" - the user specified in the DefaultUser option
-# Default is None
-#PreselectUser=Previous
-# If this is true, the password input line is focused automatically if
-# a user is preselected.
-# Default is false
-#FocusPasswd=true
-# The password input fields cloak the typed in text. Specify, how to do it:
-# "OneStar" - <literal>*</literal> is shown for every typed letter
-# "ThreeStars" - <literal>***</literal> is shown for every typed letter
-# "NoEcho" - nothing is shown at all, the cursor does not move
-# Default is OneStar
-EchoMode=OneStar
-# If true, krootimage will be automatically started by KDM; otherwise, the
-# Setup script should be used to setup the background.
-# Default is true
-UseBackground=true
-# The configuration file to be used by krootimage.
-# Default is "/usr/local/share/config/kdm/backgroundrc"
-BackgroundCfg=/usr/local/share/config/kdm/backgroundrc
-# Hold the X-server grabbed the whole time the greeter is visible. This
-# may be more secure, but it will disable any background and other
-# X-clients started from the Setup script.
-# Default is false
-#GrabServer=true
-# How many seconds to wait for grab to succeed.
-# Default is 3
-#GrabTimeout=3
-# Warn, if display has no X-authorization (local auth cannot be created,
-# XDMCP display wants no auth, or display is foreign from StaticServers).
-# Default is true
-#AuthComplain=false
-# Random seed for forging saved session types, etc. of unknown users.
-# This value should be random but constant across the login domain.
-# Default is 0
-ForgingSeed=1113045471
-# Specify conversation plugins for the login dialog. Each plugin can be
-# specified as a base name (which expands to $kde_modulesdir/kgreet_$base)
-# or as a full pathname.
-# Default is "classic"
-#PluginsLogin=sign
-# Same as PluginsLogin, but for the shutdown dialog.
-# Default is "classic"
-#PluginsShutdown=modern
-# A list of options of the form Key=Value. The conversation plugins can query
-# these settings; it is up to them what possible keys are.
-# Default is ""
-#PluginOptions=SomeKey=randomvalue,Foo=bar
-# Show the "Console Login" action in the greeter (if ServerTTY/ConsoleTTYs
-# is configured).
-# Default is true
-#AllowConsole=false
-# A program to run while the greeter is visible. It is supposed to preload
-# as much as possible of the session that is going to be started (most
-# probably).
-# Default is ""
-Preloader=/usr/local/bin/preloadkde
-# Whether the greeter should be themed.
-# Default is false
-#UseTheme=true
-# The theme to use for the greeter. Can point to either a directory or an XML
-# file.
-# Default is ""
-Theme=/usr/local/share/apps/kdm/themes/circles
-
-# Core config for local displays
-[X-:*-Core]
-# How often to try to run the X-server. Running includes executing it and
-# waiting for it to come up.
-# Default is 1
-#ServerAttempts=1
-# How long to wait for a local X-server to come up.
-# Default is 15
-#ServerTimeout=15
-# The command line to start the X-server, without display number and VT spec.
-# This string is subject to word splitting.
-# Default is "/usr/X11R6/bin/X -br"
-ServerCmd=/usr/X11R6/bin/X
-# Additional arguments for the X-servers for local sessions.
-# This string is subject to word splitting.
-# Default is ""
-ServerArgsLocal=-nolisten tcp
-# Additional arguments for the X-servers for remote sessions.
-# This string is subject to word splitting.
-# Default is ""
-#ServerArgsRemote=
-# Restart instead of resetting the local X-server after session exit.
-# Use it if the server leaks memory etc.
-# Default is false
-#TerminateServer=true
-# The signal needed to reset the local X-server.
-# Default is 1 (SIGHUP)
-#ResetSignal=1
-# The signal needed to terminate the local X-server.
-# Default is 15 (SIGTERM)
-#TermSignal=15
-# Create X-authorizations for local displays.
-# Default is true
-#Authorize=false
-# Which X-authorization mechanisms should be used.
-# Default is "MIT-MAGIC-COOKIE-1"
-#AuthNames=
-# Need to reset the X-server to make it read initial Xauth file.
-# Default is false
-#ResetForAuth=true
-# See above
-AllowNullPasswd=true
-# See above
-AllowShutdown=All
-# Enable password-less logins on this display. USE WITH EXTREME CARE!
-# Default is false
-NoPassEnable=true
-# The users that do not need to provide a password to log in. NEVER list root!
-# "*" means all non-root users. @<group> means all users in that group.
-# Default is ""
-NoPassUsers=
-
-# Greeter config for local displays
-[X-:*-Greeter]
-# See above
-PreselectUser=None
-# See above
-FocusPasswd=true
-# Specify whether the greeter of local displays should start up in host chooser
-# (remote) or login (local) mode and whether it is allowed to switch to the
-# other mode.
-# "LocalOnly" - only local login possible
-# "DefaultLocal" - start up in local mode, but allow switching to remote mode
-# "DefaultRemote" - ... and the other way round
-# "RemoteOnly" - only choice of remote host possible
-# Default is LocalOnly
-LoginMode=DefaultLocal
-# A list of hosts to be automatically added to the remote login menu. The
-# special name "*" means broadcast.
-# Default is "*"
-#ChooserHosts=*,ugly,sky,dino,kiste.local,login.crap.com
-# Show the "Restart X Server"/"Close Connection" action in the greeter.
-# Default is true
-AllowClose=false
-# The user to preselect if PreselectUser=Default.
-# Default is ""
-DefaultUser=
-
-# Core config for 1st local display
-[X-:0-Core]
-# The TTY line (without /dev/) the X-server covers physically.
-# Default is ""
-ServerTTY=
-# Enable automatic login. USE WITH EXTREME CARE!
-# Default is false
-AutoLoginEnable=true
-# If true, auto-login after logout. If false, auto-login is performed only
-# when a display session starts up.
-# Default is false
-#AutoLoginAgain=true
-# The delay in seconds before automatic login kicks in.
-# Default is 0
-#AutoLoginDelay=10
-# The user to log in automatically. NEVER specify root!
-# Default is ""
-AutoLoginUser=
-# The password for the user to log in automatically. This is NOT required
-# unless the user is logged into a NIS or Kerberos domain. If you use this
-# option, you should "chmod 600 kdmrc" for obvious reasons.
-# Default is ""
-#AutoLoginPass=secret!
-# Immediately lock the automatically started session. This works only with
-# KDE sessions.
-# Default is false
-#AutoLoginLocked=true
-# See above
-ClientLogFile=.xsession-errors
-
-# Greeter config for 1st local display
-[X-:0-Greeter]
-# See above
-#PreselectUser=Default
-# See above
-#DefaultUser=johndoe
+# KDM master configuration file
+#
+# Definition: the greeter is the login dialog, i.e., the part of KDM
+# which the user sees.
+#
+# You can configure every X-display individually.
+# Every display has a display name, which consists of a host name
+# (which is empty for local displays specified in {Static|Reserve}Servers),
+# a colon, and a display number. Additionally, a display belongs to a
+# display class (which can be ignored in most cases; the control center
+# does not support this feature at all).
+# Sections with display-specific settings have the formal syntax
+# "[X-" host [":" number [ "_" class ]] "-" sub-section "]"
+# You can use the "*" wildcard for host, number, and class. You may omit
+# trailing components; they are assumed to be "*" then.
+# The host part may be a domain specification like ".inf.tu-dresden.de".
+# It may also be "+", which means non-empty, i.e. remote displays only.
+# From which section a setting is actually taken is determined by these
+# rules:
+# - an exact match takes precedence over a partial match (for the host part),
+#   which in turn takes precedence over a wildcard ("+" taking precedence
+#   over "*")
+# - precedence decreases from left to right for equally exact matches
+# Example: display name "myhost:0", class "dpy".
+# [X-myhost:0_dpy] precedes
+# [X-myhost:0_*] (same as [X-myhost:0]) precedes
+# [X-myhost:*_dpy] precedes
+# [X-myhost:*_*] (same as [X-myhost]) precedes
+# [X-+:0_dpy] precedes
+# [X-*:0_dpy] precedes
+# [X-*:0_*] (same as [X-*:0]) precedes
+# [X-*:*_*] (same as [X-*])
+# These sections do NOT match this display:
+# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]
+# If a setting is not found in any matching section, the default is used.
+#
+# Every comment applies to the following section or key. Note that all
+# comments will be lost if you change this file with the kcontrol frontend.
+# The defaults refer to KDM's built-in values, not anything set in this file.
+#
+# Special characters need to be backslash-escaped (leading and trailing
+# spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the
+# backslash itself (\\)).
+# In lists, fields are separated with commas without whitespace in between.
+# Some command strings are subject to simplified sh-style word splitting:
+# single quotes (') and double quotes (") have the usual meaning; the backslash
+# quotes everything (not only special characters). Note that the backslashes
+# need to be doubled because of the two levels of quoting.
+
+[General]
+# This option exists solely for the purpose of a clean automatic upgrade.
+# Do not even think about changing it!
+ConfigVersion=2.3
+# List of permanent displays. Displays with a hostname are foreign. A display
+# class may be specified separated by an underscore.
+# Default is ":0"
+StaticServers=:0
+# List of on-demand displays. See StaticServers for syntax.
+# Default is ""
+ReserveServers=:1,:2,:3
+# Where KDM should store its PID (do not store if empty).
+# Default is ""
+PidFile=/var/run/kdm.pid
+# Whether KDM should lock the PID file to prevent having multiple KDM
+# instances running at once. Do not change unless you are brave.
+# Default is true
+#LockPidFile=false
+# Where to store authorization files.
+# Default is "/var/run/xauth"
+#AuthDir=/tmp
+# Whether KDM should automatically re-read configuration files, if it
+# finds them having changed.
+# Default is true
+#AutoRescan=false
+# Additional environment variables KDM should pass on to all programs it runs.
+# LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
+# otherwise, it should not be necessary very often.
+# Default is ""
+#ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
+# A file KDM should read entropy from.
+# Default is "/dev/mem"
+#RandomFile=
+# A UNIX domain socket KDM should read entropy from.
+# Default is ""
+#PrngdSocket=/tmp/entropy
+# A TCP socket on localhost KDM should read entropy from.
+# Default is 0
+#PrngdPort=4840
+# A character device KDM should read entropy from.
+# Empty means use the system's preferred entropy device.
+# Default is ""
+#RandomDevice=/dev/altrandom
+# Where the command FiFos should be created; make it empty to disable
+# them.
+# Default is "/var/run/xdmctl"
+#FifoDir=/tmp
+# The group to which the global command FiFo should belong;
+# can be either a name or a numerical ID.
+# Default is 0
+#FifoGroup=xdmctl
+# The directory in which KDM should store persistent working data.
+# Default is "/var/lib/kdm"
+#DataDir=
+# The directory in which KDM should store users' .dmrc files. This is only
+# needed if the home directories are not readable before actually logging in
+# (like with AFS).
+# Default is ""
+#DmrcDir=/nfs-shared/var/dmrcs
+
+[Xdmcp]
+# Whether KDM should listen to incoming XDMCP requests.
+# Default is true
+Enable=false
+# The UDP port on which KDM should listen for XDMCP requests. Do not change.
+# Default is 177
+#Port=177
+# File with the private keys of X-terminals. Required for XDM authentication.
+# Default is ""
+#KeyFile=/usr/local/share/config/kdm/kdmkeys
+# XDMCP access control file in the usual XDM-Xaccess format.
+# Default is "/usr/local/share/config/kdm/Xaccess"
+Xaccess=/usr/local/share/config/kdm/Xaccess
+# Number of seconds to wait for display to respond after the user has
+# selected a host from the chooser.
+# Default is 15
+#ChoiceTimeout=10
+# Strip domain name from remote display names if it is equal to the local
+# domain.
+# Default is true
+#RemoveDomainname=false
+# Use the numeric IP address of the incoming connection on multihomed hosts
+# instead of the host name.
+# Default is false
+#SourceAddress=true
+# The program which is invoked to dynamically generate replies to XDMCP
+# DirectQuery or BroadcastQuery requests.
+# If empty, no program is invoked and "Willing to manage" is sent.
+# Default is ""
+Willing=/usr/local/share/config/kdm/Xwilling
+
+[Shutdown]
+# The command (subject to word splitting) to run to halt the system.
+# Default is "/sbin/shutdown -h now"
+HaltCmd=/sbin/shutdown -p now
+# The command (subject to word splitting) to run to reboot the system.
+# Default is "/sbin/shutdown -r now"
+RebootCmd=/sbin/reboot
+# Whether it is allowed to shut down the system via the global command FiFo.
+# Default is false
+#AllowFifo=true
+# Whether it is allowed to abort active sessions when shutting down the
+# system via the global command FiFo.
+# Default is true
+#AllowFifoNow=false
+# The boot manager KDM should use for offering boot options in the
+# shutdown dialog.
+# "None" - no boot manager
+# "Grub" - Grub boot manager
+# "Lilo" - Lilo boot manager (Linux on i386 &amp; x86-64 only)
+# Default is None
+#BootManager=Grub
+
+# Rough estimations about how many seconds KDM will spend at most on
+# - opening a connection to the X-server (OpenTime) if the attempt
+#   - times out: OpenTimeout
+#   - is refused: OpenRepeat * OpenDelay
+# - starting a local X-server (ServerTime):
+#   ServerAttempts * (ServerTimeout + OpenDelay)
+# - starting a display:
+#   - local display: ServerTime + OpenTime
+#   - foreign display: StartAttempts * OpenTime
+#   - XDMCP display: OpenTime (repeated indefinitely by client)
+
+# Core config for all displays
+[X-*-Core]
+# How long to wait before retrying to connect a display.
+# Default is 15
+#OpenDelay=15
+# How long to wait before timing out a display connection attempt.
+# Default is 120
+#OpenTimeout=120
+# How many connection attempts to make during a start attempt. Note that
+# a timeout aborts the entire start attempt.
+# Default is 5
+#OpenRepeat=5
+# Try at most that many times to start a display. If this fails, the display
+# is disabled.
+# Default is 4
+#StartAttempts=4
+# Ping remote display every that many minutes.
+# Default is 5
+#PingInterval=5
+# Wait for a Pong that many minutes.
+# Default is 5
+#PingTimeout=5
+# The name of this X-server's Xauth file.
+# If empty, a random name in the AuthDir directory will be used.
+# Default is ""
+#AuthFile=
+# Specify a file with X-resources for the greeter, chooser and background.
+# The KDE frontend does not use this file, so you do not need it unless you
+# use another background generator than krootimage.
+# Default is ""
+#Resources=
+# The xrdb program to use to read the above specified recources.
+# Subject to word splitting.
+# Default is "/usr/X11R6/bin/xrdb"
+#Xrdb=
+# A program to run before the greeter is shown. Can be used to start an
+# xconsole or an alternative background generator. Subject to word splitting.
+# Default is ""
+Setup=/usr/local/share/config/kdm/Xsetup
+# A program to run before a user session starts. Subject to word splitting.
+# Default is ""
+Startup=/usr/local/share/config/kdm/Xstartup
+# A program to run after a user session exits. Subject to word splitting.
+# Default is ""
+Reset=/usr/local/share/config/kdm/Xreset
+# The program which is run as the user which logs in. It is supposed to
+# interpret the session argument (see SessionsDirs) and start an appropriate
+# session according to it. Subject to word splitting.
+# Default is "/usr/X11R6/bin/xterm -ls -T"
+Session=/usr/local/share/config/kdm/Xsession
+# The program to run if Session fails.
+# Default is "/usr/X11R6/bin/xterm"
+#FailsafeClient=
+# The PATH for the Session program.
+# Default is "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games"
+#UserPath=
+# The PATH for Setup, Startup and Reset, etc.
+# Default is "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
+#SystemPath=
+# The default system shell.
+# Default is "/bin/sh"
+#SystemShell=/bin/bash
+# Where to put the user's X-server authorization file if ~/.Xauthority
+# cannot be created.
+# Default is "/tmp"
+#UserAuthDir=
+# Whether to automatically restart sessions after X-server crashes.
+# Note that enabling this makes circumventing screen lockers other than
+# KDE's built-in one possible!
+# Default is false
+AutoReLogin=false
+# Allow root logins?
+# Default is true
+AllowRootLogin=false
+# Allow to log in, when user has set an empty password?
+# Default is true
+AllowNullPasswd=false
+# Who is allowed to shut down the system. This applies both to the
+# greeter and to the command FiFo.
+# "None" - no "Shutdown..." menu entry is shown at all
+# "Root" - the root password must be entered to shut down
+# "All" - everybody can shut down the machine
+# Default is All
+AllowShutdown=Root
+# Who is allowed to abort active sessions when shutting down.
+# "None" - no forced shutdown is allowed at all
+# "Root" - the root password must be entered to shut down forcibly
+# "All" - everybody can shut down the machine forcibly
+# Default is All
+#AllowSdForceNow=Root
+# The default choice for the shutdown condition/timing.
+# "Schedule" - shut down after all active sessions exit (possibly at once)
+# "TryNow" - shut down, if no active sessions are open; otherwise, do nothing
+# "ForceNow" - shut down unconditionally
+# Default is Schedule
+#DefaultSdMode=ForceNow
+# How to offer shutdown scheduling options:
+# "Never" - not at all
+# "Optional" - as a button in the simple shutdown dialogs
+# "Always" - instead of the simple shutdown dialogs
+# Default is Never
+#ScheduledSd=Optional
+# The directories containing session type definitions in .desktop format.
+# Default is "/usr/local/share/apps/kdm/sessions"
+#SessionsDirs=/etc/X11/sessions,/usr/share/xsessions
+# The file (relative to $HOME) to redirect the session output to. This is
+# a printf format string; one %s will be replaced with the display name.
+# Default is ".xsession-errors"
+ClientLogFile=.xsession-errors-%s
+# Whether KDM's built-in utmp/wtmp/lastlog registration should be used.
+# Default is true
+#UseSessReg=false
+
+# Greeter config for all displays
+[X-*-Greeter]
+# Widget style of the greeter. "" means the built-in default which currently
+# is "Plastik".
+# Default is ""
+GUIStyle=Plastik
+# Widget color scheme of the greeter. "" means the built-in default which
+# currently is yellowish grey with some light blue and yellow elements.
+# Default is ""
+ColorScheme=Plastik
+# What should be shown in the greeter's logo are:
+# "None" - nothing
+# "Logo" - the image specified by LogoPixmap
+# "Clock" - a neat analog clock
+# Default is Clock
+LogoArea=None
+# The image to show when LogoArea=Logo.
+# Default is ""
+LogoPixmap=
+# The relative coordinates (X,Y in percent) of the center of the greeter.
+# Default is "50,50"
+GreeterPos=50,50
+# The screen the greeter should be displayed on in multi-headed and Xinerama
+# setups. The numbering starts with 0. For Xinerama, it corresponds to the
+# listing order in the active ServerLayout section of XF86Config; -1 means
+# to use the upper-left screen, -2 means to use the upper-right screen.
+# Default is 0
+#GreeterScreen=-1
+# The headline in the greeter. The following character pairs are replaced:
+# - %d -> current display
+# - %h -> host name, possibly with domain name
+# - %n -> node name, most probably the host name without domain name
+# - %s -> the operating system
+# - %r -> the operating system's version
+# - %m -> the machine (hardware) type
+# - %% -> a single %
+# Default is "Welcome to %s at %n"
+GreetString=
+# Whether the fonts used in the greeter should be antialiased.
+# Default is false
+AntiAliasing=true
+# The font for the greeter headline.
+# Default is "Serif,20,bold"
+GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0
+# The normal font used in the greeter.
+# Default is "Sans Serif,10"
+StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0
+# The font used for the "Login Failed" message.
+# Default is "Sans Serif,10,bold"
+FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0
+# What to do with the Num Lock modifier for the time the greeter is running:
+# "Off" - turn off
+# "On" - turn on
+# "Keep" - do not change the state
+# Default is Keep
+NumLock=On
+# Language and locale to use in the greeter, encoded like $LC_LANG.
+# Default is "en_US"
+Language=en_US
+# Enable autocompletion in the username line edit.
+# Default is false
+UserCompletion=false
+# Enable user list (names along with images) in the greeter.
+# Default is true
+UserList=true
+# User selection for UserCompletion and UserList:
+# "NotHidden" - all users except those listed in HiddenUsers
+# "Selected" - only the users listed in SelectedUsers
+# Default is NotHidden
+ShowUsers=NotHidden
+# For ShowUsers=Selected. @<group> means all users in that group.
+# Default is ""
+SelectedUsers=
+# For ShowUsers=NotHidden. @<group> means all users in that group.
+# Default is ""
+HiddenUsers=
+# Special case of HiddenUsers: users with a non-zero UID less than this number
+# will not be shown as well.
+# Default is 0
+MinShowUID=1000
+# Complement to MinShowUID: users with a UID greater than this number will
+# not be shown as well.
+# Default is 65535
+MaxShowUID=65000
+# If false, the users are listed in the order they appear in /etc/passwd.
+# If true, they are sorted alphabetically.
+# Default is true
+SortUsers=true
+# Specify, where the users' pictures should be taken from.
+# "AdminOnly" - from <FaceDir>/$USER.face[.icon]
+# "PreferAdmin" - prefer <FaceDir>, fallback on $HOME
+# "PreferUser" - ... and the other way round
+# "UserOnly" - from the user's $HOME/.face[.icon]
+# Default is AdminOnly
+FaceSource=PreferAdmin
+# The directory containing the user images if FaceSource is not UserOnly.
+# Default is "/usr/local/share/apps/kdm/faces"
+#FaceDir=/usr/share/faces
+# Specify, if/which user should be preselected for log in.
+# "None" - do not preselect any user
+# "Previous" - the user which successfully logged in last time
+# "Default" - the user specified in the DefaultUser option
+# Default is None
+#PreselectUser=Previous
+# If this is true, the password input line is focused automatically if
+# a user is preselected.
+# Default is false
+#FocusPasswd=true
+# The password input fields cloak the typed in text. Specify, how to do it:
+# "OneStar" - <literal>*</literal> is shown for every typed letter
+# "ThreeStars" - <literal>***</literal> is shown for every typed letter
+# "NoEcho" - nothing is shown at all, the cursor does not move
+# Default is OneStar
+EchoMode=OneStar
+# If true, krootimage will be automatically started by KDM; otherwise, the
+# Setup script should be used to setup the background.
+# Default is true
+UseBackground=true
+# The configuration file to be used by krootimage.
+# Default is "/usr/local/share/config/kdm/backgroundrc"
+BackgroundCfg=/usr/local/share/config/kdm/backgroundrc
+# Hold the X-server grabbed the whole time the greeter is visible. This
+# may be more secure, but it will disable any background and other
+# X-clients started from the Setup script.
+# Default is false
+#GrabServer=true
+# How many seconds to wait for grab to succeed.
+# Default is 3
+#GrabTimeout=3
+# Warn, if display has no X-authorization (local auth cannot be created,
+# XDMCP display wants no auth, or display is foreign from StaticServers).
+# Default is true
+#AuthComplain=false
+# Random seed for forging saved session types, etc. of unknown users.
+# This value should be random but constant across the login domain.
+# Default is 0
+ForgingSeed=1113045471
+# Specify conversation plugins for the login dialog. Each plugin can be
+# specified as a base name (which expands to $kde_modulesdir/kgreet_$base)
+# or as a full pathname.
+# Default is "classic"
+#PluginsLogin=sign
+# Same as PluginsLogin, but for the shutdown dialog.
+# Default is "classic"
+#PluginsShutdown=modern
+# A list of options of the form Key=Value. The conversation plugins can query
+# these settings; it is up to them what possible keys are.
+# Default is ""
+#PluginOptions=SomeKey=randomvalue,Foo=bar
+# Show the "Console Login" action in the greeter (if ServerTTY/ConsoleTTYs
+# is configured).
+# Default is true
+#AllowConsole=false
+# A program to run while the greeter is visible. It is supposed to preload
+# as much as possible of the session that is going to be started (most
+# probably).
+# Default is ""
+Preloader=/usr/local/bin/preloadkde
+# Whether the greeter should be themed.
+# Default is false
+#UseTheme=true
+# The theme to use for the greeter. Can point to either a directory or an XML
+# file.
+# Default is ""
+Theme=/usr/local/share/apps/kdm/themes/circles
+
+# Core config for local displays
+[X-:*-Core]
+# How often to try to run the X-server. Running includes executing it and
+# waiting for it to come up.
+# Default is 1
+#ServerAttempts=1
+# How long to wait for a local X-server to come up.
+# Default is 15
+#ServerTimeout=15
+# The command line to start the X-server, without display number and VT spec.
+# This string is subject to word splitting.
+# Default is "/usr/X11R6/bin/X -br"
+ServerCmd=/usr/X11R6/bin/X
+# Additional arguments for the X-servers for local sessions.
+# This string is subject to word splitting.
+# Default is ""
+ServerArgsLocal=-nolisten tcp
+# Additional arguments for the X-servers for remote sessions.
+# This string is subject to word splitting.
+# Default is ""
+#ServerArgsRemote=
+# Restart instead of resetting the local X-server after session exit.
+# Use it if the server leaks memory etc.
+# Default is false
+#TerminateServer=true
+# The signal needed to reset the local X-server.
+# Default is 1 (SIGHUP)
+#ResetSignal=1
+# The signal needed to terminate the local X-server.
+# Default is 15 (SIGTERM)
+#TermSignal=15
+# Create X-authorizations for local displays.
+# Default is true
+#Authorize=false
+# Which X-authorization mechanisms should be used.
+# Default is "MIT-MAGIC-COOKIE-1"
+#AuthNames=
+# Need to reset the X-server to make it read initial Xauth file.
+# Default is false
+#ResetForAuth=true
+# See above
+AllowNullPasswd=true
+# See above
+AllowShutdown=All
+# Enable password-less logins on this display. USE WITH EXTREME CARE!
+# Default is false
+NoPassEnable=true
+# The users that do not need to provide a password to log in. NEVER list root!
+# "*" means all non-root users. @<group> means all users in that group.
+# Default is ""
+NoPassUsers=
+
+# Greeter config for local displays
+[X-:*-Greeter]
+# See above
+PreselectUser=None
+# See above
+FocusPasswd=true
+# Specify whether the greeter of local displays should start up in host chooser
+# (remote) or login (local) mode and whether it is allowed to switch to the
+# other mode.
+# "LocalOnly" - only local login possible
+# "DefaultLocal" - start up in local mode, but allow switching to remote mode
+# "DefaultRemote" - ... and the other way round
+# "RemoteOnly" - only choice of remote host possible
+# Default is LocalOnly
+LoginMode=DefaultLocal
+# A list of hosts to be automatically added to the remote login menu. The
+# special name "*" means broadcast.
+# Default is "*"
+#ChooserHosts=*,ugly,sky,dino,kiste.local,login.crap.com
+# Show the "Restart X Server"/"Close Connection" action in the greeter.
+# Default is true
+AllowClose=false
+# The user to preselect if PreselectUser=Default.
+# Default is ""
+DefaultUser=
+
+# Core config for 1st local display
+[X-:0-Core]
+# The TTY line (without /dev/) the X-server covers physically.
+# Default is ""
+ServerTTY=
+# Enable automatic login. USE WITH EXTREME CARE!
+# Default is false
+AutoLoginEnable=true
+# If true, auto-login after logout. If false, auto-login is performed only
+# when a display session starts up.
+# Default is false
+#AutoLoginAgain=true
+# The delay in seconds before automatic login kicks in.
+# Default is 0
+#AutoLoginDelay=10
+# The user to log in automatically. NEVER specify root!
+# Default is ""
+AutoLoginUser=
+# The password for the user to log in automatically. This is NOT required
+# unless the user is logged into a NIS or Kerberos domain. If you use this
+# option, you should "chmod 600 kdmrc" for obvious reasons.
+# Default is ""
+#AutoLoginPass=secret!
+# Immediately lock the automatically started session. This works only with
+# KDE sessions.
+# Default is false
+#AutoLoginLocked=true
+# See above
+ClientLogFile=.xsession-errors
+
+# Greeter config for 1st local display
+[X-:0-Greeter]
+# See above
+#PreselectUser=Default
+# See above
+#DefaultUser=johndoe

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/init
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/init	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/init	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,40 +1,40 @@
-session.screen0.slit.placement:	BottomRight
-session.screen0.slit.direction:	Vertical
-session.screen0.slit.onTop:	False
-session.screen0.slit.autoHide:	False
-session.screen0.tab.placement:	Top
-session.screen0.tab.alignment:	Left
-session.screen0.tab.rotatevertical:	True
-session.screen0.toolbar.onTop:	False
-session.screen0.toolbar.autoHide:	False
-session.screen0.toolbar.placement:	BottomCenter
-session.screen0.toolbar.widthPercent:	66
-session.screen0.workspaceNames:	one,two,three,four
-session.screen0.strftimeFormat:	%k:%M
-session.screen0.focusNewWindows:	True
-session.screen0.focusModel:	ClickToFocus
-session.screen0.fullMaximization:	False
-session.screen0.edgeSnapThreshold:	0
-session.screen0.rowPlacementDirection:	LeftToRight
-session.screen0.workspaces:	4
-session.screen0.focusLastWindow:	True
-session.screen0.colPlacementDirection:	TopToBottom
-session.screen0.windowPlacement:	RowSmartPlacement
-session.screen0.tab.width:	64
-session.screen0.tab.height:	16
-session.screen0.showwindowposition: true
-session.screen0.rootCommand: ~/.fluxbox/startup
-session.opaqueMove:	False
-session.autoRaiseDelay:	250
-session.menuFile:	~/.fluxbox/menu
-session.cacheLife:	5
-session.styleFile:	/usr/X11R6/share/fluxbox/styles/Clean
-session.keyFile: ~/.fluxbox/keys
-session.colorsPerChannel:	4
-session.doubleClickInterval:	250
-session.cacheMax:	200
-session.imageDither:	True
-session.iconbar: true
-session.titlebar.left: Stick
-session.titlebar.right: Minimize Maximize Close
-
+session.screen0.slit.placement:	BottomRight
+session.screen0.slit.direction:	Vertical
+session.screen0.slit.onTop:	False
+session.screen0.slit.autoHide:	False
+session.screen0.tab.placement:	Top
+session.screen0.tab.alignment:	Left
+session.screen0.tab.rotatevertical:	True
+session.screen0.toolbar.onTop:	False
+session.screen0.toolbar.autoHide:	False
+session.screen0.toolbar.placement:	BottomCenter
+session.screen0.toolbar.widthPercent:	66
+session.screen0.workspaceNames:	one,two,three,four
+session.screen0.strftimeFormat:	%k:%M
+session.screen0.focusNewWindows:	True
+session.screen0.focusModel:	ClickToFocus
+session.screen0.fullMaximization:	False
+session.screen0.edgeSnapThreshold:	0
+session.screen0.rowPlacementDirection:	LeftToRight
+session.screen0.workspaces:	4
+session.screen0.focusLastWindow:	True
+session.screen0.colPlacementDirection:	TopToBottom
+session.screen0.windowPlacement:	RowSmartPlacement
+session.screen0.tab.width:	64
+session.screen0.tab.height:	16
+session.screen0.showwindowposition: true
+session.screen0.rootCommand: ~/.fluxbox/startup
+session.opaqueMove:	False
+session.autoRaiseDelay:	250
+session.menuFile:	~/.fluxbox/menu
+session.cacheLife:	5
+session.styleFile:	/usr/X11R6/share/fluxbox/styles/Clean
+session.keyFile: ~/.fluxbox/keys
+session.colorsPerChannel:	4
+session.doubleClickInterval:	250
+session.cacheMax:	200
+session.imageDither:	True
+session.iconbar: true
+session.titlebar.left: Stick
+session.titlebar.right: Minimize Maximize Close
+

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/keys
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/keys	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/keys	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,14 +1,14 @@
-Mod1 Tab :NextWindow
-Mod1 Shift Tab :PrevWindow
-Mod1 F1 :Workspace1
-Mod1 F2 :Workspace2
-Mod1 F3 :Workspace3
-Mod1 F4 :Workspace4
-Mod1 F5 :Workspace5
-Mod1 F6 :Workspace6
-Mod1 F7 :Workspace7
-Mod1 F8 :Workspace8
-Mod1 F9 :Workspace9
-Mod1 F10 :Workspace10
-Mod1 F11 :Workspace11
-Mod1 F12 :Workspace12
+Mod1 Tab :NextWindow
+Mod1 Shift Tab :PrevWindow
+Mod1 F1 :Workspace1
+Mod1 F2 :Workspace2
+Mod1 F3 :Workspace3
+Mod1 F4 :Workspace4
+Mod1 F5 :Workspace5
+Mod1 F6 :Workspace6
+Mod1 F7 :Workspace7
+Mod1 F8 :Workspace8
+Mod1 F9 :Workspace9
+Mod1 F10 :Workspace10
+Mod1 F11 :Workspace11
+Mod1 F12 :Workspace12

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/menu
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/menu	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/menu	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,99 +1,99 @@
-[begin] (Fluxbox)
-	[exec]    (xterm) {xterm}
-	[exec] (konqueror) {kfmclient openProfile webbrowsing}
-	[exec] (Run) {fbrun}
-[submenu] (Terminals)
-	[exec] (xterm) {xterm}
-	[exec] (konsole) {konsole}
-[end]
-[submenu] (Net)
-[submenu] (Browsers)
-	[exec] (konqueror) {kfmclient openProfile webbrowsing}
-[end]
-[submenu] (IM)
-	[exec] (kopete) {kopete}
-[end]
-[submenu] (Mail)
-	[exec] (kmail) {kmail}
-[end]
-[end]
-[submenu] (Editors)
-	[exec] (xedit) {xedit}
-	[exec] (kwrite) {kwrite}
-	[exec] (kate) {kate}
-[end]
-[submenu] (Multimedia)
-[submenu] (Graphics)
-	[exec] (xv) {xv}
-	[exec] (kiconedit) {kiconedit}
-[end]
-[submenu] (Music)
-	[exec] (kmix) {kmix}
-[end]
-[submenu] (Misc)
-	[exec] (gmplayer) {gmplayer}
-[end]
-[submenu] (X-utils)
-	[exec] (xfontsel) {xfontsel}
-	[exec] (xman) {xman}
-	[exec] (xload) {xload}
-	[exec] (editres) {editres}
-	[exec] (viewres) {viewres}
-	[exec] (xclock) {xclock}
-[end]
-[end]
-[submenu] (Office)
-	[exec] (xclock) {xclock}
-	[exec] (xcalc) {xcalc}
-	[exec] (kcalc) {kcalc}
-	[exec] (xpdf) {xpdf}
-[end]
-[submenu] (Games)
-	[exec] (xeyes) {xeyes}
-[end]
-[submenu] (KDE-menus)
-[submenu] (Applications)
-	[exec] ()         {}
-	[exec] (KMag)         {kmag -caption "%c" %i %m}
-	[exec] (KMouseTool)         {kmousetool -caption "%c" %i %m}
-	[exec] (KMouth)         {kmouth -caption "%c" %i %m}
-[end]
-[submenu] (Graphics)
-	[exec] ()         {}
-[end]
-[submenu] (Internet)
-	[exec] ()         {}
-[end]
-[submenu] (System)
-	[exec] ()         {}
-	[exec] ()         {}
-	[exec] ()         {}
-[end]
-[submenu] (Toys)
-	[exec] ()         {}
-[end]
-[submenu] (Utilities)
-	[exec] ()         {}
-	[exec] ()         {}
-	[exec] ()         {}
-	[exec] ()         {}
-	[exec] (SuperKaramba)         {superkaramba %U}
-[end]
-	[exec] (Konqueror)         {konqueror %U}
-[end]
-[submenu] (Fluxbox-menu)
-	[config] (Configure)
-[submenu] (Styles) {Choose a style...}
-	[stylesdir] (/usr/local/share/fluxbox/styles)
-	[stylesdir] (~/.fluxbox/styles)
-[end]
-	[workspaces]   (Workspace List)
-[submenu] (Tools)
-	[exec] (Windowname) {xprop|grep WM_CLASS|cut -d \" -f 2|xmessage -file - -center}
-	[exec] (Run) {fbrun}
-[end]
-	[reconfig] (Reload config)
-	[restart] (Restart)
-	[exit] (Exit)
-[end]
-[end]
+[begin] (Fluxbox)
+	[exec]    (xterm) {xterm}
+	[exec] (konqueror) {kfmclient openProfile webbrowsing}
+	[exec] (Run) {fbrun}
+[submenu] (Terminals)
+	[exec] (xterm) {xterm}
+	[exec] (konsole) {konsole}
+[end]
+[submenu] (Net)
+[submenu] (Browsers)
+	[exec] (konqueror) {kfmclient openProfile webbrowsing}
+[end]
+[submenu] (IM)
+	[exec] (kopete) {kopete}
+[end]
+[submenu] (Mail)
+	[exec] (kmail) {kmail}
+[end]
+[end]
+[submenu] (Editors)
+	[exec] (xedit) {xedit}
+	[exec] (kwrite) {kwrite}
+	[exec] (kate) {kate}
+[end]
+[submenu] (Multimedia)
+[submenu] (Graphics)
+	[exec] (xv) {xv}
+	[exec] (kiconedit) {kiconedit}
+[end]
+[submenu] (Music)
+	[exec] (kmix) {kmix}
+[end]
+[submenu] (Misc)
+	[exec] (gmplayer) {gmplayer}
+[end]
+[submenu] (X-utils)
+	[exec] (xfontsel) {xfontsel}
+	[exec] (xman) {xman}
+	[exec] (xload) {xload}
+	[exec] (editres) {editres}
+	[exec] (viewres) {viewres}
+	[exec] (xclock) {xclock}
+[end]
+[end]
+[submenu] (Office)
+	[exec] (xclock) {xclock}
+	[exec] (xcalc) {xcalc}
+	[exec] (kcalc) {kcalc}
+	[exec] (xpdf) {xpdf}
+[end]
+[submenu] (Games)
+	[exec] (xeyes) {xeyes}
+[end]
+[submenu] (KDE-menus)
+[submenu] (Applications)
+	[exec] ()         {}
+	[exec] (KMag)         {kmag -caption "%c" %i %m}
+	[exec] (KMouseTool)         {kmousetool -caption "%c" %i %m}
+	[exec] (KMouth)         {kmouth -caption "%c" %i %m}
+[end]
+[submenu] (Graphics)
+	[exec] ()         {}
+[end]
+[submenu] (Internet)
+	[exec] ()         {}
+[end]
+[submenu] (System)
+	[exec] ()         {}
+	[exec] ()         {}
+	[exec] ()         {}
+[end]
+[submenu] (Toys)
+	[exec] ()         {}
+[end]
+[submenu] (Utilities)
+	[exec] ()         {}
+	[exec] ()         {}
+	[exec] ()         {}
+	[exec] ()         {}
+	[exec] (SuperKaramba)         {superkaramba %U}
+[end]
+	[exec] (Konqueror)         {konqueror %U}
+[end]
+[submenu] (Fluxbox-menu)
+	[config] (Configure)
+[submenu] (Styles) {Choose a style...}
+	[stylesdir] (/usr/local/share/fluxbox/styles)
+	[stylesdir] (~/.fluxbox/styles)
+[end]
+	[workspaces]   (Workspace List)
+[submenu] (Tools)
+	[exec] (Windowname) {xprop|grep WM_CLASS|cut -d \" -f 2|xmessage -file - -center}
+	[exec] (Run) {fbrun}
+[end]
+	[reconfig] (Reload config)
+	[restart] (Restart)
+	[exit] (Exit)
+[end]
+[end]

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/menu.bak
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/menu.bak	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/menu.bak	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,99 +1,99 @@
-[begin] (Fluxbox)
-	[exec]    (xterm) {xterm}
-	[exec] (konqueror) {kfmclient openProfile webbrowsing}
-	[exec] (Run) {fbrun}
-[submenu] (Terminals)
-	[exec] (xterm) {xterm}
-	[exec] (konsole) {konsole}
-[end]
-[submenu] (Net)
-[submenu] (Browsers)
-	[exec] (konqueror) {kfmclient openProfile webbrowsing}
-[end]
-[submenu] (IM)
-	[exec] (kopete) {kopete}
-[end]
-[submenu] (Mail)
-	[exec] (kmail) {kmail}
-[end]
-[end]
-[submenu] (Editors)
-	[exec] (xedit) {xedit}
-	[exec] (kwrite) {kwrite}
-	[exec] (kate) {kate}
-[end]
-[submenu] (Multimedia)
-[submenu] (Graphics)
-	[exec] (xv) {xv}
-	[exec] (kiconedit) {kiconedit}
-[end]
-[submenu] (Music)
-	[exec] (kmix) {kmix}
-[end]
-[submenu] (Misc)
-	[exec] (gmplayer) {gmplayer}
-[end]
-[submenu] (X-utils)
-	[exec] (xfontsel) {xfontsel}
-	[exec] (xman) {xman}
-	[exec] (xload) {xload}
-	[exec] (editres) {editres}
-	[exec] (viewres) {viewres}
-	[exec] (xclock) {xclock}
-[end]
-[end]
-[submenu] (Office)
-	[exec] (xclock) {xclock}
-	[exec] (xcalc) {xcalc}
-	[exec] (kcalc) {kcalc}
-	[exec] (xpdf) {xpdf}
-[end]
-[submenu] (Games)
-	[exec] (xeyes) {xeyes}
-[end]
-[submenu] (KDE-menus)
-[submenu] (Applications)
-	[exec] ()         {}
-	[exec] (KMag)         {kmag -caption "%c" %i %m}
-	[exec] (KMouseTool)         {kmousetool -caption "%c" %i %m}
-	[exec] (KMouth)         {kmouth -caption "%c" %i %m}
-[end]
-[submenu] (Graphics)
-	[exec] ()         {}
-[end]
-[submenu] (Internet)
-	[exec] ()         {}
-[end]
-[submenu] (System)
-	[exec] ()         {}
-	[exec] ()         {}
-	[exec] ()         {}
-[end]
-[submenu] (Toys)
-	[exec] ()         {}
-[end]
-[submenu] (Utilities)
-	[exec] ()         {}
-	[exec] ()         {}
-	[exec] ()         {}
-	[exec] ()         {}
-	[exec] (SuperKaramba)         {superkaramba %U}
-[end]
-	[exec] (Konqueror)         {konqueror %U}
-[end]
-[submenu] (Fluxbox-menu)
-	[config] (Configure)
-[submenu] (Styles) {Choose a style...}
-	[stylesdir] (/usr/local/share/fluxbox/styles)
-	[stylesdir] (~/.fluxbox/styles)
-[end]
-	[workspaces]   (Workspace List)
-[submenu] (Tools)
-	[exec] (Windowname) {xprop|grep WM_CLASS|cut -d \" -f 2|xmessage -file - -center}
-	[exec] (Run) {fbrun}
-[end]
-	[reconfig] (Reload config)
-	[restart] (Restart)
-	[exit] (Exit)
-[end]
-[end]
+[begin] (Fluxbox)
+	[exec]    (xterm) {xterm}
+	[exec] (konqueror) {kfmclient openProfile webbrowsing}
+	[exec] (Run) {fbrun}
+[submenu] (Terminals)
+	[exec] (xterm) {xterm}
+	[exec] (konsole) {konsole}
+[end]
+[submenu] (Net)
+[submenu] (Browsers)
+	[exec] (konqueror) {kfmclient openProfile webbrowsing}
+[end]
+[submenu] (IM)
+	[exec] (kopete) {kopete}
+[end]
+[submenu] (Mail)
+	[exec] (kmail) {kmail}
+[end]
+[end]
+[submenu] (Editors)
+	[exec] (xedit) {xedit}
+	[exec] (kwrite) {kwrite}
+	[exec] (kate) {kate}
+[end]
+[submenu] (Multimedia)
+[submenu] (Graphics)
+	[exec] (xv) {xv}
+	[exec] (kiconedit) {kiconedit}
+[end]
+[submenu] (Music)
+	[exec] (kmix) {kmix}
+[end]
+[submenu] (Misc)
+	[exec] (gmplayer) {gmplayer}
+[end]
+[submenu] (X-utils)
+	[exec] (xfontsel) {xfontsel}
+	[exec] (xman) {xman}
+	[exec] (xload) {xload}
+	[exec] (editres) {editres}
+	[exec] (viewres) {viewres}
+	[exec] (xclock) {xclock}
+[end]
+[end]
+[submenu] (Office)
+	[exec] (xclock) {xclock}
+	[exec] (xcalc) {xcalc}
+	[exec] (kcalc) {kcalc}
+	[exec] (xpdf) {xpdf}
+[end]
+[submenu] (Games)
+	[exec] (xeyes) {xeyes}
+[end]
+[submenu] (KDE-menus)
+[submenu] (Applications)
+	[exec] ()         {}
+	[exec] (KMag)         {kmag -caption "%c" %i %m}
+	[exec] (KMouseTool)         {kmousetool -caption "%c" %i %m}
+	[exec] (KMouth)         {kmouth -caption "%c" %i %m}
+[end]
+[submenu] (Graphics)
+	[exec] ()         {}
+[end]
+[submenu] (Internet)
+	[exec] ()         {}
+[end]
+[submenu] (System)
+	[exec] ()         {}
+	[exec] ()         {}
+	[exec] ()         {}
+[end]
+[submenu] (Toys)
+	[exec] ()         {}
+[end]
+[submenu] (Utilities)
+	[exec] ()         {}
+	[exec] ()         {}
+	[exec] ()         {}
+	[exec] ()         {}
+	[exec] (SuperKaramba)         {superkaramba %U}
+[end]
+	[exec] (Konqueror)         {konqueror %U}
+[end]
+[submenu] (Fluxbox-menu)
+	[config] (Configure)
+[submenu] (Styles) {Choose a style...}
+	[stylesdir] (/usr/local/share/fluxbox/styles)
+	[stylesdir] (~/.fluxbox/styles)
+[end]
+	[workspaces]   (Workspace List)
+[submenu] (Tools)
+	[exec] (Windowname) {xprop|grep WM_CLASS|cut -d \" -f 2|xmessage -file - -center}
+	[exec] (Run) {fbrun}
+[end]
+	[reconfig] (Reload config)
+	[restart] (Restart)
+	[exit] (Exit)
+[end]
+[end]

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/startup
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/startup	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.fluxbox/startup	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,5 +1,5 @@
-# Start idesk
-idesk &
-
-# Start gkrellm
-gkrellm &
+# Start idesk
+idesk &
+
+# Start gkrellm
+gkrellm &

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.gkrellm2/user-config
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.gkrellm2/user-config	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.gkrellm2/user-config	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,113 +1,113 @@
-### GKrellM user config.  Auto written, do not edit (usually) ###
-### Version 2.2.9 ###
-enable_hostname 1
-hostname_short 0
-enable_sysname 0
-mbmon_port 0
-sticky_state 0
-dock_type 0
-decorated 0
-skip_taskbar 0
-skip_pager 0
-above 0
-below 0
-track_gtk_theme_name 0
-default_track_theme "Default"
-save_position 0
-chart_width 60
-update_HZ 10
-allow_multiple_instances 0
-float_factor 1000
-hostname sysname_mode 1
-clock_cal clock_launch 
-clock_cal clock_tooltip 
-clock_cal cal_launch 
-clock_cal cal_tooltip 
-clock_cal hour_chime_command 
-clock_cal quarter_chime_command 
-clock_cal loop_chime_enable 0
-clock_cal clock_options 1 1 0 1
-clock_cal cal_options 1
-cpu extra_info cpu 1
-cpu chart_config cpu 40 25 0 0 0 0 : 0 0 0 0 500 : 0 0 0 0 500 : 0 0 0 0 500
-cpu enable 1
-cpu smp_mode 0
-cpu omit_nice_mode 0
-cpu config_tracking 0
-cpu sensor_mode 0
-cpu text_format $T
-proc enable 1 1
-proc launch 
-proc tooltip_comment 
-proc sensor_mode 0
-proc text_format \w88\a$p\f procs\n\e$u\f users
-proc chart_config 40 100 0 0 0 0 : 1 0 0 0 500 : 0 0 0 0 500
-disk assign_method 2
-disk device Disk 0 0 0 1 1 0 0
-disk chart_config Disk 40 300000 0 1 0 0 : 0 0 0 0 500 : 0 0 0 0 500
-disk device ad0 0 0 -1 0 1 -1 0
-disk device cd0 0 0 -1 0 1 -1 0
-disk device pass0 0 0 -1 0 1 -1 0
-disk text_format $T
-inet text_format all \t$a\f $l\N$A\f $L
-inet update_interval 1
-net enables lnc0 1 1 0
-net chart_config lnc0 40 700 0 1 0 0 : 0 0 0 0 500 : 0 0 0 0 500
-net enables lo0 1 1 0
-net chart_config lo0 40 10000 0 1 0 0 : 0 0 0 0 500 : 0 0 0 0 500
-net enables tun0 1 1 0
-net chart_config tun0 40 2000 0 1 0 0 : 0 0 0 0 500 : 0 0 0 0 500
-net timer_enabled 1
-net timer_seconds 1
-net timer_iface tun0
-net timer_on 
-net timer_off 
-net text_format $T\b\c\f$L
-net reset_mday 1
-net net_stats_window_height 200
-meminfo mem_meter 1 1 0
-meminfo swap_meter 1 0
-meminfo swap_chart 0 1
-meminfo mem_launch 
-meminfo mem_tooltip 
-meminfo mem_data_format $t - $f free
-meminfo swap_launch 
-meminfo swap_tooltip 
-meminfo swap_data_format $t - $f free
-meminfo text_format $T
-fs fs_check_timeout 2
-fs nfs_check_timeout 16
-fs auto_eject 0
-fs binary_units 0
-fs data_format $t - $f free
-mail mailbox-local mbox /var/mail/q
-mail mua 
-mail notify 
-mail fetch_command 
-mail remote_check_timeout 5
-mail local_check_timeout 4
-mail fetch_check_is_local 0
-mail msg_count_mode 0
-mail animation_select_mode 3
-mail fetch_check_only_mode 0
-mail reset_remote_mode 0
-mail unseen_is_new 0
-mail enable 1 0 0 0
-mail animation_continuous 0
-mail show_tooltip 1
-mail mh_seq_ignore 0
-battery enable 0
-battery enable_composite 0
-battery estimate_time 0
-battery estimate_time_discharge 1500
-battery estimate_time_charge 3000
-battery estimate_time_charge_model 0
-battery full_cap_fallback 5000
-battery poll_interval 5
-battery launch1 
-battery tooltip_comment 
-battery alert_units_percent 0
-battery display_mode_composite 0 -1
-uptime enable 1
-uptime launch 
-uptime tooltip 
+### GKrellM user config.  Auto written, do not edit (usually) ###
+### Version 2.2.9 ###
+enable_hostname 1
+hostname_short 0
+enable_sysname 0
+mbmon_port 0
+sticky_state 0
+dock_type 0
+decorated 0
+skip_taskbar 0
+skip_pager 0
+above 0
+below 0
+track_gtk_theme_name 0
+default_track_theme "Default"
+save_position 0
+chart_width 60
+update_HZ 10
+allow_multiple_instances 0
+float_factor 1000
+hostname sysname_mode 1
+clock_cal clock_launch 
+clock_cal clock_tooltip 
+clock_cal cal_launch 
+clock_cal cal_tooltip 
+clock_cal hour_chime_command 
+clock_cal quarter_chime_command 
+clock_cal loop_chime_enable 0
+clock_cal clock_options 1 1 0 1
+clock_cal cal_options 1
+cpu extra_info cpu 1
+cpu chart_config cpu 40 25 0 0 0 0 : 0 0 0 0 500 : 0 0 0 0 500 : 0 0 0 0 500
+cpu enable 1
+cpu smp_mode 0
+cpu omit_nice_mode 0
+cpu config_tracking 0
+cpu sensor_mode 0
+cpu text_format $T
+proc enable 1 1
+proc launch 
+proc tooltip_comment 
+proc sensor_mode 0
+proc text_format \w88\a$p\f procs\n\e$u\f users
+proc chart_config 40 100 0 0 0 0 : 1 0 0 0 500 : 0 0 0 0 500
+disk assign_method 2
+disk device Disk 0 0 0 1 1 0 0
+disk chart_config Disk 40 300000 0 1 0 0 : 0 0 0 0 500 : 0 0 0 0 500
+disk device ad0 0 0 -1 0 1 -1 0
+disk device cd0 0 0 -1 0 1 -1 0
+disk device pass0 0 0 -1 0 1 -1 0
+disk text_format $T
+inet text_format all \t$a\f $l\N$A\f $L
+inet update_interval 1
+net enables lnc0 1 1 0
+net chart_config lnc0 40 700 0 1 0 0 : 0 0 0 0 500 : 0 0 0 0 500
+net enables lo0 1 1 0
+net chart_config lo0 40 10000 0 1 0 0 : 0 0 0 0 500 : 0 0 0 0 500
+net enables tun0 1 1 0
+net chart_config tun0 40 2000 0 1 0 0 : 0 0 0 0 500 : 0 0 0 0 500
+net timer_enabled 1
+net timer_seconds 1
+net timer_iface tun0
+net timer_on 
+net timer_off 
+net text_format $T\b\c\f$L
+net reset_mday 1
+net net_stats_window_height 200
+meminfo mem_meter 1 1 0
+meminfo swap_meter 1 0
+meminfo swap_chart 0 1
+meminfo mem_launch 
+meminfo mem_tooltip 
+meminfo mem_data_format $t - $f free
+meminfo swap_launch 
+meminfo swap_tooltip 
+meminfo swap_data_format $t - $f free
+meminfo text_format $T
+fs fs_check_timeout 2
+fs nfs_check_timeout 16
+fs auto_eject 0
+fs binary_units 0
+fs data_format $t - $f free
+mail mailbox-local mbox /var/mail/q
+mail mua 
+mail notify 
+mail fetch_command 
+mail remote_check_timeout 5
+mail local_check_timeout 4
+mail fetch_check_is_local 0
+mail msg_count_mode 0
+mail animation_select_mode 3
+mail fetch_check_only_mode 0
+mail reset_remote_mode 0
+mail unseen_is_new 0
+mail enable 1 0 0 0
+mail animation_continuous 0
+mail show_tooltip 1
+mail mh_seq_ignore 0
+battery enable 0
+battery enable_composite 0
+battery estimate_time 0
+battery estimate_time_discharge 1500
+battery estimate_time_charge 3000
+battery estimate_time_charge_model 0
+battery full_cap_fallback 5000
+battery poll_interval 5
+battery launch1 
+battery tooltip_comment 
+battery alert_units_percent 0
+battery display_mode_composite 0 -1
+uptime enable 1
+uptime launch 
+uptime tooltip 

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.idesktop/default.lnk
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.idesktop/default.lnk	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.idesktop/default.lnk	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,8 +1,8 @@
-table Icon
-  Caption: PC-BSD Homepage
-  Command: konqueror http://www.pcbsd.org
-  Icon: /usr/local/share/icons/nuvola/64x64/apps/konqueror.png
-  X: 919
-  Y: 50
-end
-
+table Icon
+  Caption: PC-BSD Homepage
+  Command: konqueror http://www.pcbsd.org
+  Icon: /usr/local/share/icons/nuvola/64x64/apps/konqueror.png
+  X: 919
+  Y: 50
+end
+

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.idesktop/fm.lnk
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.idesktop/fm.lnk	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.idesktop/fm.lnk	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,8 +1,8 @@
-table Icon
-  Caption: File Manager
-  Command: konqueror ~
-  Icon: /usr/local/share/icons/nuvola/64x64/filesystems/folder_cyan_open.png
-  X: 919
-  Y: 250
-end
-
+table Icon
+  Caption: File Manager
+  Command: konqueror ~
+  Icon: /usr/local/share/icons/nuvola/64x64/filesystems/folder_cyan_open.png
+  X: 919
+  Y: 250
+end
+

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.idesktop/pbi.lnk
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.idesktop/pbi.lnk	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.idesktop/pbi.lnk	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,8 +1,8 @@
-table Icon
-  Caption: Get PBIs
-  Command: konqueror http://www.pbidir.com
-  Icon: /usr/local/share/icons/nuvola/64x64/apps/konqueror.png
-  X: 919
-  Y: 150
-end
-
+table Icon
+  Caption: Get PBIs
+  Command: konqueror http://www.pbidir.com
+  Icon: /usr/local/share/icons/nuvola/64x64/apps/konqueror.png
+  X: 919
+  Y: 150
+end
+

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/env/win-key.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/env/win-key.sh	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/env/win-key.sh	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,3 +1,3 @@
-#!/bin/sh
-
-xmodmap -e 'keycode 115=Menu'
+#!/bin/sh
+
+xmodmap -e 'keycode 115=Menu'

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kconf_update/log/update.log
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kconf_update/log/update.log	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kconf_update/log/update.log	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,309 +1,309 @@
-2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kcookiescfg.upd' for new updates
-2006-01-11T13:06:18 kcookiescfg.upd: Found new update 'kde2.2/b1'
-2006-01-11T13:06:18 kcookiescfg.upd: Found new update 'kde3.1/cvs'
-2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kded.upd' for new updates
-2006-01-11T13:06:18 kded.upd: Found new update 'kde3.0'
-2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kdeprintrc.upd' for new updates
-2006-01-11T13:06:18 kdeprintrc.upd: Found new update 'kde-3.1-toolbar'
-2006-01-11T13:06:18 kdeprintrc.upd: Skipping kdeprintrc:General:ViewMenuBar, already exists.
-2006-01-11T13:06:18 kdeprintrc.upd: RemoveKey removes kdeprintrc:General:ViewToolBar
-2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/knewsticker.upd' for new updates
-2006-01-11T13:06:18 knewsticker.upd: Found new update 'KNewsTicker-0.2'
-2006-01-11T13:06:18 knewsticker.upd: Running script 'knt-0.1-0.2.pl'
-2006-01-11T13:06:18 knewsticker.upd: Found new update 'KNewsTicker-0.2-Rename-KDE3'
-2006-01-11T13:06:18 knewsticker.upd: Found new update 'KNewsTicker-0.2-Rename-KDE3.1'
-2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kghostview.upd' for new updates
-2006-01-11T13:06:18 kghostview.upd: Found new update '1changeToKConfigXT'
-2006-01-11T13:06:18 kghostview.upd: Found new update '2changeToKConfigXT'
-2006-01-11T13:06:18 kghostview.upd: Running script 'update-to-xt-names.pl'
-2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kpilot.upd' for new updates
-2006-01-11T13:06:18 kpilot.upd: Found new update 'kdepim_3.3'
-2006-01-11T13:06:18 kpilot.upd: Found new update 'kdepim_3.3_SplitConfig'
-2006-01-11T13:06:18 kpilot.upd: Skipping update 'kdepim_3.3_SplitConfig'
-2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kpalmdoc.upd' for new updates
-2006-01-11T13:06:18 kpalmdoc.upd: Found new update 'kdepim_3.3'
-2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kmail.upd' for new updates
-2006-01-11T13:06:18 kmail.upd: Found new update '1'
-2006-01-11T13:06:18 kmail.upd: Running script 'upgrade-transport.pl'
-2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Mailer
-2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Method
-2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Precommand
-2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Smtp Host
-2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Smtp Password
-2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Smtp Port
-2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Smtp Username
-2006-01-11T13:06:18 kmail.upd: Found new update '4'
-2006-01-11T13:06:18 kmail.upd: Found new update '5'
-2006-01-11T13:06:18 kmail.upd: Found new update '6'
-2006-01-11T13:06:18 kmail.upd: Found new update '7'
-2006-01-11T13:06:18 kmail.upd: Found new update '8'
-2006-01-11T13:06:18 kmail.upd: Running script 'kmail-pgpidentity.pl'
-2006-01-11T13:06:18 kmail.upd: Found new update '9'
-2006-01-11T13:06:18 kmail.upd: Running script 'upgrade-signature.pl'
-2006-01-11T13:06:18 kmail.upd: Found new update '3.1-update-identities'
-2006-01-11T13:06:18 kmail.upd: Running script 'kmail-upd-identities.pl'
-2006-01-11T13:06:18 kmail.upd: Found new update '3.1-use-identity-uoids'
-2006-01-11T13:06:18 kmail.upd: Running script 'kmail-3.1-use-UOID-for-identities.pl'
-2006-01-11T13:06:18 [Script] Use of uninitialized value in hash element at /usr/local/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl line 45.
-2006-01-11T13:06:18 [Script] Use of uninitialized value in concatenation (.) or string at /usr/local/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl line 45.
-2006-01-11T13:06:18 [Script] Use of uninitialized value in hash element at /usr/local/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl line 49.
-2006-01-11T13:06:18 [Script] Use of uninitialized value in concatenation (.) or string at /usr/local/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl line 49.
-2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:General:Default Identity
-2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:Composer:previous-identity
-2006-01-11T13:06:18 kmail.upd: Updating kmailrc:Composer:previous-identity to ''
-2006-01-11T13:06:18 kmail.upd: Updating kmailrc:General:Default Identity to ''
-2006-01-11T13:06:18 kmail.upd: Found new update '3.1-new-mail-notification'
-2006-01-11T13:06:18 kmail.upd: Running script 'kmail-3.1-update-new-mail-notification-settings.pl'
-2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:General:msgbox-on-mail
-2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:General:exec-on-mail
-2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:General:exec-on-mail-cmd
-2006-01-11T13:06:18 kmail.upd: Found new update '3.2-update-loop-on-goto-unread-settings'
-2006-01-11T13:06:18 kmail.upd: Running script 'kmail-3.2-update-loop-on-goto-unread-settings.sh'
-2006-01-11T13:06:18 kmail.upd: !! An error occured while running 'bash /usr/local/share/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh'
-2006-01-11T13:06:18 kmail.upd: Found new update '3.1.4-dont-use-UOID-0-for-any-identity'
-2006-01-11T13:06:18 kmail.upd: Running script 'kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.2-misc'
-2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.2-misc.sh'
-2006-01-11T13:06:19 kmail.upd: !! An error occured while running 'bash /usr/local/share/apps/kconf_update/kmail-3.2-misc.sh'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.2-moves'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.3-use-ID-for-accounts'
-2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.3-use-ID-for-accounts.pl'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.3-update-filter-rules'
-2006-01-11T13:06:19 kmail.upd: !! Script 'kmail-3.3-update-filter-rules.pl' not found in line 99 : 'Script=kmail-3.3-update-filter-rules.pl,perl'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.3-move-identities-to-own-file'
-2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.3-move-identities.pl'
-2006-01-11T13:06:19 kmail.upd: Script removes kmailrc:General:Default Identity
-2006-01-11T13:06:19 kmail.upd: Updating emailidentities:General:Default Identity to ''
-2006-01-11T13:06:19 kmail.upd: Found new update '3.3-aegypten-kpgprc-to-kmailrc'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.3-aegypten-kpgprc-to-libkleopatrarc'
-2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.3-aegypten.pl'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.3-aegypten-emailidentities-split-sign-encr-keys'
-2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.3-split-sign-encr-keys.sh'
-2006-01-11T13:06:19 [Script] /usr/local/share/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh: not found
-2006-01-11T13:06:19 kmail.upd: !! An error occured while running '/usr/local/share/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.3-misc'
-2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.3-misc.pl'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.3b1-misc'
-2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.3b1-misc.pl'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.4'
-2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.4-misc.pl'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.4a'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.4b'
-2006-01-11T13:06:19 kmail.upd: Found new update '3.4.1'
-2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.4.1-update-status-filters.pl'
-2006-01-11T13:06:19 Checking update-file '/usr/local/share/apps/kconf_update/kio_help.upd' for new updates
-2006-01-11T13:06:19 kio_help.upd: Found new update 'kde3_2'
-2006-01-11T13:06:19 kio_help.upd: Running script 'move_kio_help_cache.sh'
-2006-01-11T13:06:19 [Script] mv: rename /home/kris/.kde/share/apps/kio_help/cache to /var/tmp/kdecache-kris/kio_help: No such file or directory
-2006-01-11T13:06:19 [Script] rmdir: /home/kris/.kde/share/apps/kio_help: No such file or directory
-2006-01-11T13:06:19 Checking update-file '/usr/local/share/apps/kconf_update/audiocd.upd' for new updates
-2006-01-11T13:06:19 audiocd.upd: Found new update '1'
-2006-01-11T13:06:19 audiocd.upd: Running script 'upgrade-metadata.sh'
-2006-01-11T13:06:19 audiocd.upd: !! An error occured while running 'bash /usr/local/share/apps/kconf_update/upgrade-metadata.sh'
-2006-01-11T13:06:19 Checking update-file '/usr/local/share/apps/kconf_update/kaudiocreator-libkcddb.upd' for new updates
-2006-01-11T13:06:19 kaudiocreator-libkcddb.upd: Found new update 'kaudiocreator-libkcddb'
-2006-01-11T13:06:19 Checking update-file '/usr/local/share/apps/kconf_update/kaudiocreator-meta.upd' for new updates
-2006-01-11T13:06:19 kaudiocreator-meta.upd: Found new update '3'
-2006-01-11T13:06:19 kaudiocreator-meta.upd: Running script 'upgrade-kaudiocreator-metadata.sh'
-2006-01-11T13:06:19 kaudiocreator-meta.upd: !! An error occured while running 'bash /usr/local/share/apps/kconf_update/upgrade-kaudiocreator-metadata.sh'
-2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kcmcddb-emailsettings.upd' for new updates
-2006-01-11T13:06:20 kcmcddb-emailsettings.upd: Found new update 'kcmcddb_emailsettings'
-2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/korganizer.upd' for new updates
-2006-01-11T13:06:20 korganizer.upd: Found new update 'korganizer_3.4_GroupwareCleanup'
-2006-01-11T13:06:20 korganizer.upd: Found new update 'korganizer_3.4_WebExport'
-2006-01-11T13:06:20 korganizer.upd: Found new update 'korganizer_3.4_FilterAction'
-2006-01-11T13:06:20 korganizer.upd: Found new update 'korganizer_3.4_HolidayPlugin'
-2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kcalcrc.upd' for new updates
-2006-01-11T13:06:20 kcalcrc.upd: Found new update 'KDE_3_2_0'
-2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kcharselect.upd' for new updates
-2006-01-11T13:06:20 kcharselect.upd: Found new update '1'
-2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kopete-account-kconf_update.upd' for new updates
-2006-01-11T13:06:20 kopete-account-kconf_update.upd: Found new update 'kopete0.7/r1'
-2006-01-11T13:06:20 kopete-account-kconf_update.upd: Running script 'kopete-account-kconf_update.sh'
-2006-01-11T13:06:20 kopete-account-kconf_update.upd: Found new update 'kopete0.10/r1'
-2006-01-11T13:06:20 kopete-account-kconf_update.upd: Running script 'kopete-account-0.10.pl'
-2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kioslave.upd' for new updates
-2006-01-11T13:06:20 kioslave.upd: Found new update 'kde2.2/r1'
-2006-01-11T13:06:20 kioslave.upd: Skipping update 'kde2.2/r1'
-2006-01-11T13:06:20 kioslave.upd: Found new update 'kde2.2/r2'
-2006-01-11T13:06:20 kioslave.upd: Running script 'useragent.pl'
-2006-01-11T13:06:20 kioslave.upd: Script removes kioslaverc:UserAgent:EntriesCount
-2006-01-11T13:06:20 kioslave.upd: Found new update 'kde2.2/r3'
-2006-01-11T13:06:20 kioslave.upd: Running script 'proxytype.pl'
-2006-01-11T13:06:20 kioslave.upd: Script removes kioslaverc:Proxy Settings:UseProxy
-2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd' for new updates
-2006-01-11T13:06:20 kopete-jabberpriorityaddition-kconf_update.upd: Found new update 'kopete0.9/r1'
-2006-01-11T13:06:20 kopete-jabberpriorityaddition-kconf_update.upd: Running script 'kopete-jabberpriorityaddition-kconf_update.sh'
-2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kopete-jabberproxytype-kconf_update.upd' for new updates
-2006-01-11T13:06:20 kopete-jabberproxytype-kconf_update.upd: Found new update 'kopete0.9/r1'
-2006-01-11T13:06:20 kopete-jabberproxytype-kconf_update.upd: Running script 'kopete-jabberproxytype-kconf_update.sh'
-2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kopete-nameTracking.upd' for new updates
-2006-01-11T13:06:20 kopete-nameTracking.upd: Found new update 'kopete0.9/r1'
-2006-01-11T13:06:20 kopete-nameTracking.upd: Running script 'kopete-nameTracking-kconf_update'
-2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kopete-pluginloader.upd' for new updates
-2006-01-11T13:06:20 kopete-pluginloader.upd: Found new update 'kopete0.7/r1'
-2006-01-11T13:06:20 kopete-pluginloader.upd: Running script 'kopete-pluginloader.pl'
-2006-01-11T13:06:20 kopete-pluginloader.upd: Script removes kopeterc::Modules
-2006-01-11T13:06:20 kopete-pluginloader.upd: Removing empty group kopeterc:
-2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/noatun.upd' for new updates
-2006-01-11T13:06:20 noatun.upd: Found new update 'noatun20'
-2006-01-11T13:06:20 noatun.upd: Running script 'noatun20update'
-2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/kpgp.upd' for new updates
-2006-01-11T13:06:21 kpgp.upd: Found new update 'preKDE3_a'
-2006-01-11T13:06:21 kpgp.upd: Found new update '3.1-1'
-2006-01-11T13:06:21 kpgp.upd: Running script 'kpgp-3.1-upgrade-address-data.pl'
-2006-01-11T13:06:21 kpgp.upd: Script removes kpgprc:General:addressKeyEntries
-2006-01-11T13:06:21 kpgp.upd: Script removes kpgprc:General:addressEntries
-2006-01-11T13:06:21 kpgp.upd: Updating kpgprc:General:addressEntries to '0'
-2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/korn-3-4-config_change.upd' for new updates
-2006-01-11T13:06:21 korn-3-4-config_change.upd: Found new update 'korn_kde_3_4_config_change'
-2006-01-11T13:06:21 korn-3-4-config_change.upd: Running script 'korn-3-4-config_change'
-2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/korn-3-5-update.upd' for new updates
-2006-01-11T13:06:21 korn-3-5-update.upd: Found new update 'korn-3-5-ssl-update'
-2006-01-11T13:06:21 korn-3-5-update.upd: Running script 'korn-3-5-ssl-update.pl'
-2006-01-11T13:06:21 korn-3-5-update.upd: Found new update 'korn-3-5-metadata-update'
-2006-01-11T13:06:21 korn-3-5-update.upd: Running script 'korn-3-5-metadata-update.pl'
-2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/kopete-pluginloader2.upd' for new updates
-2006-01-11T13:06:21 kopete-pluginloader2.upd: Found new update 'kopete0.8/r1'
-2006-01-11T13:06:21 kopete-pluginloader2.upd: Running script 'kopete-pluginloader2.sh'
-2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/favicons.upd' for new updates
-2006-01-11T13:06:21 favicons.upd: Found new update 'kde3_2'
-2006-01-11T13:06:21 favicons.upd: Running script 'move_favicons.sh'
-2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/kaccel.upd' for new updates
-2006-01-11T13:06:21 kaccel.upd: Found new update 'kde3.3/r1'
-2006-01-11T13:06:21 kaccel.upd: Running script 'convertShortcuts.pl'
-2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/kate-2.4.upd' for new updates
-2006-01-11T13:06:21 kate-2.4.upd: Found new update 'kate2.4'
-2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/kcmdisplayrc.upd' for new updates
-2006-01-11T13:06:21 kcmdisplayrc.upd: Found new update 'kde3'
-2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/kfmclient_3_2.upd' for new updates
-2006-01-11T13:06:21 kfmclient_3_2.upd: Found new update 'kfmclient_3_2'
-2006-01-11T13:06:21 kfmclient_3_2.upd: Running script 'kfmclient_3_2_update.sh'
-2006-01-11T13:06:21 kfmclient_3_2.upd: Script removes kfmclientrc:Settings:StartNewKonqueror
-2006-01-11T13:06:22 Checking update-file '/usr/local/share/apps/kconf_update/khotkeys_32b1_update.upd' for new updates
-2006-01-11T13:06:22 khotkeys_32b1_update.upd: Found new update 'kde32b1'
-2006-01-11T13:06:22 khotkeys_32b1_update.upd: Running script 'khotkeys_update' with arguments '--id kde32b1'
-2006-01-11T13:06:22 [Script] Fontconfig warning: "local.conf", line 236: missing test expression
-2006-01-11T13:06:22 [Script] Fontconfig warning: "local.conf", line 237: missing test expression
-2006-01-11T13:06:22 [Script] Fontconfig warning: "local.conf", line 238: missing test expression
-2006-01-11T13:06:22 [Script] Fontconfig warning: "local.conf", line 239: missing test expression
-2006-01-11T13:06:22 [Script] Fontconfig warning: "local.conf", line 240: missing test expression
-2006-01-11T13:06:22 Checking update-file '/usr/local/share/apps/kconf_update/kickerrc.upd' for new updates
-2006-01-11T13:06:22 kickerrc.upd: Found new update 'kde_3_1_sizeChanges'
-2006-01-11T13:06:22 kickerrc.upd: Running script 'kicker-3.1-properSizeSetting.pl'
-2006-01-11T13:06:22 kickerrc.upd: Found new update 'kde_3_4_reverseLayout'
-2006-01-11T13:06:22 kickerrc.upd: Running script 'kicker-3.4-reverseLayout'
-2006-01-11T13:06:22 kickerrc.upd: Found new update 'kde_3_5_taskbarEnums'
-2006-01-11T13:06:22 kickerrc.upd: Running script 'kicker-3.5-taskbarEnums.pl'
-2006-01-11T13:06:22 kickerrc.upd: Found new update 'kde_3_5_kconfigXTize'
-2006-01-11T13:06:22 kickerrc.upd: Running script 'kicker-3.5-kconfigXTize.pl'
-2006-01-11T13:06:22 kickerrc.upd: Updating kickerrc:menus:MenuEntryFormat to 'NameAndDescription'
-2006-01-11T13:06:22 Checking update-file '/usr/local/share/apps/kconf_update/klipperrc.upd' for new updates
-2006-01-11T13:06:22 klipperrc.upd: Found new update '25082001'
-2006-01-11T13:06:22 klipperrc.upd: Running script 'klipper-1-2.pl'
-2006-01-11T13:06:22 klipperrc.upd: Found new update 'kde3.1'
-2006-01-11T13:06:22 klipperrc.upd: Running script 'klipper-kde31.sh'
-2006-01-11T13:06:23 klipperrc.upd: Updating klipperrc:General:AutoStart to 'true'
-2006-01-11T13:06:23 Checking update-file '/usr/local/share/apps/kconf_update/klippershortcuts.upd' for new updates
-2006-01-11T13:06:23 klippershortcuts.upd: Found new update '04112002'
-2006-01-11T13:06:23 Checking update-file '/usr/local/share/apps/kconf_update/konqsidebartng.upd' for new updates
-2006-01-11T13:06:23 konqsidebartng.upd: Found new update 'konqsidebartng_rc'
-2006-01-11T13:06:23 konqsidebartng.upd: Found new update 'konqsidebartng_entries'
-2006-01-11T13:06:23 konqsidebartng.upd: Running script 'move_konqsidebartng_entries.sh'
-2006-01-11T13:06:23 Checking update-file '/usr/local/share/apps/kconf_update/konqueror_gestures_kde321_update.upd' for new updates
-2006-01-11T13:06:23 konqueror_gestures_kde321_update.upd: Found new update 'kde321'
-2006-01-11T13:06:23 konqueror_gestures_kde321_update.upd: Running script 'khotkeys_update' with arguments '--id konqueror_gestures_kde321'
-2006-01-11T13:06:23 [Script] Fontconfig warning: "local.conf", line 236: missing test expression
-2006-01-11T13:06:23 [Script] Fontconfig warning: "local.conf", line 237: missing test expression
-2006-01-11T13:06:23 [Script] Fontconfig warning: "local.conf", line 238: missing test expression
-2006-01-11T13:06:23 [Script] Fontconfig warning: "local.conf", line 239: missing test expression
-2006-01-11T13:06:23 [Script] Fontconfig warning: "local.conf", line 240: missing test expression
-2006-01-11T13:06:23 Checking update-file '/usr/local/share/apps/kconf_update/konsole.upd' for new updates
-2006-01-11T13:06:23 konsole.upd: Found new update 'kde2.2/r1'
-2006-01-11T13:06:24 konsole.upd: Found new update 'kde3.0/r1'
-2006-01-11T13:06:24 konsole.upd: Running script 'schemaStrip.pl'
-2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/ksmserver.upd' for new updates
-2006-01-11T13:06:24 ksmserver.upd: Found new update 'kde3'
-2006-01-11T13:06:24 ksmserver.upd: Running script 'move_session_config.sh'
-2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kuriikwsfilter.upd' for new updates
-2006-01-11T13:06:24 kuriikwsfilter.upd: Found new update 'post-kde3.1/cvs'
-2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwin.upd' for new updates
-2006-01-11T13:06:24 kwin.upd: Found new update 'kde3.0r1'
-2006-01-11T13:06:24 kwin.upd: Running script 'pluginlibFix.pl'
-2006-01-11T13:06:24 kwin.upd: Updating kwinrc:MouseBindings:CommandActiveTitlebar2 to 'Lower'
-2006-01-11T13:06:24 kwin.upd: Updating kwinrc:MouseBindings:CommandActiveTitlebar3 to 'Operations menu'
-2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Style:PluginLib to 'kwin3_plastik'
-2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:AltTabStyle to 'KDE'
-2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:AnimateMinimize to 'true'
-2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:AnimateShade to 'true'
-2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:FocusPolicy to 'ClickToFocus'
-2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:MoveMode to 'Opaque'
-2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:MoveResizeMaximizedWindows to 'true'
-2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:ResizeMode to 'Opaque'
-2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:ShadeHover to 'true'
-2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:TitlebarDoubleClickCommand to 'Maximize'
-2006-01-11T13:06:24 kwin.upd: Found new update 'kde3.2Xinerama'
-2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwin3_plugin.upd' for new updates
-2006-01-11T13:06:24 kwin3_plugin.upd: Found new update 'kde3.2'
-2006-01-11T13:06:24 kwin3_plugin.upd: Running script 'kwin3_plugin.pl'
-2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:MouseBindings:CommandActiveTitlebar2 to 'Lower'
-2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:MouseBindings:CommandActiveTitlebar3 to 'Operations menu'
-2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Style:PluginLib to 'kwin3_plastik'
-2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:AltTabStyle to 'KDE'
-2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:AnimateMinimize to 'true'
-2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:AnimateShade to 'true'
-2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:FocusPolicy to 'ClickToFocus'
-2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:MoveMode to 'Opaque'
-2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:MoveResizeMaximizedWindows to 'true'
-2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:ResizeMode to 'Opaque'
-2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:ShadeHover to 'true'
-2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:TitlebarDoubleClickCommand to 'Maximize'
-2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwin_focus1.upd' for new updates
-2006-01-11T13:06:24 kwin_focus1.upd: Found new update 'kwin_focus1'
-2006-01-11T13:06:24 kwin_focus1.upd: Running script 'kwin_focus1.sh'
-2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:AltTabStyle to 'KDE'
-2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:AnimateMinimize to 'true'
-2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:AnimateShade to 'true'
-2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:FocusPolicy to 'ClickToFocus'
-2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:IgnoreFocusStealingClasses to 'kio_uiserver'
-2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:MoveMode to 'Opaque'
-2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:MoveResizeMaximizedWindows to 'true'
-2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:ResizeMode to 'Opaque'
-2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:ShadeHover to 'true'
-2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:TitlebarDoubleClickCommand to 'Maximize'
-2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwin_focus2.upd' for new updates
-2006-01-11T13:06:24 kwin_focus2.upd: Found new update 'kwin_focus2'
-2006-01-11T13:06:24 kwin_focus2.upd: Running script 'kwin_focus2.sh'
-2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:AltTabStyle to 'KDE'
-2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:AnimateMinimize to 'true'
-2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:AnimateShade to 'true'
-2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:FocusPolicy to 'ClickToFocus'
-2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:IgnoreFocusStealingClasses to 'kio_uiserver'
-2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:MoveMode to 'Opaque'
-2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:MoveResizeMaximizedWindows to 'true'
-2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:ResizeMode to 'Opaque'
-2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:ShadeHover to 'true'
-2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:TitlebarDoubleClickCommand to 'Maximize'
-2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwiniconify.upd' for new updates
-2006-01-11T13:06:24 kwiniconify.upd: Found new update 'iconifyupd3.1'
-2006-01-11T13:06:24 kwiniconify.upd: Updating kwin.eventsrc:minimize:presentation to '1'
-2006-01-11T13:06:24 kwiniconify.upd: Removing kwin.eventsrc:iconify:presentation, moved.
-2006-01-11T13:06:24 kwiniconify.upd: Updating kwin.eventsrc:unminimize:presentation to '1'
-2006-01-11T13:06:24 kwiniconify.upd: Removing kwin.eventsrc:deiconify:presentation, moved.
-2006-01-11T13:06:24 kwiniconify.upd: RemoveGroup removes group kwin.eventsrc:iconify
-2006-01-11T13:06:24 kwiniconify.upd: RemoveGroup removes group kwin.eventsrc:deiconify
-2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwinsticky.upd' for new updates
-2006-01-11T13:06:24 kwinsticky.upd: Found new update 'stickyupd3.1'
-2006-01-11T13:06:24 kwinsticky.upd: Updating kwin.eventsrc:on_all_desktops:presentation to '1'
-2006-01-11T13:06:24 kwinsticky.upd: Removing kwin.eventsrc:sticky:presentation, moved.
-2006-01-11T13:06:24 kwinsticky.upd: Updating kwin.eventsrc:not_on_all_desktops:presentation to '1'
-2006-01-11T13:06:24 kwinsticky.upd: Removing kwin.eventsrc:unsticky:presentation, moved.
-2006-01-11T13:06:24 kwinsticky.upd: RemoveGroup removes group kwin.eventsrc:sticky
-2006-01-11T13:06:24 kwinsticky.upd: RemoveGroup removes group kwin.eventsrc:unsticky
-2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwinupdatewindowsettings.upd' for new updates
-2006-01-11T13:06:24 kwinupdatewindowsettings.upd: Found new update 'kde33b1'
-2006-01-11T13:06:24 kwinupdatewindowsettings.upd: Running script 'kwin_update_window_settings'
-2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/mouse_cursor_theme.upd' for new updates
-2006-01-11T13:06:24 mouse_cursor_theme.upd: Found new update 'kde3.4.99'
-2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/socks.upd' for new updates
-2006-01-11T13:06:24 socks.upd: Found new update 'kde3.0/r1'
+2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kcookiescfg.upd' for new updates
+2006-01-11T13:06:18 kcookiescfg.upd: Found new update 'kde2.2/b1'
+2006-01-11T13:06:18 kcookiescfg.upd: Found new update 'kde3.1/cvs'
+2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kded.upd' for new updates
+2006-01-11T13:06:18 kded.upd: Found new update 'kde3.0'
+2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kdeprintrc.upd' for new updates
+2006-01-11T13:06:18 kdeprintrc.upd: Found new update 'kde-3.1-toolbar'
+2006-01-11T13:06:18 kdeprintrc.upd: Skipping kdeprintrc:General:ViewMenuBar, already exists.
+2006-01-11T13:06:18 kdeprintrc.upd: RemoveKey removes kdeprintrc:General:ViewToolBar
+2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/knewsticker.upd' for new updates
+2006-01-11T13:06:18 knewsticker.upd: Found new update 'KNewsTicker-0.2'
+2006-01-11T13:06:18 knewsticker.upd: Running script 'knt-0.1-0.2.pl'
+2006-01-11T13:06:18 knewsticker.upd: Found new update 'KNewsTicker-0.2-Rename-KDE3'
+2006-01-11T13:06:18 knewsticker.upd: Found new update 'KNewsTicker-0.2-Rename-KDE3.1'
+2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kghostview.upd' for new updates
+2006-01-11T13:06:18 kghostview.upd: Found new update '1changeToKConfigXT'
+2006-01-11T13:06:18 kghostview.upd: Found new update '2changeToKConfigXT'
+2006-01-11T13:06:18 kghostview.upd: Running script 'update-to-xt-names.pl'
+2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kpilot.upd' for new updates
+2006-01-11T13:06:18 kpilot.upd: Found new update 'kdepim_3.3'
+2006-01-11T13:06:18 kpilot.upd: Found new update 'kdepim_3.3_SplitConfig'
+2006-01-11T13:06:18 kpilot.upd: Skipping update 'kdepim_3.3_SplitConfig'
+2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kpalmdoc.upd' for new updates
+2006-01-11T13:06:18 kpalmdoc.upd: Found new update 'kdepim_3.3'
+2006-01-11T13:06:18 Checking update-file '/usr/local/share/apps/kconf_update/kmail.upd' for new updates
+2006-01-11T13:06:18 kmail.upd: Found new update '1'
+2006-01-11T13:06:18 kmail.upd: Running script 'upgrade-transport.pl'
+2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Mailer
+2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Method
+2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Precommand
+2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Smtp Host
+2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Smtp Password
+2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Smtp Port
+2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:sending mail:Smtp Username
+2006-01-11T13:06:18 kmail.upd: Found new update '4'
+2006-01-11T13:06:18 kmail.upd: Found new update '5'
+2006-01-11T13:06:18 kmail.upd: Found new update '6'
+2006-01-11T13:06:18 kmail.upd: Found new update '7'
+2006-01-11T13:06:18 kmail.upd: Found new update '8'
+2006-01-11T13:06:18 kmail.upd: Running script 'kmail-pgpidentity.pl'
+2006-01-11T13:06:18 kmail.upd: Found new update '9'
+2006-01-11T13:06:18 kmail.upd: Running script 'upgrade-signature.pl'
+2006-01-11T13:06:18 kmail.upd: Found new update '3.1-update-identities'
+2006-01-11T13:06:18 kmail.upd: Running script 'kmail-upd-identities.pl'
+2006-01-11T13:06:18 kmail.upd: Found new update '3.1-use-identity-uoids'
+2006-01-11T13:06:18 kmail.upd: Running script 'kmail-3.1-use-UOID-for-identities.pl'
+2006-01-11T13:06:18 [Script] Use of uninitialized value in hash element at /usr/local/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl line 45.
+2006-01-11T13:06:18 [Script] Use of uninitialized value in concatenation (.) or string at /usr/local/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl line 45.
+2006-01-11T13:06:18 [Script] Use of uninitialized value in hash element at /usr/local/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl line 49.
+2006-01-11T13:06:18 [Script] Use of uninitialized value in concatenation (.) or string at /usr/local/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl line 49.
+2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:General:Default Identity
+2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:Composer:previous-identity
+2006-01-11T13:06:18 kmail.upd: Updating kmailrc:Composer:previous-identity to ''
+2006-01-11T13:06:18 kmail.upd: Updating kmailrc:General:Default Identity to ''
+2006-01-11T13:06:18 kmail.upd: Found new update '3.1-new-mail-notification'
+2006-01-11T13:06:18 kmail.upd: Running script 'kmail-3.1-update-new-mail-notification-settings.pl'
+2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:General:msgbox-on-mail
+2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:General:exec-on-mail
+2006-01-11T13:06:18 kmail.upd: Script removes kmailrc:General:exec-on-mail-cmd
+2006-01-11T13:06:18 kmail.upd: Found new update '3.2-update-loop-on-goto-unread-settings'
+2006-01-11T13:06:18 kmail.upd: Running script 'kmail-3.2-update-loop-on-goto-unread-settings.sh'
+2006-01-11T13:06:18 kmail.upd: !! An error occured while running 'bash /usr/local/share/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh'
+2006-01-11T13:06:18 kmail.upd: Found new update '3.1.4-dont-use-UOID-0-for-any-identity'
+2006-01-11T13:06:18 kmail.upd: Running script 'kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.2-misc'
+2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.2-misc.sh'
+2006-01-11T13:06:19 kmail.upd: !! An error occured while running 'bash /usr/local/share/apps/kconf_update/kmail-3.2-misc.sh'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.2-moves'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.3-use-ID-for-accounts'
+2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.3-use-ID-for-accounts.pl'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.3-update-filter-rules'
+2006-01-11T13:06:19 kmail.upd: !! Script 'kmail-3.3-update-filter-rules.pl' not found in line 99 : 'Script=kmail-3.3-update-filter-rules.pl,perl'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.3-move-identities-to-own-file'
+2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.3-move-identities.pl'
+2006-01-11T13:06:19 kmail.upd: Script removes kmailrc:General:Default Identity
+2006-01-11T13:06:19 kmail.upd: Updating emailidentities:General:Default Identity to ''
+2006-01-11T13:06:19 kmail.upd: Found new update '3.3-aegypten-kpgprc-to-kmailrc'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.3-aegypten-kpgprc-to-libkleopatrarc'
+2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.3-aegypten.pl'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.3-aegypten-emailidentities-split-sign-encr-keys'
+2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.3-split-sign-encr-keys.sh'
+2006-01-11T13:06:19 [Script] /usr/local/share/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh: not found
+2006-01-11T13:06:19 kmail.upd: !! An error occured while running '/usr/local/share/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.3-misc'
+2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.3-misc.pl'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.3b1-misc'
+2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.3b1-misc.pl'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.4'
+2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.4-misc.pl'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.4a'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.4b'
+2006-01-11T13:06:19 kmail.upd: Found new update '3.4.1'
+2006-01-11T13:06:19 kmail.upd: Running script 'kmail-3.4.1-update-status-filters.pl'
+2006-01-11T13:06:19 Checking update-file '/usr/local/share/apps/kconf_update/kio_help.upd' for new updates
+2006-01-11T13:06:19 kio_help.upd: Found new update 'kde3_2'
+2006-01-11T13:06:19 kio_help.upd: Running script 'move_kio_help_cache.sh'
+2006-01-11T13:06:19 [Script] mv: rename /home/kris/.kde/share/apps/kio_help/cache to /var/tmp/kdecache-kris/kio_help: No such file or directory
+2006-01-11T13:06:19 [Script] rmdir: /home/kris/.kde/share/apps/kio_help: No such file or directory
+2006-01-11T13:06:19 Checking update-file '/usr/local/share/apps/kconf_update/audiocd.upd' for new updates
+2006-01-11T13:06:19 audiocd.upd: Found new update '1'
+2006-01-11T13:06:19 audiocd.upd: Running script 'upgrade-metadata.sh'
+2006-01-11T13:06:19 audiocd.upd: !! An error occured while running 'bash /usr/local/share/apps/kconf_update/upgrade-metadata.sh'
+2006-01-11T13:06:19 Checking update-file '/usr/local/share/apps/kconf_update/kaudiocreator-libkcddb.upd' for new updates
+2006-01-11T13:06:19 kaudiocreator-libkcddb.upd: Found new update 'kaudiocreator-libkcddb'
+2006-01-11T13:06:19 Checking update-file '/usr/local/share/apps/kconf_update/kaudiocreator-meta.upd' for new updates
+2006-01-11T13:06:19 kaudiocreator-meta.upd: Found new update '3'
+2006-01-11T13:06:19 kaudiocreator-meta.upd: Running script 'upgrade-kaudiocreator-metadata.sh'
+2006-01-11T13:06:19 kaudiocreator-meta.upd: !! An error occured while running 'bash /usr/local/share/apps/kconf_update/upgrade-kaudiocreator-metadata.sh'
+2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kcmcddb-emailsettings.upd' for new updates
+2006-01-11T13:06:20 kcmcddb-emailsettings.upd: Found new update 'kcmcddb_emailsettings'
+2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/korganizer.upd' for new updates
+2006-01-11T13:06:20 korganizer.upd: Found new update 'korganizer_3.4_GroupwareCleanup'
+2006-01-11T13:06:20 korganizer.upd: Found new update 'korganizer_3.4_WebExport'
+2006-01-11T13:06:20 korganizer.upd: Found new update 'korganizer_3.4_FilterAction'
+2006-01-11T13:06:20 korganizer.upd: Found new update 'korganizer_3.4_HolidayPlugin'
+2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kcalcrc.upd' for new updates
+2006-01-11T13:06:20 kcalcrc.upd: Found new update 'KDE_3_2_0'
+2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kcharselect.upd' for new updates
+2006-01-11T13:06:20 kcharselect.upd: Found new update '1'
+2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kopete-account-kconf_update.upd' for new updates
+2006-01-11T13:06:20 kopete-account-kconf_update.upd: Found new update 'kopete0.7/r1'
+2006-01-11T13:06:20 kopete-account-kconf_update.upd: Running script 'kopete-account-kconf_update.sh'
+2006-01-11T13:06:20 kopete-account-kconf_update.upd: Found new update 'kopete0.10/r1'
+2006-01-11T13:06:20 kopete-account-kconf_update.upd: Running script 'kopete-account-0.10.pl'
+2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kioslave.upd' for new updates
+2006-01-11T13:06:20 kioslave.upd: Found new update 'kde2.2/r1'
+2006-01-11T13:06:20 kioslave.upd: Skipping update 'kde2.2/r1'
+2006-01-11T13:06:20 kioslave.upd: Found new update 'kde2.2/r2'
+2006-01-11T13:06:20 kioslave.upd: Running script 'useragent.pl'
+2006-01-11T13:06:20 kioslave.upd: Script removes kioslaverc:UserAgent:EntriesCount
+2006-01-11T13:06:20 kioslave.upd: Found new update 'kde2.2/r3'
+2006-01-11T13:06:20 kioslave.upd: Running script 'proxytype.pl'
+2006-01-11T13:06:20 kioslave.upd: Script removes kioslaverc:Proxy Settings:UseProxy
+2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd' for new updates
+2006-01-11T13:06:20 kopete-jabberpriorityaddition-kconf_update.upd: Found new update 'kopete0.9/r1'
+2006-01-11T13:06:20 kopete-jabberpriorityaddition-kconf_update.upd: Running script 'kopete-jabberpriorityaddition-kconf_update.sh'
+2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kopete-jabberproxytype-kconf_update.upd' for new updates
+2006-01-11T13:06:20 kopete-jabberproxytype-kconf_update.upd: Found new update 'kopete0.9/r1'
+2006-01-11T13:06:20 kopete-jabberproxytype-kconf_update.upd: Running script 'kopete-jabberproxytype-kconf_update.sh'
+2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kopete-nameTracking.upd' for new updates
+2006-01-11T13:06:20 kopete-nameTracking.upd: Found new update 'kopete0.9/r1'
+2006-01-11T13:06:20 kopete-nameTracking.upd: Running script 'kopete-nameTracking-kconf_update'
+2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/kopete-pluginloader.upd' for new updates
+2006-01-11T13:06:20 kopete-pluginloader.upd: Found new update 'kopete0.7/r1'
+2006-01-11T13:06:20 kopete-pluginloader.upd: Running script 'kopete-pluginloader.pl'
+2006-01-11T13:06:20 kopete-pluginloader.upd: Script removes kopeterc::Modules
+2006-01-11T13:06:20 kopete-pluginloader.upd: Removing empty group kopeterc:
+2006-01-11T13:06:20 Checking update-file '/usr/local/share/apps/kconf_update/noatun.upd' for new updates
+2006-01-11T13:06:20 noatun.upd: Found new update 'noatun20'
+2006-01-11T13:06:20 noatun.upd: Running script 'noatun20update'
+2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/kpgp.upd' for new updates
+2006-01-11T13:06:21 kpgp.upd: Found new update 'preKDE3_a'
+2006-01-11T13:06:21 kpgp.upd: Found new update '3.1-1'
+2006-01-11T13:06:21 kpgp.upd: Running script 'kpgp-3.1-upgrade-address-data.pl'
+2006-01-11T13:06:21 kpgp.upd: Script removes kpgprc:General:addressKeyEntries
+2006-01-11T13:06:21 kpgp.upd: Script removes kpgprc:General:addressEntries
+2006-01-11T13:06:21 kpgp.upd: Updating kpgprc:General:addressEntries to '0'
+2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/korn-3-4-config_change.upd' for new updates
+2006-01-11T13:06:21 korn-3-4-config_change.upd: Found new update 'korn_kde_3_4_config_change'
+2006-01-11T13:06:21 korn-3-4-config_change.upd: Running script 'korn-3-4-config_change'
+2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/korn-3-5-update.upd' for new updates
+2006-01-11T13:06:21 korn-3-5-update.upd: Found new update 'korn-3-5-ssl-update'
+2006-01-11T13:06:21 korn-3-5-update.upd: Running script 'korn-3-5-ssl-update.pl'
+2006-01-11T13:06:21 korn-3-5-update.upd: Found new update 'korn-3-5-metadata-update'
+2006-01-11T13:06:21 korn-3-5-update.upd: Running script 'korn-3-5-metadata-update.pl'
+2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/kopete-pluginloader2.upd' for new updates
+2006-01-11T13:06:21 kopete-pluginloader2.upd: Found new update 'kopete0.8/r1'
+2006-01-11T13:06:21 kopete-pluginloader2.upd: Running script 'kopete-pluginloader2.sh'
+2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/favicons.upd' for new updates
+2006-01-11T13:06:21 favicons.upd: Found new update 'kde3_2'
+2006-01-11T13:06:21 favicons.upd: Running script 'move_favicons.sh'
+2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/kaccel.upd' for new updates
+2006-01-11T13:06:21 kaccel.upd: Found new update 'kde3.3/r1'
+2006-01-11T13:06:21 kaccel.upd: Running script 'convertShortcuts.pl'
+2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/kate-2.4.upd' for new updates
+2006-01-11T13:06:21 kate-2.4.upd: Found new update 'kate2.4'
+2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/kcmdisplayrc.upd' for new updates
+2006-01-11T13:06:21 kcmdisplayrc.upd: Found new update 'kde3'
+2006-01-11T13:06:21 Checking update-file '/usr/local/share/apps/kconf_update/kfmclient_3_2.upd' for new updates
+2006-01-11T13:06:21 kfmclient_3_2.upd: Found new update 'kfmclient_3_2'
+2006-01-11T13:06:21 kfmclient_3_2.upd: Running script 'kfmclient_3_2_update.sh'
+2006-01-11T13:06:21 kfmclient_3_2.upd: Script removes kfmclientrc:Settings:StartNewKonqueror
+2006-01-11T13:06:22 Checking update-file '/usr/local/share/apps/kconf_update/khotkeys_32b1_update.upd' for new updates
+2006-01-11T13:06:22 khotkeys_32b1_update.upd: Found new update 'kde32b1'
+2006-01-11T13:06:22 khotkeys_32b1_update.upd: Running script 'khotkeys_update' with arguments '--id kde32b1'
+2006-01-11T13:06:22 [Script] Fontconfig warning: "local.conf", line 236: missing test expression
+2006-01-11T13:06:22 [Script] Fontconfig warning: "local.conf", line 237: missing test expression
+2006-01-11T13:06:22 [Script] Fontconfig warning: "local.conf", line 238: missing test expression
+2006-01-11T13:06:22 [Script] Fontconfig warning: "local.conf", line 239: missing test expression
+2006-01-11T13:06:22 [Script] Fontconfig warning: "local.conf", line 240: missing test expression
+2006-01-11T13:06:22 Checking update-file '/usr/local/share/apps/kconf_update/kickerrc.upd' for new updates
+2006-01-11T13:06:22 kickerrc.upd: Found new update 'kde_3_1_sizeChanges'
+2006-01-11T13:06:22 kickerrc.upd: Running script 'kicker-3.1-properSizeSetting.pl'
+2006-01-11T13:06:22 kickerrc.upd: Found new update 'kde_3_4_reverseLayout'
+2006-01-11T13:06:22 kickerrc.upd: Running script 'kicker-3.4-reverseLayout'
+2006-01-11T13:06:22 kickerrc.upd: Found new update 'kde_3_5_taskbarEnums'
+2006-01-11T13:06:22 kickerrc.upd: Running script 'kicker-3.5-taskbarEnums.pl'
+2006-01-11T13:06:22 kickerrc.upd: Found new update 'kde_3_5_kconfigXTize'
+2006-01-11T13:06:22 kickerrc.upd: Running script 'kicker-3.5-kconfigXTize.pl'
+2006-01-11T13:06:22 kickerrc.upd: Updating kickerrc:menus:MenuEntryFormat to 'NameAndDescription'
+2006-01-11T13:06:22 Checking update-file '/usr/local/share/apps/kconf_update/klipperrc.upd' for new updates
+2006-01-11T13:06:22 klipperrc.upd: Found new update '25082001'
+2006-01-11T13:06:22 klipperrc.upd: Running script 'klipper-1-2.pl'
+2006-01-11T13:06:22 klipperrc.upd: Found new update 'kde3.1'
+2006-01-11T13:06:22 klipperrc.upd: Running script 'klipper-kde31.sh'
+2006-01-11T13:06:23 klipperrc.upd: Updating klipperrc:General:AutoStart to 'true'
+2006-01-11T13:06:23 Checking update-file '/usr/local/share/apps/kconf_update/klippershortcuts.upd' for new updates
+2006-01-11T13:06:23 klippershortcuts.upd: Found new update '04112002'
+2006-01-11T13:06:23 Checking update-file '/usr/local/share/apps/kconf_update/konqsidebartng.upd' for new updates
+2006-01-11T13:06:23 konqsidebartng.upd: Found new update 'konqsidebartng_rc'
+2006-01-11T13:06:23 konqsidebartng.upd: Found new update 'konqsidebartng_entries'
+2006-01-11T13:06:23 konqsidebartng.upd: Running script 'move_konqsidebartng_entries.sh'
+2006-01-11T13:06:23 Checking update-file '/usr/local/share/apps/kconf_update/konqueror_gestures_kde321_update.upd' for new updates
+2006-01-11T13:06:23 konqueror_gestures_kde321_update.upd: Found new update 'kde321'
+2006-01-11T13:06:23 konqueror_gestures_kde321_update.upd: Running script 'khotkeys_update' with arguments '--id konqueror_gestures_kde321'
+2006-01-11T13:06:23 [Script] Fontconfig warning: "local.conf", line 236: missing test expression
+2006-01-11T13:06:23 [Script] Fontconfig warning: "local.conf", line 237: missing test expression
+2006-01-11T13:06:23 [Script] Fontconfig warning: "local.conf", line 238: missing test expression
+2006-01-11T13:06:23 [Script] Fontconfig warning: "local.conf", line 239: missing test expression
+2006-01-11T13:06:23 [Script] Fontconfig warning: "local.conf", line 240: missing test expression
+2006-01-11T13:06:23 Checking update-file '/usr/local/share/apps/kconf_update/konsole.upd' for new updates
+2006-01-11T13:06:23 konsole.upd: Found new update 'kde2.2/r1'
+2006-01-11T13:06:24 konsole.upd: Found new update 'kde3.0/r1'
+2006-01-11T13:06:24 konsole.upd: Running script 'schemaStrip.pl'
+2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/ksmserver.upd' for new updates
+2006-01-11T13:06:24 ksmserver.upd: Found new update 'kde3'
+2006-01-11T13:06:24 ksmserver.upd: Running script 'move_session_config.sh'
+2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kuriikwsfilter.upd' for new updates
+2006-01-11T13:06:24 kuriikwsfilter.upd: Found new update 'post-kde3.1/cvs'
+2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwin.upd' for new updates
+2006-01-11T13:06:24 kwin.upd: Found new update 'kde3.0r1'
+2006-01-11T13:06:24 kwin.upd: Running script 'pluginlibFix.pl'
+2006-01-11T13:06:24 kwin.upd: Updating kwinrc:MouseBindings:CommandActiveTitlebar2 to 'Lower'
+2006-01-11T13:06:24 kwin.upd: Updating kwinrc:MouseBindings:CommandActiveTitlebar3 to 'Operations menu'
+2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Style:PluginLib to 'kwin3_plastik'
+2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:AltTabStyle to 'KDE'
+2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:AnimateMinimize to 'true'
+2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:AnimateShade to 'true'
+2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:FocusPolicy to 'ClickToFocus'
+2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:MoveMode to 'Opaque'
+2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:MoveResizeMaximizedWindows to 'true'
+2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:ResizeMode to 'Opaque'
+2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:ShadeHover to 'true'
+2006-01-11T13:06:24 kwin.upd: Updating kwinrc:Windows:TitlebarDoubleClickCommand to 'Maximize'
+2006-01-11T13:06:24 kwin.upd: Found new update 'kde3.2Xinerama'
+2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwin3_plugin.upd' for new updates
+2006-01-11T13:06:24 kwin3_plugin.upd: Found new update 'kde3.2'
+2006-01-11T13:06:24 kwin3_plugin.upd: Running script 'kwin3_plugin.pl'
+2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:MouseBindings:CommandActiveTitlebar2 to 'Lower'
+2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:MouseBindings:CommandActiveTitlebar3 to 'Operations menu'
+2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Style:PluginLib to 'kwin3_plastik'
+2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:AltTabStyle to 'KDE'
+2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:AnimateMinimize to 'true'
+2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:AnimateShade to 'true'
+2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:FocusPolicy to 'ClickToFocus'
+2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:MoveMode to 'Opaque'
+2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:MoveResizeMaximizedWindows to 'true'
+2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:ResizeMode to 'Opaque'
+2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:ShadeHover to 'true'
+2006-01-11T13:06:24 kwin3_plugin.upd: Updating kwinrc:Windows:TitlebarDoubleClickCommand to 'Maximize'
+2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwin_focus1.upd' for new updates
+2006-01-11T13:06:24 kwin_focus1.upd: Found new update 'kwin_focus1'
+2006-01-11T13:06:24 kwin_focus1.upd: Running script 'kwin_focus1.sh'
+2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:AltTabStyle to 'KDE'
+2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:AnimateMinimize to 'true'
+2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:AnimateShade to 'true'
+2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:FocusPolicy to 'ClickToFocus'
+2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:IgnoreFocusStealingClasses to 'kio_uiserver'
+2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:MoveMode to 'Opaque'
+2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:MoveResizeMaximizedWindows to 'true'
+2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:ResizeMode to 'Opaque'
+2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:ShadeHover to 'true'
+2006-01-11T13:06:24 kwin_focus1.upd: Updating kwinrc:Windows:TitlebarDoubleClickCommand to 'Maximize'
+2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwin_focus2.upd' for new updates
+2006-01-11T13:06:24 kwin_focus2.upd: Found new update 'kwin_focus2'
+2006-01-11T13:06:24 kwin_focus2.upd: Running script 'kwin_focus2.sh'
+2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:AltTabStyle to 'KDE'
+2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:AnimateMinimize to 'true'
+2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:AnimateShade to 'true'
+2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:FocusPolicy to 'ClickToFocus'
+2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:IgnoreFocusStealingClasses to 'kio_uiserver'
+2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:MoveMode to 'Opaque'
+2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:MoveResizeMaximizedWindows to 'true'
+2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:ResizeMode to 'Opaque'
+2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:ShadeHover to 'true'
+2006-01-11T13:06:24 kwin_focus2.upd: Updating kwinrc:Windows:TitlebarDoubleClickCommand to 'Maximize'
+2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwiniconify.upd' for new updates
+2006-01-11T13:06:24 kwiniconify.upd: Found new update 'iconifyupd3.1'
+2006-01-11T13:06:24 kwiniconify.upd: Updating kwin.eventsrc:minimize:presentation to '1'
+2006-01-11T13:06:24 kwiniconify.upd: Removing kwin.eventsrc:iconify:presentation, moved.
+2006-01-11T13:06:24 kwiniconify.upd: Updating kwin.eventsrc:unminimize:presentation to '1'
+2006-01-11T13:06:24 kwiniconify.upd: Removing kwin.eventsrc:deiconify:presentation, moved.
+2006-01-11T13:06:24 kwiniconify.upd: RemoveGroup removes group kwin.eventsrc:iconify
+2006-01-11T13:06:24 kwiniconify.upd: RemoveGroup removes group kwin.eventsrc:deiconify
+2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwinsticky.upd' for new updates
+2006-01-11T13:06:24 kwinsticky.upd: Found new update 'stickyupd3.1'
+2006-01-11T13:06:24 kwinsticky.upd: Updating kwin.eventsrc:on_all_desktops:presentation to '1'
+2006-01-11T13:06:24 kwinsticky.upd: Removing kwin.eventsrc:sticky:presentation, moved.
+2006-01-11T13:06:24 kwinsticky.upd: Updating kwin.eventsrc:not_on_all_desktops:presentation to '1'
+2006-01-11T13:06:24 kwinsticky.upd: Removing kwin.eventsrc:unsticky:presentation, moved.
+2006-01-11T13:06:24 kwinsticky.upd: RemoveGroup removes group kwin.eventsrc:sticky
+2006-01-11T13:06:24 kwinsticky.upd: RemoveGroup removes group kwin.eventsrc:unsticky
+2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/kwinupdatewindowsettings.upd' for new updates
+2006-01-11T13:06:24 kwinupdatewindowsettings.upd: Found new update 'kde33b1'
+2006-01-11T13:06:24 kwinupdatewindowsettings.upd: Running script 'kwin_update_window_settings'
+2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/mouse_cursor_theme.upd' for new updates
+2006-01-11T13:06:24 mouse_cursor_theme.upd: Found new update 'kde3.4.99'
+2006-01-11T13:06:24 Checking update-file '/usr/local/share/apps/kconf_update/socks.upd' for new updates
+2006-01-11T13:06:24 socks.upd: Found new update 'kde3.0/r1'

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kcookiejar/cookies
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kcookiejar/cookies	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kcookiejar/cookies	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,3 +1,3 @@
-# KDE Cookie File v2
-#
-# Host               Domain               Path         Exp.date   Prot Name                 Sec  Value
+# KDE Cookie File v2
+#
+# Host               Domain               Path         Exp.date   Prot Name                 Sec  Value

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kdesktop/IconPositions
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kdesktop/IconPositions	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kdesktop/IconPositions	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,23 +1,23 @@
-[IconPosition::PC-BSD.desktop]
-Xabs=7
-Xabs_1024x768=7
-Yabs=8
-Yabs_1024x768=8
-
-[IconPosition::guide.desktop]
-Xabs=17
-Xabs_1024x768=17
-Yabs=168
-Yabs_1024x768=168
-
-[IconPosition::software.desktop]
-Xabs=7
-Xabs_1024x768=7
-Yabs=88
-Yabs_1024x768=88
-
-[IconPosition::trash.desktop]
-Xabs=970
-Xabs_1024x768=970
-Yabs=648
-Yabs_1024x768=648
+[IconPosition::PC-BSD.desktop]
+Xabs=7
+Xabs_1024x768=7
+Yabs=8
+Yabs_1024x768=8
+
+[IconPosition::guide.desktop]
+Xabs=17
+Xabs_1024x768=17
+Yabs=168
+Yabs_1024x768=168
+
+[IconPosition::software.desktop]
+Xabs=7
+Xabs_1024x768=7
+Yabs=88
+Yabs_1024x768=88
+
+[IconPosition::trash.desktop]
+Xabs=970
+Xabs_1024x768=970
+Yabs=648
+Yabs_1024x768=648

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/bookmarks.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/bookmarks.desktop	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/bookmarks.desktop	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,153 +1,153 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Link
-URL=
-Icon=bookmark
-Name=Bookmarks
-Name[af]=Boekmerke
-Name[ar]=علامات مواقع
-Name[az]=Nişanlar
-Name[be]=Закладкі
-Name[bg]=Отметки
-Name[bn]=বুকমার্ক
-Name[br]=Sinedoù
-Name[bs]=Zabilješke
-Name[ca]=Punts
-Name[cs]=Záložky
-Name[cy]=Nodau Tudalen
-Name[da]=Bogmærker
-Name[de]=Lesezeichen
-Name[el]=Σελιδοδείκτες
-Name[eo]=Legosignoj
-Name[es]=Marcadores
-Name[et]=Järjehoidjad
-Name[eu]=Laster-markak
-Name[fa]=چوب‌الف‌ها
-Name[fi]=Kirjanmerkit
-Name[fr]=Signets
-Name[fy]=Blêdwizers
-Name[ga]=Leabharmharcanna
-Name[gl]=Marcadores
-Name[he]=סימניות
-Name[hi]= पसंदीदा 
-Name[hr]=Knjiške oznake
-Name[hu]=Könyvjelzők
-Name[id]=Bookmark
-Name[is]=Bókamerki
-Name[it]=Segnalibri
-Name[ja]=ブックマーク
-Name[km]=កន្លែង​ចំណាំ
-Name[ko]=책갈피
-Name[lo]=ທີ່ຄັ້ນປື້ມ
-Name[lt]=Žymelės
-Name[lv]=Grāmatzīmes
-Name[mk]=Обележувачи
-Name[mn]=Хавчуурга
-Name[mt]=Favoriti
-Name[nb]=Bokmerker
-Name[nds]=Leesteken
-Name[nl]=Bladwijzers
-Name[nn]=Bokmerke
-Name[nso]=Ditshwao tsa Buka
-Name[pa]=ਬੁੱਕਮਾਰਕ
-Name[pl]=Zakładki
-Name[pt]=Favoritos
-Name[pt_BR]=Favoritos
-Name[ro]=Semne de carte
-Name[ru]=Закладки
-Name[rw]=Utumenyetso
-Name[se]=Girjemearkkat
-Name[sk]=Záložky
-Name[sl]=Zaznamki
-Name[sr]=Маркери
-Name[sr at Latn]=Markeri
-Name[sv]=Bokmärken
-Name[ta]=புத்தகக்குறிகள்
-Name[tg]=Гузориш
-Name[th]=ที่คั่นหน้า
-Name[tr]=Yer imleri
-Name[tt]=Bitbilge
-Name[uk]=Закладки
-Name[uz]=Хатчўплар
-Name[ven]=Dzitswayo dza bugu
-Name[vi]=Đánh dấu trang
-Name[wa]=Rimåkes
-Name[xh]=Amanqaku eencwadi
-Name[xx]=xxBookmarksxx
-Name[zh_CN]=书签
-Name[zh_TW]=書籤
-Name[zu]=Omaka bencwadi
-Comment=This is the list of your bookmarks, for a faster access
-Comment[af]=Hierdie is die lys van jou boekmerke, vir 'n vinniger toegang verkry
-Comment[ar]=هذه قائمة بمواقعك المفضلة من أجل وصول أسرع
-Comment[az]=Bunlar daha asan yetişmək üçün toplanan nişanlarınızdır
-Comment[bg]=Списък на отметки за бърз достъп
-Comment[bn]=আপনার বুকমার্কের তালিকা, পছন্দের গন্তব্যে চটপট পৌঁছে যাবার জন্য
-Comment[bs]=Ovo je lista vaših zabiljeških, za brži pristup
-Comment[ca]=Aquesta és la llista dels vostres punts, per un accés més ràpid
-Comment[cs]=Toto je seznam vašich záložek k jejich rychlejšímu nalezení
-Comment[cy]=Dyma restr eich nodau tudalen, am gyrchiad cyflymach
-Comment[da]=Dette er en liste af dine bogmærker for hurtigere adgang
-Comment[de]=Dies ist eine Liste Ihrer Lesezeichen, sie dient dem schnelleren Zugriff
-Comment[el]=Αυτή είναι η λίστα των σελιδοδεικτών σας, για γρηγορότερη πρόσβαση
-Comment[eo]=Jen la listo de viaj legosignoj por pli rapida aliro
-Comment[es]=Esta es la lista de sus marcadores, para un acceso más rápido.
-Comment[et]=Sinu järjehoidjate nimekiri
-Comment[eu]=Hemen duzu zure laster-marken zerrenda, atzitze azkarragorako
-Comment[fa]=این سیاهه‌ای از چوب‌الف‌های شماست،برای دسترسی سریعتر
-Comment[fi]=Tämä on lista kirjanmerkeistäsi
-Comment[fr]=Voici la liste de vos signets, afin que vous y accédiez plus rapidement
-Comment[fy]=Dit is de list mei dyn blêdwizers, foar fluggere tagong
-Comment[ga]=Seo liosta do chuid leabharmharcanna, le haghaidh rochtain níos tapúla
-Comment[gl]=Ésta é a lista dos seus marcadores, para un aceso máis rápido
-Comment[he]=זוהי רשימת הסימניות שלך, לגישה מהירה
-Comment[hi]=यह आपकी पसंद की सूची है, तेजी से पहुँच के लिए
-Comment[hr]=Ovo je popis vaših knjiških oznaka, za brži pristup
-Comment[hu]=A könyvjelzők listája (gyors elérhetőség)
-Comment[is]=Hér eru bókamerkin þín
-Comment[it]=Questa è la lista dei tuoi segnalibri, per un accesso più rapido
-Comment[ja]=高速アクセスのためのブックマークのリストです
-Comment[km]=នេះ​ជា​បញ្ជី​កន្លែង​ចំណាំ​របស់​អ្នក ដែល​អាច​ចូលដំណើរការ​បាន​លឿន
-Comment[ko]=빨리 찾아가도록 도와주는 책갈피 목록입니다.
-Comment[lo]=ນີ້ເປັນລາຍການທີ່ຄັ້ນປື້ມຂອງທ່ານ ເພື່ການຮງກໃຊ້ຢ່າງໄວร็ว
-Comment[lt]=Šiame aplanke yra visos Jūsų žymelės, skirtos greitesniam priėjimui
-Comment[lv]=Šis ir jūsu grāmatzīmju saraksts ātrākai pieejai
-Comment[mk]=Ова е листа на вашите обележувачи кои служат за побрз пристап
-Comment[mn]=Энэ бол таны хавчуургын жагсаалт ба таньд хурдан хандах боломж олгоно.
-Comment[mt]=Din hija lista tal-favoriti tiegħek, għal aċċess ta' malajr
-Comment[nb]=Dette er en liste over bokmerkene dine, for raskere tilgang
-Comment[nds]=Dat is de List vun Dien Leesteken för gauen Togriep
-Comment[nl]=Dit is de lijst met uw bladwijzers, voor snellere toegang
-Comment[nn]=Dette er ei liste over bokmerka dine, for snøggare tilgang
-Comment[nso]=Ye ke palo ya ditshwao tsa gago tsa buka,go tsenelo ya kapela
-Comment[pa]=ਤੇਜ਼ ਖੋਲਣ ਲਈ ਇਹ ਤੁਹਾਡੇ ਬੁੱਕਮਾਰਕ ਦੀ ਸੂਚੀ ਹੈ
-Comment[pl]=To jest lista zakładek, dla szybszego dostępu
-Comment[pt]=Os seus favoritos, para um acesso mais rápido
-Comment[pt_BR]=Esta pasta contém a sua lista dos favoritos, para o acesso mais rápido
-Comment[ro]=Aceasta este lista semnelor dumneavoastră de carte
-Comment[ru]=Список закладок для быстрого доступа
-Comment[rw]=Uru ni urutonde rw'utumenyetso twawe, k'ukugera kwihuse
-Comment[se]=Dát leat du girjemearkkat, álkibut gávdnat
-Comment[sk]=Toto je zoznam vašich záložiek, pre rýchlejší prístup k nim
-Comment[sl]=To je seznam vaših zaznamkov, za hitrejši dostop.
-Comment[sr]=Ово је листа ваших маркера, ради лакшег приступа
-Comment[sr at Latn]=Ovo je lista vaših markera, radi lakšeg pristupa
-Comment[sv]=Det här är listan på dina bokmärken, för snabbare åtkomst
-Comment[ta]=இந்த பட்டியல் உங்கள் புத்தக குறியீடுகளை விரைவாற் அணுகுவதற்கு.
-Comment[tg]=Рӯйхати гузориш барои дастраси тез
-Comment[th]=นี่เป็นรายการที่คั่นหน้าของคุณ เพื่อการเรียกใช้อย่างรวดเร็ว
-Comment[tr]=Bu sizin daha hızlı erişiminiz için kısa yollarınızın bir listesidir
-Comment[tt]=Tiz ireşü öçen bitbilgelär tezmäse
-Comment[uk]=Це - список Ваших закладок для швидкого доступу
-Comment[uz]=Хатчўплар рўйхати
-Comment[ven]=Hoyu ndi mutevhe wa tswayo dza bugu, uitele u dzhene ngau tavhanya
-Comment[vi]=Đây là danh sách tất cả các trang đánh dấu của bạn, giúp cho truy cập nhanh hơn 
-Comment[xh]=Olu luluhlu lwamanqaku encwadi yakho, yonikezelo olukhawulezayo
-Comment[xx]=xxThis is the list of your bookmarks, for a faster accessxx
-Comment[zh_CN]=这是您的书签列表,以便使得访问更加方便
-Comment[zh_TW]=快速存取網站的書籤列表
-Comment[zu]=Lolu uhlu lomaka bakho bencwadi,ukuze ungene ngokushesha
-Open=false
-X-KDE-TreeModule=Bookmarks
-X-KDE-SearchableTreeModule=true
-X-KDE-KonqSidebarModule=konqsidebar_tree
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+URL=
+Icon=bookmark
+Name=Bookmarks
+Name[af]=Boekmerke
+Name[ar]=علامات مواقع
+Name[az]=Nişanlar
+Name[be]=Закладкі
+Name[bg]=Отметки
+Name[bn]=বুকমার্ক
+Name[br]=Sinedoù
+Name[bs]=Zabilješke
+Name[ca]=Punts
+Name[cs]=Záložky
+Name[cy]=Nodau Tudalen
+Name[da]=Bogmærker
+Name[de]=Lesezeichen
+Name[el]=Σελιδοδείκτες
+Name[eo]=Legosignoj
+Name[es]=Marcadores
+Name[et]=Järjehoidjad
+Name[eu]=Laster-markak
+Name[fa]=چوب‌الف‌ها
+Name[fi]=Kirjanmerkit
+Name[fr]=Signets
+Name[fy]=Blêdwizers
+Name[ga]=Leabharmharcanna
+Name[gl]=Marcadores
+Name[he]=סימניות
+Name[hi]= पसंदीदा 
+Name[hr]=Knjiške oznake
+Name[hu]=Könyvjelzők
+Name[id]=Bookmark
+Name[is]=Bókamerki
+Name[it]=Segnalibri
+Name[ja]=ブックマーク
+Name[km]=កន្លែង​ចំណាំ
+Name[ko]=책갈피
+Name[lo]=ທີ່ຄັ້ນປື້ມ
+Name[lt]=Žymelės
+Name[lv]=Grāmatzīmes
+Name[mk]=Обележувачи
+Name[mn]=Хавчуурга
+Name[mt]=Favoriti
+Name[nb]=Bokmerker
+Name[nds]=Leesteken
+Name[nl]=Bladwijzers
+Name[nn]=Bokmerke
+Name[nso]=Ditshwao tsa Buka
+Name[pa]=ਬੁੱਕਮਾਰਕ
+Name[pl]=Zakładki
+Name[pt]=Favoritos
+Name[pt_BR]=Favoritos
+Name[ro]=Semne de carte
+Name[ru]=Закладки
+Name[rw]=Utumenyetso
+Name[se]=Girjemearkkat
+Name[sk]=Záložky
+Name[sl]=Zaznamki
+Name[sr]=Маркери
+Name[sr at Latn]=Markeri
+Name[sv]=Bokmärken
+Name[ta]=புத்தகக்குறிகள்
+Name[tg]=Гузориш
+Name[th]=ที่คั่นหน้า
+Name[tr]=Yer imleri
+Name[tt]=Bitbilge
+Name[uk]=Закладки
+Name[uz]=Хатчўплар
+Name[ven]=Dzitswayo dza bugu
+Name[vi]=Đánh dấu trang
+Name[wa]=Rimåkes
+Name[xh]=Amanqaku eencwadi
+Name[xx]=xxBookmarksxx
+Name[zh_CN]=书签
+Name[zh_TW]=書籤
+Name[zu]=Omaka bencwadi
+Comment=This is the list of your bookmarks, for a faster access
+Comment[af]=Hierdie is die lys van jou boekmerke, vir 'n vinniger toegang verkry
+Comment[ar]=هذه قائمة بمواقعك المفضلة من أجل وصول أسرع
+Comment[az]=Bunlar daha asan yetişmək üçün toplanan nişanlarınızdır
+Comment[bg]=Списък на отметки за бърз достъп
+Comment[bn]=আপনার বুকমার্কের তালিকা, পছন্দের গন্তব্যে চটপট পৌঁছে যাবার জন্য
+Comment[bs]=Ovo je lista vaših zabiljeških, za brži pristup
+Comment[ca]=Aquesta és la llista dels vostres punts, per un accés més ràpid
+Comment[cs]=Toto je seznam vašich záložek k jejich rychlejšímu nalezení
+Comment[cy]=Dyma restr eich nodau tudalen, am gyrchiad cyflymach
+Comment[da]=Dette er en liste af dine bogmærker for hurtigere adgang
+Comment[de]=Dies ist eine Liste Ihrer Lesezeichen, sie dient dem schnelleren Zugriff
+Comment[el]=Αυτή είναι η λίστα των σελιδοδεικτών σας, για γρηγορότερη πρόσβαση
+Comment[eo]=Jen la listo de viaj legosignoj por pli rapida aliro
+Comment[es]=Esta es la lista de sus marcadores, para un acceso más rápido.
+Comment[et]=Sinu järjehoidjate nimekiri
+Comment[eu]=Hemen duzu zure laster-marken zerrenda, atzitze azkarragorako
+Comment[fa]=این سیاهه‌ای از چوب‌الف‌های شماست،برای دسترسی سریعتر
+Comment[fi]=Tämä on lista kirjanmerkeistäsi
+Comment[fr]=Voici la liste de vos signets, afin que vous y accédiez plus rapidement
+Comment[fy]=Dit is de list mei dyn blêdwizers, foar fluggere tagong
+Comment[ga]=Seo liosta do chuid leabharmharcanna, le haghaidh rochtain níos tapúla
+Comment[gl]=Ésta é a lista dos seus marcadores, para un aceso máis rápido
+Comment[he]=זוהי רשימת הסימניות שלך, לגישה מהירה
+Comment[hi]=यह आपकी पसंद की सूची है, तेजी से पहुँच के लिए
+Comment[hr]=Ovo je popis vaših knjiških oznaka, za brži pristup
+Comment[hu]=A könyvjelzők listája (gyors elérhetőség)
+Comment[is]=Hér eru bókamerkin þín
+Comment[it]=Questa è la lista dei tuoi segnalibri, per un accesso più rapido
+Comment[ja]=高速アクセスのためのブックマークのリストです
+Comment[km]=នេះ​ជា​បញ្ជី​កន្លែង​ចំណាំ​របស់​អ្នក ដែល​អាច​ចូលដំណើរការ​បាន​លឿន
+Comment[ko]=빨리 찾아가도록 도와주는 책갈피 목록입니다.
+Comment[lo]=ນີ້ເປັນລາຍການທີ່ຄັ້ນປື້ມຂອງທ່ານ ເພື່ການຮງກໃຊ້ຢ່າງໄວร็ว
+Comment[lt]=Šiame aplanke yra visos Jūsų žymelės, skirtos greitesniam priėjimui
+Comment[lv]=Šis ir jūsu grāmatzīmju saraksts ātrākai pieejai
+Comment[mk]=Ова е листа на вашите обележувачи кои служат за побрз пристап
+Comment[mn]=Энэ бол таны хавчуургын жагсаалт ба таньд хурдан хандах боломж олгоно.
+Comment[mt]=Din hija lista tal-favoriti tiegħek, għal aċċess ta' malajr
+Comment[nb]=Dette er en liste over bokmerkene dine, for raskere tilgang
+Comment[nds]=Dat is de List vun Dien Leesteken för gauen Togriep
+Comment[nl]=Dit is de lijst met uw bladwijzers, voor snellere toegang
+Comment[nn]=Dette er ei liste over bokmerka dine, for snøggare tilgang
+Comment[nso]=Ye ke palo ya ditshwao tsa gago tsa buka,go tsenelo ya kapela
+Comment[pa]=ਤੇਜ਼ ਖੋਲਣ ਲਈ ਇਹ ਤੁਹਾਡੇ ਬੁੱਕਮਾਰਕ ਦੀ ਸੂਚੀ ਹੈ
+Comment[pl]=To jest lista zakładek, dla szybszego dostępu
+Comment[pt]=Os seus favoritos, para um acesso mais rápido
+Comment[pt_BR]=Esta pasta contém a sua lista dos favoritos, para o acesso mais rápido
+Comment[ro]=Aceasta este lista semnelor dumneavoastră de carte
+Comment[ru]=Список закладок для быстрого доступа
+Comment[rw]=Uru ni urutonde rw'utumenyetso twawe, k'ukugera kwihuse
+Comment[se]=Dát leat du girjemearkkat, álkibut gávdnat
+Comment[sk]=Toto je zoznam vašich záložiek, pre rýchlejší prístup k nim
+Comment[sl]=To je seznam vaših zaznamkov, za hitrejši dostop.
+Comment[sr]=Ово је листа ваших маркера, ради лакшег приступа
+Comment[sr at Latn]=Ovo je lista vaših markera, radi lakšeg pristupa
+Comment[sv]=Det här är listan på dina bokmärken, för snabbare åtkomst
+Comment[ta]=இந்த பட்டியல் உங்கள் புத்தக குறியீடுகளை விரைவாற் அணுகுவதற்கு.
+Comment[tg]=Рӯйхати гузориш барои дастраси тез
+Comment[th]=นี่เป็นรายการที่คั่นหน้าของคุณ เพื่อการเรียกใช้อย่างรวดเร็ว
+Comment[tr]=Bu sizin daha hızlı erişiminiz için kısa yollarınızın bir listesidir
+Comment[tt]=Tiz ireşü öçen bitbilgelär tezmäse
+Comment[uk]=Це - список Ваших закладок для швидкого доступу
+Comment[uz]=Хатчўплар рўйхати
+Comment[ven]=Hoyu ndi mutevhe wa tswayo dza bugu, uitele u dzhene ngau tavhanya
+Comment[vi]=Đây là danh sách tất cả các trang đánh dấu của bạn, giúp cho truy cập nhanh hơn 
+Comment[xh]=Olu luluhlu lwamanqaku encwadi yakho, yonikezelo olukhawulezayo
+Comment[xx]=xxThis is the list of your bookmarks, for a faster accessxx
+Comment[zh_CN]=这是您的书签列表,以便使得访问更加方便
+Comment[zh_TW]=快速存取網站的書籤列表
+Comment[zu]=Lolu uhlu lomaka bakho bencwadi,ukuze ungene ngokushesha
+Open=false
+X-KDE-TreeModule=Bookmarks
+X-KDE-SearchableTreeModule=true
+X-KDE-KonqSidebarModule=konqsidebar_tree

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/history.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/history.desktop	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/history.desktop	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,149 +1,149 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Link
-URL=
-Icon=history
-Name=History
-Name[af]=Geskiedenis
-Name[ar]=التاريخ
-Name[az]=Keçmiş
-Name[be]=Гісторыя
-Name[bg]=История
-Name[bn]=ইতিহাস
-Name[br]=Istor
-Name[bs]=Historija
-Name[ca]=Historial
-Name[cs]=Historie
-Name[cy]=Hanes
-Name[da]=Historik
-Name[de]=Verlauf
-Name[el]=Ιστορικό
-Name[eo]=Historio
-Name[es]=Historial
-Name[et]=Ajalugu
-Name[eu]=Historia
-Name[fa]=تاریخچه
-Name[fi]=Historia
-Name[fr]=Historique
-Name[fy]=Histoarje
-Name[ga]=Stair
-Name[gl]=Historial
-Name[he]=היסטוריה
-Name[hi]=इतिहास
-Name[hr]=Povijest
-Name[hu]=Napló
-Name[id]=Sejarah
-Name[is]=Saga
-Name[it]=Cronologia
-Name[ja]=履歴
-Name[km]=ប្រវត្តិ
-Name[lo]=ປະວັດການໃຊ້ງານ
-Name[lt]=Istorija
-Name[lv]=Vēsture
-Name[mk]=Историја
-Name[mn]=Түүх
-Name[mt]=Kronoloġija
-Name[nb]=Historie
-Name[nds]=Vörgeschicht
-Name[nl]=Geschiedenis
-Name[nn]=Historie
-Name[nso]=Histori
-Name[pa]=ਅਤੀਤ
-Name[pl]=Historia
-Name[pt]=Historial
-Name[pt_BR]=Histórico
-Name[ro]=Istoric
-Name[ru]=Журнал
-Name[rw]=Amateka
-Name[se]=Historihkka
-Name[sk]=História
-Name[sl]=Zgodovina
-Name[sr]=Историјат
-Name[sr at Latn]=Istorijat
-Name[sv]=Historik
-Name[ta]=வரலாறு
-Name[tg]=Таърих
-Name[th]=ประวัติการใช้
-Name[tr]=Geçmiş
-Name[tt]=Taríx
-Name[uk]=Історія
-Name[uz]=Тарих
-Name[ven]=Divhazwakale
-Name[vi]=Lịch sử
-Name[wa]=Istwere
-Name[xh]=Imbali
-Name[xx]=xxHistoryxx
-Name[zh_CN]=历史
-Name[zh_TW]=歷史紀錄
-Name[zu]=Umlando
-Comment=This is the history of the URLs you have recently visited. You can sort them in many ways.
-Comment[af]=Hierdie is die geskiedenis van die Urls jy het onlangse besoekte. jy kan sorteer hulle in veel maniere.
-Comment[ar]=هذه قائمة بالمواقع التي زرتها حديثاً. يمكنك ترتيبها بالعديد من الطرق.
-Comment[az]=Bu da əvvəllər ziyarət etdiyiniz URLlərin siyahısıdır. Onları istədiyiniz kimi düzə bilərsiiz.
-Comment[bg]=История на скоро посетените адреси
-Comment[bn]=আপনি সম্প্রতি কোন কোন ইউ-আর-এল-এ গিয়েছেন তার ইতিহাস। আপনি এই তালিকাটি নানাভাবে সাজাতে পারেন।
-Comment[bs]=Ovo je historija URLova koje ste nedavno posjetili. Možete ih složiti na više načina.
-Comment[ca]=Aquest és l'historial amb les URL que heu visitat recentment. Podeu ordenar-les de moltes maneres.
-Comment[cs]=Toto je historie URL, které jste naposledy navštívili. Můžete si je různými způsoby setřídit.
-Comment[cy]=Dyma hanes y safleoedd rydych wedi ymweld a nhw. Gallwch eu didoli mewn sawl ffordd.
-Comment[da]=Dette er historikken for de URL'er du har besøgt for nyligt. Du kan sortere dem på mange måder.
-Comment[de]=Dies ist ein Ordner für alle Adressen, die Sie in letzter Zeit besucht haben. Sie können sie auf vielerlei Weise sortieren.
-Comment[el]=Αυτό είναι το ιστορικό των URL που επισκεφθήκατε πρόσφατα. Μπορείτε να τα ταξινομήσετε με πολλούς τρόπους.
-Comment[eo]=Jen la historio de la vizititaj URLoj. Vi povas ordigi ilin diversmaniere.
-Comment[es]=Este es el historial con las URLs que ha visitado recientemente. Puede ordenarlas de diversos modos.
-Comment[et]=Sinu hiljuti külastatud saitide ajalugu. Ajalugu on võimalik mitmel moel sorteerida.
-Comment[eu]=Hau bisitatu berri dituzun URLen historiala da. Era askotan antola ditzakezu
-Comment[fa]=سیاهه‌ای از تاریخچه‌ی URLهایی که اخیرا دیده‌اید.می‌توانید آنهارا به هر صورت دلخواه مرتب کنید.
-Comment[fi]=Tämä on historia selatuista verkko-osoitteista. Ne voidaan järjestää monella tavalla.
-Comment[fr]=Voici la liste des URL que vous avez récemment visitées. Vous pouvez les trier de multiples façons.
-Comment[fy]=Dit is de histoarje fan de URL-adressen wêrst koartlyn west bist. Do kinst se op meardere manieren sortearje.
-Comment[gl]=Éste é o historial de URLs que visitou recentemente. Pode ordená-las de vários xeitos.
-Comment[he]=זוהי היסטוריית הכתובות בהן ביקרת לאחרונה. באפשרותך לסדר אותה במגוון דרכים.
-Comment[hi]=आप जो हालिया भ्रमण किए हैं, उन यूआरएल का यह इतिहास है. आप इन्हें कई तरीकों से क्रमबद्ध कर सकते हैं.
-Comment[hu]=Itt láthatók a legutóbb meglátogatott URL-ek. Többféle szempont szerint is sorba rendezhetők.
-Comment[is]=Þetta er saga þeirra heimasíðna sem þú hefur heimsótt.  Þú getur raðað þessum lista á ýmsan hátt.
-Comment[it]=Questa è la cronologia degli indirizzi URL che hai visitato recentemente. Puoi ordinarli in vari modi.
-Comment[ja]=これは最近訪問したURLの履歴です。さまざまな種類のソートができます。
-Comment[km]=នេះ​ជា​ប្រវត្តិ​របស់ URL ដែល​អ្នក​បាន​ទស្សនា​ថ្មីៗ​នេះ ។ អ្នក​អាច​តម្រៀប​ពួក​វា​តាម​វិធី​ជា​ច្រើន ។
-Comment[lo]=ນີ້ເປັນປະວັດເກັບ URL ທີ່ທ່ານເຄີຍມມກ່ອນໂດຍທ່ານສາມາດລງງລຳດັບມັນໄດ້ໃນຫລາຍຮູບແບບ
-Comment[lt]=Tai Jūsų neseniai aplankytų URL istorija, Jūs galite surūšiuoti juos įvairiais būdais.
-Comment[lv]=Šī ir nesen apmeklēto URL vēsture. Jūs varat to šķirot daudzos veidos.
-Comment[mk]=Ова е историја на URL кои скоро сте ги посетиле. Можете да ги подредувате на разни начини.
-Comment[mn]= Энэ бол таны хамгийн сүүлд айлчилсан URL хаягуудын түүх юм. Та тэдгээрийг янз бүрээр эрэмбэлж болно.
-Comment[mt]=Din hija kronoloġija tal-URLs kollha li żort reċentement. Tista' tissortjahom b'diversi modi.
-Comment[nb]=Dette er en liste over de nettadressene du har vært innom nylig. Du kan sortere dem på ulike måter.
-Comment[nds]=Dit is de Vörgeschicht vun Sieden, de Du tolest besöcht hest. Du kannst se op mennige Oorden sorteren.
-Comment[nl]=Dit is de geschiedenis van de URL-adressen waar u recentelijk bent geweest. U kunt ze op meerdere manieren sorteren.
-Comment[nn]=Dette er historia over adressene du nyleg har vitja. Du kan sortera lista på mange måtar.
-Comment[nso]=Ye ke histori ya di-URL tseo odi etetsego gabjale. Okadi rarolla ka mekgwa ye mentshi.
-Comment[pa]=ਇਹ URL ਦੀ ਸੂਚੀ ਹੈ, ਜੋ ਕਿ ਤੁਸੀਂ ਖੋਲੋ ਸਨ, ਤੁਸੀਂ ਇਹਨਾਂ ਨੂੰ ਕਈ ਤਰਾਂ ਕ੍ਰਮਬੱਧ ਕਰ ਸਕਦੇ ਹੋ।
-Comment[pl]=Historia ostatnio odwiedzonych adresów URL. Można ją na różne sposoby posortować.
-Comment[pt]=O historial dos URLs visitados recentemente. É possível ordená-los de várias maneiras.
-Comment[pt_BR]=Este é o histórico das URLs que você visitou recentemente. Você pode ordenar esta lista de várias maneiras.
-Comment[ro]=Acesta este istoricul URL-urilor pe care le-aţi vizitat recent. Le puteţi sorta în diferite moduri.
-Comment[ru]=Журнал недавно посещённых адресов (URL). Его можно настраивать по своему усмотрению.
-Comment[rw]=Aya ni amateka ya URL wasuye vuba. Ushobora kuzishungura mu buryo bwinshi.
-Comment[se]=Dán listtus oainnát čujuhusaid maid áiddo leat guossohan. Don sáhtát erohallat listtu máŋgga láhkai.
-Comment[sk]=Toto je história URL, ktoré ste naposledy navštívili. Môžete ich utriediť rôznymi spôsobmi.
-Comment[sl]=To je zgodovina URL-jev, ki ste jih pred kratkim obiskali. Lahko jih uredite na različne načine.
-Comment[sr]=Ово је листа URL-ова које сте недавно посетили. Можете је поређати на разне начине.
-Comment[sr at Latn]=Ovo je lista URL-ova koje ste nedavno posetili. Možete je poređati na razne načine.
-Comment[sv]=Det här är historiken på de webbadresser du nyligen besökt. Du kan sortera dem på många sätt.
-Comment[ta]=நீங்கள் தற்போது பார்த்த வலைப்பின்னல்களின் வரலாறு. அதை பல வழிகளில் வரிசைப்படுத்தலாம்.
-Comment[tg]=Ин саҳифаҳои аз торихчаи URL-ҳое ки охирон дидаед. Метавонед онҳоро ба ҳар сурати дархост мураттаб кунед.
-Comment[th]=นี่เป็นประวัติเก็บ URL ที่คุณเคยไปมาก่อน โดยคุณสามารถเรียงลำดับมันได้ในหลายรูปแบบ
-Comment[tr]=Bu sizim yakın geçmişte ziyaret ettiğiniz URL'lerin bir listesidir. Bunları bir çok şekilde sıralayabilirsiniz.
-Comment[tt]=Soñğı arada qaralğan bulğan URL tezmäse. Anı törleçä tärtipläp bula.
-Comment[uk]=Це - історія URL, які Ви недавно відвідали. Ви можете також впорядкувати її будь-яким чином.
-Comment[uz]=Яқинда кўрган URL'ларнинг тарихи. Уларни турлича саралашингиз мумкин
-Comment[ven]=Heyi ndi divhazwakale ya URL no i dalelaho zwazwino. Ni nga i lugisa nga ndila dzo fhambananho.
-Comment[vi]=Đây là danh sách các URL bạn đã xem gần đâỵ Bọn có thể sắp xếp lại chúng theo vài cách khác nhau
-Comment[xh]=Le yimbali yee URL obusandukuzindwendwela. Ungazibeka ngendlela ezininzi.
-Comment[xx]=xxThis is the history of the URLs you have recently visited. You can sort them in many ways.xx
-Comment[zh_CN]=这是您曾经浏览过的 URL 历史。您可以以多种方式对其排序。
-Comment[zh_TW]=這是您最近訪問的 URL 的歷史紀錄。您可以將它們以多種方式排序。
-Comment[zu]=Lo umlando wama-URL osanda kuwavakashela. Ungawahlela ngezindlela eziningi.
-Open=false
-X-KDE-TreeModule=History
-X-KDE-SearchableTreeModule=true
-X-KDE-KonqSidebarModule=konqsidebar_tree
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+URL=
+Icon=history
+Name=History
+Name[af]=Geskiedenis
+Name[ar]=التاريخ
+Name[az]=Keçmiş
+Name[be]=Гісторыя
+Name[bg]=История
+Name[bn]=ইতিহাস
+Name[br]=Istor
+Name[bs]=Historija
+Name[ca]=Historial
+Name[cs]=Historie
+Name[cy]=Hanes
+Name[da]=Historik
+Name[de]=Verlauf
+Name[el]=Ιστορικό
+Name[eo]=Historio
+Name[es]=Historial
+Name[et]=Ajalugu
+Name[eu]=Historia
+Name[fa]=تاریخچه
+Name[fi]=Historia
+Name[fr]=Historique
+Name[fy]=Histoarje
+Name[ga]=Stair
+Name[gl]=Historial
+Name[he]=היסטוריה
+Name[hi]=इतिहास
+Name[hr]=Povijest
+Name[hu]=Napló
+Name[id]=Sejarah
+Name[is]=Saga
+Name[it]=Cronologia
+Name[ja]=履歴
+Name[km]=ប្រវត្តិ
+Name[lo]=ປະວັດການໃຊ້ງານ
+Name[lt]=Istorija
+Name[lv]=Vēsture
+Name[mk]=Историја
+Name[mn]=Түүх
+Name[mt]=Kronoloġija
+Name[nb]=Historie
+Name[nds]=Vörgeschicht
+Name[nl]=Geschiedenis
+Name[nn]=Historie
+Name[nso]=Histori
+Name[pa]=ਅਤੀਤ
+Name[pl]=Historia
+Name[pt]=Historial
+Name[pt_BR]=Histórico
+Name[ro]=Istoric
+Name[ru]=Журнал
+Name[rw]=Amateka
+Name[se]=Historihkka
+Name[sk]=História
+Name[sl]=Zgodovina
+Name[sr]=Историјат
+Name[sr at Latn]=Istorijat
+Name[sv]=Historik
+Name[ta]=வரலாறு
+Name[tg]=Таърих
+Name[th]=ประวัติการใช้
+Name[tr]=Geçmiş
+Name[tt]=Taríx
+Name[uk]=Історія
+Name[uz]=Тарих
+Name[ven]=Divhazwakale
+Name[vi]=Lịch sử
+Name[wa]=Istwere
+Name[xh]=Imbali
+Name[xx]=xxHistoryxx
+Name[zh_CN]=历史
+Name[zh_TW]=歷史紀錄
+Name[zu]=Umlando
+Comment=This is the history of the URLs you have recently visited. You can sort them in many ways.
+Comment[af]=Hierdie is die geskiedenis van die Urls jy het onlangse besoekte. jy kan sorteer hulle in veel maniere.
+Comment[ar]=هذه قائمة بالمواقع التي زرتها حديثاً. يمكنك ترتيبها بالعديد من الطرق.
+Comment[az]=Bu da əvvəllər ziyarət etdiyiniz URLlərin siyahısıdır. Onları istədiyiniz kimi düzə bilərsiiz.
+Comment[bg]=История на скоро посетените адреси
+Comment[bn]=আপনি সম্প্রতি কোন কোন ইউ-আর-এল-এ গিয়েছেন তার ইতিহাস। আপনি এই তালিকাটি নানাভাবে সাজাতে পারেন।
+Comment[bs]=Ovo je historija URLova koje ste nedavno posjetili. Možete ih složiti na više načina.
+Comment[ca]=Aquest és l'historial amb les URL que heu visitat recentment. Podeu ordenar-les de moltes maneres.
+Comment[cs]=Toto je historie URL, které jste naposledy navštívili. Můžete si je různými způsoby setřídit.
+Comment[cy]=Dyma hanes y safleoedd rydych wedi ymweld a nhw. Gallwch eu didoli mewn sawl ffordd.
+Comment[da]=Dette er historikken for de URL'er du har besøgt for nyligt. Du kan sortere dem på mange måder.
+Comment[de]=Dies ist ein Ordner für alle Adressen, die Sie in letzter Zeit besucht haben. Sie können sie auf vielerlei Weise sortieren.
+Comment[el]=Αυτό είναι το ιστορικό των URL που επισκεφθήκατε πρόσφατα. Μπορείτε να τα ταξινομήσετε με πολλούς τρόπους.
+Comment[eo]=Jen la historio de la vizititaj URLoj. Vi povas ordigi ilin diversmaniere.
+Comment[es]=Este es el historial con las URLs que ha visitado recientemente. Puede ordenarlas de diversos modos.
+Comment[et]=Sinu hiljuti külastatud saitide ajalugu. Ajalugu on võimalik mitmel moel sorteerida.
+Comment[eu]=Hau bisitatu berri dituzun URLen historiala da. Era askotan antola ditzakezu
+Comment[fa]=سیاهه‌ای از تاریخچه‌ی URLهایی که اخیرا دیده‌اید.می‌توانید آنهارا به هر صورت دلخواه مرتب کنید.
+Comment[fi]=Tämä on historia selatuista verkko-osoitteista. Ne voidaan järjestää monella tavalla.
+Comment[fr]=Voici la liste des URL que vous avez récemment visitées. Vous pouvez les trier de multiples façons.
+Comment[fy]=Dit is de histoarje fan de URL-adressen wêrst koartlyn west bist. Do kinst se op meardere manieren sortearje.
+Comment[gl]=Éste é o historial de URLs que visitou recentemente. Pode ordená-las de vários xeitos.
+Comment[he]=זוהי היסטוריית הכתובות בהן ביקרת לאחרונה. באפשרותך לסדר אותה במגוון דרכים.
+Comment[hi]=आप जो हालिया भ्रमण किए हैं, उन यूआरएल का यह इतिहास है. आप इन्हें कई तरीकों से क्रमबद्ध कर सकते हैं.
+Comment[hu]=Itt láthatók a legutóbb meglátogatott URL-ek. Többféle szempont szerint is sorba rendezhetők.
+Comment[is]=Þetta er saga þeirra heimasíðna sem þú hefur heimsótt.  Þú getur raðað þessum lista á ýmsan hátt.
+Comment[it]=Questa è la cronologia degli indirizzi URL che hai visitato recentemente. Puoi ordinarli in vari modi.
+Comment[ja]=これは最近訪問したURLの履歴です。さまざまな種類のソートができます。
+Comment[km]=នេះ​ជា​ប្រវត្តិ​របស់ URL ដែល​អ្នក​បាន​ទស្សនា​ថ្មីៗ​នេះ ។ អ្នក​អាច​តម្រៀប​ពួក​វា​តាម​វិធី​ជា​ច្រើន ។
+Comment[lo]=ນີ້ເປັນປະວັດເກັບ URL ທີ່ທ່ານເຄີຍມມກ່ອນໂດຍທ່ານສາມາດລງງລຳດັບມັນໄດ້ໃນຫລາຍຮູບແບບ
+Comment[lt]=Tai Jūsų neseniai aplankytų URL istorija, Jūs galite surūšiuoti juos įvairiais būdais.
+Comment[lv]=Šī ir nesen apmeklēto URL vēsture. Jūs varat to šķirot daudzos veidos.
+Comment[mk]=Ова е историја на URL кои скоро сте ги посетиле. Можете да ги подредувате на разни начини.
+Comment[mn]= Энэ бол таны хамгийн сүүлд айлчилсан URL хаягуудын түүх юм. Та тэдгээрийг янз бүрээр эрэмбэлж болно.
+Comment[mt]=Din hija kronoloġija tal-URLs kollha li żort reċentement. Tista' tissortjahom b'diversi modi.
+Comment[nb]=Dette er en liste over de nettadressene du har vært innom nylig. Du kan sortere dem på ulike måter.
+Comment[nds]=Dit is de Vörgeschicht vun Sieden, de Du tolest besöcht hest. Du kannst se op mennige Oorden sorteren.
+Comment[nl]=Dit is de geschiedenis van de URL-adressen waar u recentelijk bent geweest. U kunt ze op meerdere manieren sorteren.
+Comment[nn]=Dette er historia over adressene du nyleg har vitja. Du kan sortera lista på mange måtar.
+Comment[nso]=Ye ke histori ya di-URL tseo odi etetsego gabjale. Okadi rarolla ka mekgwa ye mentshi.
+Comment[pa]=ਇਹ URL ਦੀ ਸੂਚੀ ਹੈ, ਜੋ ਕਿ ਤੁਸੀਂ ਖੋਲੋ ਸਨ, ਤੁਸੀਂ ਇਹਨਾਂ ਨੂੰ ਕਈ ਤਰਾਂ ਕ੍ਰਮਬੱਧ ਕਰ ਸਕਦੇ ਹੋ।
+Comment[pl]=Historia ostatnio odwiedzonych adresów URL. Można ją na różne sposoby posortować.
+Comment[pt]=O historial dos URLs visitados recentemente. É possível ordená-los de várias maneiras.
+Comment[pt_BR]=Este é o histórico das URLs que você visitou recentemente. Você pode ordenar esta lista de várias maneiras.
+Comment[ro]=Acesta este istoricul URL-urilor pe care le-aţi vizitat recent. Le puteţi sorta în diferite moduri.
+Comment[ru]=Журнал недавно посещённых адресов (URL). Его можно настраивать по своему усмотрению.
+Comment[rw]=Aya ni amateka ya URL wasuye vuba. Ushobora kuzishungura mu buryo bwinshi.
+Comment[se]=Dán listtus oainnát čujuhusaid maid áiddo leat guossohan. Don sáhtát erohallat listtu máŋgga láhkai.
+Comment[sk]=Toto je história URL, ktoré ste naposledy navštívili. Môžete ich utriediť rôznymi spôsobmi.
+Comment[sl]=To je zgodovina URL-jev, ki ste jih pred kratkim obiskali. Lahko jih uredite na različne načine.
+Comment[sr]=Ово је листа URL-ова које сте недавно посетили. Можете је поређати на разне начине.
+Comment[sr at Latn]=Ovo je lista URL-ova koje ste nedavno posetili. Možete je poređati na razne načine.
+Comment[sv]=Det här är historiken på de webbadresser du nyligen besökt. Du kan sortera dem på många sätt.
+Comment[ta]=நீங்கள் தற்போது பார்த்த வலைப்பின்னல்களின் வரலாறு. அதை பல வழிகளில் வரிசைப்படுத்தலாம்.
+Comment[tg]=Ин саҳифаҳои аз торихчаи URL-ҳое ки охирон дидаед. Метавонед онҳоро ба ҳар сурати дархост мураттаб кунед.
+Comment[th]=นี่เป็นประวัติเก็บ URL ที่คุณเคยไปมาก่อน โดยคุณสามารถเรียงลำดับมันได้ในหลายรูปแบบ
+Comment[tr]=Bu sizim yakın geçmişte ziyaret ettiğiniz URL'lerin bir listesidir. Bunları bir çok şekilde sıralayabilirsiniz.
+Comment[tt]=Soñğı arada qaralğan bulğan URL tezmäse. Anı törleçä tärtipläp bula.
+Comment[uk]=Це - історія URL, які Ви недавно відвідали. Ви можете також впорядкувати її будь-яким чином.
+Comment[uz]=Яқинда кўрган URL'ларнинг тарихи. Уларни турлича саралашингиз мумкин
+Comment[ven]=Heyi ndi divhazwakale ya URL no i dalelaho zwazwino. Ni nga i lugisa nga ndila dzo fhambananho.
+Comment[vi]=Đây là danh sách các URL bạn đã xem gần đâỵ Bọn có thể sắp xếp lại chúng theo vài cách khác nhau
+Comment[xh]=Le yimbali yee URL obusandukuzindwendwela. Ungazibeka ngendlela ezininzi.
+Comment[xx]=xxThis is the history of the URLs you have recently visited. You can sort them in many ways.xx
+Comment[zh_CN]=这是您曾经浏览过的 URL 历史。您可以以多种方式对其排序。
+Comment[zh_TW]=這是您最近訪問的 URL 的歷史紀錄。您可以將它們以多種方式排序。
+Comment[zu]=Lo umlando wama-URL osanda kuwavakashela. Ungawahlela ngezindlela eziningi.
+Open=false
+X-KDE-TreeModule=History
+X-KDE-SearchableTreeModule=true
+X-KDE-KonqSidebarModule=konqsidebar_tree

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/home.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/home.desktop	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/home.desktop	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,146 +1,146 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Link
-URL=file:$HOME
-Icon=folder_home
-Name=Home Folder
-Name[af]=Tuis Gids
-Name[ar]=مجلدي
-Name[az]=Ev Qovluğu
-Name[be]=Хатняя тэчка
-Name[bg]=Домашна директория
-Name[bn]=ব্যক্তিগত ফোল্ডার
-Name[br]=Renkell ar gêr
-Name[bs]=Home direktorij
-Name[ca]=Carpeta inici
-Name[cs]=Domovská složka
-Name[cy]=Plygell Cartref
-Name[da]=Hjemmemappe
-Name[de]=Persönlicher Ordner
-Name[el]=Προσωπικός φάκελος
-Name[eo]=Hejma dosierujo
-Name[es]=Carpeta personal
-Name[et]=Kodukataloog
-Name[eu]=Etxea
-Name[fi]=Kotikansio
-Name[fr]=Dossier personnel
-Name[fy]=Persoanlike map
-Name[ga]=Fillteán Baile
-Name[gl]=Cartafol Persoal
-Name[he]=תיקיית בית
-Name[hi]=मुख फ़ोल्डर
-Name[hr]=Početna mapa korisnika
-Name[hu]=Saját könyvtár
-Name[is]=Heimasvæði
-Name[it]=Cartella Home
-Name[ja]=ホームフォルダ
-Name[km]=ថត​ផ្ទះ
-Name[lt]=Namų aplankas
-Name[lv]=Mājas mape
-Name[mk]=Домашна папка
-Name[mn]=Хувийн лавлах
-Name[mt]=Direttorju Personali
-Name[nb]=Hjemmemappe
-Name[nds]=Tohuus
-Name[nl]=Persoonlijke map
-Name[nn]=Heimemappe
-Name[pa]=ਘਰ ਫੋਲਡਰ
-Name[pl]=Katalog domowy
-Name[pt]=Pasta Pessoal
-Name[pt_BR]=Pasta do Usuário
-Name[ro]=Folder personal
-Name[ru]=Домашняя папка
-Name[rw]=Ububiko Urugo
-Name[se]=Ruoktomáhppa
-Name[sk]=Domovský priečinok
-Name[sl]=Domača mapa
-Name[sr]=Домаћа фасцикла
-Name[sr at Latn]=Domaća fascikla
-Name[sv]=Hemkatalog
-Name[ta]=வீட்டு அடைவு
-Name[tg]=Феҳристи хонагӣ
-Name[th]=โฟลเดอร์ส่วนตัว
-Name[tr]=Başlangıç Dizini
-Name[tt]=Ana Törgäk
-Name[uk]=Домашня тека
-Name[uz]=Уй жилди
-Name[vi]=Thư mục nhà
-Name[wa]=Ridant måjhon
-Name[xx]=xxHome Folderxx
-Name[zh_CN]=主文件夹
-Name[zh_TW]=家目錄
-Comment=This folder contains your personal files
-Comment[af]=Hierdie kabinet bevat jou persoonlike lêers
-Comment[ar]=هذا الدليل يحتوي على ملفاتك الخاصة
-Comment[az]=Bütün şəxsi fayllarınız bu qovluqda yer alır
-Comment[be]=Гэтая тэчка зьмяшчае Вашыя пэрсанальныя файлы
-Comment[bg]=Тази директория съдържа Вашите лични файлове
-Comment[bn]=এই ফোল্ডারে আপনার নিজের জাবতীয় ফাইল থাকে
-Comment[bs]=Ovaj direktorij sadrži sve vaše osobne datoteke
-Comment[ca]=Aquest directori conté els vostres fitxers personals
-Comment[cs]=Tento adresář obsahuje vaše osobní soubory
-Comment[cy]=Mae'r plygell yma'n cadw eich ffeiliau personol
-Comment[da]=Denne mappe indeholder dine personlige filer
-Comment[de]=Dieser Ordner enthält Ihre persönlichen Dateien.
-Comment[el]=Αυτός ο φάκελος περιέχει τα προσωπικά σας αρχεία
-Comment[eo]=Tiu ĉi dosierujo enhavas viajn personajn dosierojn
-Comment[es]=Esta carpeta contiene sus archivos personales
-Comment[et]=See kataloog sisaldab sinu isiklike faile
-Comment[eu]=Zeure fitxategiak karpeta honetan daude
-Comment[fa]=این پوشه شامل پرونده‌ی‌های شخصی شماست
-Comment[fi]=Tämä kansio sisältää henkilökohtaiset tiedostot
-Comment[fr]=Ce dossier contient tous vos fichiers personnels
-Comment[fy]=Dizze map befet al dyn persoanlike triemen
-Comment[ga]=Tá do chomhaid phearsanta san fhillteán seo
-Comment[gl]=Este cartafol contén os seus arquivos persoais
-Comment[he]=תיקייה זו מכילה את הקבצים האישיים שלך
-Comment[hi]=यह फ़ोल्डर आपकी निजी फ़ाइलें रखता है
-Comment[hr]=Ovaj direktorij sadrži sve vaše osobne datoteke
-Comment[hu]=Ez a mappa tartalmazza az Ön személyes fájljait
-Comment[is]=Þessi mappa inniheldur skjölin þín
-Comment[it]=Questa cartella contiene i tuoi file personali
-Comment[ja]=このフォルダはあなたの全ての個人的なファイルを含みます
-Comment[km]=ថត​នេះ​មាន​ឯកសារ​ផ្ទាល់​ខ្លួន​របស់​អ្នក
-Comment[ko]=혼자만 쓰는 파일을 담고 있는 폴더
-Comment[lo]=ໂຟເດີນີ້ບັນຈຸແຟ້ມຕ່າງຯທີ່ເປັນສ່ວນຕົວຂອງທ່ານ
-Comment[lt]=Šiame aplanke yra Jūsų asmeninės bylos
-Comment[lv]=Šī mape satur jūsu personālos failus
-Comment[mk]=Оваа папка ги содржи вашите лични датотеки
-Comment[mn]=Энэ лавлах таны хувийн файлуудыг агуулна.
-Comment[mt]=Dan id-direttorju iżomm il-fajls personali kollha tiegħek.
-Comment[nb]=Denne mappa inneholder dine personlige filer
-Comment[nds]=In dissen Orner sünd dien egen Dateien
-Comment[nl]=Deze map bevat al uw persoonlijke bestanden
-Comment[nn]=Denne mappa inneheld dine personlege filer.
-Comment[nso]=Sephuthi se sena le difaele tsa gago tsa botho
-Comment[pa]=ਇਹ ਫੋਲਡਰ ਤੁਹਾਡੀਆਂ ਨਿੱਜੀ ਫਾਇਲਾਂ ਰੱਖਦਾ ਹੈ
-Comment[pl]=Ten katalog zawiera wszystkie twoje osobiste pliki.
-Comment[pt]=Esta pasta contém os seus ficheiros pessoais
-Comment[pt_BR]=Esta pasta contém os seus arquivos pessoais
-Comment[ro]=Acest director conţine fişierele dumneavoastră personale
-Comment[ru]=Папка ваших личных файлов
-Comment[rw]=Ubu bubiko bufite amadosiye yihariye yawe
-Comment[se]=Dán máhpas du iežat fiillat leat
-Comment[sk]=Tento priečinok obsahuje vaše osobné súbory
-Comment[sl]=Ta mapa vsebuje vaše osebne datoteke.
-Comment[sr]=Ова фасцикла садржи ваше личне фајлове
-Comment[sr at Latn]=Ova fascikla sadrži vaše lične fajlove
-Comment[sv]=Den här katalogen innehåller dina personliga filer
-Comment[ta]=இந்த அடைவில் உங்கள் அந்தரங்க கோப்புகள் உள்ளன
-Comment[tg]=Ин феҳрист шомили файлҳои шахсии шумост
-Comment[th]=โฟลเดอร์นี้บรรจุแฟ้มต่าง ๆ ที่เป็นส่วนตัวของคุณ
-Comment[tr]=Bu dizin kişisel dosyalarınızı içerir
-Comment[tt]=Bu törgäktä şäxsi biremnäreñ yata
-Comment[uk]=Цей каталог містить Ваші персональні файли
-Comment[uz]=Бу жилд сизнинг шахсий файлларингиздан иборат
-Comment[ven]=Foludara ino ina dzifaela dzanu
-Comment[vi]=Thư mục này chứa các file của riêng bạn
-Comment[wa]=Ci ridant chal a les fitchîs et dnêyes da vosse
-Comment[xh]=Le ncwadi eneenkcukacha iqulathe iifayile zobuntu bakho
-Comment[xx]=xxThis folder contains your personal filesxx
-Comment[zh_CN]=此文件夹包含了您的个人文件
-Comment[zh_TW]=這個資料夾包含有您的個人文件
-Comment[zu]=Lesi sigcini samafayela siqukethe amafayela akho siqu
-Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+URL=file:$HOME
+Icon=folder_home
+Name=Home Folder
+Name[af]=Tuis Gids
+Name[ar]=مجلدي
+Name[az]=Ev Qovluğu
+Name[be]=Хатняя тэчка
+Name[bg]=Домашна директория
+Name[bn]=ব্যক্তিগত ফোল্ডার
+Name[br]=Renkell ar gêr
+Name[bs]=Home direktorij
+Name[ca]=Carpeta inici
+Name[cs]=Domovská složka
+Name[cy]=Plygell Cartref
+Name[da]=Hjemmemappe
+Name[de]=Persönlicher Ordner
+Name[el]=Προσωπικός φάκελος
+Name[eo]=Hejma dosierujo
+Name[es]=Carpeta personal
+Name[et]=Kodukataloog
+Name[eu]=Etxea
+Name[fi]=Kotikansio
+Name[fr]=Dossier personnel
+Name[fy]=Persoanlike map
+Name[ga]=Fillteán Baile
+Name[gl]=Cartafol Persoal
+Name[he]=תיקיית בית
+Name[hi]=मुख फ़ोल्डर
+Name[hr]=Početna mapa korisnika
+Name[hu]=Saját könyvtár
+Name[is]=Heimasvæði
+Name[it]=Cartella Home
+Name[ja]=ホームフォルダ
+Name[km]=ថត​ផ្ទះ
+Name[lt]=Namų aplankas
+Name[lv]=Mājas mape
+Name[mk]=Домашна папка
+Name[mn]=Хувийн лавлах
+Name[mt]=Direttorju Personali
+Name[nb]=Hjemmemappe
+Name[nds]=Tohuus
+Name[nl]=Persoonlijke map
+Name[nn]=Heimemappe
+Name[pa]=ਘਰ ਫੋਲਡਰ
+Name[pl]=Katalog domowy
+Name[pt]=Pasta Pessoal
+Name[pt_BR]=Pasta do Usuário
+Name[ro]=Folder personal
+Name[ru]=Домашняя папка
+Name[rw]=Ububiko Urugo
+Name[se]=Ruoktomáhppa
+Name[sk]=Domovský priečinok
+Name[sl]=Domača mapa
+Name[sr]=Домаћа фасцикла
+Name[sr at Latn]=Domaća fascikla
+Name[sv]=Hemkatalog
+Name[ta]=வீட்டு அடைவு
+Name[tg]=Феҳристи хонагӣ
+Name[th]=โฟลเดอร์ส่วนตัว
+Name[tr]=Başlangıç Dizini
+Name[tt]=Ana Törgäk
+Name[uk]=Домашня тека
+Name[uz]=Уй жилди
+Name[vi]=Thư mục nhà
+Name[wa]=Ridant måjhon
+Name[xx]=xxHome Folderxx
+Name[zh_CN]=主文件夹
+Name[zh_TW]=家目錄
+Comment=This folder contains your personal files
+Comment[af]=Hierdie kabinet bevat jou persoonlike lêers
+Comment[ar]=هذا الدليل يحتوي على ملفاتك الخاصة
+Comment[az]=Bütün şəxsi fayllarınız bu qovluqda yer alır
+Comment[be]=Гэтая тэчка зьмяшчае Вашыя пэрсанальныя файлы
+Comment[bg]=Тази директория съдържа Вашите лични файлове
+Comment[bn]=এই ফোল্ডারে আপনার নিজের জাবতীয় ফাইল থাকে
+Comment[bs]=Ovaj direktorij sadrži sve vaše osobne datoteke
+Comment[ca]=Aquest directori conté els vostres fitxers personals
+Comment[cs]=Tento adresář obsahuje vaše osobní soubory
+Comment[cy]=Mae'r plygell yma'n cadw eich ffeiliau personol
+Comment[da]=Denne mappe indeholder dine personlige filer
+Comment[de]=Dieser Ordner enthält Ihre persönlichen Dateien.
+Comment[el]=Αυτός ο φάκελος περιέχει τα προσωπικά σας αρχεία
+Comment[eo]=Tiu ĉi dosierujo enhavas viajn personajn dosierojn
+Comment[es]=Esta carpeta contiene sus archivos personales
+Comment[et]=See kataloog sisaldab sinu isiklike faile
+Comment[eu]=Zeure fitxategiak karpeta honetan daude
+Comment[fa]=این پوشه شامل پرونده‌ی‌های شخصی شماست
+Comment[fi]=Tämä kansio sisältää henkilökohtaiset tiedostot
+Comment[fr]=Ce dossier contient tous vos fichiers personnels
+Comment[fy]=Dizze map befet al dyn persoanlike triemen
+Comment[ga]=Tá do chomhaid phearsanta san fhillteán seo
+Comment[gl]=Este cartafol contén os seus arquivos persoais
+Comment[he]=תיקייה זו מכילה את הקבצים האישיים שלך
+Comment[hi]=यह फ़ोल्डर आपकी निजी फ़ाइलें रखता है
+Comment[hr]=Ovaj direktorij sadrži sve vaše osobne datoteke
+Comment[hu]=Ez a mappa tartalmazza az Ön személyes fájljait
+Comment[is]=Þessi mappa inniheldur skjölin þín
+Comment[it]=Questa cartella contiene i tuoi file personali
+Comment[ja]=このフォルダはあなたの全ての個人的なファイルを含みます
+Comment[km]=ថត​នេះ​មាន​ឯកសារ​ផ្ទាល់​ខ្លួន​របស់​អ្នក
+Comment[ko]=혼자만 쓰는 파일을 담고 있는 폴더
+Comment[lo]=ໂຟເດີນີ້ບັນຈຸແຟ້ມຕ່າງຯທີ່ເປັນສ່ວນຕົວຂອງທ່ານ
+Comment[lt]=Šiame aplanke yra Jūsų asmeninės bylos
+Comment[lv]=Šī mape satur jūsu personālos failus
+Comment[mk]=Оваа папка ги содржи вашите лични датотеки
+Comment[mn]=Энэ лавлах таны хувийн файлуудыг агуулна.
+Comment[mt]=Dan id-direttorju iżomm il-fajls personali kollha tiegħek.
+Comment[nb]=Denne mappa inneholder dine personlige filer
+Comment[nds]=In dissen Orner sünd dien egen Dateien
+Comment[nl]=Deze map bevat al uw persoonlijke bestanden
+Comment[nn]=Denne mappa inneheld dine personlege filer.
+Comment[nso]=Sephuthi se sena le difaele tsa gago tsa botho
+Comment[pa]=ਇਹ ਫੋਲਡਰ ਤੁਹਾਡੀਆਂ ਨਿੱਜੀ ਫਾਇਲਾਂ ਰੱਖਦਾ ਹੈ
+Comment[pl]=Ten katalog zawiera wszystkie twoje osobiste pliki.
+Comment[pt]=Esta pasta contém os seus ficheiros pessoais
+Comment[pt_BR]=Esta pasta contém os seus arquivos pessoais
+Comment[ro]=Acest director conţine fişierele dumneavoastră personale
+Comment[ru]=Папка ваших личных файлов
+Comment[rw]=Ubu bubiko bufite amadosiye yihariye yawe
+Comment[se]=Dán máhpas du iežat fiillat leat
+Comment[sk]=Tento priečinok obsahuje vaše osobné súbory
+Comment[sl]=Ta mapa vsebuje vaše osebne datoteke.
+Comment[sr]=Ова фасцикла садржи ваше личне фајлове
+Comment[sr at Latn]=Ova fascikla sadrži vaše lične fajlove
+Comment[sv]=Den här katalogen innehåller dina personliga filer
+Comment[ta]=இந்த அடைவில் உங்கள் அந்தரங்க கோப்புகள் உள்ளன
+Comment[tg]=Ин феҳрист шомили файлҳои шахсии шумост
+Comment[th]=โฟลเดอร์นี้บรรจุแฟ้มต่าง ๆ ที่เป็นส่วนตัวของคุณ
+Comment[tr]=Bu dizin kişisel dosyalarınızı içerir
+Comment[tt]=Bu törgäktä şäxsi biremnäreñ yata
+Comment[uk]=Цей каталог містить Ваші персональні файли
+Comment[uz]=Бу жилд сизнинг шахсий файлларингиздан иборат
+Comment[ven]=Foludara ino ina dzifaela dzanu
+Comment[vi]=Thư mục này chứa các file của riêng bạn
+Comment[wa]=Ci ridant chal a les fitchîs et dnêyes da vosse
+Comment[xh]=Le ncwadi eneenkcukacha iqulathe iifayile zobuntu bakho
+Comment[xx]=xxThis folder contains your personal filesxx
+Comment[zh_CN]=此文件夹包含了您的个人文件
+Comment[zh_TW]=這個資料夾包含有您的個人文件
+Comment[zu]=Lesi sigcini samafayela siqukethe amafayela akho siqu
+Open=false
+X-KDE-TreeModule=Directory
+X-KDE-KonqSidebarModule=konqsidebar_tree

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/root.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/root.desktop	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/root.desktop	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,146 +1,146 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Link
-URL=file:/
-Icon=folder_red
-Name=Root Folder
-Name[af]=Basis Gids
-Name[ar]=مجلد الجذر
-Name[az]=Ali İstifadəçi Qovluğu
-Name[be]=Карэнная тэчка
-Name[bg]=Главна директория
-Name[bn]=রুট ফোল্ডার
-Name[br]=Renkell gwrizienn
-Name[bs]=Root direktorij
-Name[ca]=Carpeta arrel
-Name[cs]=Kořenová složka
-Name[cy]=Plygell Gwraidd
-Name[da]=Rodmappe
-Name[de]=Basisordner
-Name[el]=Ριζικός φάκελος
-Name[eo]=Baza dosierujo
-Name[es]=Directorio raiz
-Name[et]=Juurkataloog
-Name[eu]=Erro karpeta
-Name[fi]=Juurikansio
-Name[fr]=Dossier racine
-Name[fy]=Rootmap
-Name[ga]=Fréamhfhillteán
-Name[gl]=Cartafol Raíz
-Name[he]=תיקיית שורש
-Name[hi]=रूट फ़ोल्डर
-Name[hr]=Korijenska mapa
-Name[hu]=Gyökérkönyvtár
-Name[is]=Rótarmappa
-Name[it]=Cartella radice
-Name[ja]=ルートフォルダ
-Name[km]=ថត Root
-Name[lt]=Root aplankas
-Name[lv]=Saknes katalogs
-Name[mk]=Коренова папка
-Name[mn]=Язгуур лавлах
-Name[mt]=Direttorju root
-Name[nb]=Rotkatalog
-Name[nds]=Wörtelorner
-Name[nl]=Hoofdmap
-Name[nn]=Rotmappe
-Name[pa]=ਰੂਟ(root) ਫੋਲਡਰ
-Name[pl]=Katalog główny
-Name[pt]=Pasta Raiz
-Name[pt_BR]=Pasta Raiz
-Name[ro]=Folder rădăcină
-Name[ru]=Корневая папка
-Name[rw]=Ububiko Umuzi
-Name[se]=Ruohtasmáhppa
-Name[sk]=Koreňový priečinok
-Name[sl]=Korenska mapa
-Name[sr]=Корена фасцикла
-Name[sr at Latn]=Korena fascikla
-Name[sv]=Rotkatalog
-Name[ta]=ஆரம்ப அடைவு
-Name[tg]=Феҳристи реша
-Name[th]=โฟลเดอร์ราก
-Name[tr]=Kök Dizini
-Name[tt]=Töp Törgäk
-Name[uk]=Коренева тека
-Name[uz]=Туб жилди
-Name[vi]=Thư mục của Root
-Name[wa]=Ridant raecene
-Name[xx]=xxRoot Folderxx
-Name[zh_CN]=根文件夹
-Name[zh_TW]=Root 資料夾
-Comment=This is the root of the filesystem
-Comment[af]=Hierdie is die basis van die lêer stelsel
-Comment[ar]=هذا الدليل هو دليل النظام الأساسي
-Comment[az]=Bu, fayl sisteminizin köküdür
-Comment[be]=Гэта корань файлавай сыстэмы
-Comment[bg]=Тази директория е главната директория на системата
-Comment[bn]=এটি ফাইলসিস্টেমের মূল (root)
-Comment[bs]=Ovo je korijen datotečnog sistema
-Comment[ca]=Aquest és l'arrel del sistema de fitxers
-Comment[cs]=Toto je kořenový adresář souborového systému
-Comment[cy]=Dyma wraidd y cysawd ffeiliau
-Comment[da]=Dette er roden af filsystemet
-Comment[de]=Dies ist der Basisordner Ihres Dateisystems
-Comment[el]=Αυτή είναι η ρίζα του συστήματος αρχείων
-Comment[eo]=Jen la radiko de la dosieraro
-Comment[es]=Esta es la raíz del sistema de archivos
-Comment[et]=See on failisüsteemi ülemkataloog
-Comment[eu]=Hau fitxategi sistemaren erroa da
-Comment[fa]=اینجا ریشه‌ی سیستم پرونده است
-Comment[fi]=Tämä on tiedostojärjestelmän juuri
-Comment[fr]=Ce dossier est à la racine de votre arborescence
-Comment[fy]=Dit is de Root fan it triemsysteem
-Comment[ga]=Seo fréamh an comhadchórais
-Comment[gl]=Ésta é a raiz do sistema de arquivos
-Comment[he]=זהו השורש של מערכת הקבצים שלך
-Comment[hi]=यह फ़ाइल सिस्टम का रूट है
-Comment[hr]=Ovo je korijenski (root) direktorij sustava
-Comment[hu]=Ez a fájlrendszer gyökere
-Comment[is]=Þetta er rót skráarkerfisins
-Comment[it]=Questa è la radice del filesystem
-Comment[ja]=ファイルシステムのルートです
-Comment[km]=នេះ​ជា​ឫស​របស់​ប្រព័ន្ធ​ឯកសារ
-Comment[ko]=파일 시스템 뿌리입니다.
-Comment[lo]=ນີ້ເປັນຮາກຂອງລະບົບແຟ້ມ
-Comment[lt]=Tai yra bylų sistemos pradžia
-Comment[lv]=Šī ir failusistēmas sakne
-Comment[mk]=Ова е коренот на датотечниот системот
-Comment[mn]=Энэ бол таны файлын системийн язгуур
-Comment[mt]=Dan huwa d-direttorju ewlieni tas-sistema
-Comment[nb]=Dette er rota til filsystemet
-Comment[nds]=Dit is dat Dateisysteem sien Wörtel
-Comment[nl]=Dit is de root van het bestandssysteem
-Comment[nn]=Dette er rota i filsystemet.
-Comment[nso]=Se ke modu wa system ya faele
-Comment[pa]=ਇਹ ਫਾਇਲ ਸਿਸਟਮ ਦਾ ਰੂਟ (root) ਹੈ
-Comment[pl]=To jest korzeń systemu plików (czyli katalog główny)
-Comment[pt]=A base do sistema de ficheiros
-Comment[pt_BR]=Esta é a raiz do seu sistema de arquivos
-Comment[ro]=Aceasta este rădăcina sistemului de fişiere
-Comment[ru]=Корневая папка файловой системы
-Comment[rw]=Uyu ni umuzi w'idosiyesisitemu
-Comment[se]=Dát lea du fiilavuogádaga ruohtas
-Comment[sk]=Toto je koreňový priečinok systému súborov
-Comment[sl]=To je koren datotečnega sistema.
-Comment[sr]=Ово је корен система фајлова
-Comment[sr at Latn]=Ovo je koren sistema fajlova
-Comment[sv]=Det här är roten på filsystemet
-Comment[ta]=இதுவே கோப்பு அமைப்பின் வேராகும்
-Comment[tg]=Инҷо решаи системаи файл аст
-Comment[th]=นี่เป็นรากของระบบแฟ้ม
-Comment[tr]=Bu dosya sisteminizi kök dizinidir
-Comment[tt]=Birem sistemeneñ töp törgäge bu
-Comment[uk]=Це - корінь файлової системи
-Comment[uz]=Файл тизимининг туби
-Comment[ven]=Hoyu ndi mudzi wa maitele a faela
-Comment[vi]=Đây là gốc của hệ thống tệp tin
-Comment[wa]=Cichal est li ridant raecene do sistinme di fitchîs
-Comment[xh]=Le yingcambu yendlela yefayile
-Comment[xx]=xxThis is the root of the filesystemxx
-Comment[zh_CN]=这是文件系统的根
-Comment[zh_TW]=這是檔案系統的根目錄
-Comment[zu]=Le yimpande yesistimu yamafayela
-Open=false
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+URL=file:/
+Icon=folder_red
+Name=Root Folder
+Name[af]=Basis Gids
+Name[ar]=مجلد الجذر
+Name[az]=Ali İstifadəçi Qovluğu
+Name[be]=Карэнная тэчка
+Name[bg]=Главна директория
+Name[bn]=রুট ফোল্ডার
+Name[br]=Renkell gwrizienn
+Name[bs]=Root direktorij
+Name[ca]=Carpeta arrel
+Name[cs]=Kořenová složka
+Name[cy]=Plygell Gwraidd
+Name[da]=Rodmappe
+Name[de]=Basisordner
+Name[el]=Ριζικός φάκελος
+Name[eo]=Baza dosierujo
+Name[es]=Directorio raiz
+Name[et]=Juurkataloog
+Name[eu]=Erro karpeta
+Name[fi]=Juurikansio
+Name[fr]=Dossier racine
+Name[fy]=Rootmap
+Name[ga]=Fréamhfhillteán
+Name[gl]=Cartafol Raíz
+Name[he]=תיקיית שורש
+Name[hi]=रूट फ़ोल्डर
+Name[hr]=Korijenska mapa
+Name[hu]=Gyökérkönyvtár
+Name[is]=Rótarmappa
+Name[it]=Cartella radice
+Name[ja]=ルートフォルダ
+Name[km]=ថត Root
+Name[lt]=Root aplankas
+Name[lv]=Saknes katalogs
+Name[mk]=Коренова папка
+Name[mn]=Язгуур лавлах
+Name[mt]=Direttorju root
+Name[nb]=Rotkatalog
+Name[nds]=Wörtelorner
+Name[nl]=Hoofdmap
+Name[nn]=Rotmappe
+Name[pa]=ਰੂਟ(root) ਫੋਲਡਰ
+Name[pl]=Katalog główny
+Name[pt]=Pasta Raiz
+Name[pt_BR]=Pasta Raiz
+Name[ro]=Folder rădăcină
+Name[ru]=Корневая папка
+Name[rw]=Ububiko Umuzi
+Name[se]=Ruohtasmáhppa
+Name[sk]=Koreňový priečinok
+Name[sl]=Korenska mapa
+Name[sr]=Корена фасцикла
+Name[sr at Latn]=Korena fascikla
+Name[sv]=Rotkatalog
+Name[ta]=ஆரம்ப அடைவு
+Name[tg]=Феҳристи реша
+Name[th]=โฟลเดอร์ราก
+Name[tr]=Kök Dizini
+Name[tt]=Töp Törgäk
+Name[uk]=Коренева тека
+Name[uz]=Туб жилди
+Name[vi]=Thư mục của Root
+Name[wa]=Ridant raecene
+Name[xx]=xxRoot Folderxx
+Name[zh_CN]=根文件夹
+Name[zh_TW]=Root 資料夾
+Comment=This is the root of the filesystem
+Comment[af]=Hierdie is die basis van die lêer stelsel
+Comment[ar]=هذا الدليل هو دليل النظام الأساسي
+Comment[az]=Bu, fayl sisteminizin köküdür
+Comment[be]=Гэта корань файлавай сыстэмы
+Comment[bg]=Тази директория е главната директория на системата
+Comment[bn]=এটি ফাইলসিস্টেমের মূল (root)
+Comment[bs]=Ovo je korijen datotečnog sistema
+Comment[ca]=Aquest és l'arrel del sistema de fitxers
+Comment[cs]=Toto je kořenový adresář souborového systému
+Comment[cy]=Dyma wraidd y cysawd ffeiliau
+Comment[da]=Dette er roden af filsystemet
+Comment[de]=Dies ist der Basisordner Ihres Dateisystems
+Comment[el]=Αυτή είναι η ρίζα του συστήματος αρχείων
+Comment[eo]=Jen la radiko de la dosieraro
+Comment[es]=Esta es la raíz del sistema de archivos
+Comment[et]=See on failisüsteemi ülemkataloog
+Comment[eu]=Hau fitxategi sistemaren erroa da
+Comment[fa]=اینجا ریشه‌ی سیستم پرونده است
+Comment[fi]=Tämä on tiedostojärjestelmän juuri
+Comment[fr]=Ce dossier est à la racine de votre arborescence
+Comment[fy]=Dit is de Root fan it triemsysteem
+Comment[ga]=Seo fréamh an comhadchórais
+Comment[gl]=Ésta é a raiz do sistema de arquivos
+Comment[he]=זהו השורש של מערכת הקבצים שלך
+Comment[hi]=यह फ़ाइल सिस्टम का रूट है
+Comment[hr]=Ovo je korijenski (root) direktorij sustava
+Comment[hu]=Ez a fájlrendszer gyökere
+Comment[is]=Þetta er rót skráarkerfisins
+Comment[it]=Questa è la radice del filesystem
+Comment[ja]=ファイルシステムのルートです
+Comment[km]=នេះ​ជា​ឫស​របស់​ប្រព័ន្ធ​ឯកសារ
+Comment[ko]=파일 시스템 뿌리입니다.
+Comment[lo]=ນີ້ເປັນຮາກຂອງລະບົບແຟ້ມ
+Comment[lt]=Tai yra bylų sistemos pradžia
+Comment[lv]=Šī ir failusistēmas sakne
+Comment[mk]=Ова е коренот на датотечниот системот
+Comment[mn]=Энэ бол таны файлын системийн язгуур
+Comment[mt]=Dan huwa d-direttorju ewlieni tas-sistema
+Comment[nb]=Dette er rota til filsystemet
+Comment[nds]=Dit is dat Dateisysteem sien Wörtel
+Comment[nl]=Dit is de root van het bestandssysteem
+Comment[nn]=Dette er rota i filsystemet.
+Comment[nso]=Se ke modu wa system ya faele
+Comment[pa]=ਇਹ ਫਾਇਲ ਸਿਸਟਮ ਦਾ ਰੂਟ (root) ਹੈ
+Comment[pl]=To jest korzeń systemu plików (czyli katalog główny)
+Comment[pt]=A base do sistema de ficheiros
+Comment[pt_BR]=Esta é a raiz do seu sistema de arquivos
+Comment[ro]=Aceasta este rădăcina sistemului de fişiere
+Comment[ru]=Корневая папка файловой системы
+Comment[rw]=Uyu ni umuzi w'idosiyesisitemu
+Comment[se]=Dát lea du fiilavuogádaga ruohtas
+Comment[sk]=Toto je koreňový priečinok systému súborov
+Comment[sl]=To je koren datotečnega sistema.
+Comment[sr]=Ово је корен система фајлова
+Comment[sr at Latn]=Ovo je koren sistema fajlova
+Comment[sv]=Det här är roten på filsystemet
+Comment[ta]=இதுவே கோப்பு அமைப்பின் வேராகும்
+Comment[tg]=Инҷо решаи системаи файл аст
+Comment[th]=นี่เป็นรากของระบบแฟ้ม
+Comment[tr]=Bu dosya sisteminizi kök dizinidir
+Comment[tt]=Birem sistemeneñ töp törgäge bu
+Comment[uk]=Це - корінь файлової системи
+Comment[uz]=Файл тизимининг туби
+Comment[ven]=Hoyu ndi mudzi wa maitele a faela
+Comment[vi]=Đây là gốc của hệ thống tệp tin
+Comment[wa]=Cichal est li ridant raecene do sistinme di fitchîs
+Comment[xh]=Le yingcambu yendlela yefayile
+Comment[xx]=xxThis is the root of the filesystemxx
+Comment[zh_CN]=这是文件系统的根
+Comment[zh_TW]=這是檔案系統的根目錄
+Comment[zu]=Le yimpande yesistimu yamafayela
+Open=false
+X-KDE-TreeModule=Directory
+X-KDE-KonqSidebarModule=konqsidebar_tree

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/services.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/services.desktop	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/services.desktop	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,80 +1,80 @@
-[Desktop Entry]
-Encoding=UTF-8
-URL=
-Icon=services
-Name=Services
-Name[af]=Dienste
-Name[ar]=الخدمات
-Name[az]=Xidmətlər
-Name[be]=Сэрвісы
-Name[bg]=Услуги
-Name[bn]=সার্ভিসসমূহ
-Name[br]=Servijoù
-Name[bs]=Servisi
-Name[ca]=Serveis
-Name[cs]=Služby
-Name[cy]=Gwasanaethau
-Name[da]=Tjenester
-Name[de]=KDE-Dienste
-Name[el]=Υπηρεσίες
-Name[eo]=Servoj
-Name[es]=Servicios
-Name[et]=Teenused
-Name[eu]=Zerbitzuak
-Name[fa]=سرویس‌ها
-Name[fi]=Palvelut
-Name[fo]=Tænastur
-Name[fy]=Tsjinsten
-Name[ga]=Seirbhísí
-Name[gl]=Servizos
-Name[he]=שירותים
-Name[hi]=सेवाएं
-Name[hr]=Servisi
-Name[hu]=Szolgáltatások
-Name[is]=Þjónustur
-Name[it]=Servizi
-Name[ja]=サービス
-Name[km]=សេវា
-Name[ko]=서비스
-Name[lo]=ບໍລິການ
-Name[lt]=Tarnybos
-Name[lv]=Servisi
-Name[mk]=Сервиси
-Name[mn]=КДЭ-Үйлчилгээ
-Name[mt]=Servizzi
-Name[nb]=Tjenester
-Name[nds]=KDE-Deensten
-Name[nn]=Tenester
-Name[nso]=Ditirelo
-Name[pa]=ਸੇਵਾਵਾਂ
-Name[pl]=Usługi
-Name[pt]=Serviços
-Name[pt_BR]=Serviços
-Name[ro]=Servicii
-Name[ru]=Сервисы
-Name[rw]=Serivise
-Name[se]=Bálvalusat
-Name[sk]=Služby
-Name[sl]=Storitve
-Name[sr]=Сервиси
-Name[sr at Latn]=Servisi
-Name[sv]=Tjänster
-Name[ta]=சேவைகள்
-Name[tg]=Хидматҳо
-Name[th]=บริการ
-Name[tr]=Servisler
-Name[tt]=Xezmätlär
-Name[uk]=Служби
-Name[uz]=Хизматлар
-Name[ven]=Dzitshumelo
-Name[vi]=Các dịch vụ
-Name[wa]=Siervices
-Name[xh]=Iinkonzo
-Name[xx]=xxServicesxx
-Name[zh_CN]=服务
-Name[zh_TW]=服務
-Name[zu]=Imisebenzi
-Open=false
-X-KDE-TreeModule=Virtual
-X-KDE-RelURL=services
-X-KDE-KonqSidebarModule=konqsidebar_tree
+[Desktop Entry]
+Encoding=UTF-8
+URL=
+Icon=services
+Name=Services
+Name[af]=Dienste
+Name[ar]=الخدمات
+Name[az]=Xidmətlər
+Name[be]=Сэрвісы
+Name[bg]=Услуги
+Name[bn]=সার্ভিসসমূহ
+Name[br]=Servijoù
+Name[bs]=Servisi
+Name[ca]=Serveis
+Name[cs]=Služby
+Name[cy]=Gwasanaethau
+Name[da]=Tjenester
+Name[de]=KDE-Dienste
+Name[el]=Υπηρεσίες
+Name[eo]=Servoj
+Name[es]=Servicios
+Name[et]=Teenused
+Name[eu]=Zerbitzuak
+Name[fa]=سرویس‌ها
+Name[fi]=Palvelut
+Name[fo]=Tænastur
+Name[fy]=Tsjinsten
+Name[ga]=Seirbhísí
+Name[gl]=Servizos
+Name[he]=שירותים
+Name[hi]=सेवाएं
+Name[hr]=Servisi
+Name[hu]=Szolgáltatások
+Name[is]=Þjónustur
+Name[it]=Servizi
+Name[ja]=サービス
+Name[km]=សេវា
+Name[ko]=서비스
+Name[lo]=ບໍລິການ
+Name[lt]=Tarnybos
+Name[lv]=Servisi
+Name[mk]=Сервиси
+Name[mn]=КДЭ-Үйлчилгээ
+Name[mt]=Servizzi
+Name[nb]=Tjenester
+Name[nds]=KDE-Deensten
+Name[nn]=Tenester
+Name[nso]=Ditirelo
+Name[pa]=ਸੇਵਾਵਾਂ
+Name[pl]=Usługi
+Name[pt]=Serviços
+Name[pt_BR]=Serviços
+Name[ro]=Servicii
+Name[ru]=Сервисы
+Name[rw]=Serivise
+Name[se]=Bálvalusat
+Name[sk]=Služby
+Name[sl]=Storitve
+Name[sr]=Сервиси
+Name[sr at Latn]=Servisi
+Name[sv]=Tjänster
+Name[ta]=சேவைகள்
+Name[tg]=Хидматҳо
+Name[th]=บริการ
+Name[tr]=Servisler
+Name[tt]=Xezmätlär
+Name[uk]=Служби
+Name[uz]=Хизматлар
+Name[ven]=Dzitshumelo
+Name[vi]=Các dịch vụ
+Name[wa]=Siervices
+Name[xh]=Iinkonzo
+Name[xx]=xxServicesxx
+Name[zh_CN]=服务
+Name[zh_TW]=服務
+Name[zu]=Imisebenzi
+Open=false
+X-KDE-TreeModule=Virtual
+X-KDE-RelURL=services
+X-KDE-KonqSidebarModule=konqsidebar_tree

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/system.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/system.desktop	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqsidebartng/filemanagement/entries/system.desktop	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,118 +1,118 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Link
-URL=system:/
-Icon=system
-Name=System
-Name[af]=Stelsel
-Name[ar]=النظام
-Name[az]=Sistem
-Name[be]=Сыстэма
-Name[bg]=Система
-Name[bn]=সিস্টেম
-Name[br]=Reizhiad
-Name[bs]=Sistem
-Name[ca]=Sistema
-Name[cs]=Systém
-Name[cy]=Cysawd
-Name[el]=Σύστημα
-Name[eo]=Sistemo
-Name[es]=Sistema
-Name[et]=Süsteem
-Name[eu]=Sistema
-Name[fa]=سیستم
-Name[fi]=Järjestelmä
-Name[fo]=Kervi
-Name[fr]=Système
-Name[fy]=Systeem
-Name[ga]=Córas
-Name[gl]=Sistema
-Name[he]=מערכת
-Name[hi]=तंत्र
-Name[hr]=Sustav
-Name[hu]=Rendszer
-Name[id]=Sistem
-Name[is]=Kerfi
-Name[it]=Sistema
-Name[ja]=システム
-Name[km]=ប្រព័ន្ធ
-Name[ko]=시스템
-Name[lo]=ຈັດການລະບົບ
-Name[lt]=Sistema
-Name[lv]=Sistēma
-Name[mk]=Систем
-Name[mn]=Систем
-Name[ms]=Sistem
-Name[mt]=Sistema
-Name[nds]=Systeem
-Name[nl]=Systeem
-Name[oc]=Sistemo
-Name[pa]=ਸਿਸਟਮ
-Name[pt]=Sistema
-Name[pt_BR]=Sistema
-Name[ro]=Sistem
-Name[ru]=Система
-Name[rw]=Sisitemu
-Name[se]=Vuogádat
-Name[sk]=Systém
-Name[sl]=Sistem
-Name[sr]=Систем
-Name[sr at Latn]=Sistem
-Name[ss]=Umshini
-Name[ta]=அமைப்பு
-Name[tg]=Система
-Name[th]=ระบบ
-Name[tr]=Sistem
-Name[tt]=Sistem
-Name[uk]=Система
-Name[uz]=Тизим
-Name[ven]=Maitele
-Name[vi]=Hệ Thống
-Name[wa]=Sistinme
-Name[xh]=Indlela esestyenziswayo
-Name[xx]=xxSystemxx
-Name[zh_CN]=系统
-Name[zh_TW]=系統
-Name[zu]=Isistimu
-Comment=This folder allows to access common places in your computer
-Comment[af]=Hierdie gids laat toegang na algemene plekke op die rekenaar toe
-Comment[bg]=Директория за достъп до често използваните места в компютъра
-Comment[cs]=Tato složka zpřístupňuje často používaná umístění na vašem počítači
-Comment[da]=Denne mappe giver adgang til sædvanlige steder på din computer
-Comment[de]=Dieser Ordner ermöglicht den Zugriff auf gebräuchliche Systembereiche des Computers
-Comment[el]=Αυτός ο φάκελος σας επιτρέπει την πρόσβαση σε τυπικές τοποθεσίες του συστήματός σας
-Comment[en_GB]=This folder allows you to access common places in your computer
-Comment[es]=Esta carpeta permite acceder a lugares usuales en su ordenador
-Comment[eu]=Karpeta honek zure ordenagailuaren leku arruntetarako sarbidea ematen dizu
-Comment[fi]=Tämä kansio sallii pääsyn tietokoneesi yleisiin kohteisiin
-Comment[fr]=Ce dossier vous permet d'accéder aux endroits de votre ordinateur régulièrement utilisés
-Comment[gl]=Este cartafol permite-lle aceder a lugares habituais do seu ordenador
-Comment[he]=תיקייה זו מכילה את הקבצים האישיים שלך
-Comment[hu]=Néhány fontosabb rendszerkönyvtár elérése
-Comment[is]=Þessi mappa veitir aðgang að almennum stöðum á tölvunni þinni
-Comment[it]=Questa cartella permette di accedere agli oggetti comuni del tuo computer
-Comment[km]=ថត​នេះ​អនុញ្ញាត​ឲ្យ​ចូលដំណើរការ​កន្លែង​ទូទៅ​ក្នុង​កុំព្យូទ័រ​របស់​អ្នក
-Comment[lt]=Šio aplanko pagalba pasieksite dažniausiai lankomas kompiuterio vietas
-Comment[nb]=Denne mappa gir deg tilgang til vanlige steder på din datamaskin
-Comment[nds]=Disse Orner bargt en Reeg faken bruukte Systeemoorden
-Comment[nl]=Deze map geeft toegang tot algemene plekken in uw computer
-Comment[nn]=Denne mappa gir deg tilgang til nokre vanlege stader på datamaskina
-Comment[pa]=ਇਹ ਫੋਲਡਰ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ 'ਚ ਆਮ ਥਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ
-Comment[pl]=Ten folder umożliwia dostęp do najczęściej używanych miejsc w Twoim komputerze
-Comment[pt]=Esta pasta permite aceder a alguns locais comuns no seu computador
-Comment[pt_BR]=Esta pasta permite acesso a lugares comuns em seu computador
-Comment[ru]=Папка для доступа к часто используемым ресурсам системы
-Comment[se]=Dán máhpa bokte beasat álkit dihtorat dehálaš báikkiide
-Comment[sl]=Ta mapa omogoča dostop do pomembnih lokacij na vašem računalniku
-Comment[sr]=Ова фасцикла омогућава приступ уобичајеним местима на вашем рачунару
-Comment[sr at Latn]=Ova fascikla omogućava pristup uobičajenim mestima na vašem računaru
-Comment[sv]=Den här katalogen gör det möjligt att komma åt vanliga platser på din dator
-Comment[th]=โฟลเดอร์นี้อนุญาตให้คุณเข้าถึงสถานที่ทั่วๆ ไปในเครื่องคอมพิวเตอร์ของคุณ
-Comment[tr]=Bu dizin bilgisayardaki belirli yerlere erişim sağlar
-Comment[uk]=Ця тека надає доступ до спільних місць у вашому комп'ютері
-Comment[xx]=xxThis folder allows to access common places in your computerxx
-Comment[zh_CN]=此文件夹允许您访问计算机中的公共位置
-Comment[zh_TW]=這個資料夾允許存取您電腦上的一般空間
-Open=true
-X-KDE-TreeModule=Directory
-X-KDE-KonqSidebarModule=konqsidebar_tree
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+URL=system:/
+Icon=system
+Name=System
+Name[af]=Stelsel
+Name[ar]=النظام
+Name[az]=Sistem
+Name[be]=Сыстэма
+Name[bg]=Система
+Name[bn]=সিস্টেম
+Name[br]=Reizhiad
+Name[bs]=Sistem
+Name[ca]=Sistema
+Name[cs]=Systém
+Name[cy]=Cysawd
+Name[el]=Σύστημα
+Name[eo]=Sistemo
+Name[es]=Sistema
+Name[et]=Süsteem
+Name[eu]=Sistema
+Name[fa]=سیستم
+Name[fi]=Järjestelmä
+Name[fo]=Kervi
+Name[fr]=Système
+Name[fy]=Systeem
+Name[ga]=Córas
+Name[gl]=Sistema
+Name[he]=מערכת
+Name[hi]=तंत्र
+Name[hr]=Sustav
+Name[hu]=Rendszer
+Name[id]=Sistem
+Name[is]=Kerfi
+Name[it]=Sistema
+Name[ja]=システム
+Name[km]=ប្រព័ន្ធ
+Name[ko]=시스템
+Name[lo]=ຈັດການລະບົບ
+Name[lt]=Sistema
+Name[lv]=Sistēma
+Name[mk]=Систем
+Name[mn]=Систем
+Name[ms]=Sistem
+Name[mt]=Sistema
+Name[nds]=Systeem
+Name[nl]=Systeem
+Name[oc]=Sistemo
+Name[pa]=ਸਿਸਟਮ
+Name[pt]=Sistema
+Name[pt_BR]=Sistema
+Name[ro]=Sistem
+Name[ru]=Система
+Name[rw]=Sisitemu
+Name[se]=Vuogádat
+Name[sk]=Systém
+Name[sl]=Sistem
+Name[sr]=Систем
+Name[sr at Latn]=Sistem
+Name[ss]=Umshini
+Name[ta]=அமைப்பு
+Name[tg]=Система
+Name[th]=ระบบ
+Name[tr]=Sistem
+Name[tt]=Sistem
+Name[uk]=Система
+Name[uz]=Тизим
+Name[ven]=Maitele
+Name[vi]=Hệ Thống
+Name[wa]=Sistinme
+Name[xh]=Indlela esestyenziswayo
+Name[xx]=xxSystemxx
+Name[zh_CN]=系统
+Name[zh_TW]=系統
+Name[zu]=Isistimu
+Comment=This folder allows to access common places in your computer
+Comment[af]=Hierdie gids laat toegang na algemene plekke op die rekenaar toe
+Comment[bg]=Директория за достъп до често използваните места в компютъра
+Comment[cs]=Tato složka zpřístupňuje často používaná umístění na vašem počítači
+Comment[da]=Denne mappe giver adgang til sædvanlige steder på din computer
+Comment[de]=Dieser Ordner ermöglicht den Zugriff auf gebräuchliche Systembereiche des Computers
+Comment[el]=Αυτός ο φάκελος σας επιτρέπει την πρόσβαση σε τυπικές τοποθεσίες του συστήματός σας
+Comment[en_GB]=This folder allows you to access common places in your computer
+Comment[es]=Esta carpeta permite acceder a lugares usuales en su ordenador
+Comment[eu]=Karpeta honek zure ordenagailuaren leku arruntetarako sarbidea ematen dizu
+Comment[fi]=Tämä kansio sallii pääsyn tietokoneesi yleisiin kohteisiin
+Comment[fr]=Ce dossier vous permet d'accéder aux endroits de votre ordinateur régulièrement utilisés
+Comment[gl]=Este cartafol permite-lle aceder a lugares habituais do seu ordenador
+Comment[he]=תיקייה זו מכילה את הקבצים האישיים שלך
+Comment[hu]=Néhány fontosabb rendszerkönyvtár elérése
+Comment[is]=Þessi mappa veitir aðgang að almennum stöðum á tölvunni þinni
+Comment[it]=Questa cartella permette di accedere agli oggetti comuni del tuo computer
+Comment[km]=ថត​នេះ​អនុញ្ញាត​ឲ្យ​ចូលដំណើរការ​កន្លែង​ទូទៅ​ក្នុង​កុំព្យូទ័រ​របស់​អ្នក
+Comment[lt]=Šio aplanko pagalba pasieksite dažniausiai lankomas kompiuterio vietas
+Comment[nb]=Denne mappa gir deg tilgang til vanlige steder på din datamaskin
+Comment[nds]=Disse Orner bargt en Reeg faken bruukte Systeemoorden
+Comment[nl]=Deze map geeft toegang tot algemene plekken in uw computer
+Comment[nn]=Denne mappa gir deg tilgang til nokre vanlege stader på datamaskina
+Comment[pa]=ਇਹ ਫੋਲਡਰ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ 'ਚ ਆਮ ਥਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ
+Comment[pl]=Ten folder umożliwia dostęp do najczęściej używanych miejsc w Twoim komputerze
+Comment[pt]=Esta pasta permite aceder a alguns locais comuns no seu computador
+Comment[pt_BR]=Esta pasta permite acesso a lugares comuns em seu computador
+Comment[ru]=Папка для доступа к часто используемым ресурсам системы
+Comment[se]=Dán máhpa bokte beasat álkit dihtorat dehálaš báikkiide
+Comment[sl]=Ta mapa omogoča dostop do pomembnih lokacij na vašem računalniku
+Comment[sr]=Ова фасцикла омогућава приступ уобичајеним местима на вашем рачунару
+Comment[sr at Latn]=Ova fascikla omogućava pristup uobičajenim mestima na vašem računaru
+Comment[sv]=Den här katalogen gör det möjligt att komma åt vanliga platser på din dator
+Comment[th]=โฟลเดอร์นี้อนุญาตให้คุณเข้าถึงสถานที่ทั่วๆ ไปในเครื่องคอมพิวเตอร์ของคุณ
+Comment[tr]=Bu dizin bilgisayardaki belirli yerlere erişim sağlar
+Comment[uk]=Ця тека надає доступ до спільних місць у вашому комп'ютері
+Comment[xx]=xxThis folder allows to access common places in your computerxx
+Comment[zh_CN]=此文件夹允许您访问计算机中的公共位置
+Comment[zh_TW]=這個資料夾允許存取您電腦上的一般空間
+Open=true
+X-KDE-TreeModule=Directory
+X-KDE-KonqSidebarModule=konqsidebar_tree

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/bookmarks.xml
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/bookmarks.xml	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/bookmarks.xml	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xbel>
-<xbel/>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xbel>
+<xbel/>

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/profiles/webbrowsing
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/profiles/webbrowsing	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/profiles/webbrowsing	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,36 +1,36 @@
-[Main Window Settings Toolbar Speech Toolbar]
-IconText=IconOnly
-Index=4
-
-[Main Window Settings Toolbar bookmarkToolBar]
-Hidden=true
-IconText=IconTextRight
-Index=3
-
-[Main Window Settings Toolbar extraToolBar]
-IconText=IconOnly
-Index=0
-
-[Main Window Settings Toolbar locationToolBar]
-IconText=IconOnly
-Index=2
-
-[Main Window Settings Toolbar mainToolBar]
-Index=1
-
-[Profile]
-FullScreen=false
-Height=692
-Name=Web Browsing
-RootItem=Tabs0
-Tabs0_Children=ViewT0
-Tabs0_activeChildIndex=0
-ViewT0_LinkedView=false
-ViewT0_LockedLocation=false
-ViewT0_PassiveMode=false
-ViewT0_ServiceName=khtml
-ViewT0_ServiceType=text/html
-ViewT0_ToggleView=false
-ViewT0_URL=http://www.pcbsd.com/
-Width=1016
-XMLUIFile=konqueror.rc
+[Main Window Settings Toolbar Speech Toolbar]
+IconText=IconOnly
+Index=4
+
+[Main Window Settings Toolbar bookmarkToolBar]
+Hidden=true
+IconText=IconTextRight
+Index=3
+
+[Main Window Settings Toolbar extraToolBar]
+IconText=IconOnly
+Index=0
+
+[Main Window Settings Toolbar locationToolBar]
+IconText=IconOnly
+Index=2
+
+[Main Window Settings Toolbar mainToolBar]
+Index=1
+
+[Profile]
+FullScreen=false
+Height=692
+Name=Web Browsing
+RootItem=Tabs0
+Tabs0_Children=ViewT0
+Tabs0_activeChildIndex=0
+ViewT0_LinkedView=false
+ViewT0_LockedLocation=false
+ViewT0_PassiveMode=false
+ViewT0_ServiceName=khtml
+ViewT0_ServiceType=text/html
+ViewT0_ToggleView=false
+ViewT0_URL=http://www.pcbsd.com/
+Width=1016
+XMLUIFile=konqueror.rc

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/servicemenus/Play_Audio_CD_with_Kaffeine.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/servicemenus/Play_Audio_CD_with_Kaffeine.desktop	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/servicemenus/Play_Audio_CD_with_Kaffeine.desktop	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,8 +1,8 @@
-[Desktop Action Play Audio CD with Kaffeine]
-Exec=kaffeine -d %U AudioCD
-Icon=cdaudio_unmount
-Name=Play Audio CD with Kaffeine
-
-[Desktop Entry]
-Actions=Play Audio CD with Kaffeine
-ServiceTypes=media/cdrom_unmounted
+[Desktop Action Play Audio CD with Kaffeine]
+Exec=kaffeine -d %U AudioCD
+Icon=cdaudio_unmount
+Name=Play Audio CD with Kaffeine
+
+[Desktop Entry]
+Actions=Play Audio CD with Kaffeine
+ServiceTypes=media/cdrom_unmounted

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/servicemenus/Play_DVD_with_Kaffeine.desktop
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/servicemenus/Play_DVD_with_Kaffeine.desktop	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/konqueror/servicemenus/Play_DVD_with_Kaffeine.desktop	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,8 +1,8 @@
-[Desktop Action Play DVD with Kaffeine]
-Exec=kaffeine -d %U DVD
-Icon=dvd_unmount
-Name=Play DVD with Kaffeine
-
-[Desktop Entry]
-Actions=Play DVD with Kaffeine
-ServiceTypes=media/cdrom_unmounted,media/dvd_unmounted,media/dvdvideo,media/cdwriter_unmounted
+[Desktop Action Play DVD with Kaffeine]
+Exec=kaffeine -d %U DVD
+Icon=dvd_unmount
+Name=Play DVD with Kaffeine
+
+[Desktop Entry]
+Actions=Play DVD with Kaffeine
+ServiceTypes=media/cdrom_unmounted,media/dvd_unmounted,media/dvdvideo,media/cdwriter_unmounted

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kstyle/themes/original/original.xml
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kstyle/themes/original/original.xml	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/kstyle/themes/original/original.xml	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,144 +1,144 @@
-<!DOCTYPE ktheme>
-<ktheme version="1" >
-  <general/>
-  <desktop number="0" common="1" >
-    <mode id="Flat" />
-    <color1 rgb="#003082" />
-    <color2 rgb="#6c8bb9" />
-    <blending mode="NoBlending" balance="100" reverse="0" />
-    <pattern name="" />
-    <wallpaper mode="Scaled" url="theme:/wallpapers/desktop/pcbsd-default.png" />
-  </desktop>
-  <screensaver name="KLines-saver.desktop" />
-  <icons name="nuvola" >
-    <Animated value="1" object="desktop" />
-    <DoublePixels value="0" object="desktop" />
-    <Size value="48" object="desktop" />
-    <ActiveEffect name="togamma" object="desktop" />
-    <ActiveSemiTransparent value="0" object="desktop" />
-    <ActiveValue value="1" object="desktop" />
-    <DefaultColor rgb="#9080f8" object="desktop" />
-    <DefaultColor2 rgb="#000000" object="desktop" />
-    <DefaultEffect name="none" object="desktop" />
-    <DefaultSemiTransparent value="0" object="desktop" />
-    <DefaultValue value="1" object="desktop" />
-    <DisabledColor rgb="#22ca00" object="desktop" />
-    <DisabledColor2 rgb="#000000" object="desktop" />
-    <DisabledEffect name="togray" object="desktop" />
-    <DisabledSemiTransparent value="1" object="desktop" />
-    <DisabledValue value="1" object="desktop" />
-    <Animated value="0" object="mainToolbar" />
-    <DoublePixels value="0" object="mainToolbar" />
-    <Size value="22" object="mainToolbar" />
-    <ActiveColor rgb="#a99cff" object="mainToolbar" />
-    <ActiveColor2 rgb="#000000" object="mainToolbar" />
-    <ActiveEffect name="none" object="mainToolbar" />
-    <ActiveSemiTransparent value="0" object="mainToolbar" />
-    <ActiveValue value="1" object="mainToolbar" />
-    <DefaultColor rgb="#9080f8" object="mainToolbar" />
-    <DefaultColor2 rgb="#000000" object="mainToolbar" />
-    <DefaultEffect name="none" object="mainToolbar" />
-    <DefaultSemiTransparent value="0" object="mainToolbar" />
-    <DefaultValue value="1" object="mainToolbar" />
-    <DisabledColor rgb="#22ca00" object="mainToolbar" />
-    <DisabledColor2 rgb="#000000" object="mainToolbar" />
-    <DisabledEffect name="togray" object="mainToolbar" />
-    <DisabledSemiTransparent value="1" object="mainToolbar" />
-    <DisabledValue value="1" object="mainToolbar" />
-    <Animated value="0" object="panel" />
-    <DoublePixels value="0" object="panel" />
-    <Size value="32" object="panel" />
-    <ActiveEffect name="togamma" object="panel" />
-    <ActiveSemiTransparent value="0" object="panel" />
-    <ActiveValue value="1" object="panel" />
-    <DefaultColor rgb="#9080f8" object="panel" />
-    <DefaultColor2 rgb="#000000" object="panel" />
-    <DefaultEffect name="none" object="panel" />
-    <DefaultSemiTransparent value="0" object="panel" />
-    <DefaultValue value="1" object="panel" />
-    <DisabledColor rgb="#22ca00" object="panel" />
-    <DisabledColor2 rgb="#000000" object="panel" />
-    <DisabledEffect name="togray" object="panel" />
-    <DisabledSemiTransparent value="1" object="panel" />
-    <DisabledValue value="1" object="panel" />
-    <Animated value="0" object="small" />
-    <DoublePixels value="0" object="small" />
-    <Size value="16" object="small" />
-    <ActiveColor rgb="#a99cff" object="small" />
-    <ActiveColor2 rgb="#000000" object="small" />
-    <ActiveEffect name="none" object="small" />
-    <ActiveSemiTransparent value="0" object="small" />
-    <ActiveValue value="1" object="small" />
-    <DefaultColor rgb="#9080f8" object="small" />
-    <DefaultColor2 rgb="#000000" object="small" />
-    <DefaultEffect name="none" object="small" />
-    <DefaultSemiTransparent value="0" object="small" />
-    <DefaultValue value="1" object="small" />
-    <DisabledColor rgb="#22ca00" object="small" />
-    <DisabledColor2 rgb="#000000" object="small" />
-    <DisabledEffect name="togray" object="small" />
-    <DisabledSemiTransparent value="1" object="small" />
-    <DisabledValue value="1" object="small" />
-    <Animated value="0" object="toolbar" />
-    <DoublePixels value="0" object="toolbar" />
-    <Size value="22" object="toolbar" />
-    <ActiveColor rgb="#a99cff" object="toolbar" />
-    <ActiveColor2 rgb="#000000" object="toolbar" />
-    <ActiveEffect name="none" object="toolbar" />
-    <ActiveSemiTransparent value="0" object="toolbar" />
-    <ActiveValue value="1" object="toolbar" />
-    <DefaultColor rgb="#9080f8" object="toolbar" />
-    <DefaultColor2 rgb="#000000" object="toolbar" />
-    <DefaultEffect name="none" object="toolbar" />
-    <DefaultSemiTransparent value="0" object="toolbar" />
-    <DefaultValue value="1" object="toolbar" />
-    <DisabledColor rgb="#22ca00" object="toolbar" />
-    <DisabledColor2 rgb="#000000" object="toolbar" />
-    <DisabledEffect name="togray" object="toolbar" />
-    <DisabledSemiTransparent value="1" object="toolbar" />
-    <DisabledValue value="1" object="toolbar" />
-  </icons>
-  <sounds/>
-  <colors contrast="7" >
-    <background rgb="#efefef" object="global" />
-    <selectBackground rgb="#678db2" object="global" />
-    <foreground rgb="#000000" object="global" />
-    <windowForeground rgb="#000000" object="global" />
-    <windowBackground rgb="#ffffff" object="global" />
-    <selectForeground rgb="#ffffff" object="global" />
-    <buttonBackground rgb="#dddfe4" object="global" />
-    <buttonForeground rgb="#000000" object="global" />
-    <linkColor rgb="#0000ee" object="global" />
-    <visitedLinkColor rgb="#52188b" object="global" />
-    <activeForeground rgb="#ffffff" object="kwin" />
-    <inactiveBackground rgb="#9daaba" object="kwin" />
-    <inactiveBlend rgb="#9daaba" object="kwin" />
-    <activeBackground rgb="#418edc" object="kwin" />
-    <activeBlend rgb="#6b91b8" object="kwin" />
-    <inactiveForeground rgb="#dddddd" object="kwin" />
-    <activeTitleBtnBg rgb="#7f9ec8" object="kwin" />
-    <inactiveTitleBtnBg rgb="#a7b5c7" object="kwin" />
-  </colors>
-  <cursors name="" />
-  <wm type="builtin" name="kwin3_plastik" >
-    <border size="1" />
-  </wm>
-  <konqueror>
-    <wallpaper url="theme:/wallpapers/konqueror/kde4ever.png" />
-    <bgcolor rgb="#000000" />
-  </konqueror>
-  <panel>
-    <background colorize="0" url="" />
-    <transparent value="0" />
-  </panel>
-  <widgets name="Plastik" />
-  <fonts>
-    <font value="Luxi Sans,10,-1,5,50,0,0,0,0,0" object="General" />
-    <fixed value="Serif,10,-1,5,50,0,0,0,0,0" object="General" />
-    <toolBarFont value="Luxi Sans,10,-1,5,50,0,0,0,0,0" object="General" />
-    <menuFont value="Luxi Sans,10,-1,5,50,0,0,0,0,0" object="General" />
-    <activeFont value="Luxi Sans,9,-1,5,75,0,0,0,0,0" object="WM" />
-    <taskbarFont value="Luxi Sans,10,-1,5,50,0,0,0,0,0" object="General" />
-    <StandardFont value="Luxi Sans,10,-1,5,50,0,0,0,0,0" object="FMSettings" />
-  </fonts>
-</ktheme>
+<!DOCTYPE ktheme>
+<ktheme version="1" >
+  <general/>
+  <desktop number="0" common="1" >
+    <mode id="Flat" />
+    <color1 rgb="#003082" />
+    <color2 rgb="#6c8bb9" />
+    <blending mode="NoBlending" balance="100" reverse="0" />
+    <pattern name="" />
+    <wallpaper mode="Scaled" url="theme:/wallpapers/desktop/pcbsd-default.png" />
+  </desktop>
+  <screensaver name="KLines-saver.desktop" />
+  <icons name="nuvola" >
+    <Animated value="1" object="desktop" />
+    <DoublePixels value="0" object="desktop" />
+    <Size value="48" object="desktop" />
+    <ActiveEffect name="togamma" object="desktop" />
+    <ActiveSemiTransparent value="0" object="desktop" />
+    <ActiveValue value="1" object="desktop" />
+    <DefaultColor rgb="#9080f8" object="desktop" />
+    <DefaultColor2 rgb="#000000" object="desktop" />
+    <DefaultEffect name="none" object="desktop" />
+    <DefaultSemiTransparent value="0" object="desktop" />
+    <DefaultValue value="1" object="desktop" />
+    <DisabledColor rgb="#22ca00" object="desktop" />
+    <DisabledColor2 rgb="#000000" object="desktop" />
+    <DisabledEffect name="togray" object="desktop" />
+    <DisabledSemiTransparent value="1" object="desktop" />
+    <DisabledValue value="1" object="desktop" />
+    <Animated value="0" object="mainToolbar" />
+    <DoublePixels value="0" object="mainToolbar" />
+    <Size value="22" object="mainToolbar" />
+    <ActiveColor rgb="#a99cff" object="mainToolbar" />
+    <ActiveColor2 rgb="#000000" object="mainToolbar" />
+    <ActiveEffect name="none" object="mainToolbar" />
+    <ActiveSemiTransparent value="0" object="mainToolbar" />
+    <ActiveValue value="1" object="mainToolbar" />
+    <DefaultColor rgb="#9080f8" object="mainToolbar" />
+    <DefaultColor2 rgb="#000000" object="mainToolbar" />
+    <DefaultEffect name="none" object="mainToolbar" />
+    <DefaultSemiTransparent value="0" object="mainToolbar" />
+    <DefaultValue value="1" object="mainToolbar" />
+    <DisabledColor rgb="#22ca00" object="mainToolbar" />
+    <DisabledColor2 rgb="#000000" object="mainToolbar" />
+    <DisabledEffect name="togray" object="mainToolbar" />
+    <DisabledSemiTransparent value="1" object="mainToolbar" />
+    <DisabledValue value="1" object="mainToolbar" />
+    <Animated value="0" object="panel" />
+    <DoublePixels value="0" object="panel" />
+    <Size value="32" object="panel" />
+    <ActiveEffect name="togamma" object="panel" />
+    <ActiveSemiTransparent value="0" object="panel" />
+    <ActiveValue value="1" object="panel" />
+    <DefaultColor rgb="#9080f8" object="panel" />
+    <DefaultColor2 rgb="#000000" object="panel" />
+    <DefaultEffect name="none" object="panel" />
+    <DefaultSemiTransparent value="0" object="panel" />
+    <DefaultValue value="1" object="panel" />
+    <DisabledColor rgb="#22ca00" object="panel" />
+    <DisabledColor2 rgb="#000000" object="panel" />
+    <DisabledEffect name="togray" object="panel" />
+    <DisabledSemiTransparent value="1" object="panel" />
+    <DisabledValue value="1" object="panel" />
+    <Animated value="0" object="small" />
+    <DoublePixels value="0" object="small" />
+    <Size value="16" object="small" />
+    <ActiveColor rgb="#a99cff" object="small" />
+    <ActiveColor2 rgb="#000000" object="small" />
+    <ActiveEffect name="none" object="small" />
+    <ActiveSemiTransparent value="0" object="small" />
+    <ActiveValue value="1" object="small" />
+    <DefaultColor rgb="#9080f8" object="small" />
+    <DefaultColor2 rgb="#000000" object="small" />
+    <DefaultEffect name="none" object="small" />
+    <DefaultSemiTransparent value="0" object="small" />
+    <DefaultValue value="1" object="small" />
+    <DisabledColor rgb="#22ca00" object="small" />
+    <DisabledColor2 rgb="#000000" object="small" />
+    <DisabledEffect name="togray" object="small" />
+    <DisabledSemiTransparent value="1" object="small" />
+    <DisabledValue value="1" object="small" />
+    <Animated value="0" object="toolbar" />
+    <DoublePixels value="0" object="toolbar" />
+    <Size value="22" object="toolbar" />
+    <ActiveColor rgb="#a99cff" object="toolbar" />
+    <ActiveColor2 rgb="#000000" object="toolbar" />
+    <ActiveEffect name="none" object="toolbar" />
+    <ActiveSemiTransparent value="0" object="toolbar" />
+    <ActiveValue value="1" object="toolbar" />
+    <DefaultColor rgb="#9080f8" object="toolbar" />
+    <DefaultColor2 rgb="#000000" object="toolbar" />
+    <DefaultEffect name="none" object="toolbar" />
+    <DefaultSemiTransparent value="0" object="toolbar" />
+    <DefaultValue value="1" object="toolbar" />
+    <DisabledColor rgb="#22ca00" object="toolbar" />
+    <DisabledColor2 rgb="#000000" object="toolbar" />
+    <DisabledEffect name="togray" object="toolbar" />
+    <DisabledSemiTransparent value="1" object="toolbar" />
+    <DisabledValue value="1" object="toolbar" />
+  </icons>
+  <sounds/>
+  <colors contrast="7" >
+    <background rgb="#efefef" object="global" />
+    <selectBackground rgb="#678db2" object="global" />
+    <foreground rgb="#000000" object="global" />
+    <windowForeground rgb="#000000" object="global" />
+    <windowBackground rgb="#ffffff" object="global" />
+    <selectForeground rgb="#ffffff" object="global" />
+    <buttonBackground rgb="#dddfe4" object="global" />
+    <buttonForeground rgb="#000000" object="global" />
+    <linkColor rgb="#0000ee" object="global" />
+    <visitedLinkColor rgb="#52188b" object="global" />
+    <activeForeground rgb="#ffffff" object="kwin" />
+    <inactiveBackground rgb="#9daaba" object="kwin" />
+    <inactiveBlend rgb="#9daaba" object="kwin" />
+    <activeBackground rgb="#418edc" object="kwin" />
+    <activeBlend rgb="#6b91b8" object="kwin" />
+    <inactiveForeground rgb="#dddddd" object="kwin" />
+    <activeTitleBtnBg rgb="#7f9ec8" object="kwin" />
+    <inactiveTitleBtnBg rgb="#a7b5c7" object="kwin" />
+  </colors>
+  <cursors name="" />
+  <wm type="builtin" name="kwin3_plastik" >
+    <border size="1" />
+  </wm>
+  <konqueror>
+    <wallpaper url="theme:/wallpapers/konqueror/kde4ever.png" />
+    <bgcolor rgb="#000000" />
+  </konqueror>
+  <panel>
+    <background colorize="0" url="" />
+    <transparent value="0" />
+  </panel>
+  <widgets name="Plastik" />
+  <fonts>
+    <font value="Luxi Sans,10,-1,5,50,0,0,0,0,0" object="General" />
+    <fixed value="Serif,10,-1,5,50,0,0,0,0,0" object="General" />
+    <toolBarFont value="Luxi Sans,10,-1,5,50,0,0,0,0,0" object="General" />
+    <menuFont value="Luxi Sans,10,-1,5,50,0,0,0,0,0" object="General" />
+    <activeFont value="Luxi Sans,9,-1,5,75,0,0,0,0,0" object="WM" />
+    <taskbarFont value="Luxi Sans,10,-1,5,50,0,0,0,0,0" object="General" />
+    <StandardFont value="Luxi Sans,10,-1,5,50,0,0,0,0,0" object="FMSettings" />
+  </fonts>
+</ktheme>

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/nsplugins/pluginsinfo
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/nsplugins/pluginsinfo	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/apps/nsplugins/pluginsinfo	2007-04-06 03:51:03 UTC (rev 153)
@@ -1 +1 @@
-number=0
+number=0

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/clock_panelapplet_kry2atturw62n6fdfzxd_rc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/clock_panelapplet_kry2atturw62n6fdfzxd_rc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/clock_panelapplet_kry2atturw62n6fdfzxd_rc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,6 +1,6 @@
-[Digital]
-Show_Date=true
-
-[General]
-Initial_TZ=0
-RemoteZones=
+[Digital]
+Show_Date=true
+
+[General]
+Initial_TZ=0
+RemoteZones=

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/colors/Recent_Colors
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/colors/Recent_Colors	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/colors/Recent_Colors	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,5 +1,5 @@
-KDE RGB Palette
-#
-255 255 255 
-255 108 75 
-40 255 33 
+KDE RGB Palette
+#
+255 255 255 
+255 108 75 
+40 255 33 

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/converterrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/converterrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/converterrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kpalmdoc.upd:kdepim_3.3
+[$Version]
+update_info=kpalmdoc.upd:kdepim_3.3

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/emaildefaults
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/emaildefaults	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/emaildefaults	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,5 +1,5 @@
-[Defaults]
-Profile=Default
-
-[PROFILE_Default]
-ServerType=
+[Defaults]
+Profile=Default
+
+[PROFILE_Default]
+ServerType=

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/emailidentities
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/emailidentities	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/emailidentities	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,5 +1,5 @@
-[$Version]
-update_info=kmail.upd:3.3-move-identities-to-own-file,kmail.upd:3.3-aegypten-emailidentities-split-sign-encr-keys
-
-[General]
-Default Identity=
+[$Version]
+update_info=kmail.upd:3.3-move-identities-to-own-file,kmail.upd:3.3-aegypten-emailidentities-split-sign-encr-keys
+
+[General]
+Default Identity=

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/gtkrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/gtkrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/gtkrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,53 +1,53 @@
-# created by KDE, Mon Oct 30 14:33:42 2006
-#
-# If you do not want KDE to override your GTK settings, select
-# Appearance & Themes -> Colors in the Control Center and disable the checkbox
-# "Apply colors to non-KDE applications"
-#
-#
-style "default"
-{
-  bg[NORMAL] = { 0.937, 0.929, 0.882 }
-  bg[SELECTED] = { 0.180, 0.533, 0.859 }
-  bg[INSENSITIVE] = { 0.937, 0.929, 0.882 }
-  bg[ACTIVE] = { 0.780, 0.773, 0.733 }
-  bg[PRELIGHT] = { 0.937, 0.929, 0.882 }
-
-  base[NORMAL] = { 1.000, 1.000, 1.000 }
-  base[SELECTED] = { 0.180, 0.533, 0.859 }
-  base[INSENSITIVE] = { 0.937, 0.929, 0.882 }
-  base[ACTIVE] = { 0.180, 0.533, 0.859 }
-  base[PRELIGHT] = { 0.180, 0.533, 0.859 }
-
-  text[NORMAL] = { 0.000, 0.000, 0.000 }
-  text[SELECTED] = { 1.000, 1.000, 1.000 }
-  text[INSENSITIVE] = { 0.780, 0.773, 0.733 }
-  text[ACTIVE] = { 1.000, 1.000, 1.000 }
-  text[PRELIGHT] = { 1.000, 1.000, 1.000 }
-
-  fg[NORMAL] = { 0.000, 0.000, 0.000 }
-  fg[SELECTED] = { 1.000, 1.000, 1.000 }
-  fg[INSENSITIVE] = { 0.780, 0.773, 0.733 }
-  fg[ACTIVE] = { 0.000, 0.000, 0.000 }
-  fg[PRELIGHT] = { 0.000, 0.000, 0.000 }
-}
-
-class "*" style "default"
-
-style "ToolTip"
-{
-  bg[NORMAL] = { 1.000, 1.000, 0.863 }
-  base[NORMAL] = { 1.000, 1.000, 0.863 }
-  text[NORMAL] = { 0.000, 0.000, 0.000 }
-  fg[NORMAL] = { 0.000, 0.000, 0.000 }
-}
-
-widget "gtk-tooltips" style "ToolTip"
-
-style "MenuItem"
-{
-  bg[PRELIGHT] = { 0.180, 0.533, 0.859 }
-}
-
-class "*MenuItem" style "MenuItem"
-
+# created by KDE, Mon Oct 30 14:33:42 2006
+#
+# If you do not want KDE to override your GTK settings, select
+# Appearance & Themes -> Colors in the Control Center and disable the checkbox
+# "Apply colors to non-KDE applications"
+#
+#
+style "default"
+{
+  bg[NORMAL] = { 0.937, 0.929, 0.882 }
+  bg[SELECTED] = { 0.180, 0.533, 0.859 }
+  bg[INSENSITIVE] = { 0.937, 0.929, 0.882 }
+  bg[ACTIVE] = { 0.780, 0.773, 0.733 }
+  bg[PRELIGHT] = { 0.937, 0.929, 0.882 }
+
+  base[NORMAL] = { 1.000, 1.000, 1.000 }
+  base[SELECTED] = { 0.180, 0.533, 0.859 }
+  base[INSENSITIVE] = { 0.937, 0.929, 0.882 }
+  base[ACTIVE] = { 0.180, 0.533, 0.859 }
+  base[PRELIGHT] = { 0.180, 0.533, 0.859 }
+
+  text[NORMAL] = { 0.000, 0.000, 0.000 }
+  text[SELECTED] = { 1.000, 1.000, 1.000 }
+  text[INSENSITIVE] = { 0.780, 0.773, 0.733 }
+  text[ACTIVE] = { 1.000, 1.000, 1.000 }
+  text[PRELIGHT] = { 1.000, 1.000, 1.000 }
+
+  fg[NORMAL] = { 0.000, 0.000, 0.000 }
+  fg[SELECTED] = { 1.000, 1.000, 1.000 }
+  fg[INSENSITIVE] = { 0.780, 0.773, 0.733 }
+  fg[ACTIVE] = { 0.000, 0.000, 0.000 }
+  fg[PRELIGHT] = { 0.000, 0.000, 0.000 }
+}
+
+class "*" style "default"
+
+style "ToolTip"
+{
+  bg[NORMAL] = { 1.000, 1.000, 0.863 }
+  base[NORMAL] = { 1.000, 1.000, 0.863 }
+  text[NORMAL] = { 0.000, 0.000, 0.000 }
+  fg[NORMAL] = { 0.000, 0.000, 0.000 }
+}
+
+widget "gtk-tooltips" style "ToolTip"
+
+style "MenuItem"
+{
+  bg[PRELIGHT] = { 0.180, 0.533, 0.859 }
+}
+
+class "*MenuItem" style "MenuItem"
+

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/gtkrc-2.0
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/gtkrc-2.0	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/gtkrc-2.0	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,55 +1,55 @@
-# created by KDE, Mon Oct 30 14:33:42 2006
-#
-# If you do not want KDE to override your GTK settings, select
-# Appearance & Themes -> Colors in the Control Center and disable the checkbox
-# "Apply colors to non-KDE applications"
-#
-#
-style "default"
-{
-  bg[NORMAL] = { 0.937, 0.929, 0.882 }
-  bg[SELECTED] = { 0.180, 0.533, 0.859 }
-  bg[INSENSITIVE] = { 0.937, 0.929, 0.882 }
-  bg[ACTIVE] = { 0.780, 0.773, 0.733 }
-  bg[PRELIGHT] = { 0.937, 0.929, 0.882 }
-
-  base[NORMAL] = { 1.000, 1.000, 1.000 }
-  base[SELECTED] = { 0.180, 0.533, 0.859 }
-  base[INSENSITIVE] = { 0.937, 0.929, 0.882 }
-  base[ACTIVE] = { 0.180, 0.533, 0.859 }
-  base[PRELIGHT] = { 0.180, 0.533, 0.859 }
-
-  text[NORMAL] = { 0.000, 0.000, 0.000 }
-  text[SELECTED] = { 1.000, 1.000, 1.000 }
-  text[INSENSITIVE] = { 0.780, 0.773, 0.733 }
-  text[ACTIVE] = { 1.000, 1.000, 1.000 }
-  text[PRELIGHT] = { 1.000, 1.000, 1.000 }
-
-  fg[NORMAL] = { 0.000, 0.000, 0.000 }
-  fg[SELECTED] = { 1.000, 1.000, 1.000 }
-  fg[INSENSITIVE] = { 0.780, 0.773, 0.733 }
-  fg[ACTIVE] = { 0.000, 0.000, 0.000 }
-  fg[PRELIGHT] = { 0.000, 0.000, 0.000 }
-}
-
-class "*" style "default"
-
-gtk-alternative-button-order = 1
-
-style "ToolTip"
-{
-  bg[NORMAL] = { 1.000, 1.000, 0.863 }
-  base[NORMAL] = { 1.000, 1.000, 0.863 }
-  text[NORMAL] = { 0.000, 0.000, 0.000 }
-  fg[NORMAL] = { 0.000, 0.000, 0.000 }
-}
-
-widget "gtk-tooltips" style "ToolTip"
-
-style "MenuItem"
-{
-  bg[PRELIGHT] = { 0.180, 0.533, 0.859 }
-}
-
-class "*MenuItem" style "MenuItem"
-
+# created by KDE, Mon Oct 30 14:33:42 2006
+#
+# If you do not want KDE to override your GTK settings, select
+# Appearance & Themes -> Colors in the Control Center and disable the checkbox
+# "Apply colors to non-KDE applications"
+#
+#
+style "default"
+{
+  bg[NORMAL] = { 0.937, 0.929, 0.882 }
+  bg[SELECTED] = { 0.180, 0.533, 0.859 }
+  bg[INSENSITIVE] = { 0.937, 0.929, 0.882 }
+  bg[ACTIVE] = { 0.780, 0.773, 0.733 }
+  bg[PRELIGHT] = { 0.937, 0.929, 0.882 }
+
+  base[NORMAL] = { 1.000, 1.000, 1.000 }
+  base[SELECTED] = { 0.180, 0.533, 0.859 }
+  base[INSENSITIVE] = { 0.937, 0.929, 0.882 }
+  base[ACTIVE] = { 0.180, 0.533, 0.859 }
+  base[PRELIGHT] = { 0.180, 0.533, 0.859 }
+
+  text[NORMAL] = { 0.000, 0.000, 0.000 }
+  text[SELECTED] = { 1.000, 1.000, 1.000 }
+  text[INSENSITIVE] = { 0.780, 0.773, 0.733 }
+  text[ACTIVE] = { 1.000, 1.000, 1.000 }
+  text[PRELIGHT] = { 1.000, 1.000, 1.000 }
+
+  fg[NORMAL] = { 0.000, 0.000, 0.000 }
+  fg[SELECTED] = { 1.000, 1.000, 1.000 }
+  fg[INSENSITIVE] = { 0.780, 0.773, 0.733 }
+  fg[ACTIVE] = { 0.000, 0.000, 0.000 }
+  fg[PRELIGHT] = { 0.000, 0.000, 0.000 }
+}
+
+class "*" style "default"
+
+gtk-alternative-button-order = 1
+
+style "ToolTip"
+{
+  bg[NORMAL] = { 1.000, 1.000, 0.863 }
+  base[NORMAL] = { 1.000, 1.000, 0.863 }
+  text[NORMAL] = { 0.000, 0.000, 0.000 }
+  fg[NORMAL] = { 0.000, 0.000, 0.000 }
+}
+
+widget "gtk-tooltips" style "ToolTip"
+
+style "MenuItem"
+{
+  bg[PRELIGHT] = { 0.180, 0.533, 0.859 }
+}
+
+class "*MenuItem" style "MenuItem"
+

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kab2kabcrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kab2kabcrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kab2kabcrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[Startup]
-EnableAutostart=false
+[Startup]
+EnableAutostart=false

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/katerc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/katerc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/katerc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kate-2.4.upd:kate2.4
+[$Version]
+update_info=kate-2.4.upd:kate2.4

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kaudiocreatorrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kaudiocreatorrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kaudiocreatorrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kaudiocreator-libkcddb.upd:kaudiocreator-libkcddb,kaudiocreator-meta.upd:3
+[$Version]
+update_info=kaudiocreator-libkcddb.upd:kaudiocreator-libkcddb,kaudiocreator-meta.upd:3

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kbookmarkrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kbookmarkrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kbookmarkrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,3 +1,3 @@
-[Bookmarks]
-AdvancedAddBookmarkDialog=false
-FilteredToolbar=false
+[Bookmarks]
+AdvancedAddBookmarkDialog=false
+FilteredToolbar=false

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcalcrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcalcrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcalcrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kcalcrc.upd:KDE_3_2_0
+[$Version]
+update_info=kcalcrc.upd:KDE_3_2_0

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcharselectrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcharselectrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcharselectrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kcharselect.upd:1
+[$Version]
+update_info=kcharselect.upd:1

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmaudiocdrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmaudiocdrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmaudiocdrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=audiocd.upd:1
+[$Version]
+update_info=audiocd.upd:1

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmcddbrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmcddbrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmcddbrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kaudiocreator-libkcddb.upd:kaudiocreator-libkcddb,kcmcddb-emailsettings.upd:kcmcddb_emailsettings
+[$Version]
+update_info=kaudiocreator-libkcddb.upd:kaudiocreator-libkcddb,kcmcddb-emailsettings.upd:kcmcddb_emailsettings

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmdisplayrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmdisplayrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmdisplayrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kcmdisplayrc.upd:kde3
+[$Version]
+update_info=kcmdisplayrc.upd:kde3

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcminputrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcminputrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcminputrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,9 +1,9 @@
-[$Version]
-update_info=mouse_cursor_theme.upd:kde3.4.99
-
-[Keyboard]
-ClickVolume=0
-KeyboardRepeating=true
-NumLock=0
-RepeatDelay=660
-RepeatRate=25
+[$Version]
+update_info=mouse_cursor_theme.upd:kde3.4.99
+
+[Keyboard]
+ClickVolume=0
+KeyboardRepeating=true
+NumLock=0
+RepeatDelay=660
+RepeatRate=25

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmkresourcesrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmkresourcesrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmkresourcesrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[General]
-CurrentFamily=0
+[General]
+CurrentFamily=0

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmnspluginrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmnspluginrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmnspluginrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,3 +1,3 @@
-[Misc]
-firstTime=false
-scanPaths=$HOME/.mozilla/plugins,$HOME/.netscape/plugins,/usr/lib64/browser-plugins,/usr/lib/browser-plugins,/usr/local/netscape/plugins,/opt/mozilla/plugins,/opt/mozilla/lib/plugins,/opt/netscape/plugins,/opt/netscape/communicator/plugins,/usr/lib/netscape/plugins,/usr/lib/netscape/plugins-libc5,/usr/lib/netscape/plugins-libc6,/usr/lib/mozilla/plugins,/usr/lib64/netscape/plugins,/usr/lib64/mozilla/plugins,$MOZILLA_HOME/plugins,/usr/local/lib/linux-flashplugin6,/usr/X11R6/lib/linux-flashplugin6,/usr/X11R6/lib/browser_plugins
+[Misc]
+firstTime=false
+scanPaths=$HOME/.mozilla/plugins,$HOME/.netscape/plugins,/usr/lib64/browser-plugins,/usr/lib/browser-plugins,/usr/local/netscape/plugins,/opt/mozilla/plugins,/opt/mozilla/lib/plugins,/opt/netscape/plugins,/opt/netscape/communicator/plugins,/usr/lib/netscape/plugins,/usr/lib/netscape/plugins-libc5,/usr/lib/netscape/plugins-libc6,/usr/lib/mozilla/plugins,/usr/lib64/netscape/plugins,/usr/lib64/mozilla/plugins,$MOZILLA_HOME/plugins,/usr/local/lib/linux-flashplugin6,/usr/X11R6/lib/linux-flashplugin6,/usr/X11R6/lib/browser_plugins

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmthememanagerrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmthememanagerrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcmthememanagerrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[General]
-CurrentTheme=PC-BSD
+[General]
+CurrentTheme=PC-BSD

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kconf_updaterc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kconf_updaterc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kconf_updaterc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,261 +1,261 @@
-updateInfoAdded=true
-
-[audiocd.upd]
-ctime=1162218133
-done=1
-mtime=1126340389
-
-[favicons.upd]
-ctime=1162218133
-done=kde3_2
-mtime=1126340753
-
-[kaccel.upd]
-ctime=1162218133
-done=kde3.3/r1
-mtime=1126340712
-
-[kate-2.4.upd]
-ctime=1162218133
-done=kate2.4
-mtime=1126340698
-
-[kaudiocreator-libkcddb.upd]
-ctime=1162218133
-done=kaudiocreator-libkcddb
-mtime=1126340405
-
-[kaudiocreator-meta.upd]
-ctime=1162218133
-done=3
-mtime=1126340405
-
-[kcalcrc.upd]
-ctime=1162218133
-done=KDE_3_2_0
-mtime=1126340494
-
-[kcharselect.upd]
-ctime=1162218133
-done=1
-mtime=1126340487
-
-[kcmcddb-emailsettings.upd]
-ctime=1162218133
-done=kcmcddb_emailsettings
-mtime=1126340370
-
-[kcmdisplayrc.upd]
-ctime=1162218133
-done=kde3
-mtime=1126340701
-
-[kcookiescfg.upd]
-ctime=1162218133
-done=kde2.2/b1,kde3.1/cvs
-mtime=1126340801
-
-[kded.upd]
-ctime=1162218133
-done=kde3.0
-mtime=1126340860
-
-[kdeprintrc.upd]
-ctime=1162218133
-done=kde-3.1-toolbar
-mtime=1126340863
-
-[kfmclient_3_2.upd]
-ctime=1162218133
-done=kfmclient_3_2
-mtime=1126340748
-
-[kghostview.upd]
-ctime=1162218133
-done=1changeToKConfigXT,2changeToKConfigXT
-mtime=1126340363
-
-[khotkeys_32b1_update.upd]
-ctime=1162218133
-done=kde32b1
-mtime=1126340753
-
-[khotkeys_printscreen.upd]
-ctime=1162218133
-done=printscreen
-mtime=1153556151
-
-[kickerrc.upd]
-ctime=1162218133
-done=kde_3_1_sizeChanges,kde_3_4_reverseLayout,kde_3_5_taskbarEnums,kde_3_5_kconfigXTize
-mtime=1126340731
-
-[kio_help.upd]
-ctime=1162218133
-done=kde3_2
-mtime=1126340859
-
-[kioslave.upd]
-ctime=1162218133
-done=kde2.2/r2,kde2.2/r3
-mtime=1126340809
-
-[klipperrc.upd]
-ctime=1162218133
-done=25082001,kde3.1
-mtime=1126340726
-
-[klippershortcuts.upd]
-ctime=1162218133
-done=04112002
-mtime=1126340726
-
-[kmail.upd]
-ctime=1162218133
-done=1,4,5,6,7,8,9,3.1-update-identities,3.1-use-identity-uoids,3.1-new-mail-notification,3.2-update-loop-on-goto-unread-settings,3.1.4-dont-use-UOID-0-for-any-identity,3.2-misc,3.2-moves,3.3-use-ID-for-accounts,3.3-move-identities-to-own-file,3.3-aegypten-kpgprc-to-kmailrc,3.3-aegypten-kpgprc-to-libkleopatrarc,3.3-aegypten-emailidentities-split-sign-encr-keys,3.3-misc,3.3b1-misc,3.4,3.4a,3.4b,3.4.1,3.5.4
-mtime=1153556056
-
-[knewsticker.upd]
-ctime=1162218133
-done=KNewsTicker-0.2,KNewsTicker-0.2-Rename-KDE3,KNewsTicker-0.2-Rename-KDE3.1
-mtime=1126340430
-
-[konqsidebartng.upd]
-ctime=1162218133
-done=konqsidebartng_rc,konqsidebartng_entries
-mtime=1126340747
-
-[konqueror_gestures_kde321_update.upd]
-ctime=1162218133
-done=kde321
-mtime=1126340753
-
-[konsole.upd]
-ctime=1162218133
-done=kde2.2/r1,kde3.0/r1
-mtime=1126340768
-
-[kopete-account-kconf_update.upd]
-ctime=1162218133
-done=kopete0.7/r1,kopete0.10/r1
-mtime=1126340425
-
-[kopete-jabberpriorityaddition-kconf_update.upd]
-ctime=1162218133
-done=kopete0.9/r1
-mtime=1126340425
-
-[kopete-jabberproxytype-kconf_update.upd]
-ctime=1162218133
-done=kopete0.9/r1
-mtime=1126340425
-
-[kopete-nameTracking.upd]
-ctime=1162218133
-done=kopete0.9/r1
-mtime=1126340425
-
-[kopete-pluginloader.upd]
-ctime=1162218133
-done=kopete0.7/r1
-mtime=1126340425
-
-[kopete-pluginloader2.upd]
-ctime=1162218133
-done=kopete0.8/r1
-mtime=1126340425
-
-[korganizer.upd]
-ctime=1162218133
-done=korganizer_3.4_GroupwareCleanup,korganizer_3.4_WebExport,korganizer_3.4_FilterAction,korganizer_3.4_HolidayPlugin
-mtime=1126340687
-
-[korn-3-4-config_change.upd]
-ctime=1162218133
-done=korn_kde_3_4_config_change
-mtime=1126340654
-
-[korn-3-5-update.upd]
-ctime=1162218133
-done=korn-3-5-ssl-update,korn-3-5-metadata-update
-mtime=1126340654
-
-[kpalmdoc.upd]
-ctime=1162218133
-done=kdepim_3.3
-mtime=1126340677
-
-[kpgp.upd]
-ctime=1162218133
-done=preKDE3_a,3.1-1
-mtime=1126340631
-
-[kpilot.upd]
-ctime=1162218133
-done=kdepim_3.3
-mtime=1126340679
-
-[ksmserver.upd]
-ctime=1162218133
-done=kde3
-mtime=1126340697
-
-[kuriikwsfilter.upd]
-ctime=1162218133
-done=post-kde3.1/cvs
-mtime=1126340707
-
-[kwin.upd]
-ctime=1162218133
-done=kde3.0r1,kde3.2Xinerama
-mtime=1126340762
-
-[kwin3_plugin.upd]
-ctime=1162218133
-done=kde3.2
-mtime=1126340762
-
-[kwin_focus1.upd]
-ctime=1162218133
-done=kwin_focus1
-mtime=1126340762
-
-[kwin_focus2.upd]
-ctime=1162218133
-done=kwin_focus2
-mtime=1126340762
-
-[kwin_fsp_workarounds_1.upd]
-ctime=1162218133
-done=kde351
-mtime=1142590662
-
-[kwiniconify.upd]
-ctime=1162218133
-done=iconifyupd3.1
-mtime=1126340762
-
-[kwinsticky.upd]
-ctime=1162218133
-done=stickyupd3.1
-mtime=1126340762
-
-[kwinupdatewindowsettings.upd]
-ctime=1162218133
-done=kde33b1
-mtime=1126340762
-
-[mouse_cursor_theme.upd]
-ctime=1162218133
-done=kde3.4.99
-mtime=1126340707
-
-[noatun.upd]
-ctime=1162218133
-done=noatun20
-mtime=1126340382
-
-[socks.upd]
-ctime=1162218133
-done=kde3.0/r1
-mtime=1126340710
+updateInfoAdded=true
+
+[audiocd.upd]
+ctime=1162218133
+done=1
+mtime=1126340389
+
+[favicons.upd]
+ctime=1162218133
+done=kde3_2
+mtime=1126340753
+
+[kaccel.upd]
+ctime=1162218133
+done=kde3.3/r1
+mtime=1126340712
+
+[kate-2.4.upd]
+ctime=1162218133
+done=kate2.4
+mtime=1126340698
+
+[kaudiocreator-libkcddb.upd]
+ctime=1162218133
+done=kaudiocreator-libkcddb
+mtime=1126340405
+
+[kaudiocreator-meta.upd]
+ctime=1162218133
+done=3
+mtime=1126340405
+
+[kcalcrc.upd]
+ctime=1162218133
+done=KDE_3_2_0
+mtime=1126340494
+
+[kcharselect.upd]
+ctime=1162218133
+done=1
+mtime=1126340487
+
+[kcmcddb-emailsettings.upd]
+ctime=1162218133
+done=kcmcddb_emailsettings
+mtime=1126340370
+
+[kcmdisplayrc.upd]
+ctime=1162218133
+done=kde3
+mtime=1126340701
+
+[kcookiescfg.upd]
+ctime=1162218133
+done=kde2.2/b1,kde3.1/cvs
+mtime=1126340801
+
+[kded.upd]
+ctime=1162218133
+done=kde3.0
+mtime=1126340860
+
+[kdeprintrc.upd]
+ctime=1162218133
+done=kde-3.1-toolbar
+mtime=1126340863
+
+[kfmclient_3_2.upd]
+ctime=1162218133
+done=kfmclient_3_2
+mtime=1126340748
+
+[kghostview.upd]
+ctime=1162218133
+done=1changeToKConfigXT,2changeToKConfigXT
+mtime=1126340363
+
+[khotkeys_32b1_update.upd]
+ctime=1162218133
+done=kde32b1
+mtime=1126340753
+
+[khotkeys_printscreen.upd]
+ctime=1162218133
+done=printscreen
+mtime=1153556151
+
+[kickerrc.upd]
+ctime=1162218133
+done=kde_3_1_sizeChanges,kde_3_4_reverseLayout,kde_3_5_taskbarEnums,kde_3_5_kconfigXTize
+mtime=1126340731
+
+[kio_help.upd]
+ctime=1162218133
+done=kde3_2
+mtime=1126340859
+
+[kioslave.upd]
+ctime=1162218133
+done=kde2.2/r2,kde2.2/r3
+mtime=1126340809
+
+[klipperrc.upd]
+ctime=1162218133
+done=25082001,kde3.1
+mtime=1126340726
+
+[klippershortcuts.upd]
+ctime=1162218133
+done=04112002
+mtime=1126340726
+
+[kmail.upd]
+ctime=1162218133
+done=1,4,5,6,7,8,9,3.1-update-identities,3.1-use-identity-uoids,3.1-new-mail-notification,3.2-update-loop-on-goto-unread-settings,3.1.4-dont-use-UOID-0-for-any-identity,3.2-misc,3.2-moves,3.3-use-ID-for-accounts,3.3-move-identities-to-own-file,3.3-aegypten-kpgprc-to-kmailrc,3.3-aegypten-kpgprc-to-libkleopatrarc,3.3-aegypten-emailidentities-split-sign-encr-keys,3.3-misc,3.3b1-misc,3.4,3.4a,3.4b,3.4.1,3.5.4
+mtime=1153556056
+
+[knewsticker.upd]
+ctime=1162218133
+done=KNewsTicker-0.2,KNewsTicker-0.2-Rename-KDE3,KNewsTicker-0.2-Rename-KDE3.1
+mtime=1126340430
+
+[konqsidebartng.upd]
+ctime=1162218133
+done=konqsidebartng_rc,konqsidebartng_entries
+mtime=1126340747
+
+[konqueror_gestures_kde321_update.upd]
+ctime=1162218133
+done=kde321
+mtime=1126340753
+
+[konsole.upd]
+ctime=1162218133
+done=kde2.2/r1,kde3.0/r1
+mtime=1126340768
+
+[kopete-account-kconf_update.upd]
+ctime=1162218133
+done=kopete0.7/r1,kopete0.10/r1
+mtime=1126340425
+
+[kopete-jabberpriorityaddition-kconf_update.upd]
+ctime=1162218133
+done=kopete0.9/r1
+mtime=1126340425
+
+[kopete-jabberproxytype-kconf_update.upd]
+ctime=1162218133
+done=kopete0.9/r1
+mtime=1126340425
+
+[kopete-nameTracking.upd]
+ctime=1162218133
+done=kopete0.9/r1
+mtime=1126340425
+
+[kopete-pluginloader.upd]
+ctime=1162218133
+done=kopete0.7/r1
+mtime=1126340425
+
+[kopete-pluginloader2.upd]
+ctime=1162218133
+done=kopete0.8/r1
+mtime=1126340425
+
+[korganizer.upd]
+ctime=1162218133
+done=korganizer_3.4_GroupwareCleanup,korganizer_3.4_WebExport,korganizer_3.4_FilterAction,korganizer_3.4_HolidayPlugin
+mtime=1126340687
+
+[korn-3-4-config_change.upd]
+ctime=1162218133
+done=korn_kde_3_4_config_change
+mtime=1126340654
+
+[korn-3-5-update.upd]
+ctime=1162218133
+done=korn-3-5-ssl-update,korn-3-5-metadata-update
+mtime=1126340654
+
+[kpalmdoc.upd]
+ctime=1162218133
+done=kdepim_3.3
+mtime=1126340677
+
+[kpgp.upd]
+ctime=1162218133
+done=preKDE3_a,3.1-1
+mtime=1126340631
+
+[kpilot.upd]
+ctime=1162218133
+done=kdepim_3.3
+mtime=1126340679
+
+[ksmserver.upd]
+ctime=1162218133
+done=kde3
+mtime=1126340697
+
+[kuriikwsfilter.upd]
+ctime=1162218133
+done=post-kde3.1/cvs
+mtime=1126340707
+
+[kwin.upd]
+ctime=1162218133
+done=kde3.0r1,kde3.2Xinerama
+mtime=1126340762
+
+[kwin3_plugin.upd]
+ctime=1162218133
+done=kde3.2
+mtime=1126340762
+
+[kwin_focus1.upd]
+ctime=1162218133
+done=kwin_focus1
+mtime=1126340762
+
+[kwin_focus2.upd]
+ctime=1162218133
+done=kwin_focus2
+mtime=1126340762
+
+[kwin_fsp_workarounds_1.upd]
+ctime=1162218133
+done=kde351
+mtime=1142590662
+
+[kwiniconify.upd]
+ctime=1162218133
+done=iconifyupd3.1
+mtime=1126340762
+
+[kwinsticky.upd]
+ctime=1162218133
+done=stickyupd3.1
+mtime=1126340762
+
+[kwinupdatewindowsettings.upd]
+ctime=1162218133
+done=kde33b1
+mtime=1126340762
+
+[mouse_cursor_theme.upd]
+ctime=1162218133
+done=kde3.4.99
+mtime=1126340707
+
+[noatun.upd]
+ctime=1162218133
+done=noatun20
+mtime=1126340382
+
+[socks.upd]
+ctime=1162218133
+done=kde3.0/r1
+mtime=1126340710

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcontrolrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcontrolrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcontrolrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,11 +1,11 @@
-[General]
-InitialHeight 768=692
-InitialWidth 1024=1014
-SplitterSizes=204,804
-
-[HTML Settings]
-AutomaticDetectionLanguage=0
-
-[Index]
-IconSize=Medium
-ViewMode=Tree
+[General]
+InitialHeight 768=692
+InitialWidth 1024=1014
+SplitterSizes=204,804
+
+[HTML Settings]
+AutomaticDetectionLanguage=0
+
+[Index]
+IconSize=Medium
+ViewMode=Tree

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcookiejarrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcookiejarrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kcookiejarrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,10 +1,10 @@
-[$Version]
-update_info=kcookiescfg.upd:kde2.2/b1,kcookiescfg.upd:kde3.1/cvs
-
-[Cookie Policy]
-AcceptSessionCookies=true
-CookieDomainAdvice=
-CookieGlobalAdvice=Accept
-Cookies=true
-IgnoreExpirationDate=false
-RejectCrossDomainCookies=true
+[$Version]
+update_info=kcookiescfg.upd:kde2.2/b1,kcookiescfg.upd:kde3.1/cvs
+
+[Cookie Policy]
+AcceptSessionCookies=true
+CookieDomainAdvice=
+CookieGlobalAdvice=Accept
+Cookies=true
+IgnoreExpirationDate=false
+RejectCrossDomainCookies=true

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdedrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdedrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdedrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kded.upd:kde3.0
+[$Version]
+update_info=kded.upd:kde3.0

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdeglobals
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdeglobals	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdeglobals	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,290 +1,290 @@
-[$Version]
-update_info=kded.upd:kde3.0,kaccel.upd:kde3.3/r1,klippershortcuts.upd:04112002,kwin.upd:kde3.2Xinerama,mouse_cursor_theme.upd:kde3.4.99,socks.upd:kde3.0/r1
-
-[DesktopIcons]
-ActiveColor=invalid
-ActiveColor2=invalid
-ActiveEffect=togamma
-ActiveSemiTransparent=false
-ActiveValue=1
-Animated=true
-DefaultColor=144,128,248
-DefaultColor2=0,0,0
-DefaultEffect=none
-DefaultSemiTransparent=false
-DefaultValue=1
-DisabledColor=34,202,0
-DisabledColor2=0,0,0
-DisabledEffect=togray
-DisabledSemiTransparent=true
-DisabledValue=1
-DoublePixels=false
-Size=32
-
-[FMSettings]
-StandardFont=Sans Serif,11,-1,5,50,0,0,0,0,0
-
-[General]
-XftHintStyle=hintmedium
-XftSubPixel=rgb
-alternateBackground=238,246,255
-background=239,237,225
-buttonBackground=253,252,245
-buttonForeground=0,0,0
-fixed=Monospace,12,-1,5,50,0,0,0,0,0
-font=Sans Serif,11,-1,5,50,0,0,0,0,0
-foreground=0,0,0
-linkColor=0,0,238
-menuFont=Sans Serif,11,-1,5,50,0,0,0,0,0
-selectBackground=46,136,219
-selectForeground=255,255,255
-taskbarFont=Sans Serif,11,-1,5,50,0,0,0,0,0
-toolBarFont=Sans Serif,11,-1,5,50,0,0,0,0,0
-visitedLinkColor=82,24,139
-widgetStyle=lipstik
-windowBackground=255,255,255
-windowForeground=0,0,0
-
-[Global Shortcuts]
-Activate Window Demanding Attention=default(Alt+Ctrl+A)
-Block Global Shortcuts=none
-Defaults timestamp=Oct 19 200612:57:31
-Desktop Screenshot=Print
-Enable/Disable Clipboard Actions=none
-Halt without Confirmation=none
-Kill Window=none
-Lock Session=none
-Log Out=none
-Log Out Without Confirmation=default(Alt+Ctrl+Shift+Delete)
-Manually Invoke Action on Current Clipboard=none
-Mouse Emulation=none
-Next Taskbar Entry=none
-Popup Launch Menu=Menu
-Previous Taskbar Entry=none
-Reboot without Confirmation=none
-Run Command=Win+R
-Setup Window Shortcut=none
-Show Klipper Popup-Menu=none
-Show Taskmanager=none
-Show Window List=none
-Switch One Desktop Down=none
-Switch One Desktop Up=none
-Switch One Desktop to the Left=none
-Switch One Desktop to the Right=none
-Switch User=default(Alt+Ctrl+Insert)
-Switch to Desktop 1=Win+F1
-Switch to Desktop 10=Win+F10
-Switch to Desktop 11=none
-Switch to Desktop 12=none
-Switch to Desktop 13=none
-Switch to Desktop 14=none
-Switch to Desktop 15=none
-Switch to Desktop 16=none
-Switch to Desktop 17=default(Ctrl+Shift+F5)
-Switch to Desktop 18=default(Ctrl+Shift+F6)
-Switch to Desktop 19=default(Ctrl+Shift+F7)
-Switch to Desktop 2=Win+F2
-Switch to Desktop 20=default(Ctrl+Shift+F8)
-Switch to Desktop 3=Win+F3
-Switch to Desktop 4=Win+F4
-Switch to Desktop 5=Win+F5
-Switch to Desktop 6=Win+F6
-Switch to Desktop 7=Win+F7
-Switch to Desktop 8=Win+F8
-Switch to Desktop 9=Win+F9
-Switch to Next Desktop=none
-Switch to Next Keyboard Layout=default(Alt+Ctrl+K)
-Switch to Previous Desktop=none
-Toggle Showing Desktop=Win+D;Win+M
-Toggle Window Raise/Lower=none
-Walk Through Desktop List=none
-Walk Through Desktop List (Reverse)=none
-Walk Through Desktops=Win+Tab
-Walk Through Desktops (Reverse)=Win+Shift+Tab
-Walk Through Windows=default(Alt+Tab)
-Walk Through Windows (Reverse)=default(Alt+Shift+Tab)
-Window Above Other Windows=none
-Window Below Other Windows=none
-Window Close=default(Alt+F4)
-Window Fullscreen=none
-Window Grow Horizontal=none
-Window Grow Vertical=none
-Window Lower=none
-Window Maximize=none
-Window Maximize Horizontal=none
-Window Maximize Vertical=none
-Window Minimize=none
-Window Move=none
-Window No Border=none
-Window On All Desktops=none
-Window One Desktop Down=none
-Window One Desktop Up=none
-Window One Desktop to the Left=none
-Window One Desktop to the Right=none
-Window Operations Menu=Alt+Space
-Window Pack Down=none
-Window Pack Left=none
-Window Pack Right=none
-Window Pack Up=none
-Window Raise=none
-Window Resize=none
-Window Screenshot=default(Alt+Print)
-Window Shade=none
-Window Shrink Horizontal=none
-Window Shrink Vertical=none
-Window to Desktop 1=none
-Window to Desktop 10=none
-Window to Desktop 11=none
-Window to Desktop 12=none
-Window to Desktop 13=none
-Window to Desktop 14=none
-Window to Desktop 15=none
-Window to Desktop 16=none
-Window to Desktop 17=none
-Window to Desktop 18=none
-Window to Desktop 19=none
-Window to Desktop 2=none
-Window to Desktop 20=none
-Window to Desktop 3=none
-Window to Desktop 4=none
-Window to Desktop 5=none
-Window to Desktop 6=none
-Window to Desktop 7=none
-Window to Desktop 8=none
-Window to Desktop 9=none
-Window to Next Desktop=none
-Window to Previous Desktop=none
-
-[Icons]
-Theme=nuvola
-
-[KDE]
-ChangeCursor=false
-EffectAnimateCombo=true
-EffectFadeMenu=true
-EffectFadeTooltip=true
-EffectsEnabled=true
-OpaqueResize=true
-ShowIconsOnPushButtons=true
-SingleClick=false
-colorScheme=thememgr.kcsrc
-contrast=7
-macStyle=false
-
-[Keyboard]
-Gestures=false
-
-[Locale]
-Country=C
-Language=en_US
-PositiveSign=
-TimeFormat=%l:%M:%S %p
-
-[MainToolbarIcons]
-ActiveColor=169,156,255
-ActiveColor2=0,0,0
-ActiveEffect=none
-ActiveSemiTransparent=false
-ActiveValue=1
-Animated=false
-DefaultColor=144,128,248
-DefaultColor2=0,0,0
-DefaultEffect=none
-DefaultSemiTransparent=false
-DefaultValue=1
-DisabledColor=34,202,0
-DisabledColor2=0,0,0
-DisabledEffect=togray
-DisabledSemiTransparent=true
-DisabledValue=1
-DoublePixels=false
-Size=22
-
-[PanelIcons]
-ActiveColor=invalid
-ActiveColor2=invalid
-ActiveEffect=togamma
-ActiveSemiTransparent=false
-ActiveValue=1
-Animated=false
-DefaultColor=144,128,248
-DefaultColor2=0,0,0
-DefaultEffect=none
-DefaultSemiTransparent=false
-DefaultValue=1
-DisabledColor=34,202,0
-DisabledColor2=0,0,0
-DisabledEffect=togray
-DisabledSemiTransparent=true
-DisabledValue=1
-DoublePixels=false
-Size=32
-
-[Paths]
-Trash=$HOME/Desktop/Trash/
+[$Version]
+update_info=kded.upd:kde3.0,kaccel.upd:kde3.3/r1,klippershortcuts.upd:04112002,kwin.upd:kde3.2Xinerama,mouse_cursor_theme.upd:kde3.4.99,socks.upd:kde3.0/r1
+
+[DesktopIcons]
+ActiveColor=invalid
+ActiveColor2=invalid
+ActiveEffect=togamma
+ActiveSemiTransparent=false
+ActiveValue=1
+Animated=true
+DefaultColor=144,128,248
+DefaultColor2=0,0,0
+DefaultEffect=none
+DefaultSemiTransparent=false
+DefaultValue=1
+DisabledColor=34,202,0
+DisabledColor2=0,0,0
+DisabledEffect=togray
+DisabledSemiTransparent=true
+DisabledValue=1
+DoublePixels=false
+Size=32
+
+[FMSettings]
+StandardFont=Sans Serif,11,-1,5,50,0,0,0,0,0
+
+[General]
+XftHintStyle=hintmedium
+XftSubPixel=rgb
+alternateBackground=238,246,255
+background=239,237,225
+buttonBackground=253,252,245
+buttonForeground=0,0,0
+fixed=Monospace,12,-1,5,50,0,0,0,0,0
+font=Sans Serif,11,-1,5,50,0,0,0,0,0
+foreground=0,0,0
+linkColor=0,0,238
+menuFont=Sans Serif,11,-1,5,50,0,0,0,0,0
+selectBackground=46,136,219
+selectForeground=255,255,255
+taskbarFont=Sans Serif,11,-1,5,50,0,0,0,0,0
+toolBarFont=Sans Serif,11,-1,5,50,0,0,0,0,0
+visitedLinkColor=82,24,139
+widgetStyle=lipstik
+windowBackground=255,255,255
+windowForeground=0,0,0
+
+[Global Shortcuts]
+Activate Window Demanding Attention=default(Alt+Ctrl+A)
+Block Global Shortcuts=none
+Defaults timestamp=Oct 19 200612:57:31
+Desktop Screenshot=Print
+Enable/Disable Clipboard Actions=none
+Halt without Confirmation=none
+Kill Window=none
+Lock Session=none
+Log Out=none
+Log Out Without Confirmation=default(Alt+Ctrl+Shift+Delete)
+Manually Invoke Action on Current Clipboard=none
+Mouse Emulation=none
+Next Taskbar Entry=none
+Popup Launch Menu=Menu
+Previous Taskbar Entry=none
+Reboot without Confirmation=none
+Run Command=Win+R
+Setup Window Shortcut=none
+Show Klipper Popup-Menu=none
+Show Taskmanager=none
+Show Window List=none
+Switch One Desktop Down=none
+Switch One Desktop Up=none
+Switch One Desktop to the Left=none
+Switch One Desktop to the Right=none
+Switch User=default(Alt+Ctrl+Insert)
+Switch to Desktop 1=Win+F1
+Switch to Desktop 10=Win+F10
+Switch to Desktop 11=none
+Switch to Desktop 12=none
+Switch to Desktop 13=none
+Switch to Desktop 14=none
+Switch to Desktop 15=none
+Switch to Desktop 16=none
+Switch to Desktop 17=default(Ctrl+Shift+F5)
+Switch to Desktop 18=default(Ctrl+Shift+F6)
+Switch to Desktop 19=default(Ctrl+Shift+F7)
+Switch to Desktop 2=Win+F2
+Switch to Desktop 20=default(Ctrl+Shift+F8)
+Switch to Desktop 3=Win+F3
+Switch to Desktop 4=Win+F4
+Switch to Desktop 5=Win+F5
+Switch to Desktop 6=Win+F6
+Switch to Desktop 7=Win+F7
+Switch to Desktop 8=Win+F8
+Switch to Desktop 9=Win+F9
+Switch to Next Desktop=none
+Switch to Next Keyboard Layout=default(Alt+Ctrl+K)
+Switch to Previous Desktop=none
+Toggle Showing Desktop=Win+D;Win+M
+Toggle Window Raise/Lower=none
+Walk Through Desktop List=none
+Walk Through Desktop List (Reverse)=none
+Walk Through Desktops=Win+Tab
+Walk Through Desktops (Reverse)=Win+Shift+Tab
+Walk Through Windows=default(Alt+Tab)
+Walk Through Windows (Reverse)=default(Alt+Shift+Tab)
+Window Above Other Windows=none
+Window Below Other Windows=none
+Window Close=default(Alt+F4)
+Window Fullscreen=none
+Window Grow Horizontal=none
+Window Grow Vertical=none
+Window Lower=none
+Window Maximize=none
+Window Maximize Horizontal=none
+Window Maximize Vertical=none
+Window Minimize=none
+Window Move=none
+Window No Border=none
+Window On All Desktops=none
+Window One Desktop Down=none
+Window One Desktop Up=none
+Window One Desktop to the Left=none
+Window One Desktop to the Right=none
+Window Operations Menu=Alt+Space
+Window Pack Down=none
+Window Pack Left=none
+Window Pack Right=none
+Window Pack Up=none
+Window Raise=none
+Window Resize=none
+Window Screenshot=default(Alt+Print)
+Window Shade=none
+Window Shrink Horizontal=none
+Window Shrink Vertical=none
+Window to Desktop 1=none
+Window to Desktop 10=none
+Window to Desktop 11=none
+Window to Desktop 12=none
+Window to Desktop 13=none
+Window to Desktop 14=none
+Window to Desktop 15=none
+Window to Desktop 16=none
+Window to Desktop 17=none
+Window to Desktop 18=none
+Window to Desktop 19=none
+Window to Desktop 2=none
+Window to Desktop 20=none
+Window to Desktop 3=none
+Window to Desktop 4=none
+Window to Desktop 5=none
+Window to Desktop 6=none
+Window to Desktop 7=none
+Window to Desktop 8=none
+Window to Desktop 9=none
+Window to Next Desktop=none
+Window to Previous Desktop=none
+
+[Icons]
+Theme=nuvola
+
+[KDE]
+ChangeCursor=false
+EffectAnimateCombo=true
+EffectFadeMenu=true
+EffectFadeTooltip=true
+EffectsEnabled=true
+OpaqueResize=true
+ShowIconsOnPushButtons=true
+SingleClick=false
+colorScheme=thememgr.kcsrc
+contrast=7
+macStyle=false
+
+[Keyboard]
+Gestures=false
+
+[Locale]
+Country=C
+Language=en_US
+PositiveSign=
+TimeFormat=%l:%M:%S %p
+
+[MainToolbarIcons]
+ActiveColor=169,156,255
+ActiveColor2=0,0,0
+ActiveEffect=none
+ActiveSemiTransparent=false
+ActiveValue=1
+Animated=false
+DefaultColor=144,128,248
+DefaultColor2=0,0,0
+DefaultEffect=none
+DefaultSemiTransparent=false
+DefaultValue=1
+DisabledColor=34,202,0
+DisabledColor2=0,0,0
+DisabledEffect=togray
+DisabledSemiTransparent=true
+DisabledValue=1
+DoublePixels=false
+Size=22
+
+[PanelIcons]
+ActiveColor=invalid
+ActiveColor2=invalid
+ActiveEffect=togamma
+ActiveSemiTransparent=false
+ActiveValue=1
+Animated=false
+DefaultColor=144,128,248
+DefaultColor2=0,0,0
+DefaultEffect=none
+DefaultSemiTransparent=false
+DefaultValue=1
+DisabledColor=34,202,0
+DisabledColor2=0,0,0
+DisabledEffect=togray
+DisabledSemiTransparent=true
+DisabledValue=1
+DoublePixels=false
+Size=32
+
+[Paths]
+Trash=$HOME/Desktop/Trash/
 Documents=$HOME/Documents/
-
-[Shortcuts]
-AddBookmark=Ctrl+D
-Close=Ctrl+F4
-Copy=Ctrl+C
-Cut=Ctrl+X
-Paste=Ctrl+V
-PopupMenuContext=F10
-Quit=Alt+F4
-
-[SmallIcons]
-ActiveColor=169,156,255
-ActiveColor2=0,0,0
-ActiveEffect=none
-ActiveSemiTransparent=false
-ActiveValue=1
-Animated=false
-DefaultColor=144,128,248
-DefaultColor2=0,0,0
-DefaultEffect=none
-DefaultSemiTransparent=false
-DefaultValue=1
-DisabledColor=34,202,0
-DisabledColor2=0,0,0
-DisabledEffect=togray
-DisabledSemiTransparent=true
-DisabledValue=1
-DoublePixels=false
-Size=16
-
-[ToolbarIcons]
-ActiveColor=169,156,255
-ActiveColor2=0,0,0
-ActiveEffect=none
-ActiveSemiTransparent=false
-ActiveValue=1
-Animated=false
-DefaultColor=144,128,248
-DefaultColor2=0,0,0
-DefaultEffect=none
-DefaultSemiTransparent=false
-DefaultValue=1
-DisabledColor=34,202,0
-DisabledColor2=0,0,0
-DisabledEffect=togray
-DisabledSemiTransparent=true
-DisabledValue=1
-DoublePixels=false
-Size=22
-
-[WM]
-activeBackground=0,95,184
-activeBlend=57,123,184
-activeFont=Sans Serif,12,-1,5,75,0,0,0,0,0
-activeForeground=255,255,255
-activeTitleBtnBg=127,158,200
-alternateBackground=237,244,249
-frame=239,239,239
-handle=239,239,239
-inactiveBackground=106,148,186
-inactiveBlend=157,170,186
-inactiveForeground=221,221,221
-inactiveFrame=239,239,239
-inactiveHandle=239,239,239
-inactiveTitleBtnBg=167,181,199
+
+[Shortcuts]
+AddBookmark=Ctrl+D
+Close=Ctrl+F4
+Copy=Ctrl+C
+Cut=Ctrl+X
+Paste=Ctrl+V
+PopupMenuContext=F10
+Quit=Alt+F4
+
+[SmallIcons]
+ActiveColor=169,156,255
+ActiveColor2=0,0,0
+ActiveEffect=none
+ActiveSemiTransparent=false
+ActiveValue=1
+Animated=false
+DefaultColor=144,128,248
+DefaultColor2=0,0,0
+DefaultEffect=none
+DefaultSemiTransparent=false
+DefaultValue=1
+DisabledColor=34,202,0
+DisabledColor2=0,0,0
+DisabledEffect=togray
+DisabledSemiTransparent=true
+DisabledValue=1
+DoublePixels=false
+Size=16
+
+[ToolbarIcons]
+ActiveColor=169,156,255
+ActiveColor2=0,0,0
+ActiveEffect=none
+ActiveSemiTransparent=false
+ActiveValue=1
+Animated=false
+DefaultColor=144,128,248
+DefaultColor2=0,0,0
+DefaultEffect=none
+DefaultSemiTransparent=false
+DefaultValue=1
+DisabledColor=34,202,0
+DisabledColor2=0,0,0
+DisabledEffect=togray
+DisabledSemiTransparent=true
+DisabledValue=1
+DoublePixels=false
+Size=22
+
+[WM]
+activeBackground=0,95,184
+activeBlend=57,123,184
+activeFont=Sans Serif,12,-1,5,75,0,0,0,0,0
+activeForeground=255,255,255
+activeTitleBtnBg=127,158,200
+alternateBackground=237,244,249
+frame=239,239,239
+handle=239,239,239
+inactiveBackground=106,148,186
+inactiveBlend=157,170,186
+inactiveForeground=221,221,221
+inactiveFrame=239,239,239
+inactiveHandle=239,239,239
+inactiveTitleBtnBg=167,181,199

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdeprintrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdeprintrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdeprintrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,5 +1,5 @@
-[$Version]
-update_info=kdeprintrc.upd:kde-3.1-toolbar
-
-[General]
-ViewToolBar[$d]
+[$Version]
+update_info=kdeprintrc.upd:kde-3.1-toolbar
+
+[General]
+ViewToolBar[$d]

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdesktoprc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdesktoprc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kdesktoprc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,48 +1,48 @@
-[Desktop Icons]
-Preview=svgthumbnail,exrthumbnail,imagethumbnail,gsthumbnail,cursorthumbnail,ldifvcardthumbnail,djvuthumbnail,fontthumbnail,textthumbnail,htmlthumbnail,imagethumbnail,textthumbnail
-
-[Desktop0]
-BackgroundMode=Flat
-BlendBalance=100
-BlendMode=NoBlending
-ChangeInterval=60
-Color1=0,48,130
-Color2=108,139,185
-CurrentWallpaper=0
-LastChange=0
-MinOptimizationDepth=1
-MultiWallpaperMode=NoMulti
-Pattern=
-Program=
-ReverseBlending=false
-UseSHM=false
-Wallpaper=/usr/local/share/wallpapers/pcbsd-default.png
-WallpaperList=
-WallpaperMode=Scaled
-
-[FMSettings]
-NormalTextColor=255,255,255
-StandardFont=Sans Serif,12,-1,5,50,0,0,0,0,0
-UnderlineLinks=false
-
-[General]
-AutoLineUpIcons=true
-
-[Menubar]
-ShowMenubar=false
-
-[Mouse Buttons]
-Middle=WindowListMenu
-WheelSwitchesWorkspace=false
-
-[ScreenSaver]
-Enabled=true
-Lock=false
-LockGrace=60000
-Saver=KLines-saver.desktop
-Timeout=300
-
-[Version]
-KDEVersionMajor=3
-KDEVersionMinor=5
-KDEVersionRelease=4
+[Desktop Icons]
+Preview=svgthumbnail,exrthumbnail,imagethumbnail,gsthumbnail,cursorthumbnail,ldifvcardthumbnail,djvuthumbnail,fontthumbnail,textthumbnail,htmlthumbnail,imagethumbnail,textthumbnail
+
+[Desktop0]
+BackgroundMode=Flat
+BlendBalance=100
+BlendMode=NoBlending
+ChangeInterval=60
+Color1=0,48,130
+Color2=108,139,185
+CurrentWallpaper=0
+LastChange=0
+MinOptimizationDepth=1
+MultiWallpaperMode=NoMulti
+Pattern=
+Program=
+ReverseBlending=false
+UseSHM=false
+Wallpaper=/usr/local/share/wallpapers/pcbsd-default.png
+WallpaperList=
+WallpaperMode=Scaled
+
+[FMSettings]
+NormalTextColor=255,255,255
+StandardFont=Sans Serif,12,-1,5,50,0,0,0,0,0
+UnderlineLinks=false
+
+[General]
+AutoLineUpIcons=true
+
+[Menubar]
+ShowMenubar=false
+
+[Mouse Buttons]
+Middle=WindowListMenu
+WheelSwitchesWorkspace=false
+
+[ScreenSaver]
+Enabled=true
+Lock=false
+LockGrace=60000
+Saver=KLines-saver.desktop
+Timeout=300
+
+[Version]
+KDEVersionMajor=3
+KDEVersionMinor=5
+KDEVersionRelease=4

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kfmclientrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kfmclientrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kfmclientrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kfmclient_3_2.upd:kfmclient_3_2
+[$Version]
+update_info=kfmclient_3_2.upd:kfmclient_3_2

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kfontinstuirc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kfontinstuirc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kfontinstuirc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,9 +1,9 @@
-[ListView Settings]
-ColumnOrder=0,1,2
-ColumnWidths=52,40,45
-SortAscending=true
-SortColumn=0
-
-[Main Settings]
-ListView=true
-SplitterSizes=486,292
+[ListView Settings]
+ColumnOrder=0,1,2
+ColumnWidths=52,40,45
+SortAscending=true
+SortColumn=0
+
+[Main Settings]
+ListView=true
+SplitterSizes=486,292

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kghostviewrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kghostviewrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kghostviewrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kghostview.upd:1changeToKConfigXT,kghostview.upd:2changeToKConfigXT
+[$Version]
+update_info=kghostview.upd:1changeToKConfigXT,kghostview.upd:2changeToKConfigXT

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/khotkeys_update
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/khotkeys_update	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/khotkeys_update	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=khotkeys_32b1_update.upd:kde32b1,konqueror_gestures_kde321_update.upd:kde321,khotkeys_printscreen.upd:printscreen
+[$Version]
+update_info=khotkeys_32b1_update.upd:kde32b1,konqueror_gestures_kde321_update.upd:kde321,khotkeys_printscreen.upd:printscreen

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/khotkeysrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/khotkeysrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/khotkeysrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,923 +1,923 @@
-[Data]
-DataCount=4
-
-[Data_1]
-Comment=This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)\n
-DataCount=8
-Enabled=false
-Name=Examples
-SystemGroup=0
-Type=ACTION_DATA_GROUP
-
-[Data_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1]
-Comment=After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple.\n
-Enabled=false
-Name=Activate KSIRC Window
-Type=ACTIVATE_WINDOW_SHORTCUT_ACTION_DATA
-
-[Data_1_1Actions]
-ActionsCount=1
-
-[Data_1_1Actions0]
-Type=ACTIVATE_WINDOW
-
-[Data_1_1Actions0Window]
-Comment=KSIRC window
-WindowsCount=1
-
-[Data_1_1Actions0Window0]
-Class=ksirc
-ClassType=1
-Comment=KSIRC
-Role=
-RoleType=0
-Title=
-TitleType=0
-Type=SIMPLE
-WindowTypes=33
-
-[Data_1_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_1Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_1_1Triggers0]
-Key=Alt+Ctrl+I
-Type=SHORTCUT
-
-[Data_1_2]
-Comment=After pressing Alt+Ctrl+H, 'Hello' input will be simulated just like if you typed it. Especially useful if you're lazy to type things like 'unsigned'. Every keypress in the input is separated by a colon ':' . Note that the keypresses mean really keypresses, so you have to write what you'd really press on the keyboard. In the table below, left column shows the input and the right column shows what to type.\n\n"enter" (i.e. new line)                Enter or Return\na (i.e. small a)                          A\nA (i.e. capital a)                       Shift+A\n: (colon)                                  Shift+;\n' '  (space)                              Space\n
-Enabled=false
-Name=Type 'Hello'
-Type=KEYBOARD_INPUT_SHORTCUT_ACTION_DATA
-
-[Data_1_2Actions]
-ActionsCount=1
-
-[Data_1_2Actions0]
-ActiveWindow=false
-Input=Shift+H:E:L:L:O\n
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_1_2Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_2Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_1_2Triggers0]
-Key=Alt+Ctrl+H
-Type=SHORTCUT
-
-[Data_1_3]
-Comment=This action runs Konsole, after pressing Ctrl+Alt+T.\n
-Enabled=false
-Name=Run Konsole
-Type=COMMAND_URL_SHORTCUT_ACTION_DATA
-
-[Data_1_3Actions]
-ActionsCount=1
-
-[Data_1_3Actions0]
-CommandURL=konsole
-Type=COMMAND_URL
-
-[Data_1_3Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_3Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_1_3Triggers0]
-Key=Alt+Ctrl+T
-Type=SHORTCUT
-
-[Data_1_4]
-Comment=Read the comment on action "Type 'Hello'" first.\n\nQt Designer uses Ctrl+F4 for closing windows (maybe because MS Windows does it that way *shrug*). But Ctrl+F4 in KDE stands for going to virtual desktop 4, so it doesn't work in Qt Designer, and also, Qt Designer doesn't use KDE's standard Ctrl+W for closing the window.\n\nBut the problem can be solved by remaping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, Ctrl+W remains working the usual way of course.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title.\n
-Enabled=false
-Name=Remap Ctrl+W to Ctrl+F4 in Qt Designer
-Type=GENERIC_ACTION_DATA
-
-[Data_1_4Actions]
-ActionsCount=1
-
-[Data_1_4Actions0]
-ActiveWindow=false
-Input=Ctrl+F4
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_1_4Conditions]
-Comment=
-ConditionsCount=1
-
-[Data_1_4Conditions0]
-Type=ACTIVE_WINDOW
-
-[Data_1_4Conditions0Window]
-Comment=Qt Designer
-WindowsCount=1
-
-[Data_1_4Conditions0Window0]
-Class=
-ClassType=0
-Comment=
-Role=
-RoleType=0
-Title=Qt Designer by Trolltech
-TitleType=2
-Type=SIMPLE
-WindowTypes=33
-
-[Data_1_4Triggers]
-Comment=
-TriggersCount=1
-
-[Data_1_4Triggers0]
-Key=Ctrl+W
-Type=SHORTCUT
-
-[Data_1_5]
-Comment=By pressing Alt+Ctrl+W a DCOP call will be performed that will show the minicli. You can use any kind of DCOP call, just like using the command line 'dcop' tool.\n
-Enabled=false
-Name=Perform DCOP call 'kdesktop KDesktopIface popupExecuteCommand()'
-Type=DCOP_SHORTCUT_ACTION_DATA
-
-[Data_1_5Actions]
-ActionsCount=1
-
-[Data_1_5Actions0]
-Arguments=
-Call=popupExecuteCommand
-RemoteApp=kdesktop
-RemoteObj=KDesktopIface
-Type=DCOP
-
-[Data_1_5Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_5Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_1_5Triggers0]
-Key=Alt+Ctrl+W
-Type=SHORTCUT
-
-[Data_1_6]
-Comment=Read the comment on action "Type 'Hello'" first.\n\nJust like the "Type 'Hello'" action, this one simulates a keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if it's e.g. on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player').\n
-Enabled=false
-Name=Next in XMMS
-Type=KEYBOARD_INPUT_SHORTCUT_ACTION_DATA
-
-[Data_1_6Actions]
-ActionsCount=1
-
-[Data_1_6Actions0]
-ActiveWindow=false
-Input=B
-IsDestinationWindow=true
-Type=KEYBOARD_INPUT
-
-[Data_1_6Actions0DestinationWindow]
-Comment=XMMS window
-WindowsCount=1
-
-[Data_1_6Actions0DestinationWindow0]
-Class=XMMS_Player
-ClassType=1
-Comment=XMMS Player window
-Role=
-RoleType=0
-Title=
-TitleType=0
-Type=SIMPLE
-WindowTypes=33
-
-[Data_1_6Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_6Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_1_6Triggers0]
-Key=Alt+Ctrl+B
-Type=SHORTCUT
-
-[Data_1_7]
-Comment=Ok, Konqi in KDE3.1 has tabs, and now you can also have gestures. No need to use other browsers >;).\n\nJust press the middle mouse button and start drawing one of the gestures, and after you're finished, release the mouse button. If you only need to paste the selection, it still works, simply only click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are these gestures available:\nmove right and back left - Forward (ALt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down  - Up (Alt+Up)\ncircle anticlockwise - Reload (F5)\n (As soon as I find out which ones are in Opera or Mozilla, I'll add more and make sure they are the same. Or if you do it yourself, feel free to help me and send me your khotkeysrc.)\n\nThe gestures shapes (some of the dialogs are from KGesture, thanks to Mike Pilone) can be simply entered by performing them in the configuration dialog. You can also look at your n!
 umeric pad to help you, gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it's possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse moving more than once (i.e. do e.g. 45654 or 74123 as they are simple to perform but e.g. 1236987 may be already quite difficult).\n\nThe condition for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror').\n
-DataCount=4
-Enabled=false
-Name=Konqi Gestures
-SystemGroup=0
-Type=ACTION_DATA_GROUP
-
-[Data_1_7Conditions]
-Comment=Konqueror window
-ConditionsCount=1
-
-[Data_1_7Conditions0]
-Type=ACTIVE_WINDOW
-
-[Data_1_7Conditions0Window]
-Comment=Konqueror
-WindowsCount=1
-
-[Data_1_7Conditions0Window0]
-Class=konqueror
-ClassType=1
-Comment=Konqueror
-Role=
-RoleType=0
-Title=
-TitleType=0
-Type=SIMPLE
-WindowTypes=33
-
-[Data_1_7_1]
-Comment=
-Enabled=false
-Name=Back
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_1_7_1Actions]
-ActionsCount=1
-
-[Data_1_7_1Actions0]
-ActiveWindow=false
-Input=Alt+Left
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_1_7_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_7_1Triggers]
-Comment=Gesture_triggers
-TriggersCount=3
-
-[Data_1_7_1Triggers0]
-Gesture=65456
-Type=GESTURE
-
-[Data_1_7_1Triggers1]
-Gesture=5456
-Type=GESTURE
-
-[Data_1_7_1Triggers2]
-Gesture=6545
-Type=GESTURE
-
-[Data_1_7_2]
-Comment=
-Enabled=false
-Name=Forward
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_1_7_2Actions]
-ActionsCount=1
-
-[Data_1_7_2Actions0]
-ActiveWindow=false
-Input=Alt+Right
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_1_7_2Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_7_2Triggers]
-Comment=Gesture_triggers
-TriggersCount=3
-
-[Data_1_7_2Triggers0]
-Gesture=45654
-Type=GESTURE
-
-[Data_1_7_2Triggers1]
-Gesture=5654
-Type=GESTURE
-
-[Data_1_7_2Triggers2]
-Gesture=4565
-Type=GESTURE
-
-[Data_1_7_3]
-Comment=
-Enabled=false
-Name=Up
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_1_7_3Actions]
-ActionsCount=1
-
-[Data_1_7_3Actions0]
-ActiveWindow=false
-Input=Alt+Up
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_1_7_3Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_7_3Triggers]
-Comment=Gesture_triggers
-TriggersCount=3
-
-[Data_1_7_3Triggers0]
-Gesture=25852
-Type=GESTURE
-
-[Data_1_7_3Triggers1]
-Gesture=2585
-Type=GESTURE
-
-[Data_1_7_3Triggers2]
-Gesture=5852
-Type=GESTURE
-
-[Data_1_7_4]
-Comment=
-Enabled=false
-Name=Reload
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_1_7_4Actions]
-ActionsCount=1
-
-[Data_1_7_4Actions0]
-ActiveWindow=false
-Input=F5
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_1_7_4Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_7_4Triggers]
-Comment=Gesture_triggers
-TriggersCount=3
-
-[Data_1_7_4Triggers0]
-Gesture=123698741
-Type=GESTURE
-
-[Data_1_7_4Triggers1]
-Gesture=1236987412
-Type=GESTURE
-
-[Data_1_7_4Triggers2]
-Gesture=4123698741
-Type=GESTURE
-
-[Data_1_8]
-Comment=After pressing Win+E (Tux+E), WWW browser will be launched and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2).\n
-Enabled=false
-Name=Go to KDE Website
-Type=COMMAND_URL_SHORTCUT_ACTION_DATA
-
-[Data_1_8Actions]
-ActionsCount=1
-
-[Data_1_8Actions0]
-CommandURL=http://www.kde.org
-Type=COMMAND_URL
-
-[Data_1_8Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1_8Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_1_8Triggers0]
-Key=Win+E
-Type=SHORTCUT
-
-[Data_2]
-Comment=Basic Konqueror gestures.\n
-DataCount=14
-Enabled=true
-Name=Konqueror Gestures
-SystemGroup=0
-Type=ACTION_DATA_GROUP
-
-[Data_2Conditions]
-Comment=Konqueror window
-ConditionsCount=1
-
-[Data_2Conditions0]
-Type=ACTIVE_WINDOW
-
-[Data_2Conditions0Window]
-Comment=Konqueror
-WindowsCount=1
-
-[Data_2Conditions0Window0]
-Class=^konqueror\s
-ClassType=3
-Comment=Konqueror
-Role=konqueror-mainwindow#1
-RoleType=0
-Title=file:/ - Konqueror
-TitleType=0
-Type=SIMPLE
-WindowTypes=1
-
-[Data_2_1]
-Comment=Press, move left, release.\n
-Enabled=true
-Name=Back
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_10]
-Comment=Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default.\n
-Enabled=false
-Name=Stop Loading
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_10Actions]
-ActionsCount=1
-
-[Data_2_10Actions0]
-ActiveWindow=false
-Input=Escape\n
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_10Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_10Triggers]
-Comment=Gesture_triggers
-TriggersCount=1
-
-[Data_2_10Triggers0]
-Gesture=258
-Type=GESTURE
-
-[Data_2_11]
-Comment=Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release.\n
-Enabled=true
-Name=Up
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_11Actions]
-ActionsCount=1
-
-[Data_2_11Actions0]
-ActiveWindow=false
-Input=Alt+Up
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_11Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_11Triggers]
-Comment=Gesture_triggers
-TriggersCount=1
-
-[Data_2_11Triggers0]
-Gesture=36547
-Type=GESTURE
-
-[Data_2_12]
-Comment=Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with  "Activate Previous Tab", and as such is disabled by default.\n
-Enabled=false
-Name=Up #2
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_12Actions]
-ActionsCount=1
-
-[Data_2_12Actions0]
-ActiveWindow=false
-Input=Alt+Up\n
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_12Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_12Triggers]
-Comment=Gesture_triggers
-TriggersCount=1
-
-[Data_2_12Triggers0]
-Gesture=36987
-Type=GESTURE
-
-[Data_2_13]
-Comment=Press, move up, move right, release.\n\n
-Enabled=true
-Name=Activate Next Tab
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_13Actions]
-ActionsCount=1
-
-[Data_2_13Actions0]
-ActiveWindow=false
-Input=Ctrl+.\n
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_13Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_13Triggers]
-Comment=Gesture_triggers
-TriggersCount=1
-
-[Data_2_13Triggers0]
-Gesture=14789
-Type=GESTURE
-
-[Data_2_14]
-Comment=Press, move up, move left, release.\n
-Enabled=true
-Name=Activate Previous Tab
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_14Actions]
-ActionsCount=1
-
-[Data_2_14Actions0]
-ActiveWindow=false
-Input=Ctrl+,
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_14Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_14Triggers]
-Comment=Gesture_triggers
-TriggersCount=1
-
-[Data_2_14Triggers0]
-Gesture=36987
-Type=GESTURE
-
-[Data_2_1Actions]
-ActionsCount=1
-
-[Data_2_1Actions0]
-ActiveWindow=false
-Input=Alt+Left
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_1Triggers]
-Comment=Gesture_triggers
-TriggersCount=1
-
-[Data_2_1Triggers0]
-Gesture=654
-Type=GESTURE
-
-[Data_2_2]
-Comment=Press, move down, move up, move down, release.\n
-Enabled=true
-Name=Duplicate Tab
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_2Actions]
-ActionsCount=1
-
-[Data_2_2Actions0]
-ActiveWindow=false
-Input=Ctrl+Shift+D\n
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_2Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_2Triggers]
-Comment=Gesture_triggers
-TriggersCount=1
-
-[Data_2_2Triggers0]
-Gesture=8525852
-Type=GESTURE
-
-[Data_2_3]
-Comment=Press, move down, move up, release.\n
-Enabled=true
-Name=Duplicate Window
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_3Actions]
-ActionsCount=1
-
-[Data_2_3Actions0]
-ActiveWindow=false
-Input=Ctrl+D\n
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_3Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_3Triggers]
-Comment=Gesture_triggers
-TriggersCount=1
-
-[Data_2_3Triggers0]
-Gesture=85258
-Type=GESTURE
-
-[Data_2_4]
-Comment=Press, move right, release.\n
-Enabled=true
-Name=Forward
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_4Actions]
-ActionsCount=1
-
-[Data_2_4Actions0]
-ActiveWindow=false
-Input=Alt+Right
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_4Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_4Triggers]
-Comment=Gesture_triggers
-TriggersCount=1
-
-[Data_2_4Triggers0]
-Gesture=456
-Type=GESTURE
-
-[Data_2_5]
-Comment=Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)\n
-Enabled=true
-Name=Home
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_5Actions]
-ActionsCount=1
-
-[Data_2_5Actions0]
-ActiveWindow=false
-Input=Ctrl+Home\n
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_5Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_5Triggers]
-Comment=Gesture_triggers
-TriggersCount=2
-
-[Data_2_5Triggers0]
-Gesture=741563
-Type=GESTURE
-
-[Data_2_5Triggers1]
-Gesture=7414563
-Type=GESTURE
-
-[Data_2_6]
-Comment=Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release.\n
-Enabled=true
-Name=Close Tab
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_6Actions]
-ActionsCount=1
-
-[Data_2_6Actions0]
-ActiveWindow=false
-Input=Ctrl+W\n
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_6Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_6Triggers]
-Comment=Gesture_triggers
-TriggersCount=2
-
-[Data_2_6Triggers0]
-Gesture=78523
-Type=GESTURE
-
-[Data_2_6Triggers1]
-Gesture=74123
-Type=GESTURE
-
-[Data_2_7]
-Comment=Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default.\n
-Enabled=true
-Name=New Tab
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_7Actions]
-ActionsCount=1
-
-[Data_2_7Actions0]
-ActiveWindow=false
-Input=Ctrl+Shift+N
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_7Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_7Triggers]
-Comment=Gesture_triggers
-TriggersCount=1
-
-[Data_2_7Triggers0]
-Gesture=258
-Type=GESTURE
-
-[Data_2_8]
-Comment=Press, move down, release.\n
-Enabled=true
-Name=New Window
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_8Actions]
-ActionsCount=1
-
-[Data_2_8Actions0]
-ActiveWindow=false
-Input=Ctrl+N\n
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_8Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_8Triggers]
-Comment=Gesture_triggers
-TriggersCount=1
-
-[Data_2_8Triggers0]
-Gesture=852
-Type=GESTURE
-
-[Data_2_9]
-Comment=Press, move up, move down, release.\n
-Enabled=true
-Name=Reload
-Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
-
-[Data_2_9Actions]
-ActionsCount=1
-
-[Data_2_9Actions0]
-ActiveWindow=false
-Input=F5
-IsDestinationWindow=false
-Type=KEYBOARD_INPUT
-
-[Data_2_9Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_2_9Triggers]
-Comment=Gesture_triggers
-TriggersCount=1
-
-[Data_2_9Triggers0]
-Gesture=25852
-Type=GESTURE
-
-[Data_3]
-Comment=These entries were created using Menu Editor.
-DataCount=1
-Enabled=true
-Name=Menu Editor entries
-SystemGroup=1
-Type=ACTION_DATA_GROUP
-
-[Data_3Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_3_1]
-Comment=
-Enabled=true
-Name=K Menu - kde-ksysguard.desktop
-Type=MENUENTRY_SHORTCUT_ACTION_DATA
-
-[Data_3_1Actions]
-ActionsCount=1
-
-[Data_3_1Actions0]
-CommandURL=kde-ksysguard.desktop
-Type=MENUENTRY
-
-[Data_3_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_3_1Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_3_1Triggers0]
-Key=Alt+Ctrl+Delete
-Type=SHORTCUT
-
-[Data_4]
-Comment=This group contains actions that are set up by default.\n
-DataCount=1
-Enabled=true
-Name=Preset Actions
-SystemGroup=0
-Type=ACTION_DATA_GROUP
-
-[Data_4Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_4_1]
-Comment=Launches KSnapShot when PrintScrn is pressed.\n
-Enabled=true
-Name=PrintScreen
-Type=COMMAND_URL_SHORTCUT_ACTION_DATA
-
-[Data_4_1Actions]
-ActionsCount=1
-
-[Data_4_1Actions0]
-CommandURL=ksnapshot
-Type=COMMAND_URL
-
-[Data_4_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_4_1Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_4_1Triggers0]
-Key=Print
-Type=SHORTCUT
-
-[Gestures]
-Disabled=true
-MouseButton=2
-Timeout=300
-
-[GesturesExclude]
-Comment=
-WindowsCount=0
-
-[Main]
-AlreadyImported=kde32b1,konqueror_gestures_kde321,printscreen
-Autostart=true
-Disabled=false
-Version=2
-
-[Voice]
-Shortcut=Shift+F12
+[Data]
+DataCount=4
+
+[Data_1]
+Comment=This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)\n
+DataCount=8
+Enabled=false
+Name=Examples
+SystemGroup=0
+Type=ACTION_DATA_GROUP
+
+[Data_1Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_1]
+Comment=After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. Simple.\n
+Enabled=false
+Name=Activate KSIRC Window
+Type=ACTIVATE_WINDOW_SHORTCUT_ACTION_DATA
+
+[Data_1_1Actions]
+ActionsCount=1
+
+[Data_1_1Actions0]
+Type=ACTIVATE_WINDOW
+
+[Data_1_1Actions0Window]
+Comment=KSIRC window
+WindowsCount=1
+
+[Data_1_1Actions0Window0]
+Class=ksirc
+ClassType=1
+Comment=KSIRC
+Role=
+RoleType=0
+Title=
+TitleType=0
+Type=SIMPLE
+WindowTypes=33
+
+[Data_1_1Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_1Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_1Triggers0]
+Key=Alt+Ctrl+I
+Type=SHORTCUT
+
+[Data_1_2]
+Comment=After pressing Alt+Ctrl+H, 'Hello' input will be simulated just like if you typed it. Especially useful if you're lazy to type things like 'unsigned'. Every keypress in the input is separated by a colon ':' . Note that the keypresses mean really keypresses, so you have to write what you'd really press on the keyboard. In the table below, left column shows the input and the right column shows what to type.\n\n"enter" (i.e. new line)                Enter or Return\na (i.e. small a)                          A\nA (i.e. capital a)                       Shift+A\n: (colon)                                  Shift+;\n' '  (space)                              Space\n
+Enabled=false
+Name=Type 'Hello'
+Type=KEYBOARD_INPUT_SHORTCUT_ACTION_DATA
+
+[Data_1_2Actions]
+ActionsCount=1
+
+[Data_1_2Actions0]
+ActiveWindow=false
+Input=Shift+H:E:L:L:O\n
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_1_2Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_2Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_2Triggers0]
+Key=Alt+Ctrl+H
+Type=SHORTCUT
+
+[Data_1_3]
+Comment=This action runs Konsole, after pressing Ctrl+Alt+T.\n
+Enabled=false
+Name=Run Konsole
+Type=COMMAND_URL_SHORTCUT_ACTION_DATA
+
+[Data_1_3Actions]
+ActionsCount=1
+
+[Data_1_3Actions0]
+CommandURL=konsole
+Type=COMMAND_URL
+
+[Data_1_3Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_3Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_3Triggers0]
+Key=Alt+Ctrl+T
+Type=SHORTCUT
+
+[Data_1_4]
+Comment=Read the comment on action "Type 'Hello'" first.\n\nQt Designer uses Ctrl+F4 for closing windows (maybe because MS Windows does it that way *shrug*). But Ctrl+F4 in KDE stands for going to virtual desktop 4, so it doesn't work in Qt Designer, and also, Qt Designer doesn't use KDE's standard Ctrl+W for closing the window.\n\nBut the problem can be solved by remaping Ctrl+W to Ctrl+F4 when the active window is Qt Designer. When Qt Designer is active, every time Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other applications, Ctrl+W remains working the usual way of course.\n\nWe now need to specify three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input action sending Ctrl+F4, and a new condition that the active window is Qt Designer.\nQt Designer seems to always have title 'Qt Designer by Trolltech', so the condition will check for the active window having that title.\n
+Enabled=false
+Name=Remap Ctrl+W to Ctrl+F4 in Qt Designer
+Type=GENERIC_ACTION_DATA
+
+[Data_1_4Actions]
+ActionsCount=1
+
+[Data_1_4Actions0]
+ActiveWindow=false
+Input=Ctrl+F4
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_1_4Conditions]
+Comment=
+ConditionsCount=1
+
+[Data_1_4Conditions0]
+Type=ACTIVE_WINDOW
+
+[Data_1_4Conditions0Window]
+Comment=Qt Designer
+WindowsCount=1
+
+[Data_1_4Conditions0Window0]
+Class=
+ClassType=0
+Comment=
+Role=
+RoleType=0
+Title=Qt Designer by Trolltech
+TitleType=2
+Type=SIMPLE
+WindowTypes=33
+
+[Data_1_4Triggers]
+Comment=
+TriggersCount=1
+
+[Data_1_4Triggers0]
+Key=Ctrl+W
+Type=SHORTCUT
+
+[Data_1_5]
+Comment=By pressing Alt+Ctrl+W a DCOP call will be performed that will show the minicli. You can use any kind of DCOP call, just like using the command line 'dcop' tool.\n
+Enabled=false
+Name=Perform DCOP call 'kdesktop KDesktopIface popupExecuteCommand()'
+Type=DCOP_SHORTCUT_ACTION_DATA
+
+[Data_1_5Actions]
+ActionsCount=1
+
+[Data_1_5Actions0]
+Arguments=
+Call=popupExecuteCommand
+RemoteApp=kdesktop
+RemoteObj=KDesktopIface
+Type=DCOP
+
+[Data_1_5Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_5Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_5Triggers0]
+Key=Alt+Ctrl+W
+Type=SHORTCUT
+
+[Data_1_6]
+Comment=Read the comment on action "Type 'Hello'" first.\n\nJust like the "Type 'Hello'" action, this one simulates a keyboard input, specifically, after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next song). The 'Send to specific window' checkbox is checked and a window with its class containing 'XMMS_Player' is specified; this will make the input always be sent to this window. This way, you can control XMMS even if it's e.g. on a different virtual desktop.\n\n(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see 'XMMS_Player').\n
+Enabled=false
+Name=Next in XMMS
+Type=KEYBOARD_INPUT_SHORTCUT_ACTION_DATA
+
+[Data_1_6Actions]
+ActionsCount=1
+
+[Data_1_6Actions0]
+ActiveWindow=false
+Input=B
+IsDestinationWindow=true
+Type=KEYBOARD_INPUT
+
+[Data_1_6Actions0DestinationWindow]
+Comment=XMMS window
+WindowsCount=1
+
+[Data_1_6Actions0DestinationWindow0]
+Class=XMMS_Player
+ClassType=1
+Comment=XMMS Player window
+Role=
+RoleType=0
+Title=
+TitleType=0
+Type=SIMPLE
+WindowTypes=33
+
+[Data_1_6Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_6Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_6Triggers0]
+Key=Alt+Ctrl+B
+Type=SHORTCUT
+
+[Data_1_7]
+Comment=Ok, Konqi in KDE3.1 has tabs, and now you can also have gestures. No need to use other browsers >;).\n\nJust press the middle mouse button and start drawing one of the gestures, and after you're finished, release the mouse button. If you only need to paste the selection, it still works, simply only click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are these gestures available:\nmove right and back left - Forward (ALt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down  - Up (Alt+Up)\ncircle anticlockwise - Reload (F5)\n (As soon as I find out which ones are in Opera or Mozilla, I'll add more and make sure they are the same. Or if you do it yourself, feel free to help me and send me your khotkeysrc.)\n\nThe gestures shapes (some of the dialogs are from KGesture, thanks to Mike Pilone) can be simply entered by performing them in the configuration dialog. You can also look at your n!
 umeric pad to help you, gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it's possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse moving more than once (i.e. do e.g. 45654 or 74123 as they are simple to perform but e.g. 1236987 may be already quite difficult).\n\nThe condition for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror').\n
+DataCount=4
+Enabled=false
+Name=Konqi Gestures
+SystemGroup=0
+Type=ACTION_DATA_GROUP
+
+[Data_1_7Conditions]
+Comment=Konqueror window
+ConditionsCount=1
+
+[Data_1_7Conditions0]
+Type=ACTIVE_WINDOW
+
+[Data_1_7Conditions0Window]
+Comment=Konqueror
+WindowsCount=1
+
+[Data_1_7Conditions0Window0]
+Class=konqueror
+ClassType=1
+Comment=Konqueror
+Role=
+RoleType=0
+Title=
+TitleType=0
+Type=SIMPLE
+WindowTypes=33
+
+[Data_1_7_1]
+Comment=
+Enabled=false
+Name=Back
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_1_7_1Actions]
+ActionsCount=1
+
+[Data_1_7_1Actions0]
+ActiveWindow=false
+Input=Alt+Left
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_1_7_1Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_7_1Triggers]
+Comment=Gesture_triggers
+TriggersCount=3
+
+[Data_1_7_1Triggers0]
+Gesture=65456
+Type=GESTURE
+
+[Data_1_7_1Triggers1]
+Gesture=5456
+Type=GESTURE
+
+[Data_1_7_1Triggers2]
+Gesture=6545
+Type=GESTURE
+
+[Data_1_7_2]
+Comment=
+Enabled=false
+Name=Forward
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_1_7_2Actions]
+ActionsCount=1
+
+[Data_1_7_2Actions0]
+ActiveWindow=false
+Input=Alt+Right
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_1_7_2Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_7_2Triggers]
+Comment=Gesture_triggers
+TriggersCount=3
+
+[Data_1_7_2Triggers0]
+Gesture=45654
+Type=GESTURE
+
+[Data_1_7_2Triggers1]
+Gesture=5654
+Type=GESTURE
+
+[Data_1_7_2Triggers2]
+Gesture=4565
+Type=GESTURE
+
+[Data_1_7_3]
+Comment=
+Enabled=false
+Name=Up
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_1_7_3Actions]
+ActionsCount=1
+
+[Data_1_7_3Actions0]
+ActiveWindow=false
+Input=Alt+Up
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_1_7_3Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_7_3Triggers]
+Comment=Gesture_triggers
+TriggersCount=3
+
+[Data_1_7_3Triggers0]
+Gesture=25852
+Type=GESTURE
+
+[Data_1_7_3Triggers1]
+Gesture=2585
+Type=GESTURE
+
+[Data_1_7_3Triggers2]
+Gesture=5852
+Type=GESTURE
+
+[Data_1_7_4]
+Comment=
+Enabled=false
+Name=Reload
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_1_7_4Actions]
+ActionsCount=1
+
+[Data_1_7_4Actions0]
+ActiveWindow=false
+Input=F5
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_1_7_4Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_7_4Triggers]
+Comment=Gesture_triggers
+TriggersCount=3
+
+[Data_1_7_4Triggers0]
+Gesture=123698741
+Type=GESTURE
+
+[Data_1_7_4Triggers1]
+Gesture=1236987412
+Type=GESTURE
+
+[Data_1_7_4Triggers2]
+Gesture=4123698741
+Type=GESTURE
+
+[Data_1_8]
+Comment=After pressing Win+E (Tux+E), WWW browser will be launched and it will open http://www.kde.org . You may run all kind of commands you can run in minicli (Alt+F2).\n
+Enabled=false
+Name=Go to KDE Website
+Type=COMMAND_URL_SHORTCUT_ACTION_DATA
+
+[Data_1_8Actions]
+ActionsCount=1
+
+[Data_1_8Actions0]
+CommandURL=http://www.kde.org
+Type=COMMAND_URL
+
+[Data_1_8Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_1_8Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_1_8Triggers0]
+Key=Win+E
+Type=SHORTCUT
+
+[Data_2]
+Comment=Basic Konqueror gestures.\n
+DataCount=14
+Enabled=true
+Name=Konqueror Gestures
+SystemGroup=0
+Type=ACTION_DATA_GROUP
+
+[Data_2Conditions]
+Comment=Konqueror window
+ConditionsCount=1
+
+[Data_2Conditions0]
+Type=ACTIVE_WINDOW
+
+[Data_2Conditions0Window]
+Comment=Konqueror
+WindowsCount=1
+
+[Data_2Conditions0Window0]
+Class=^konqueror\s
+ClassType=3
+Comment=Konqueror
+Role=konqueror-mainwindow#1
+RoleType=0
+Title=file:/ - Konqueror
+TitleType=0
+Type=SIMPLE
+WindowTypes=1
+
+[Data_2_1]
+Comment=Press, move left, release.\n
+Enabled=true
+Name=Back
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_10]
+Comment=Opera-style: Press, move up, release.\nNOTE: Conflicts with 'New Tab', and as such is disabled by default.\n
+Enabled=false
+Name=Stop Loading
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_10Actions]
+ActionsCount=1
+
+[Data_2_10Actions0]
+ActiveWindow=false
+Input=Escape\n
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_10Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_10Triggers]
+Comment=Gesture_triggers
+TriggersCount=1
+
+[Data_2_10Triggers0]
+Gesture=258
+Type=GESTURE
+
+[Data_2_11]
+Comment=Going up in URL/directory structure.\nMozilla-style: Press, move up, move left, move up, release.\n
+Enabled=true
+Name=Up
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_11Actions]
+ActionsCount=1
+
+[Data_2_11Actions0]
+ActiveWindow=false
+Input=Alt+Up
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_11Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_11Triggers]
+Comment=Gesture_triggers
+TriggersCount=1
+
+[Data_2_11Triggers0]
+Gesture=36547
+Type=GESTURE
+
+[Data_2_12]
+Comment=Going up in URL/directory structure.\nOpera-style: Press, move up, move left, move up, release.\nNOTE: Conflicts with  "Activate Previous Tab", and as such is disabled by default.\n
+Enabled=false
+Name=Up #2
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_12Actions]
+ActionsCount=1
+
+[Data_2_12Actions0]
+ActiveWindow=false
+Input=Alt+Up\n
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_12Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_12Triggers]
+Comment=Gesture_triggers
+TriggersCount=1
+
+[Data_2_12Triggers0]
+Gesture=36987
+Type=GESTURE
+
+[Data_2_13]
+Comment=Press, move up, move right, release.\n\n
+Enabled=true
+Name=Activate Next Tab
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_13Actions]
+ActionsCount=1
+
+[Data_2_13Actions0]
+ActiveWindow=false
+Input=Ctrl+.\n
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_13Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_13Triggers]
+Comment=Gesture_triggers
+TriggersCount=1
+
+[Data_2_13Triggers0]
+Gesture=14789
+Type=GESTURE
+
+[Data_2_14]
+Comment=Press, move up, move left, release.\n
+Enabled=true
+Name=Activate Previous Tab
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_14Actions]
+ActionsCount=1
+
+[Data_2_14Actions0]
+ActiveWindow=false
+Input=Ctrl+,
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_14Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_14Triggers]
+Comment=Gesture_triggers
+TriggersCount=1
+
+[Data_2_14Triggers0]
+Gesture=36987
+Type=GESTURE
+
+[Data_2_1Actions]
+ActionsCount=1
+
+[Data_2_1Actions0]
+ActiveWindow=false
+Input=Alt+Left
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_1Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_1Triggers]
+Comment=Gesture_triggers
+TriggersCount=1
+
+[Data_2_1Triggers0]
+Gesture=654
+Type=GESTURE
+
+[Data_2_2]
+Comment=Press, move down, move up, move down, release.\n
+Enabled=true
+Name=Duplicate Tab
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_2Actions]
+ActionsCount=1
+
+[Data_2_2Actions0]
+ActiveWindow=false
+Input=Ctrl+Shift+D\n
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_2Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_2Triggers]
+Comment=Gesture_triggers
+TriggersCount=1
+
+[Data_2_2Triggers0]
+Gesture=8525852
+Type=GESTURE
+
+[Data_2_3]
+Comment=Press, move down, move up, release.\n
+Enabled=true
+Name=Duplicate Window
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_3Actions]
+ActionsCount=1
+
+[Data_2_3Actions0]
+ActiveWindow=false
+Input=Ctrl+D\n
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_3Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_3Triggers]
+Comment=Gesture_triggers
+TriggersCount=1
+
+[Data_2_3Triggers0]
+Gesture=85258
+Type=GESTURE
+
+[Data_2_4]
+Comment=Press, move right, release.\n
+Enabled=true
+Name=Forward
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_4Actions]
+ActionsCount=1
+
+[Data_2_4Actions0]
+ActiveWindow=false
+Input=Alt+Right
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_4Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_4Triggers]
+Comment=Gesture_triggers
+TriggersCount=1
+
+[Data_2_4Triggers0]
+Gesture=456
+Type=GESTURE
+
+[Data_2_5]
+Comment=Press, move down, move half up, move right, move down, release.\n(Drawing a lowercase 'h'.)\n
+Enabled=true
+Name=Home
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_5Actions]
+ActionsCount=1
+
+[Data_2_5Actions0]
+ActiveWindow=false
+Input=Ctrl+Home\n
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_5Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_5Triggers]
+Comment=Gesture_triggers
+TriggersCount=2
+
+[Data_2_5Triggers0]
+Gesture=741563
+Type=GESTURE
+
+[Data_2_5Triggers1]
+Gesture=7414563
+Type=GESTURE
+
+[Data_2_6]
+Comment=Press, move right, move down, move right, release.\nMozilla-style: Press, move down, move right, release.\n
+Enabled=true
+Name=Close Tab
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_6Actions]
+ActionsCount=1
+
+[Data_2_6Actions0]
+ActiveWindow=false
+Input=Ctrl+W\n
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_6Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_6Triggers]
+Comment=Gesture_triggers
+TriggersCount=2
+
+[Data_2_6Triggers0]
+Gesture=78523
+Type=GESTURE
+
+[Data_2_6Triggers1]
+Gesture=74123
+Type=GESTURE
+
+[Data_2_7]
+Comment=Press, move up, release.\nConflicts with Opera-style 'Up #2', which is disabled by default.\n
+Enabled=true
+Name=New Tab
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_7Actions]
+ActionsCount=1
+
+[Data_2_7Actions0]
+ActiveWindow=false
+Input=Ctrl+Shift+N
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_7Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_7Triggers]
+Comment=Gesture_triggers
+TriggersCount=1
+
+[Data_2_7Triggers0]
+Gesture=258
+Type=GESTURE
+
+[Data_2_8]
+Comment=Press, move down, release.\n
+Enabled=true
+Name=New Window
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_8Actions]
+ActionsCount=1
+
+[Data_2_8Actions0]
+ActiveWindow=false
+Input=Ctrl+N\n
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_8Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_8Triggers]
+Comment=Gesture_triggers
+TriggersCount=1
+
+[Data_2_8Triggers0]
+Gesture=852
+Type=GESTURE
+
+[Data_2_9]
+Comment=Press, move up, move down, release.\n
+Enabled=true
+Name=Reload
+Type=KEYBOARD_INPUT_GESTURE_ACTION_DATA
+
+[Data_2_9Actions]
+ActionsCount=1
+
+[Data_2_9Actions0]
+ActiveWindow=false
+Input=F5
+IsDestinationWindow=false
+Type=KEYBOARD_INPUT
+
+[Data_2_9Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_2_9Triggers]
+Comment=Gesture_triggers
+TriggersCount=1
+
+[Data_2_9Triggers0]
+Gesture=25852
+Type=GESTURE
+
+[Data_3]
+Comment=These entries were created using Menu Editor.
+DataCount=1
+Enabled=true
+Name=Menu Editor entries
+SystemGroup=1
+Type=ACTION_DATA_GROUP
+
+[Data_3Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_3_1]
+Comment=
+Enabled=true
+Name=K Menu - kde-ksysguard.desktop
+Type=MENUENTRY_SHORTCUT_ACTION_DATA
+
+[Data_3_1Actions]
+ActionsCount=1
+
+[Data_3_1Actions0]
+CommandURL=kde-ksysguard.desktop
+Type=MENUENTRY
+
+[Data_3_1Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_3_1Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_3_1Triggers0]
+Key=Alt+Ctrl+Delete
+Type=SHORTCUT
+
+[Data_4]
+Comment=This group contains actions that are set up by default.\n
+DataCount=1
+Enabled=true
+Name=Preset Actions
+SystemGroup=0
+Type=ACTION_DATA_GROUP
+
+[Data_4Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_4_1]
+Comment=Launches KSnapShot when PrintScrn is pressed.\n
+Enabled=true
+Name=PrintScreen
+Type=COMMAND_URL_SHORTCUT_ACTION_DATA
+
+[Data_4_1Actions]
+ActionsCount=1
+
+[Data_4_1Actions0]
+CommandURL=ksnapshot
+Type=COMMAND_URL
+
+[Data_4_1Conditions]
+Comment=
+ConditionsCount=0
+
+[Data_4_1Triggers]
+Comment=Simple_action
+TriggersCount=1
+
+[Data_4_1Triggers0]
+Key=Print
+Type=SHORTCUT
+
+[Gestures]
+Disabled=true
+MouseButton=2
+Timeout=300
+
+[GesturesExclude]
+Comment=
+WindowsCount=0
+
+[Main]
+AlreadyImported=kde32b1,konqueror_gestures_kde321,printscreen
+Autostart=true
+Disabled=false
+Version=2
+
+[Voice]
+Shortcut=Shift+F12

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kickerrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kickerrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kickerrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,73 +1,73 @@
-[$Version]
-update_info=kickerrc.upd:kde_3_1_sizeChanges,kickerrc.upd:kde_3_4_reverseLayout,kickerrc.upd:kde_3_5_kconfigXTize
-
-[Applet_1]
-ConfigFile=minipager_panelapplet_urgqczcufucpwg0r4l6v_rc
-DesktopFile=minipagerapplet.desktop
-FreeSpace2=0
-WidthForHeightHint=71
-
-[Applet_2]
-ConfigFile=taskbar_panelapplet_oy57qjaccukulw7l4ww7_rc
-DesktopFile=taskbarapplet.desktop
-FreeSpace2=0
-WidthForHeightHint=210
-
-[Applet_3]
-ConfigFile=systemtray_panelappletrc
-DesktopFile=systemtrayapplet.desktop
-FreeSpace2=1
-WidthForHeightHint=62
-
-[Applet_4]
-ConfigFile=clock_panelapplet_kry2atturw62n6fdfzxd_rc
-DesktopFile=clockapplet.desktop
-FreeSpace2=1
-WidthForHeightHint=77
-
-[General]
-Alignment=0
-Applets2=KMenuButton_1,ServiceButton_1,ServiceButton_2,Applet_1,Applet_2,Applet_3,Applet_4
-AutoHideDelay=3
-AutoHidePanel=false
-AutoHideSwitch=false
-BackgroundHide=false
-CustomSize=56
-ExpandSize=true
-HideAnimation=true
-HideAnimationSpeed=40
-IExist=true
-Position=3
-ShowLeftHideButton=false
-ShowRightHideButton=true
-Size=2
-SizePercentage=100
-UnhideLocation=0
-UntrustedApplets=
-UntrustedExtensions=
-UseBackgroundTheme=true
-XineramaScreen=0
-
-[KMenu]
-ShowText=true
-Text=Start
-UseSidePixmap=false
-
-[KMenuButton_1]
-FreeSpace2=0
-
-[ServiceButton_1]
-DesktopFile=/usr/local/share/applications/kde/Home.desktop
-FreeSpace2=0
-StorageId=kde-Home.desktop
-
-[ServiceButton_2]
-DesktopFile=/usr/local/share/applications/kde/konqbrowser.desktop
-FreeSpace2=0
-StorageId=kde-konqbrowser.desktop
-
-[buttons]
-EnableIconZoom=true
-
-[menus]
-MenuEntryFormat=NameAndDescription
+[$Version]
+update_info=kickerrc.upd:kde_3_1_sizeChanges,kickerrc.upd:kde_3_4_reverseLayout,kickerrc.upd:kde_3_5_kconfigXTize
+
+[Applet_1]
+ConfigFile=minipager_panelapplet_urgqczcufucpwg0r4l6v_rc
+DesktopFile=minipagerapplet.desktop
+FreeSpace2=0
+WidthForHeightHint=71
+
+[Applet_2]
+ConfigFile=taskbar_panelapplet_oy57qjaccukulw7l4ww7_rc
+DesktopFile=taskbarapplet.desktop
+FreeSpace2=0
+WidthForHeightHint=210
+
+[Applet_3]
+ConfigFile=systemtray_panelappletrc
+DesktopFile=systemtrayapplet.desktop
+FreeSpace2=1
+WidthForHeightHint=62
+
+[Applet_4]
+ConfigFile=clock_panelapplet_kry2atturw62n6fdfzxd_rc
+DesktopFile=clockapplet.desktop
+FreeSpace2=1
+WidthForHeightHint=77
+
+[General]
+Alignment=0
+Applets2=KMenuButton_1,ServiceButton_1,ServiceButton_2,Applet_1,Applet_2,Applet_3,Applet_4
+AutoHideDelay=3
+AutoHidePanel=false
+AutoHideSwitch=false
+BackgroundHide=false
+CustomSize=56
+ExpandSize=true
+HideAnimation=true
+HideAnimationSpeed=40
+IExist=true
+Position=3
+ShowLeftHideButton=false
+ShowRightHideButton=true
+Size=2
+SizePercentage=100
+UnhideLocation=0
+UntrustedApplets=
+UntrustedExtensions=
+UseBackgroundTheme=true
+XineramaScreen=0
+
+[KMenu]
+ShowText=true
+Text=Start
+UseSidePixmap=false
+
+[KMenuButton_1]
+FreeSpace2=0
+
+[ServiceButton_1]
+DesktopFile=/usr/local/share/applications/kde/Home.desktop
+FreeSpace2=0
+StorageId=kde-Home.desktop
+
+[ServiceButton_2]
+DesktopFile=/usr/local/share/applications/kde/konqbrowser.desktop
+FreeSpace2=0
+StorageId=kde-konqbrowser.desktop
+
+[buttons]
+EnableIconZoom=true
+
+[menus]
+MenuEntryFormat=NameAndDescription

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kinetdrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kinetdrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kinetdrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,5 +1,5 @@
-[ListenerConfig]
-enabled_expiration_krfb=2935093,2,28,0,0,0
-enabled_expiration_krfb_httpd=2935093,2,28,0,0,0
-enabled_krfb=false
-enabled_krfb_httpd=false
+[ListenerConfig]
+enabled_expiration_krfb=2935093,2,28,0,0,0
+enabled_expiration_krfb_httpd=2935093,2,28,0,0,0
+enabled_krfb=false
+enabled_krfb_httpd=false

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kio_httprc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kio_httprc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kio_httprc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kioslave.upd:kde2.2/r1,kioslave.upd:kde2.2/r2
+[$Version]
+update_info=kioslave.upd:kde2.2/r1,kioslave.upd:kde2.2/r2

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kioslaverc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kioslaverc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kioslaverc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kioslave.upd:kde2.2/r1,kioslave.upd:kde2.2/r2,kioslave.upd:kde2.2/r3
+[$Version]
+update_info=kioslave.upd:kde2.2/r1,kioslave.upd:kde2.2/r2,kioslave.upd:kde2.2/r3

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/klaunchrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/klaunchrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/klaunchrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[FeedbackStyle]
-BusyCursor=true
+[FeedbackStyle]
+BusyCursor=true

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/klipperrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/klipperrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/klipperrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,6 +1,6 @@
-[$Version]
-update_info=klipperrc.upd:25082001,klipperrc.upd:kde3.1,klippershortcuts.upd:04112002
-
-[General]
-AutoStart=true
-Synchronize=false
+[$Version]
+update_info=klipperrc.upd:25082001,klipperrc.upd:kde3.1,klippershortcuts.upd:04112002
+
+[General]
+AutoStart=true
+Synchronize=false

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kmail.eventsrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kmail.eventsrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kmail.eventsrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kmail.upd:3.1-new-mail-notification
+[$Version]
+update_info=kmail.upd:3.1-new-mail-notification

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kmailrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kmailrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kmailrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,5 +1,5 @@
-[$Version]
-update_info=kmail.upd:1,kmail.upd:4,kmail.upd:5,kmail.upd:6,kmail.upd:7,kmail.upd:8,kmail.upd:9,kmail.upd:3.1-update-identities,kmail.upd:3.1-use-identity-uoids,kmail.upd:3.1-new-mail-notification,kmail.upd:3.2-update-loop-on-goto-unread-settings,kmail.upd:3.1.4-dont-use-UOID-0-for-any-identity,kmail.upd:3.2-misc,kmail.upd:3.2-moves,kmail.upd:3.3-use-ID-for-accounts,kmail.upd:3.3-move-identities-to-own-file,kmail.upd:3.3-aegypten-kpgprc-to-kmailrc,kmail.upd:3.3-misc,kmail.upd:3.3b1-misc,kmail.upd:3.4,kmail.upd:3.4a,kmail.upd:3.4b,kmail.upd:3.4.1,kmail.upd:3.3-update-filter-rules,kmail.upd:3.5.4
-
-[Composer]
-previous-identity=
+[$Version]
+update_info=kmail.upd:1,kmail.upd:4,kmail.upd:5,kmail.upd:6,kmail.upd:7,kmail.upd:8,kmail.upd:9,kmail.upd:3.1-update-identities,kmail.upd:3.1-use-identity-uoids,kmail.upd:3.1-new-mail-notification,kmail.upd:3.2-update-loop-on-goto-unread-settings,kmail.upd:3.1.4-dont-use-UOID-0-for-any-identity,kmail.upd:3.2-misc,kmail.upd:3.2-moves,kmail.upd:3.3-use-ID-for-accounts,kmail.upd:3.3-move-identities-to-own-file,kmail.upd:3.3-aegypten-kpgprc-to-kmailrc,kmail.upd:3.3-misc,kmail.upd:3.3b1-misc,kmail.upd:3.4,kmail.upd:3.4a,kmail.upd:3.4b,kmail.upd:3.4.1,kmail.upd:3.3-update-filter-rules,kmail.upd:3.5.4
+
+[Composer]
+previous-identity=

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewsticker_appletrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewsticker_appletrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewsticker_appletrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=knewsticker.upd:KNewsTicker-0.2-Rename-KDE3,knewsticker.upd:KNewsTicker-0.2-Rename-KDE3.1
+[$Version]
+update_info=knewsticker.upd:KNewsTicker-0.2-Rename-KDE3,knewsticker.upd:KNewsTicker-0.2-Rename-KDE3.1

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewsticker_panelappletrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewsticker_panelappletrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewsticker_panelappletrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=knewsticker.upd:KNewsTicker-0.2-Rename-KDE3.1
+[$Version]
+update_info=knewsticker.upd:KNewsTicker-0.2-Rename-KDE3.1

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewstickerappletrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewstickerappletrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewstickerappletrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=knewsticker.upd:KNewsTicker-0.2,knewsticker.upd:KNewsTicker-0.2-Rename-KDE3
+[$Version]
+update_info=knewsticker.upd:KNewsTicker-0.2,knewsticker.upd:KNewsTicker-0.2-Rename-KDE3

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewstickerrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewstickerrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knewstickerrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=knewsticker.upd:KNewsTicker-0.2
+[$Version]
+update_info=knewsticker.upd:KNewsTicker-0.2

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knotifyrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knotifyrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/knotifyrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,4 +1,4 @@
-[StartProgress]
-Arts Init=true
-KNotify Init=true
-Use Arts=true
+[StartProgress]
+Arts Init=true
+KNotify Init=true
+Use Arts=true

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konq_history
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konq_history	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konq_history	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[History]
-CompletionItems=unused
+[History]
+CompletionItems=unused

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konqiconviewrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konqiconviewrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konqiconviewrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,5 +1,5 @@
-[Settings]
-DontPreview=
-PreviewsEnabled=true
-SortDirsFirst=true
-SortingCriterion=sort_nci
+[Settings]
+DontPreview=
+PreviewsEnabled=true
+SortDirsFirst=true
+SortingCriterion=sort_nci

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konqsidebartng.rc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konqsidebartng.rc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konqsidebartng.rc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=konqsidebartng.upd:konqsidebartng_rc
+[$Version]
+update_info=konqsidebartng.upd:konqsidebartng_rc

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konquerorrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konquerorrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konquerorrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,89 +1,89 @@
-[$Version]
-update_info=kfmclient_3_2.upd:kfmclient_3_2
-
-[FMSettings]
-AlwaysTabbedMode=true
-KonquerorTabforExternalURL=false
-MMBOpensTab=false
-NewTabsInFront=false
-OpenAfterCurrentPage=false
-PermanentCloseButton=false
-PopupsWithinTabs=false
-TabCloseActivatePrevious=false
-UnderlineLinks=false
-
-[HTML Settings]
-AutoDelayedActions=true
-AutoLoadImages=true
-ChangeCursor=true
-FormCompletion=true
-HoverLinks=false
-MaxFormCompletionItems=10
-ShowAnimations=Enabled
-UnderlineLinks=true
-UnfinishedImageFrame=true
-
-[HistorySettings]
-Detailed Tooltips=true
-Font olderThan=Sans Serif,13,-1,5,50,1,0,0,0,0
-Font youngerThan=Sans Serif,13,-1,5,50,0,0,0,0,0
-Maximum age of History entries=30
-Maximum of History entries=200
-Metric olderThan=days
-Metric youngerThan=days
-Value olderThan=2
-Value youngerThan=1
-
-[Java/JavaScript Settings]
-AppletServerTimeout=60
-ECMADomains=
-EnableJava=true
-EnableJavaScript=true
-EnableJavaScriptDebug=false
-EnablePlugins=true
-JavaArgs=
-JavaDomains=
-JavaPath=java
-PluginDomains=
-ReportJavaScriptErrors=false
-ShutdownAppletServer=false
-UseKio=false
-UseSecurityManager=true
-WindowFocusPolicy=0
-WindowMovePolicy=0
-WindowOpenPolicy=3
-WindowResizePolicy=0
-WindowStatusPolicy=0
-
-[KonqMainWindow Toolbar bookmarkToolBar]
-Hidden=true
-IconText=IconTextRight
-Index=3
-
-[KonqMainWindow Toolbar extraToolBar]
-IconText=IconOnly
-Index=0
-
-[KonqMainWindow Toolbar locationToolBar]
-IconText=IconOnly
-Index=2
-
-[KonqMainWindow Toolbar mainToolBar]
-Index=1
-
-[MainView Settings]
-BackRightClick=false
-OpenMiddleClick=true
-
-[Reusing]
-AlwaysHavePreloaded=false
-MaxPreloadCount=1
-PreloadOnStartup=true
-SafeParts=SAFE
-
-[SearchBar]
-CurrentEngine=google
-Mode=1
-
-[Settings]
-BgImage=kde4ever.png
+[$Version]
+update_info=kfmclient_3_2.upd:kfmclient_3_2
+
+[FMSettings]
+AlwaysTabbedMode=true
+KonquerorTabforExternalURL=false
+MMBOpensTab=false
+NewTabsInFront=false
+OpenAfterCurrentPage=false
+PermanentCloseButton=false
+PopupsWithinTabs=false
+TabCloseActivatePrevious=false
+UnderlineLinks=false
+
+[HTML Settings]
+AutoDelayedActions=true
+AutoLoadImages=true
+ChangeCursor=true
+FormCompletion=true
+HoverLinks=false
+MaxFormCompletionItems=10
+ShowAnimations=Enabled
+UnderlineLinks=true
+UnfinishedImageFrame=true
+
+[HistorySettings]
+Detailed Tooltips=true
+Font olderThan=Sans Serif,13,-1,5,50,1,0,0,0,0
+Font youngerThan=Sans Serif,13,-1,5,50,0,0,0,0,0
+Maximum age of History entries=30
+Maximum of History entries=200
+Metric olderThan=days
+Metric youngerThan=days
+Value olderThan=2
+Value youngerThan=1
+
+[Java/JavaScript Settings]
+AppletServerTimeout=60
+ECMADomains=
+EnableJava=true
+EnableJavaScript=true
+EnableJavaScriptDebug=false
+EnablePlugins=true
+JavaArgs=
+JavaDomains=
+JavaPath=java
+PluginDomains=
+ReportJavaScriptErrors=false
+ShutdownAppletServer=false
+UseKio=false
+UseSecurityManager=true
+WindowFocusPolicy=0
+WindowMovePolicy=0
+WindowOpenPolicy=3
+WindowResizePolicy=0
+WindowStatusPolicy=0
+
+[KonqMainWindow Toolbar bookmarkToolBar]
+Hidden=true
+IconText=IconTextRight
+Index=3
+
+[KonqMainWindow Toolbar extraToolBar]
+IconText=IconOnly
+Index=0
+
+[KonqMainWindow Toolbar locationToolBar]
+IconText=IconOnly
+Index=2
+
+[KonqMainWindow Toolbar mainToolBar]
+Index=1
+
+[MainView Settings]
+BackRightClick=false
+OpenMiddleClick=true
+
+[Reusing]
+AlwaysHavePreloaded=false
+MaxPreloadCount=1
+PreloadOnStartup=true
+SafeParts=SAFE
+
+[SearchBar]
+CurrentEngine=google
+Mode=1
+
+[Settings]
+BgImage=kde4ever.png

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konsolerc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konsolerc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/konsolerc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,26 +1,26 @@
-[$Version]
-update_info=konsole.upd:kde2.2/r1,konsole.upd:kde3.0/r1
-
-[Desktop Entry]
-ActiveSession=0
-AutoResizeTabs=false
-DefaultSession=shell.desktop
-DynamicTabHide=false
-EncodingName=Default
-Fullscreen=false
-Height 768=475
-TabColor=0,0,0
-TabViewMode=0
-Width 1024=666
-bellmode=0
-class=konsole-mainwindow#1
-defaultfont=Bitstream Vera Sans Mono,11,-1,5,50,0,0,0,0,0
-history=1000
-historyenabled=true
-keytab=default
-schema=
-scrollbar=2
-tabbar=2
-
-[TipOfDay]
-TipLastShown=2006,10,30,14,34,29
+[$Version]
+update_info=konsole.upd:kde2.2/r1,konsole.upd:kde3.0/r1
+
+[Desktop Entry]
+ActiveSession=0
+AutoResizeTabs=false
+DefaultSession=shell.desktop
+DynamicTabHide=false
+EncodingName=Default
+Fullscreen=false
+Height 768=475
+TabColor=0,0,0
+TabViewMode=0
+Width 1024=666
+bellmode=0
+class=konsole-mainwindow#1
+defaultfont=Bitstream Vera Sans Mono,11,-1,5,50,0,0,0,0,0
+history=1000
+historyenabled=true
+keytab=default
+schema=
+scrollbar=2
+tabbar=2
+
+[TipOfDay]
+TipLastShown=2006,10,30,14,34,29

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kopeterc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kopeterc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kopeterc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=kopete-account-kconf_update.upd:kopete0.7/r1,kopete-account-kconf_update.upd:kopete0.10/r1,kopete-jabberpriorityaddition-kconf_update.upd:kopete0.9/r1,kopete-jabberproxytype-kconf_update.upd:kopete0.9/r1,kopete-nameTracking.upd:kopete0.9/r1,kopete-pluginloader.upd:kopete0.7/r1,kopete-pluginloader2.upd:kopete0.8/r1
+[$Version]
+update_info=kopete-account-kconf_update.upd:kopete0.7/r1,kopete-account-kconf_update.upd:kopete0.10/r1,kopete-jabberpriorityaddition-kconf_update.upd:kopete0.9/r1,kopete-jabberproxytype-kconf_update.upd:kopete0.9/r1,kopete-nameTracking.upd:kopete0.9/r1,kopete-pluginloader.upd:kopete0.7/r1,kopete-pluginloader2.upd:kopete0.8/r1

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/korgacrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/korgacrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/korgacrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[Alarms]
-CalendarsLastChecked=2006,10,30,14,33,12
+[Alarms]
+CalendarsLastChecked=2006,10,30,14,33,12

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/korganizerrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/korganizerrc	2007-04-06 03:48:11 UTC (rev 152)
+++ pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/korganizerrc	2007-04-06 03:51:03 UTC (rev 153)
@@ -1,2 +1,2 @@
-[$Version]
-update_info=korganizer.upd:korganizer_3.4_GroupwareCleanup,korganizer.upd:korganizer_3.4_WebExport,korganizer.upd:korganizer_3.4_FilterAction,korganizer.upd:korganizer_3.4_HolidayPlugin
+[$Version]
+update_info=korganizer.upd:korganizer_3.4_GroupwareCleanup,korganizer.upd:korganizer_3.4_WebExport,korganizer.upd:korganizer_3.4_FilterAction,korganizer.upd:korganizer_3.4_HolidayPlugin

Modified: pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kornrc
===================================================================
--- pcbsd/trunk/system-overlay/usr/share/skel/.kde/share/config/kornrc	2007-04-06 03:48:1