[Midnightbsd-cvs] mports: Makefile: add conflicts, master site

[laffer1 at midnightbsd.org]

Log Message:
-----------
add conflicts, master site

Modified Files:
--------------
    mports/graphics/linux-jpeg:
        Makefile (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/mports/graphics/linux-jpeg/Makefile?r1=1.3&r2=1.4)