Changes: * Backport changes from emulators/i386-wine-devel * Fix CONFLICTS_INSTALL [1] Approved by: gerald [1]
Subversion and pre-commit hooks are not cooperating in the changes required for i386-wine(-devel). For the historians: This file is a copy of i386-wine-devel/Makefile as at version 321106.