From 7e23fb52285887952473a623c5797cf3494a0354 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 22 Nov 2003 20:23:32 +0000 Subject: Make sure this port only conflicts with xchat-1.x, and not the xchat-systray-plugin. Noticed by: pav --- irc/xchat-gnome/Makefile | 2 +- irc/xchat2/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index 31a42190563d..63765934c2d6 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --enable-nls \ --enable-ipv6 \ --enable-perl -CONFLICTS= xchat-* +CONFLICTS= xchat-1* .if defined(WITH_SOCKS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile index 31a42190563d..63765934c2d6 100644 --- a/irc/xchat2/Makefile +++ b/irc/xchat2/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --enable-nls \ --enable-ipv6 \ --enable-perl -CONFLICTS= xchat-* +CONFLICTS= xchat-1* .if defined(WITH_SOCKS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 -- cgit v1.2.3