summaryrefslogtreecommitdiff
path: root/chat/jabberd
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2004-04-07 13:13:18 +0000
committersalo <salo@pkgsrc.org>2004-04-07 13:13:18 +0000
commit7dfdddda6476704061c8fa76d6eca92bb3458efa (patch)
tree42dcc85e13e765a60b5a71b275c1df8e23abe4e6 /chat/jabberd
parent99de4ba34fc6f9944bd4aa97b79ef4f81d12f7c8 (diff)
downloadpkgsrc-7dfdddda6476704061c8fa76d6eca92bb3458efa.tar.gz
Fix CONFLICTS. (hi xtraeme!)
Diffstat (limited to 'chat/jabberd')
-rw-r--r--chat/jabberd/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile
index 860733486bc..35a746e60e4 100644
--- a/chat/jabberd/Makefile
+++ b/chat/jabberd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/03/26 02:27:35 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/07 13:13:18 salo Exp $
#
DISTNAME= jabber-1.4.2
@@ -12,7 +12,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://jabberd.jabberstudio.org/1.4/
COMMENT= Instant messaging server
-CONFLICTS= jabberd2-[0-9]*:../../wip/jabberd2
+CONFLICTS= jabberd2-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews