X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_zshenv;h=ad43120dca946e7bfbb5b4596a54fa338401ee0a;hb=d35ace6bac1a606e516a5f8c5e7f99db94c5f146;hp=e4f77b36239902131b56a313bca0e20bbf673962;hpb=e84ab9c8f0e9d719c3f1f0b48832893ac915bcd3;p=sugar.git

diff --git a/dot-files/_zshenv b/dot-files/_zshenv
index e4f77b3..ad43120 100644
--- a/dot-files/_zshenv
+++ b/dot-files/_zshenv
@@ -21,37 +21,51 @@ append_path PATH /bin
 append_path PATH /sbin
 append_path PATH /usr/bin
 append_path PATH /usr/sbin
-append_path PATH /usr/pkg/bin
-append_path PATH /usr/pkg/sbin
 append_path PATH /usr/local/bin
 append_path PATH /usr/local/sbin
+append_path PATH /opt/local/bin
+append_path PATH /opt/local/sbin
+append_path PATH /usr/pkg/bin
+append_path PATH /usr/pkg/sbin
+append_path PATH /usr/pkg/lib/perl5/site_perl/bin
 append_path PATH $HOME/bin
 # Hope these could be removed someday!
 append_path PATH /usr/local/ymir/perl/bin
+append_path PATH /usr/local/ymir/erlang/bin
+append_path PATH /usr/local/ymir/postgresql90/bin
+append_path PATH /usr/local/ymir/mercurial/bin
 
 # MANPATH
 export MANPATH=""
 append_path MANPATH /usr/share/man
-append_path MANPATH /usr/pkg/man
 append_path MANPATH /usr/local/man
 append_path MANPATH /usr/local/share/man
+append_path MANPATH /usr/pkg/man
 
 # INFOPATH
 export INFOPATH=""
 append_path INFOPATH /usr/share/info
-append_path INFOPATH /usr/pkg/info
 append_path INFOPATH /usr/local/info
 append_path INFOPATH /usr/local/share/info
+append_path INFOPATH /usr/pkg/info
 
 # PKG_CONFIG_PATH
 export PKG_CONFIG_PATH=""
 append_path PKG_CONFIG_PATH /usr/lib/pkgconfig
-append_path PKG_CONFIG_PATH /usr/pkg/lib/pkgconfig
 append_path PKG_CONFIG_PATH /usr/local/lib/pkgconfig
+append_path PKG_CONFIG_PATH /usr/pkg/lib/pkgconfig
+
+# TMPDIR (Only for Darwin)
+if [ `uname` = "Darwin" ]; then
+    if [ "$TMPDIR" = "" ]; then
+        export TMPDIR=`getconf DARWIN_USER_TEMP_DIR`
+    fi
+fi
 
 # DYLD_FALLBACK_LIBRARY_PATH (Only for Darwin)
 export DYLD_FALLBACK_LIBRARY_PATH=""
-append_path DYLD_FALLBACK_LIBRARY_PATH /usr/pkg/lib
+#append_path DYLD_FALLBACK_LIBRARY_PATH /usr/lib
+#append_path DYLD_FALLBACK_LIBRARY_PATH /usr/pkg/lib
 
 # Languages
 export LANGUAGAE="ja"
@@ -67,10 +81,23 @@ export LV="-Ia -c"
 export LESS="--quit-if-one-screen -R"
 export GTK_IM_MODULE=uim
 export PERL_BADLANG=0
+export HGMERGE=merge
 
 # darcs
 export DARCS_EMAIL="pho@cielonegro.org"
 export DARCS_DONT_ESCAPE_8BIT=1
 
+# CVS
+export CVS_RSH=ssh
+
 # uim-fep
 export UIM_FEP=skk
+
+# sox
+export AUDIODRIVER=ao
+
+# icc
+if [ -e /opt/intel/cce/latest/bin/iccvars.sh ]; then
+    . /opt/intel/cce/latest/bin/iccvars.sh
+    . /opt/intel/ipp/latest/em64t/tools/env/ippvarsem64t.sh
+fi