Module Name:	pkgsrc
Committed By:	hubertf
Date:		Sat Feb 20 22:48:48 UTC 1999

Modified Files:
	pkgsrc/archivers/bzip2: Makefile
	pkgsrc/archivers/unzip: Makefile
	pkgsrc/audio/mikmod: Makefile
	pkgsrc/audio/xmcd: Makefile
	pkgsrc/comms/mgetty+sendfax: Makefile
	pkgsrc/corba/ORBit: Makefile
	pkgsrc/databases/mysql: Makefile
	pkgsrc/databases/py-mysql: Makefile
	pkgsrc/devel/autoconf: Makefile
	pkgsrc/devel/cvs: Makefile
	pkgsrc/devel/ddd: Makefile
	pkgsrc/devel/gettext: Makefile
	pkgsrc/devel/glib: Makefile
	pkgsrc/devel/gmake: Makefile
	pkgsrc/devel/libtool: Makefile
	pkgsrc/editors/emacs: Makefile
	pkgsrc/editors/hexedit: Makefile
	pkgsrc/editors/pico: Makefile
	pkgsrc/editors/xemacs20: Makefile
	pkgsrc/emulators/wine: Makefile
	pkgsrc/emulators/xmame: Makefile
	pkgsrc/emulators/xmess: Makefile
	pkgsrc/games/angband-tty: Makefile
	pkgsrc/games/freeciv: Makefile
	pkgsrc/games/xblast: Makefile
	pkgsrc/graphics/ImageMagick: Makefile
	pkgsrc/graphics/Mesa: Makefile
	pkgsrc/graphics/fly: Makefile
	pkgsrc/graphics/imlib: Makefile
	pkgsrc/graphics/jpeg: Makefile
	pkgsrc/graphics/magicpoint: Makefile
	pkgsrc/graphics/netpbm: Makefile
	pkgsrc/graphics/png: Makefile
	pkgsrc/graphics/tgif: Makefile
	pkgsrc/graphics/xfig: Makefile
	pkgsrc/graphics/xpaint: Makefile
	pkgsrc/graphics/xpdf: Makefile
	pkgsrc/graphics/xpm: Makefile
	pkgsrc/lang/clisp: Makefile
	pkgsrc/lang/guile: Makefile
	pkgsrc/lang/jdk: Makefile
	pkgsrc/lang/kaffe: Makefile
	pkgsrc/lang/moscow_ml: Makefile
	pkgsrc/lang/scheme48: Makefile
	pkgsrc/mail/fetchmail: Makefile
	pkgsrc/mail/imap-uw: Makefile
	pkgsrc/mail/mutt: Makefile
	pkgsrc/mail/nmh: Makefile
	pkgsrc/mail/pine: Makefile
	pkgsrc/mail/qpopper: Makefile
	pkgsrc/mail/wmmail: Makefile
	pkgsrc/math/R: Makefile
	pkgsrc/math/abs: Makefile
	pkgsrc/math/xlispstat: Makefile
	pkgsrc/mbone/rat: Makefile
	pkgsrc/mbone/sdr: Makefile
	pkgsrc/misc/screen: Makefile
	pkgsrc/net/arpwatch: Makefile
	pkgsrc/net/rsync: Makefile
	pkgsrc/net/samba: Makefile
	pkgsrc/net/ucd-snmp: Makefile
	pkgsrc/net/wget: Makefile
	pkgsrc/net/wu-ftpd: Makefile
	pkgsrc/net/zircon: Makefile
	pkgsrc/news/suck: Makefile
	pkgsrc/pkgtools/pkglibtool: Makefile
	pkgsrc/print/a2ps: Makefile
	pkgsrc/print/enscript: Makefile
	pkgsrc/print/ghostscript5: Makefile
	pkgsrc/print/magicfilter: Makefile
	pkgsrc/print/psutils: Makefile
	pkgsrc/print/transfig: Makefile
	pkgsrc/security/ssh: Makefile
	pkgsrc/security/ssleay: Makefile
	pkgsrc/security/sudo: Makefile
	pkgsrc/shells/bash2: Makefile
	pkgsrc/sysutils/addnerd: Makefile
	pkgsrc/sysutils/cdrecord: Makefile
	pkgsrc/sysutils/mkisofs: Makefile
	pkgsrc/sysutils/xosview: Makefile
	pkgsrc/textproc/rman: Makefile
	pkgsrc/www/apache: Makefile
	pkgsrc/www/lynx: Makefile
	pkgsrc/www/mozilla: Makefile
	pkgsrc/www/squid-current: Makefile
	pkgsrc/www/squid: Makefile
	pkgsrc/www/wwwoffle: Makefile
	pkgsrc/www/zope: Makefile
	pkgsrc/x11/XF86Setup: Makefile
	pkgsrc/x11/Xaw-Xpm: Makefile
	pkgsrc/x11/Xaw3d: Makefile
	pkgsrc/x11/afterstep: Makefile
	pkgsrc/x11/asclock: Makefile
	pkgsrc/x11/gnome-libs: Makefile
	pkgsrc/x11/gtk: Makefile
	pkgsrc/x11/lesstif: Makefile
	pkgsrc/x11/qt: Makefile
	pkgsrc/x11/windowmaker: Makefile
	pkgsrc/x11/wmthemes: Makefile
	pkgsrc/x11/xlockmore: Makefile
	pkgsrc/x11/xscreensaver: Makefile
	pkgsrc/x11/xwrits: Makefile
Log Message:
Fix CONFLICTS (remove redundancy, mostly)