kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to mono-1.9

Browse source 
Between the release of 1.2.6 and 1.9 more than 400 bugs were fixed.
This commit is contained in:
kefren 2008-04-19 18:42:10 +00:00
parent b4415d1d0b
commit 613396ade2
9 changed files with 90 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lang/mono/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.63 2008/02/18 11:58:56 kefren Exp $
# $NetBSD: Makefile,v 1.64 2008/04/19 18:42:10 kefren Exp $
DISTNAME= mono-${MONO_VERSION}
CATEGORIES= lang
@ -13,12 +13,7 @@ BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
CONFLICTS= pnet-[0-9]*
.include "../../lang/mono/Makefile.version"
# XXX please test
NOT_FOR_PLATFORM= NetBSD-1.[0-5]*-*
NOT_FOR_PLATFORM+= NetBSD-1.6-* NetBSD-1.6.*-*
NOT_FOR_PLATFORM+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-*
.include "../../lang/mono/Makefile.common"
USE_TOOLS+= bison gmake gtar perl:run pkg-config bash:run
USE_LIBTOOL= yes
@ -30,6 +25,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --with-icu=yes
CONFIGURE_ARGS+= --with-preview=yes
CONFIGURE_ARGS+= --with-libgdiplus=installed
CONFIGURE_ARGS+= --with-moonlight=no
MAKE_FLAGS+= PERL=${PERL5:Q}
MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
@ -37,11 +33,11 @@ UNLIMIT_RESOURCES= datasize
UNLIMIT_RESOURCES+= stacksize
UNLIMIT_RESOURCES+= memorysize
PKGCONFIG_OVERRIDE+= mono-uninstalled.pc.in
PKGCONFIG_OVERRIDE+= data/cecil.pc.in
PKGCONFIG_OVERRIDE+= data/dotnet.pc.in
PKGCONFIG_OVERRIDE+= data/mint.pc.in
PKGCONFIG_OVERRIDE+= data/mono-cairo.pc.in
PKGCONFIG_OVERRIDE+= mono-uninstalled.pc.in
PKGCONFIG_OVERRIDE+= data/mono.pc.in
PKGCONFIG_OVERRIDE+= scripts/mono-nunit.pc.in
@ -57,11 +53,11 @@ REPLACE_PERL+= mono/tests/stress-runner.pl
REPLACE_BASH+= mono/arch/arm/dpiops.sh
REPLACE_BASH+= mono/arch/arm/fpaops.sh
REPLACE_BASH+= mono/arch/arm/vfpops.sh
REPLACE_BASH+= mono/tests/make_imt_test.sh
REPLACE_BASH+= scripts/mono-find-provides.in
REPLACE_BASH+= scripts/mono-find-requires.in
REPLACE_BASH+= scripts/mono-nunit.pc.in
REPLACE_BASH+= scripts/mono-test-install
REPLACE_BASH+= web/mono-build-w32.sh
REPLACE_BASH+= mcs/class/Mono.Mozilla/build-csproj2k5
REPLACE_BASH+= mcs/class/Managed.Windows.Forms/build-csproj
REPLACE_BASH+= mcs/class/Managed.Windows.Forms/build-csproj2k5
REPLACE_BASH+= mcs/class/Mono.Cairo/Samples/gtk/compile.sh
@ -69,7 +65,6 @@ REPLACE_BASH+= mcs/class/Mono.Cairo/Samples/png/compile.sh
REPLACE_BASH+= mcs/class/Mono.Cairo/Samples/win32/compile.sh
REPLACE_BASH+= mcs/class/Mono.Cairo/Samples/x11/compile.sh
REPLACE_BASH+= mcs/tools/tinderbox/tinderbox.sh
REPLACE_BASH+= web/mono-build-w32.sh
EGDIR= ${PREFIX}/share/examples/mono
CONF_FILES= ${EGDIR}/config ${PKG_SYSCONFDIR}/mono/config

5
lang/mono/Makefile.common Normal file
View file

