update to mono-1.0.1

Mono 1.0.1 is a maintenance release release for the 1.0 series of the
Mono runtime and thus only contains bug-fixes -- most notably for amd64.

While at it apply some changes to the package:
- Remove the MONO_GC_TYPE Makefile knob -- with 1.x the included
  libgc is the way to go.
- Also remove MONO_USE_NPTL knob and let configure do the right thing.

5 files changed, 13 insertions, 80 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index ca7f8fe13f4..4db5dbaf459 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2004/07/13 14:45:33 recht Exp $
+# $NetBSD: Makefile,v 1.29 2004/08/27 22:02:47 recht Exp $
 #
 
-DISTNAME=	mono-1.0
-PKGREVISION=	1
+DISTNAME=	mono-1.0.1
 CATEGORIES=	lang
-MASTER_SITES=	http://mono2.ximian.com/archive/1.0/
+MASTER_SITES=	http://www.go-mono.com/archive/1.0.1/
 
 MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.mono-project.com/
@@ -18,8 +17,6 @@ CONFLICTS=	pnet-[0-9]*
 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]-*
-# boehm-gc doesn't build on amd64/x86_64
-NOT_FOR_PLATFORM+=	FreeBSD-*-amd64 FreeBSD-*-x86_64
 
 USE_GNU_TOOLS+=		make yacc
 USE_BUILDLINK3=		yes
@@ -52,51 +49,13 @@ CONF_FILES+=	${EGDIR}/machine.config ${PKG_SYSCONFDIR}/machine.config
 CONF_FILES+=	${EGDIR}/DefaultWsdlHelpGenerator.aspx \
 		${PKG_SYSCONFDIR}/DefaultWsdlHelpGenerator.aspx
 
-#DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
-
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Linux"
-.  if defined(MONO_USE_NPTL) && !empty(MONO_USE_NPTL:M[yY][eE][sS])
-# Enable support for NPTL
-CONFIGURE_ARGS+=	--with-nptl=yes
-.  endif
-BUILD_DEFS+=	MONO_USE_NPTL
-.else
-CONFIGURE_ARGS+=	--with-nptl=no
-.endif
-
-# allow changing the gc_type
-# allowed values: included, boehm, none
-MONO_GC_TYPE?=included
-.if ${MONO_GC_TYPE} == "boehm"
-.  include "../../devel/boehm-gc/buildlink3.mk"
-.endif
-CONFIGURE_ARGS+=	--with-gc=${MONO_GC_TYPE}
-
-# mono debugger support is only available with the included gc
-# patch the PLIST accordingly
-.if ${MONO_GC_TYPE} == "boehm" || ${MONO_GC_TYPE} == "none"
-PLIST_SUBST+=  GC="@comment "
-.else
-PLIST_SUBST+=  GC=
-.endif
-
 # mcs coredumps with sigaltstack
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--with-sigaltstack=no
 .endif
 
-# Global Assembly Cache files are handled during (de)installation.
-#PRINT_PLIST_AWK+=	/^lib\/mono\/gac\// { next; }
-#PRINT_PLIST_AWK+=	/^@dirrm lib\/mono\/gac\// { next; }
-
-# GC files are only installed if GC was enabled.
-PRINT_PLIST_AWK+=	/^include\/mono\/private\/libgc/ \
-				{ print "$${GC}" $$0; next; }
-PRINT_PLIST_AWK+=	/^@dirrm include\/mono\/private/ \
-				{ print "$${GC}" $$0; next; }
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index 52c265227c7..9793bff92fe 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/07/03 23:02:50 recht Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/08/27 22:02:47 recht Exp $
 bin/MakeCert.exe
 bin/al
 bin/al.exe
@@ -102,7 +102,7 @@ include/mono/metadata/row-indexes.h
 include/mono/metadata/threads.h
 include/mono/metadata/tokentype.h
 include/mono/metadata/verify.h
-${GC}include/mono/private/libgc-mono-debugger.h
+include/mono/private/libgc-mono-debugger.h
 include/mono/utils/mono-codeman.h
 include/mono/utils/mono-digest.h
 include/mono/utils/mono-hash.h
