Module Name:	pkgsrc
Committed By:	tv
Date:		Fri Apr 30 17:15:31 UTC 1999

Modified Files:
	pkgsrc/net: Makefile
Log Message:
Add and enable icsi-finger, and sort.  Also enable both socks4 and socks5
simultaneously; the CONFLICTS= logic is meant to handle that situation.