CVS commit: pkgsrc/x11

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Wed Jan  6 21:42:28 UTC 2016

Modified Files:
        pkgsrc/x11/Xaw-Xpm: Makefile
        pkgsrc/x11/libXaw3d: Makefile

Log Message:
Update CONFLICTS.

x11/Xaw3d no longer exists in pkgsrc (hi wiz@! :)) and so Xaw-Xpm now conflicts
with libXaw3d and viceversa.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/Xaw-Xpm/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXaw3d/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.