you have to get hte pulley online, they are hard to find.
the integral pipe and non-integral are the same pump, just one the pipe is pressed in place, if i remember right. i had to unscrew my pipe and screw it into the new water pump.
also, when you buy your new pump, fellow 87 owner (i learned this the hard way), take your old one and lay it on the bench next to the new one and measure to make sure the pulley mounting surface is the same height on both. there are 3 or 4 water pumps that the store will show fit yours and you will probably have to go to a few parts places to find the right one. the blades on the impeller need to be facing the right direction and the heights need to be the same so make sure they are identical or you will be back and back and back
I don't feel like working on anything at this time so i sold my yj.