X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=freebsd-2.0%2Fkinstall.sh;h=bb0d88a9e424567be363c9b720fce557e03e6e24;hp=488296e7ffd3fec7530702eca187d427a2b813b8;hb=53e3b02e731858f92270828e02ae620bbdff09e3;hpb=9de44646b47a237664d4e992d10f2e2a69dcb2a7

diff --git a/freebsd-2.0/kinstall.sh b/freebsd-2.0/kinstall.sh
index 488296e..bb0d88a 100755
--- a/freebsd-2.0/kinstall.sh
+++ b/freebsd-2.0/kinstall.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # This script modifies the kernel sources in /sys to install
-# ppp-2.2.  It is intended to be run in the ppp-2.2 directory.
+# ppp-2.3.  It is intended to be run in the ppp-2.3 directory.
 #
 # Paul Mackerras	17-Mar-95
 
@@ -17,14 +17,13 @@ CONFIG=config
 # Copy new versions of files into /sys/net
 
 for f in net/if_ppp.h net/ppp-comp.h net/ppp_defs.h $SRC/bsd-comp.c \
-	 $SRC/if_ppp.c $SRC/if_pppvar.h $SRC/ppp_tty.c \
-	 $SRC/pppcompress.c $SRC/pppcompress.h; do
+	 $SRC/ppp-deflate.c $SRC/if_ppp.c $SRC/if_pppvar.h $SRC/ppp_tty.c \
+	 $SRC/pppcompress.c $SRC/pppcompress.h common/zlib.c common/zlib.h; do
   dest=$SYS/net/$(basename $f)
   if [ -f $dest ]; then
     if ! cmp -s $f $dest; then
       echo "Copying $f to $dest"
-      mv -f $dest $dest.orig
-      echo " (old version saved in $dest.orig)"
+      mv -f $dest $dest.orig && echo " (old version saved in $dest.orig)"
       cp $f $dest
       DOMAKE=yes
     fi
@@ -41,9 +40,11 @@ if [ -f $SYS/conf/files ]; then
   if ! grep -q ppp_tty $SYS/conf/files; then
     echo "Patching $SYS/conf/files"
     patch -p -N -d $SYS/conf <$SRC/files.patch
-    if [ $CONFIG = config ]; then
-      DOCONF=yes
-    fi
+    DOCONF=yes
+  elif ! grep -q ppp-deflate $SYS/conf/files; then
+    echo "Patching $SYS/conf/files"
+    patch -N $SYS/conf/$OLDFILES <$SRC/files-2.2.patch
+    DOCONF=yes
   fi
 fi
 
@@ -70,6 +71,7 @@ if [ $DOCONF ]; then
   echo "	cd $ARCHDIR/conf"
   echo "	/usr/sbin/$CONFIG $CONF"
   echo "	cd ../../compile/$CONF"
+  echo "	make depend"
   DOMAKE=yes
 elif [ $DOMAKE ]; then
   echo "You need to build a new kernel."