@ -0,0 +1,5 @@
# $NetBSD: Makefile.common,v 1.1 2008/04/19 18:42:10 kefren Exp $
MONO_VERSION= 1.9
ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q}

3
lang/mono/Makefile.version
View file

@ -1,3 +0,0 @@
# $NetBSD: Makefile.version,v 1.1 2008/02/13 14:16:43 kefren Exp $
MONO_VERSION= 1.2.6

31
lang/mono/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.23 2008/02/15 15:57:14 kefren Exp $
@comment $NetBSD: PLIST,v 1.24 2008/04/19 18:42:10 kefren Exp $
bin/al
bin/al2
bin/caspol
@ -218,6 +218,8 @@ lib/mono/1.0/ictool.exe
lib/mono/1.0/ictool.exe.mdb
lib/mono/1.0/ilasm.exe
lib/mono/1.0/ilasm.exe.mdb
lib/mono/1.0/installutil.exe
lib/mono/1.0/installutil.exe.mdb
lib/mono/1.0/installvst.exe
lib/mono/1.0/installvst.exe.mdb
lib/mono/1.0/macpack.exe
@ -318,6 +320,7 @@ lib/mono/2.0/Mono.Mozilla.dll
lib/mono/2.0/Mono.Posix.dll
lib/mono/2.0/Mono.Security.Win32.dll
lib/mono/2.0/Mono.Security.dll
lib/mono/2.0/Mono.Web.dll
lib/mono/2.0/Novell.Directory.Ldap.dll
lib/mono/2.0/Npgsql.dll
lib/mono/2.0/OpenSystem.C.dll
@ -356,6 +359,8 @@ lib/mono/2.0/httpcfg.exe
lib/mono/2.0/httpcfg.exe.mdb
lib/mono/2.0/ilasm.exe
lib/mono/2.0/ilasm.exe.mdb
lib/mono/2.0/installutil.exe
lib/mono/2.0/installutil.exe.mdb
lib/mono/2.0/mconfig.exe
lib/mono/2.0/mconfig.exe.mdb
lib/mono/2.0/mkbundle.exe
@ -370,6 +375,10 @@ lib/mono/2.0/mscorlib.dll.mdb
lib/mono/2.0/nunit-console.exe
lib/mono/2.0/nunit-console.exe.config
lib/mono/2.0/nunit-console.exe.mdb
lib/mono/2.0/nunit.core.dll
lib/mono/2.0/nunit.framework.dll
lib/mono/2.0/nunit.mocks.dll
lib/mono/2.0/nunit.util.dll
lib/mono/2.0/resgen.exe
lib/mono/2.0/resgen.exe.mdb
lib/mono/2.0/sgen.exe
@ -379,6 +388,9 @@ lib/mono/2.0/wsdl.exe.mdb
lib/mono/2.0/xbuild.exe
lib/mono/2.0/xbuild.exe.mdb
lib/mono/2.0/xbuild.rsp
lib/mono/3.5/System.Web.Extensions.Design.dll
lib/mono/3.5/System.Web.Extensions.dll
lib/mono/3.5/System.Xml.Linq.dll
lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll
lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll
lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll
@ -499,8 +511,8 @@ lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll
lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll.mdb
lib/mono/gac/Mono.Http/2.0.0.0__0738eb9f132ed756/Mono.Http.dll
lib/mono/gac/Mono.Http/2.0.0.0__0738eb9f132ed756/Mono.Http.dll.mdb
lib/mono/gac/Mono.Mozilla/0.1.0.0__0738eb9f132ed756/Mono.Mozilla.dll
lib/mono/gac/Mono.Mozilla/0.1.0.0__0738eb9f132ed756/Mono.Mozilla.dll.mdb
lib/mono/gac/Mono.Mozilla/0.2.0.0__0738eb9f132ed756/Mono.Mozilla.dll
lib/mono/gac/Mono.Mozilla/0.2.0.0__0738eb9f132ed756/Mono.Mozilla.dll.mdb
lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll
lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll.mdb
lib/mono/gac/Mono.Posix/2.0.0.0__0738eb9f132ed756/Mono.Posix.dll
@ -513,6 +525,8 @@ lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll
lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756/Mono.Security.dll.mdb
lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756/Mono.Security.dll
lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756/Mono.Security.dll.mdb
lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll.mdb
lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll
lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll.mdb
lib/mono/gac/Novell.Directory.Ldap/2.0.0.0__0738eb9f132ed756/Novell.Directory.Ldap.dll
@ -607,6 +621,8 @@ lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089/System.Windows.Fo
lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089/System.Windows.Forms.dll.mdb
lib/mono/gac/System.Windows.Forms/2.0.0.0__b77a5c561934e089/System.Windows.Forms.dll
lib/mono/gac/System.Windows.Forms/2.0.0.0__b77a5c561934e089/System.Windows.Forms.dll.mdb
lib/mono/gac/System.Xml.Linq/3.5.0.0__b77a5c561934e089/System.Xml.Linq.dll
lib/mono/gac/System.Xml.Linq/3.5.0.0__b77a5c561934e089/System.Xml.Linq.dll.mdb
lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089/System.Xml.dll
lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089/System.Xml.dll.mdb
lib/mono/gac/System.Xml/2.0.0.0__b77a5c561934e089/System.Xml.dll
@ -683,6 +699,7 @@ share/examples/mono/1.0/DefaultWsdlHelpGenerator.aspx
share/examples/mono/1.0/machine.config
share/examples/mono/2.0/DefaultWsdlHelpGenerator.aspx
share/examples/mono/2.0/machine.config
share/examples/mono/2.0/settings.map
share/examples/mono/2.0/web.config
share/examples/mono/browscap.ini
share/examples/mono/config
@ -754,6 +771,8 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
@dirrm lib/mono/gac/System/1.0.5000.0__b77a5c561934e089
@dirrm lib/mono/gac/System.Xml/2.0.0.0__b77a5c561934e089
@dirrm lib/mono/gac/System.Xml/1.0.5000.0__b77a5c561934e089
@dirrm lib/mono/gac/System.Xml.Linq/3.5.0.0__b77a5c561934e089
@dirrm lib/mono/gac/System.Xml.Linq
@dirrm lib/mono/gac/System.Xml
@dirrm lib/mono/gac/System.Windows.Forms/2.0.0.0__b77a5c561934e089
@dirrm lib/mono/gac/System.Windows.Forms/1.0.5000.0__b77a5c561934e089
@ -829,6 +848,8 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
@dirrm lib/mono/gac/Novell.Directory.Ldap/2.0.0.0__0738eb9f132ed756
@dirrm lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756
@dirrm lib/mono/gac/Novell.Directory.Ldap
@dirrm lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756
@dirrm lib/mono/gac/Mono.Web
@dirrm lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756
@dirrm lib/mono/gac/Mono.Security/1.0.5000.0__0738eb9f132ed756
@dirrm lib/mono/gac/Mono.Security.Win32/2.0.0.0__0738eb9f132ed756
@ -838,7 +859,7 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
@dirrm lib/mono/gac/Mono.Posix/2.0.0.0__0738eb9f132ed756
@dirrm lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756
@dirrm lib/mono/gac/Mono.Posix
@dirrm lib/mono/gac/Mono.Mozilla/0.1.0.0__0738eb9f132ed756
@dirrm lib/mono/gac/Mono.Mozilla/0.2.0.0__0738eb9f132ed756
@dirrm lib/mono/gac/Mono.Mozilla
@dirrm lib/mono/gac/Mono.Http/2.0.0.0__0738eb9f132ed756
@dirrm lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756
@ -935,6 +956,7 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
@dirrm lib/mono/gac
@dirrm lib/mono/compat-2.0
@dirrm lib/mono/compat-1.0
@dirrm lib/mono/3.5
@dirrm lib/mono/2.0/MSBuild
@dirrm lib/mono/2.0
@dirrm lib/mono/1.0
@ -945,5 +967,4 @@ share/mono-1.0/mono/cil/cil-opcodes.xml
@dirrm include/mono-1.0/mono/io-layer
@dirrm include/mono-1.0/mono/interpreter
@dirrm include/mono-1.0/mono/cil
@dirrm include/mono-1.0/mono
@dirrm include/mono-1.0

