-_bash_profile_addpath PATH "$HOME/bin"
-_bash_profile_addpath PATH "$HOME/sbin"
-_bash_profile_addpath LD_LIBRARY_PATH "$HOME/lib"
-_bash_profile_addpath MANPATH "$HOME/man"
-
-_bash_profile_addpath CVSROOT "$HOME/cvs" single
-_bash_profile_addpath CVSROOT "$HOME/pserver/cvs" single
+_bash_profile_addpath -f PATH "$HOME/bin"
+_bash_profile_addpath -f PATH "/share/ProductivityTools/exe"
+_bash_profile_addpath -f PATH "/opt/sfw/bin"
+# gid(1) dependency on: /opt/sfw/bin
+[ `id -u 2>/dev/null || gid -u` -eq 0 ] && _bash_profile_addpath -f PATH "$HOME/sbin"
+_bash_profile_addpath -f PATH "/usr/local/bin"
+[ `id -u 2>/dev/null || gid -u` -eq 0 ] && _bash_profile_addpath -f PATH "/usr/local/sbin"
+_bash_profile_addpath -f LD_LIBRARY_PATH "$HOME/lib"
+_bash_profile_addpath -f LD_LIBRARY_PATH "/opt/sfw/lib"
+_bash_profile_addpath -f MANPATH "$HOME/man"
+_bash_profile_addpath -f MANPATH "/usr/local/man"
+_bash_profile_addpath -f MANPATH "/usr/share/man"
+_bash_profile_addpath -f -s CVSROOT "short@vellum.cz:/home/short/pserver/cvs" # default
+_bash_profile_addpath -s CVSROOT "$HOME/pserver/cvs"
+_bash_profile_addpath -s CVSROOT "$HOME/cvs"
+_bash_profile_addpath -s JAVA_HOME "/usr/java"
+_bash_profile_addpath -s ANT_HOME "/usr/local/ant"