Index: head/emulators/wine-gecko/Makefile
===================================================================
--- head/emulators/wine-gecko/Makefile	(revision 470367)
+++ head/emulators/wine-gecko/Makefile	(revision 470368)
@@ -1,30 +1,32 @@
 # Created by: David Naylor <naylor.b.david@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	wine-gecko
 DISTVERSION=	2.47
 CATEGORIES=	emulators
 MASTER_SITES=	http://dl.winehq.org/wine/wine-gecko/${DISTVERSION}/
 DISTNAME=	wine_gecko-${DISTVERSION}-x86
 EXTRACT_SUFX=	.msi
 EXTRACT_ONLY=
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Gecko Layout Engine for Wine (HTML support)
 
 LICENSE=	MPL20 GPLv2 GPLv3 LGPL21 LGPL3
 LICENSE_COMB=	multi
 
 PORTSCOUT=	ignore:1	# for newer versions see emulators/wine-gecko-devel
 
+CONFLICTS_INSTALL=	wine-gecko-devel-[0-9]*
+
 NO_BUILD=	yes
 PLIST_SUB+=	GECKO_VERSION="${DISTVERSION}"
 DATADIR=	${PREFIX}/share/wine
-PLIST_FILES=	%%DATADIR%%/gecko/wine_gecko-%%GECKO_VERSION%%-x86.msi
+PLIST_FILES=	${DATADIR}/gecko/wine_gecko-${DISTVERSION}-x86.msi
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/gecko
 	${INSTALL_DATA} ${DISTDIR}/wine_gecko-${DISTVERSION}-x86.msi \
 		${STAGEDIR}${DATADIR}/gecko
 
 .include <bsd.port.mk>
Index: head/emulators/wine-gecko-devel/Makefile
===================================================================
--- head/emulators/wine-gecko-devel/Makefile	(revision 470367)
+++ head/emulators/wine-gecko-devel/Makefile	(revision 470368)
@@ -1,29 +1,31 @@
 # Created by: David Naylor <naylor.b.david@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	wine-gecko
 DISTVERSION=	2.47
 CATEGORIES=	emulators
 MASTER_SITES=	http://dl.winehq.org/wine/wine-gecko/${DISTVERSION}/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	wine_gecko-${DISTVERSION}-x86
 EXTRACT_SUFX=	.msi
 EXTRACT_ONLY=
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Gecko Layout Engine for Wine development branch (HTML support)
 
 LICENSE=	MPL20 GPLv2 GPLv3 LGPL21 LGPL3
 LICENSE_COMB=	multi
 
+CONFLICTS_INSTALL=	wine-gecko-[0-9]*
+
 NO_BUILD=	yes
 PLIST_SUB+=	GECKO_VERSION="${DISTVERSION}"
 DATADIR=	${PREFIX}/share/wine
-PLIST_FILES=	%%DATADIR%%/gecko/wine_gecko-%%GECKO_VERSION%%-x86.msi
+PLIST_FILES=	${DATADIR}/gecko/wine_gecko-${DISTVERSION}-x86.msi
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/gecko
 	${INSTALL_DATA} ${DISTDIR}/wine_gecko-${DISTVERSION}-x86.msi \
 		${STAGEDIR}${DATADIR}/gecko
 
 .include <bsd.port.mk>
Index: head/emulators/wine-mono/Makefile
===================================================================
--- head/emulators/wine-mono/Makefile	(revision 470367)
+++ head/emulators/wine-mono/Makefile	(revision 470368)
@@ -1,29 +1,31 @@
 # Created by: David Naylor <naylor.b.david@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	wine-mono
 DISTVERSION=	4.7.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://dl.winehq.org/wine/wine-mono/${DISTVERSION}/
 EXTRACT_SUFX=	.msi
 EXTRACT_ONLY=
 
 MAINTAINER=	dbn@FreeBSD.org
 COMMENT=	Mono .NET implementation for Wine development branch (HTML support)
 
 LICENSE=	MIT GPLv2 LGPL20
 LICENSE_COMB=	multi
 
 PORTSCOUT=	ignore:1	# for newer versions see emulators/wine-mono-devel
 
+CONFLICTS_INSTALL=	wine-mono-devel-[0-9]*
+
 NO_BUILD=	yes
 PLIST_SUB+=	MONO_VERSION="${DISTVERSION}"
 DATADIR=	${PREFIX}/share/wine
-PLIST_FILES=	%%DATADIR%%/mono/wine-mono-%%MONO_VERSION%%.msi
+PLIST_FILES=	${DATADIR}/mono/wine-mono-${DISTVERSION}.msi
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/mono
 	${INSTALL_DATA} ${DISTDIR}/wine-mono-${DISTVERSION}.msi \
 		${STAGEDIR}${DATADIR}/mono
 
 .include <bsd.port.mk>
Index: head/emulators/wine-mono-devel/Makefile
===================================================================
--- head/emulators/wine-mono-devel/Makefile	(revision 470367)
+++ head/emulators/wine-mono-devel/Makefile	(revision 470368)
@@ -1,28 +1,30 @@
 # Created by: David Naylor <naylor.b.david@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	wine-mono
 DISTVERSION=	4.7.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://dl.winehq.org/wine/wine-mono/${DISTVERSION}/
 PKGNAMESUFFIX=	-devel
 EXTRACT_SUFX=	.msi
 EXTRACT_ONLY=
 
 MAINTAINER=	dbn@FreeBSD.org
 COMMENT=	Mono .NET implementation for Wine development branch (HTML support)
 
 LICENSE=	MIT GPLv2 LGPL20
 LICENSE_COMB=	multi
 
+CONFLICTS_INSTALL=	wine-mono-[0-9]*
+
 NO_BUILD=	yes
 PLIST_SUB+=	MONO_VERSION="${DISTVERSION}"
 DATADIR=	${PREFIX}/share/wine
-PLIST_FILES=	%%DATADIR%%/mono/wine-mono-%%MONO_VERSION%%.msi
+PLIST_FILES=	${DATADIR}/mono/wine-mono-${DISTVERSION}.msi
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/mono
 	${INSTALL_DATA} ${DISTDIR}/wine-mono-${DISTVERSION}.msi \
 		${STAGEDIR}${DATADIR}/mono
 
 .include <bsd.port.mk>