diff options
| author | xtraeme <xtraeme> | 2004-01-16 06:40:50 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2004-01-16 06:40:50 +0000 |
| commit | 01c00e7081de7fa77ac72f357b4fd024341da35f (patch) | |
| tree | 81394ca1160a6464b58e46eb47ee451b6920444c | |
| parent | 08d5a36ccaa827aa93e2a744a1eabe8631b4274c (diff) | |
| download | pkgsrc-01c00e7081de7fa77ac72f357b4fd024341da35f.tar.gz | |
ilasm is installed by mono and pnet, add CONFLICTS between them and
bump PKGREVISION.
| -rw-r--r-- | doc/CHANGES | 4 | ||||
| -rw-r--r-- | lang/mono/Makefile | 8 | ||||
| -rw-r--r-- | lang/pnet/Makefile | 5 |
3 files changed, 13 insertions, 4 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 343977fa6dc..6afdc2b30dc 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -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 @@ Changes to the packages collection and infrastructure in 2004: 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 --git a/lang/mono/Makefile b/lang/mono/Makefile index f4c7e554ab2..9d7afac3c13 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -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 @@ COMMENT= Open source implementation of the .NET Development Framework 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 @@ REPLACE_PERL+= mono/metadata/make-bundle.pl 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 --git a/lang/pnet/Makefile b/lang/pnet/Makefile index 237e557fa93..badc9a6728a 100644 --- a/lang/pnet/Makefile +++ b/lang/pnet/Makefile @@ -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 @@ COMMENT= DotGNU Portable.NET (development tools) BUILD_DEPENDS= treecc>=0.2.6:../../devel/treecc +CONFLICTS= mono-[0-9]* + USE_GMAKE= yes USE_MAKEINFO= yes GNU_CONFIGURE= yes |