From abd5373792aacfb4822c885bcbd1934e0abaa679 Mon Sep 17 00:00:00 2001
From: mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Wed, 30 May 2007 18:35:53 +0000
Subject: Sync w/ FreeBSD ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8952 df743ca5-7f9a-e211-a948-0013205c9059
---
 net-im/libpurple/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'net-im')

diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 6a15ee95f..ba397bf94 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net-im/libpurple/Makefile,v 1.18 2007/05/28 18:56:33 marcus Exp $
+#   $MCom: ports/net-im/libpurple/Makefile,v 1.19 2007/05/30 03:21:43 mezz Exp $
 #
 
 PORTNAME?=	libpurple
@@ -17,8 +17,6 @@ DISTNAME=	pidgin-${PORTVERSION}
 MAINTAINER?=	marcus@FreeBSD.org
 COMMENT?=	Backend library for the Pidgin multi-protocol messaging client
 
-CONFLICTS?=	ja-gaim-[0-9]* gaim-1*
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME?=	gnomeprefix gnomehack intlhack glib20
-- 
cgit v1.2.3