[pkgsrc/trunk]: pkgsrc ilasm is installed by mono and pnet, add CONFLICTS bet...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/da00e3ac893f
branches:  trunk
changeset: 466353:da00e3ac893f
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Jan 16 06:40:50 2004 +0000

description:
ilasm is installed by mono and pnet, add CONFLICTS between them and
bump PKGREVISION.

diffstat:

 doc/CHANGES        |  4 +++-
 lang/mono/Makefile |  8 ++++++--
 lang/pnet/Makefile |  5 ++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diffs (69 lines):

diff -r 55d455202949 -r da00e3ac893f doc/CHANGES
--- a/doc/CHANGES       Fri Jan 16 03:47:06 2004 +0000
+++ b/doc/CHANGES       Fri Jan 16 06:40:50 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4473 2004/01/16 02:46:46 xtraeme Exp $
+$NetBSD: CHANGES,v 1.4474 2004/01/16 06:41:52 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -297,3 +297,5 @@
        Updated gnome-panel to 2.4.2 [xtraeme 2004-01-16]
        Updated gnome-session to 2.4.2 [xtraeme 2004-01-16]
        Updated gcalctool to 4.3.38 [xtraeme 2004-01-16]
+       Updated mono to 0.29nb1 [xtraeme 2004-01-16]
+       Updated pnet to 0.6.2nb1 [xtraeme 2004-01-16]
diff -r 55d455202949 -r da00e3ac893f lang/mono/Makefile
--- a/lang/mono/Makefile        Fri Jan 16 03:47:06 2004 +0000
+++ b/lang/mono/Makefile        Fri Jan 16 06:40:50 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/12/03 17:08:24 recht Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/16 06:40:50 xtraeme Exp $
 #
 
 DISTNAME=      mono-0.29
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://www.go-mono.org/archive/
 
@@ -11,6 +12,8 @@
 
 BUILD_DEPENDS+=                bison-[0-9]*:../../devel/bison
 
+CONFLICTS=             pnet-[0-9]*
+
 # XXX please test
 NOT_FOR_PLATFORM=      NetBSD-1.[0-5]*-*
 NOT_FOR_PLATFORM+=     NetBSD-1.6-* NetBSD-1.6.*-*
@@ -38,7 +41,8 @@
 EGDIR=         ${PREFIX}/share/examples/mono
 CONF_FILES=    ${EGDIR}/config ${PKG_SYSCONFDIR}/config
 CONF_FILES+=   ${EGDIR}/machine.config ${PKG_SYSCONFDIR}/machine.config
-CONF_FILES+=   ${EGDIR}/DefaultWsdlHelpGenerator.aspx ${PKG_SYSCONFDIR}/DefaultWsdlHelpGenerator.aspx
+CONF_FILES+=   ${EGDIR}/DefaultWsdlHelpGenerator.aspx \
+               ${PKG_SYSCONFDIR}/DefaultWsdlHelpGenerator.aspx
 
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
diff -r 55d455202949 -r da00e3ac893f lang/pnet/Makefile
--- a/lang/pnet/Makefile        Fri Jan 16 03:47:06 2004 +0000
+++ b/lang/pnet/Makefile        Fri Jan 16 06:40:50 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/12 17:13:31 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/16 06:40:50 xtraeme Exp $
 #
 
 DISTNAME=      pnet-0.6.2
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://www.southern-storm.com.au/download/
 
@@ -11,6 +12,8 @@
 
 BUILD_DEPENDS= treecc>=0.2.6:../../devel/treecc
 
+CONFLICTS=     mono-[0-9]*
+
 USE_GMAKE=     yes
 USE_MAKEINFO=  yes
 GNU_CONFIGURE= yes