6
lang/mono/buildlink3.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.25 2008/03/21 14:52:15 kefren Exp $
# $NetBSD: buildlink3.mk,v 1.26 2008/04/19 18:42:10 kefren Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MONO_BUILDLINK3_MK:= ${MONO_BUILDLINK3_MK}+
@ -12,12 +12,10 @@ BUILDLINK_PACKAGES+= mono
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono
.if ${MONO_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.mono+= mono>=1.2.6
BUILDLINK_API_DEPENDS.mono+= mono>=1.9
BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono
.endif # MONO_BUILDLINK3_MK
ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q}
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"

13
lang/mono/distinfo
View file

@ -1,17 +1,18 @@
$NetBSD: distinfo,v 1.32 2008/02/13 14:16:43 kefren Exp $
$NetBSD: distinfo,v 1.33 2008/04/19 18:42:10 kefren Exp $
SHA1 (mono-1.2.6.tar.bz2) = f51f2e14d05313dba4b2d3fd5a47a9a3361ebeae
RMD160 (mono-1.2.6.tar.bz2) = c6536b008cb73845943956c9ab365589a28c013c
Size (mono-1.2.6.tar.bz2) = 18163130 bytes
SHA1 (mono-1.9.tar.bz2) = 1008f1bacb04de9ff9f5d87808ab0c5fba577a9d
RMD160 (mono-1.9.tar.bz2) = abc62137b738d9e84b8564018ffaa85cb76f45c3
Size (mono-1.9.tar.bz2) = 18416956 bytes
SHA1 (patch-aa) = 5d9fb5f3a468f415337565021497fa1005716502
SHA1 (patch-ab) = 28217e3c8bbbde2e26d33bf32297e99971e3d436
SHA1 (patch-ac) = 4ca577c2a03a6bc71b198e6dfa87cc6b2b9ad60a
SHA1 (patch-ae) = f0654c3103e3d69c44158456f481e5a357350cb1
SHA1 (patch-af) = f53ba21803ddb82a5a78f773351d83cd83bd1e05
SHA1 (patch-af) = abe2bc406e8f58c00f4d1226bda3c5fb9d4ea36f
SHA1 (patch-ag) = 93775d9350fac57f58f20a7f5a512b8f4a3bd1ca
SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df
SHA1 (patch-ap) = db62ab3c1adc9f8a0b6051c4cbb76aef61a5c7dc
SHA1 (patch-aq) = 2279dc6b46eded6f5a67b04e79779c1c7117fbc5
SHA1 (patch-ar) = 67de5bad8bfbba35707bcfc79c9e1b75b59b3031
SHA1 (patch-ar) = a82fa37f2580cd412ac0774bca27c8bd4ec5b6f3
SHA1 (patch-ba) = b5d7f5832ea53dd00af67ac94b5289d71f0d2152
SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2
SHA1 (patch-bd) = cf15b750dbd93ebf0e0e5165b8a10aabbf4f1642

