CVSROOT:        /cvs
Module name:    ports
Changes by:     [email protected]    2013/12/15 02:31:21

Modified files:
        x11/kde4/libkdcraw: Makefile 
        x11/kde4/libkdcraw/pkg: PLIST-icons PLIST-main 

Log message:
Tweak conflict markers more: the conflict between libkdcraw and kdelibs was
caused by share/apps/cmake/modules/FindKdcraw.cmake being supplied by both
packages. So:
1) -icons does not need to have this @conflict at all.
2) -main should not conflict with kdelibs-3.x and older.

Reply via email to