@@ -250,7 +250,7 @@ lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756/I18N.West.dll
 lib/mono/gac/I18N.West/2.0.3600.0__0738eb9f132ed756/I18N.West.dll
 lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756/I18N.dll
 lib/mono/gac/I18N/2.0.3600.0__0738eb9f132ed756/I18N.dll
-lib/mono/gac/IBM.Data.DB2/1.0.1641.20878__7c307b91aa13d208/IBM.Data.DB2.dll
+lib/mono/gac/IBM.Data.DB2/${PKGVERSION}677.31401__7c307b91aa13d208/IBM.Data.DB2.dll
 lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll
 lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll
 lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll
@@ -520,7 +520,7 @@ share/mono/cil/cil-opcodes.xml
 @dirrm lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73
 @dirrm lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73
 @dirrm lib/mono/gac/ICSharpCode.SharpZipLib
-@dirrm lib/mono/gac/IBM.Data.DB2/1.0.1641.20878__7c307b91aa13d208
+@dirrm lib/mono/gac/IBM.Data.DB2/${PKGVERSION}677.31401__7c307b91aa13d208
 @dirrm lib/mono/gac/IBM.Data.DB2
 @dirrm lib/mono/gac/I18N/2.0.3600.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756
@@ -554,7 +554,7 @@ share/mono/cil/cil-opcodes.xml
 @dirrm lib/mono/1.0
 @dirrm lib/mono
 @dirrm include/mono/utils
-${GC}@dirrm include/mono/private
+@dirrm include/mono/private
 @dirrm include/mono/metadata
 @dirrm include/mono/jit
 @dirrm include/mono/io-layer
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index 4cb07c4d307..418118f3f3a 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/07/13 14:45:33 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/08/27 22:02:47 recht Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MONO_BUILDLINK3_MK:=	${MONO_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmono}
 BUILDLINK_PACKAGES+=	mono
 
 .if !empty(MONO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mono+=	mono>=1.0nb1
+BUILDLINK_DEPENDS.mono+=	mono>=1.0.1
 BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
 .endif	# MONO_BUILDLINK3_MK
 
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index e6e4af4db92..bfe3bc83c30 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.16 2004/07/13 14:45:33 recht Exp $
+$NetBSD: distinfo,v 1.17 2004/08/27 22:02:47 recht Exp $
 
-SHA1 (mono-1.0.tar.gz) = fa9c1b79152f05c1bfdd15bfce28a47e63d33dc7
-Size (mono-1.0.tar.gz) = 18218284 bytes
-SHA1 (patch-aa) = 4b8828f70c0329dd8f995142d3493310eb227d9e
+SHA1 (mono-1.0.1.tar.gz) = cc931101763266f214fe860f9c1ce98e39e63a4a
+Size (mono-1.0.1.tar.gz) = 18245041 bytes
 SHA1 (patch-ab) = 7c2b07f0e14103ccccc6e9e1514774d520865009
 SHA1 (patch-ac) = be58af38a4fa937837006066ca8a2ecc96729640
 SHA1 (patch-ad) = d8a72b7408e1209b7cb53b93b008d35ff071d2a7
diff --git a/lang/mono/patches/patch-aa b/lang/mono/patches/patch-aa
deleted file mode 100644
index ba570ab04b0..00000000000
--- a/lang/mono/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2004/07/13 14:45:34 recht Exp $
-
---- libgc/dyn_load.c.orig	2004-05-18 20:42:19.000000000 +0200
-+++ libgc/dyn_load.c	2004-07-13 16:35:00.000000000 +0200
-@@ -80,6 +80,11 @@
- #   define l_name	lm_name
- #endif
- 
-+#if defined(NETBSD)
-+#   include <machine/elf_machdep.h>
-+#   define ELFSIZE ARCH_ELFSIZE
-+#endif
-+
- #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
-     (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
-     (defined(NETBSD) && defined(__ELF__)) || defined(HURD)
-@@ -91,7 +96,7 @@
- /* Newer versions of GNU/Linux define this macro.  We
-  * define it similarly for any ELF systems that don't.  */
- #  ifndef ElfW
--#    ifdef __NetBSD__
-+#    ifdef NETBSD
- #      if ELFSIZE == 32
- #        define ElfW(type) Elf32_##type
- #      else