svn commit: r470368 - in head/emulators: wine-gecko wine-gecko-devel wine-mono wine-mono-devel

[Stefan Esser]

Author: se
Date: Sat May 19 07:59:57 2018
New Revision: 470368
URL: https://svnweb.freebsd.org/changeset/ports/470368

Log:
  Add CONFLICTS entries that prevent simultaneous installation of normal
  and devel versions of these ports. While these are allowed when the devel
  versions are newer than the normal versions, this is not always the case
  and especially not at this time. Instead of only conflicting with the
  same version of each port, a version wildcard is used, to prevent
  unexpected behavior if the non-devel version is updated to match the
  devel version when both are installed.
  
  Approved by:	gerald (maintainer)

Modified:
  head/emulators/wine-gecko-devel/Makefile
  head/emulators/wine-gecko/Makefile
  head/emulators/wine-mono-devel/Makefile
  head/emulators/wine-mono/Makefile

Modified: head/emulators/wine-gecko-devel/Makefile
==============================================================================
--- head/emulators/wine-gecko-devel/Makefile	Sat May 19 07:54:21 2018	(r470367)
+++ head/emulators/wine-gecko-devel/Makefile	Sat May 19 07:59:57 2018	(r470368)
@@ -16,10 +16,12 @@ COMMENT=	Gecko Layout Engine for Wine development bran
 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

Modified: head/emulators/wine-gecko/Makefile
==============================================================================
--- head/emulators/wine-gecko/Makefile	Sat May 19 07:54:21 2018	(r470367)
+++ head/emulators/wine-gecko/Makefile	Sat May 19 07:59:57 2018	(r470368)
@@ -17,10 +17,12 @@ 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

Modified: head/emulators/wine-mono-devel/Makefile
==============================================================================
--- head/emulators/wine-mono-devel/Makefile	Sat May 19 07:54:21 2018	(r470367)
+++ head/emulators/wine-mono-devel/Makefile	Sat May 19 07:59:57 2018	(r470368)
@@ -15,10 +15,12 @@ COMMENT=	Mono .NET implementation for Wine development
 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

Modified: head/emulators/wine-mono/Makefile
==============================================================================
--- head/emulators/wine-mono/Makefile	Sat May 19 07:54:21 2018	(r470367)
+++ head/emulators/wine-mono/Makefile	Sat May 19 07:59:57 2018	(r470368)
@@ -16,10 +16,12 @@ 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