summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-10-01 00:05:00 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-10-01 00:05:00 +0800
commit16dbea21019475309166407fe8309109f5e8e2b1 (patch)
tree3c031122cf0d7a3762a425d1849d93b86d6bcb90
parent4396d4473094f230d186c5b8ea150afde5c04bb4 (diff)
downloadmarcuscom-ports-16dbea21019475309166407fe8309109f5e8e2b1.tar
marcuscom-ports-16dbea21019475309166407fe8309109f5e8e2b1.tar.gz
marcuscom-ports-16dbea21019475309166407fe8309109f5e8e2b1.tar.bz2
marcuscom-ports-16dbea21019475309166407fe8309109f5e8e2b1.tar.lz
marcuscom-ports-16dbea21019475309166407fe8309109f5e8e2b1.tar.xz
marcuscom-ports-16dbea21019475309166407fe8309109f5e8e2b1.tar.zst
marcuscom-ports-16dbea21019475309166407fe8309109f5e8e2b1.zip
Add a CONFLICT on gaim-devel.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7426 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--net-im/gaim/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 1bc2329b0..74a0ffdaf 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/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-[0-9]*
+CONFLICTS?= ja-gaim-[0-9]* gaim-devel-2*
USE_XLIB= yes
USE_GETTEXT= yes