--- vutils-1.27.0/vupgrade.orig	2004-06-20 23:32:12.000000000 +0900
+++ vutils-1.27.0/vupgrade	2006-09-10 18:43:14.000000000 +0900
@@ -3,7 +3,7 @@
 # by Jun Nishii <jun@vinelinux.org>
 # Time-stamp: <02/10/06 00:53:57 vine>
 
-VER=3.0
+VER=4.0
 LOG=$HOME/upgrade-log
 STAMP=${HOME}/.vine/VineLinux${VER}
 
@@ -35,8 +35,16 @@
 return 1
 }
 
+chkSame(){ # target newguy
+if diff $1 $2 >/dev/null 2>&1; then
+    return 0
+else
+    return 1
+fi
+}
+
 chkMD5Update(){ # target md5sum newguy
-[ ! -f $1 ] && return 0
+[ ! -f $1 ] && return 1
 
 CHECK=`md5sum $1 | cut -f 1 -d " "`
 if [ "${CHECK}" = "$2" ]; then
@@ -55,42 +63,63 @@
 
 ###########################################################################3
 
-##### Xdefaults
-TARGET=${HOME}/.Xdefaults
+##### Xresources
+TARGET=${HOME}/.Xresources
 NEW=/etc/skel/.Xresources
+chkSame $TARGET $NEW || (
+# from 4.0
+#MD5SUM="d5651f30e2e4fabbaafe3aee60f6bda2"
+#chkMD5Update $TARGET $MD5SUM $NEW
+# from 3.x
+MD5SUM="3347c5d3eb5cbb90255b3dc46bd25728"
+chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.6
 MD5SUM="2ba8631e24045a2d76603b91a4aed6c0"
 chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.6CR
 MD5SUM="6958944eb43282ef3cb5f09f0323296f"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
+##### Xdefaults
+TARGET=${HOME}/.Xdefaults
+NEW=/etc/skel/.Xresources
+chkSame $TARGET $NEW || (
 # from 2.1 & 2.1.5
 MD5SUM="d505a8693c6482d845038bc4994ad619"
 chkMD5Update $TARGET $MD5SUM $NEW && rm ${TARGET}
 # from 2.0
 MD5SUM="ffbf1285e65c3a98d14521e6e2d4d709"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
 
 ##### bash_logout
 TARGET=${HOME}/.bash_logout
 NEW=/etc/skel/.bash_logout
-# from 2.5 & 2.6
+chkSame $TARGET $NEW || (
+# from 2.5 & 2.6 & 3.x & 4.0
 MD5SUM="d19bbbed9d713f97f487b9ed9ec3f62f"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
 
 ##### bash_profile
 TARGET=${HOME}/.bash_profile
 NEW=/etc/skel/.bash_profile
-# from 2.5 & 2.6
+chkSame $TARGET $NEW || (
+# from 2.5 & 2.6 & 3.x & 4.0
 MD5SUM="68fa45c9d56046c8f6ce3c3ea2e8376b"
 chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.1.5 and before
 MD5SUM="7feed2b53dad06634b2bc32d63f634e4"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
 
 ##### bashrc
 TARGET=${HOME}/.bashrc
 NEW=/etc/skel/.bashrc
+chkSame $TARGET $NEW || (
+# from 3.x & 4.0
+MD5SUM="6d43294e457bb568957d2fb2b43b0355"
+chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.5 & 2.6
 MD5SUM="e31a08d3af08bed5e4f246a3dacc36d8"
 chkMD5Update $TARGET $MD5SUM $NEW
@@ -100,11 +129,13 @@
 # from 2.0 
 MD5SUM="a1d1b54732257d96b9219af0c7f1fc7a"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
 
 ##### canna
 TARGET=${HOME}/.canna
 NEW=/etc/skel/.canna
-# from 2.6
+chkSame $TARGET $NEW || (
+# from 2.6 & 3.x & 4.0
 MD5SUM="c4ca3bdac07d90d1033b252685fbacb1"
 chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.5
@@ -119,11 +150,13 @@
 # from 2.0
 MD5SUM="7f9cc5dacd0b0f892e4298dcf1f532de"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
 
 ##### cshrc
 TARGET=${HOME}/.cshrc
 NEW=/etc/skel/.cshrc
-# from 2.6
+chkSame $TARGET $NEW || (
+# from 2.6 & 3.x & 4.0
 MD5SUM="d72dab0210938146b5c4ffe01d874e3a"
 chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.1 & 2.1.5 
@@ -132,40 +165,54 @@
 # from 2.0
 MD5SUM="e353c9ee3971539acdfb4a8769f34c66"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
 
 ##### emacs
 TARGET=${HOME}/.emacs
 NEW=/etc/skel/.emacs
-# from 2.6
+chkSame $TARGET $NEW || (
+# from 2.6 & 3.x & 4.0
 MD5SUM="3c866b2dafd2a7ba7ea2b41faf24f523"
 chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.1 & 2.1.5 & 2.5
 MD5SUM="289ba7d687f770983b143ea0e424c722"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
 
 ##### emacs-faces.el
 TARGET=${HOME}/.emacs-faces.el
 NEW=/etc/skel/.emacs-faces.el
+chkSame $TARGET $NEW || (
+# from 3.x & 4.0
+MD5SUM="09ef5702f5022759b092e5f65075ed71"
+chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.6
 MD5SUM="d66bb8283521eb1b3040a3d7dbf0f5d2"
 chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.5
 MD5SUM="20117126d492f2ea14e0fb2e89f5f7f6"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
 
 ##### emacs-fontset.el
 TARGET=${HOME}/.emacs-fontset.el
 NEW=/etc/skel/.emacs-fontset.el
+chkSame $TARGET $NEW || (
+# from 3.x & 4.0
+MD5SUM="d5759c01e1f6d84456fedcd9d2759496"
+chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.6
 MD5SUM="8c3106b8f4186e527bdd63fd1d936a0c"
 chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.5
 MD5SUM="d407d737475f2a093c309af91aed32d4"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
 
 ##### emacs-color.el
 TARGET=${HOME}/.emacs-color.el
 NEW=/etc/skel/.emacs-color.el
+chkSame $TARGET $NEW || (
 
 #     for 2.1/2.1.5 ----should be merged
 #                   from 2.0       
@@ -181,10 +228,21 @@
    fi
 )
 done
+)
 
 ##### .emacs.el
 TARGET=${HOME}/.emacs.el
 NEW=/etc/skel/.emacs.el
+chkSame $TARGET $NEW || (
+# from 4.0
+#MD5SUM="e327c11463415f61c781834d66a3b1b9"
+#chkMD5Update $TARGET $MD5SUM $NEW
+# from 3.1 & 3.2
+MD5SUM="d2b98e579143983a39a6639120e8579a"
+chkMD5Update $TARGET $MD5SUM $NEW
+# from 3.0
+MD5SUM="a0bbf086255f0751583520e7fd47326c"
+chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.6
 MD5SUM="76785a2498f22f430583cbd649d8cfc3"
 chkMD5Update $TARGET $MD5SUM $NEW
@@ -200,10 +258,18 @@
 # from 2.0
 MD5SUM="ecb3dec80763a8fdb0888d8980c49286"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
 
 ### rpmmacros
 TARGET=${HOME}/.rpmmacros
 NEW=/etc/skel/.rpmmacros
+chkSame $TARGET $NEW || (
+# from 4.0
+#MD5SUM="aeffd267d61af5ca4718cee9bb2cb2de"
+#chkMD5Update $TARGET $MD5SUM $NEW
+# from 3.x
+MD5SUM="ba738a926ffb0e5752ef440ba915634d"
+chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.6
 # MD5SUM="ba738a926ffb0e5752ef440ba915634d"
 # chkMD5Update $TARGET $MD5SUM $NEW
@@ -213,10 +279,18 @@
 # from 2.1
 MD5SUM="2b2a0f4e2d7ec077db33f031f66cac9c"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
 
 ##### xemacs.el
 TARGET=${HOME}/.xemacs.el
 NEW=/etc/skel/.xemacs.el
+chkSame $TARGET $NEW || (
+# from 4.0
+#MD5SUM="05c1705daa7769a65efa6045206c574b"
+#chkMD5Update $TARGET $MD5SUM $NEW
+# from 3.x
+MD5SUM="4b459e779adb38fabb461a27d0cfa76e"
+chkMD5Update $TARGET $MD5SUM $NEW
 # from 2.6
 MD5SUM="a48ed6df7d52422455713a1d61b69d64"
 chkMD5Update $TARGET $MD5SUM $NEW
@@ -229,6 +303,7 @@
 # from 2.0
 MD5SUM="81982a524f9ab581a017dbfaa77f2d34"
 chkMD5Update $TARGET $MD5SUM $NEW
+)
 
 # imelib -> vinelib (from 2.0)
 TARGET=${HOME}/.bashrc