CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:        /cvs
Module name:    ports
Changes by:     st...@cvs.openbsd.org   2014/06/03 08:28:40

Modified files:
        security/john  : Makefile 
        security/john/pkg: PLIST 

Log message:
add conflict marker