pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net Mark amule and xmule as conflicting.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7390bc3d3ac4
branches:  trunk
changeset: 465897:7390bc3d3ac4
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Jan 07 23:07:27 2004 +0000

description:
Mark amule and xmule as conflicting.

diffstat:

 net/amule/Makefile |  4 +++-
 net/xmule/Makefile |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r a176aeeddf26 -r 7390bc3d3ac4 net/amule/Makefile
--- a/net/amule/Makefile        Wed Jan 07 22:05:39 2004 +0000
+++ b/net/amule/Makefile        Wed Jan 07 23:07:27 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/07 21:46:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/07 23:07:27 jmmv Exp $
 #
 
 DISTNAME=              aMule-1.2.3
@@ -15,6 +15,8 @@
 DEPENDS=               gnome2-dirs>=1.2:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=     yes
 
+CONFLICTS=             xmule-[0-9]*
+
 USE_BUILDLINK2=                yes
 USE_GMAKE=             yes
 USE_PKGLOCALEDIR=      yes
diff -r a176aeeddf26 -r 7390bc3d3ac4 net/xmule/Makefile
--- a/net/xmule/Makefile        Wed Jan 07 22:05:39 2004 +0000
+++ b/net/xmule/Makefile        Wed Jan 07 23:07:27 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/07 21:46:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/07 23:07:27 jmmv Exp $
 #
 
 DISTNAME=      xmule-1.7.1
@@ -15,6 +15,8 @@
 DEPENDS=               gnome2-dirs>=1.2:../../misc/gnome2-dirs
 DEPENDS+=              wget>=1.8.2:../../net/wget
 
+CONFLICTS=             amule-[0-9]*
+
 GNU_CONFIGURE=         YES
 USE_BUILDLINK2=                YES
 USE_GMAKE=             YES



Home | Main Index | Thread Index | Old Index