34
lang/mono/patches/patch-aa Normal file
View file

@ -0,0 +1,34 @@
$NetBSD: patch-aa,v 1.14 2008/04/19 18:42:10 kefren Exp $
--- mcs/tools/tuner/Makefile.orig 2007-11-09 00:08:31.000000000 +0200
+++ mcs/tools/tuner/Makefile 2008-03-18 20:17:17.000000000 +0200
@@ -57,7 +57,7 @@
run-test-local run-test-ondotnet-local:
TUNER_FLAGS = -d $(WORKING_DIR) -o $(OUTPUT_DIR) \
- -l none \
+# -l none \
-c link \
-a smcs \
-b true \
@@ -78,15 +78,19 @@
TUNER_INSTALL_DIR = $(DESTDIR)$(mono_libdir)/mono/2.1
-end-install: check-install-dir inst-mscorlib.dll inst-smcs.exe gac-System gac-System.Xml.Core gac-System.Core
+end-install: check-install-dir inst-mscorlib.dll inst-tuned-smcs.exe gac-System gac-System.Xml.Core gac-System.Core
check-install-dir:
[ -d $(TUNER_INSTALL_DIR) ] || mkdir $(TUNER_INSTALL_DIR)
-inst-%:
+inst-tuned-%:
$(INSTALL_LIB) $(OUTPUT_DIR)/$* $(TUNER_INSTALL_DIR)/$*
test ! -f $(OUTPUT_DIR)/$*.mdb || $(INSTALL_LIB) $(OUTPUT_DIR)/$*.mdb $(TUNER_INSTALL_DIR)/$*.mdb
+inst-%:
+ $(INSTALL_LIB) $(WORKING_DIR)/$* $(TUNER_INSTALL_DIR)/$*
+ test ! -f $(WORKING_DIR)/$*.mdb || $(INSTALL_LIB) $(WORKING_DIR)/$*.mdb $(TUNER_INSTALL_DIR)/$*.mdb
+
gac-%:
$(GACUTIL) /i $(OUTPUT_DIR)/$*.dll /f /root $(DESTDIR)$(mono_libdir) /package 2.1

