$OpenBSD: patch-build,v 1.6 2001/11/19 02:01:58 brad Exp $
--- build.orig	Sat Nov 17 20:56:27 2001
+++ build	Sat Nov 17 21:01:46 2001
@@ -332,21 +332,6 @@ case $maketarg in
 	  echo "Including SSL functionality"
 	fi
 
-        if [ -s c-client ] ; then rm -f c-client ; fi
-        ln -s imap/c-client c-client
-        if [ -s mtest    ] ; then rm -f mtest    ; fi
-        ln -s imap/mtest mtest
-        if [ -s imapd    ] ; then rm -f imapd    ; fi
-        ln -s imap/imapd imapd
-        if [ -s ipopd    ] ; then rm -f ipopd    ; fi
-        ln -s imap/ipopd ipopd
-        echo "Making c-client library, imapd, and ipopd"
-	echo $S1 $S2 $S3 $S4 $K1 > imap/SPECIALS
-        cd $PHOME/imap
-        eval echo eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
-        eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
-        echo ''
-
         echo "Making Pico and Pilot"
         cd $PHOME/pico
         eval echo make "$makeargs" -f makefile.$picotarg
@@ -362,10 +347,6 @@ case $maketarg in
         cd $PHOME/bin
         rm -f pine mtest imapd pico pilot rpload rpdump ipop2d ipop3d
         if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
-        if [ -s ../mtest/mtest ] ;    then ln ../mtest/mtest mtest    ; fi
-        if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
-        if [ -s ../ipopd/ipop2d ] ;   then ln ../ipopd/ipop2d ipop2d  ; fi
-        if [ -s ../ipopd/ipop3d ] ;   then ln ../ipopd/ipop3d ipop3d  ; fi
         if [ -s ../pico/pico ] ;      then ln ../pico/pico pico       ; fi
         if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot     ; fi
         if [ -s ../pine/rpload ] ;    then ln ../pine/rpload rpload   ; fi
@@ -373,7 +354,7 @@ case $maketarg in
         cd $PHOME
         echo ''
         echo "Links to executables are in bin directory:"
-        size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/ipop2d bin/ipop3d
+        size bin/pine bin/pico bin/pilot bin/rpdump bin/rpload
 	case $maketarg in
 	    mnt)    echo "Fixing stacksizes ..."
 		    fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
@@ -409,16 +390,12 @@ case $maketarg in
 
 
     clean) # This only sort of works 
-        rm -f c-client mtest imapd ipopd
-        echo "Cleaning c-client and imapd"
-	cd $PHOME/imap
-	make clean
         echo "Cleaning Pine"
         cd $PHOME/pine
-        make -f makefile.ult clean
+        make -f makefile.bso clean
         echo "Cleaning pico"
         cd $PHOME/pico
-        make $makeargs -f makefile.ult clean
+        make $makeargs -f makefile.bso clean
         echo "Done"
         cd $PHOME
         ;;