From a03a7893cb23fe5fd0c19b242784ce09b02950c8 Mon Sep 17 00:00:00 2001
From: Max Khon <fjoe@FreeBSD.org>
Date: Sun, 20 Feb 2005 19:04:45 +0000
Subject: [PATCH] - This port conflicts with wxgtk2-contrib-devel-2.5.2 (common
 file lib/libwx_gtk2_xrc-2.5.so). - Bump PORTREVISION.

PR:		76692
---
 x11-toolkits/wxgtk2-devel/Makefile | 5 +++++
 x11-toolkits/wxgtk26/Makefile      | 5 +++++
 x11-toolkits/wxgtk28/Makefile      | 5 +++++
 x11-toolkits/wxgtk29/Makefile      | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/x11-toolkits/wxgtk2-devel/Makefile b/x11-toolkits/wxgtk2-devel/Makefile
index 8c7b436449c1..40562b873871 100644
--- a/x11-toolkits/wxgtk2-devel/Makefile
+++ b/x11-toolkits/wxgtk2-devel/Makefile
@@ -49,6 +49,11 @@ NO_LATEST_LINK=	yes
 
 WXGTK_FLAVOR?=	gtk2
 
+.if ${WXGTK_FLAVOR} == "gtk2"
+PORTREVISION=	1
+CONFLICTS=	wxgtk2-contrib-devel-2.5.2
+.endif
+
 .if ${WXGTK_FLAVOR} != "gtk2-common"
 RUN_DEPENDS=	${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
 .endif
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index 8c7b436449c1..40562b873871 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -49,6 +49,11 @@ NO_LATEST_LINK=	yes
 
 WXGTK_FLAVOR?=	gtk2
 
+.if ${WXGTK_FLAVOR} == "gtk2"
+PORTREVISION=	1
+CONFLICTS=	wxgtk2-contrib-devel-2.5.2
+.endif
+
 .if ${WXGTK_FLAVOR} != "gtk2-common"
 RUN_DEPENDS=	${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
 .endif
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 8c7b436449c1..40562b873871 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -49,6 +49,11 @@ NO_LATEST_LINK=	yes
 
 WXGTK_FLAVOR?=	gtk2
 
+.if ${WXGTK_FLAVOR} == "gtk2"
+PORTREVISION=	1
+CONFLICTS=	wxgtk2-contrib-devel-2.5.2
+.endif
+
 .if ${WXGTK_FLAVOR} != "gtk2-common"
 RUN_DEPENDS=	${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
 .endif
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index 8c7b436449c1..40562b873871 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -49,6 +49,11 @@ NO_LATEST_LINK=	yes
 
 WXGTK_FLAVOR?=	gtk2
 
+.if ${WXGTK_FLAVOR} == "gtk2"
+PORTREVISION=	1
+CONFLICTS=	wxgtk2-contrib-devel-2.5.2
+.endif
+
 .if ${WXGTK_FLAVOR} != "gtk2-common"
 RUN_DEPENDS=	${X11BASE}/include/wx-2.5/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2-common-devel
 .endif