10
lang/mono/patches/patch-af
View file

@ -1,6 +1,6 @@
$NetBSD: patch-af,v 1.9 2008/02/13 14:16:43 kefren Exp $
--- mono/metadata/Makefile.in.orig 2008-02-05 13:38:26.000000000 +0200
+++ mono/metadata/Makefile.in 2008-02-05 13:38:34.000000000 +0200
$NetBSD: patch-af,v 1.10 2008/04/19 18:42:10 kefren Exp $
--- mono/metadata/Makefile.in.orig 2008-03-11 01:37:56.000000000 +0200
+++ mono/metadata/Makefile.in 2008-03-18 15:35:22.000000000 +0200
@@ -65,7 +65,7 @@
libmonoruntime_static_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@ -8,5 +8,5 @@ $NetBSD: patch-af,v 1.9 2008/02/13 14:16:43 kefren Exp $
-libmonoruntime_la_LIBADD =
+libmonoruntime_la_LIBADD = $(ICU_LIBS)
am_libmonoruntime_la_OBJECTS = reflection.lo object.lo icall.lo \
decimal.lo boehm-gc.lo null-gc.lo sgen-gc.lo gc.lo marshal.lo \
mono-mlist.lo monitor.lo threads.lo threadpool.lo file-io.lo \
decimal.lo boehm-gc.lo null-gc.lo sgen-gc.lo gc.lo \
method-builder.lo marshal.lo mono-mlist.lo monitor.lo \

10
lang/mono/patches/patch-ar
View file

@ -1,7 +1,7 @@
$NetBSD: patch-ar,v 1.2 2008/02/13 14:16:43 kefren Exp $
--- data/net_2_0/Makefile.in.orig 2008-02-05 14:09:06.000000000 +0200
+++ data/net_2_0/Makefile.in 2008-02-05 14:09:24.000000000 +0200
@@ -214,7 +214,7 @@
$NetBSD: patch-ar,v 1.3 2008/04/19 18:42:10 kefren Exp $
--- data/net_2_0/Makefile.in.orig 2008-03-11 01:37:54.000000000 +0200
+++ data/net_2_0/Makefile.in 2008-03-18 15:38:00.000000000 +0200
@@ -217,7 +217,7 @@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@ -9,4 +9,4 @@ $NetBSD: patch-ar,v 1.2 2008/02/13 14:16:43 kefren Exp $
+monodir = $(datadir)/examples/mono/2.0
EXTRA_DIST = machine.config \
web.config \
DefaultWsdlHelpGenerator.aspx
DefaultWsdlHelpGenerator.aspx \