From 4d554d38d276b38bc891c0b063381d1a8980e82d Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sat, 29 Jan 2005 09:00:19 +0000
Subject: Merge CONFLICTS change from ports tree.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3547 df743ca5-7f9a-e211-a948-0013205c9059
---
 net/gaim/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index da13eed58..78e76aaa3 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Multi-protocol instant messaging client
 
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
-CONFLICTS?=	ja-gaim-*
+CONFLICTS?=	ja-gaim-[0-9]*
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-- 
cgit