uhm, the last patch worked or not, depending on SYSCONFIGDIR.

Add that stuff to CONF_FILES instead.
Being here, update to the last stable version (1.1.13.8) and fix
installed pkgconfig files not to contain relative paths (which will
break with our buildlink harnesses).

8 files changed, 98 insertions, 37 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 21cff3ae61c..4fddc63b7c9 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2006/07/31 18:10:43 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2006/08/03 18:15:07 drochner Exp $
 
-DISTNAME=	mono-1.1.12.1
-PKGREVISION=	3
+DISTNAME=	mono-1.1.13.8
 CATEGORIES=	lang
 MASTER_SITES=	http://go-mono.com/sources/mono-1.1/
 
@@ -45,7 +44,6 @@ PKGCONFIG_OVERRIDE+=	scripts/mono-nunit.pc.in
 
 REPLACE_PERL+=	mcs/class/Microsoft.VisualBasic/fixup/fixup.pl
 REPLACE_PERL+=	mcs/errors/do-tests.pl
-REPLACE_PERL+=	mcs/mbas/Test/test-mbas.pl
 REPLACE_PERL+=	mcs/tools/scan-tests.pl
 REPLACE_PERL+=	mono/benchmark/test-driver
 REPLACE_PERL+=	mono/cil/make-opcodes-def.pl
@@ -53,11 +51,28 @@ REPLACE_PERL+=	mono/metadata/make-bundle.pl
 REPLACE_PERL+=	mono/tests/stress-runner.pl
 
 EGDIR=		${PREFIX}/share/examples/mono
-CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/mono/config
-CONF_FILES+=	${EGDIR}/browscap.ini ${PKG_SYSCONFDIR}/mono/browscap.ini
+PKG_SYSCONFSUBDIR=	mono
+CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/config
+CONF_FILES+=	${EGDIR}/browscap.ini ${PKG_SYSCONFDIR}/browscap.ini
+CONF_FILES+=	${EGDIR}/1.0/DefaultWsdlHelpGenerator.aspx \
+		${PKG_SYSCONFDIR}/1.0/DefaultWsdlHelpGenerator.aspx
+CONF_FILES+=	${EGDIR}/1.0/machine.config ${PKG_SYSCONFDIR}/1.0/machine.config
+CONF_FILES+=	${EGDIR}/2.0/DefaultWsdlHelpGenerator.aspx \
+		${PKG_SYSCONFDIR}/2.0/DefaultWsdlHelpGenerator.aspx
+CONF_FILES+=	${EGDIR}/2.0/machine.config ${PKG_SYSCONFDIR}/2.0/machine.confi
 
 TEST_TARGET=	check
 
+post-patch: substpcprefix
+# replace relative prefix in pkgconfig files
+substpcprefix:
+.for f in ${PKGCONFIG_OVERRIDE}
+	(cd ${WRKSRC}; \
+	 ${SED} 's|$${pcfiledir}/../..|@prefix@|g' <$f >$f.tmp; \
+	 ${MV} $f.tmp $f \
+	)
+.endfor
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
diff --git a/lang/mono/PLIST b/lang/mono/PLIST
index 9682eeddd5f..70ef8bd5b54 100644
--- a/lang/mono/PLIST
+++ b/lang/mono/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2006/07/31 18:10:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2006/08/03 18:15:07 drochner Exp $
 bin/al
 bin/caspol
 bin/cert2spc
@@ -45,10 +45,6 @@ bin/wsdl
 bin/wsdl2
 bin/xbuild
 bin/xsd
-etc/mono/1.0/DefaultWsdlHelpGenerator.aspx
-etc/mono/1.0/machine.config
-etc/mono/2.0/DefaultWsdlHelpGenerator.aspx
-etc/mono/2.0/machine.config
 include/mono/cil/opcode.def
 include/mono/interpreter/embed.h
 include/mono/io-layer/access.h
@@ -90,7 +86,6 @@ include/mono/metadata/image.h
 include/mono/metadata/loader.h
 include/mono/metadata/mempool.h
 include/mono/metadata/metadata.h
-include/mono/metadata/mono-debug-debugger.h
 include/mono/metadata/mono-debug.h
 include/mono/metadata/mono-gc.h
 include/mono/metadata/object.h
@@ -101,7 +96,6 @@ include/mono/metadata/row-indexes.h
 include/mono/metadata/threads.h
 include/mono/metadata/tokentype.h
 include/mono/metadata/verify.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
@@ -251,7 +245,6 @@ lib/mono/1.0/xsd.exe.mdb
 lib/mono/2.0/Accessibility.dll
 lib/mono/2.0/ByteFX.Data.dll
 lib/mono/2.0/Commons.Xml.Relaxng.dll
-lib/mono/2.0/FirebirdSql.Data.Firebird.dll
 lib/mono/2.0/I18N.CJK.dll
 lib/mono/2.0/I18N.MidEast.dll
 lib/mono/2.0/I18N.Other.dll
@@ -393,8 +386,8 @@ lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll
 lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll.mdb
 lib/mono/gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll
 lib/mono/gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a/Microsoft.Vsa.dll.mdb
-lib/mono/gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd/Mono.C5.dll
-lib/mono/gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd/Mono.C5.dll.mdb
+lib/mono/gac/Mono.C5/1.0.0.0__ba07f434b1c35cbd/Mono.C5.dll
+lib/mono/gac/Mono.C5/1.0.0.0__ba07f434b1c35cbd/Mono.C5.dll.mdb
 lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll
 lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll.mdb
 lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756/Mono.Cairo.dll
@@ -589,6 +582,10 @@ man/man1/sqlsharp.1
 man/man1/wsdl.1
 man/man1/xsd.1
 man/man5/mono-config.5
+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/browscap.ini
 share/examples/mono/config
 share/jay/ACKNOWLEDGEMENTS
@@ -635,6 +632,8 @@ share/mono/cil/cil-opcodes.xml
 @dirrm share/mono
 @dirrm share/libgc-mono
 @dirrm share/jay
+@dirrm share/examples/mono/2.0
+@dirrm share/examples/mono/1.0
 @dirrm share/examples/mono
 @exec ${MKDIR} %D/lib/mono/xbuild/MSBuild
 @dirrm lib/mono/xbuild/MSBuild
@@ -752,7 +751,7 @@ share/mono/cil/cil-opcodes.xml
 @dirrm lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Cairo
-@dirrm lib/mono/gac/Mono.C5/0.5.1.1__ba07f434b1c35cbd
+@dirrm lib/mono/gac/Mono.C5/1.0.0.0__ba07f434b1c35cbd
 @dirrm lib/mono/gac/Mono.C5
 @dirrm lib/mono/gac/Microsoft.Vsa/8.0.0.0__b03f5f7f11d50a3a
 @dirrm lib/mono/gac/Microsoft.Vsa/7.0.5000.0__b03f5f7f11d50a3a
@@ -817,7 +816,6 @@ share/mono/cil/cil-opcodes.xml
 @dirrm lib/mono/1.0
 @dirrm lib/mono
 @dirrm include/mono/utils
-@dirrm include/mono/private
 @dirrm include/mono/metadata
 @dirrm include/mono/jit
 @dirrm include/mono/io-layer
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index bec50f24b20..0c4064e306c 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2006/07/26 10:57:41 drochner Exp $
+$NetBSD: distinfo,v 1.26 2006/08/03 18:15:07 drochner Exp $
 
-SHA1 (mono-1.1.12.1.tar.gz) = 9cf8fcbbe3f133328ba3555c3763536780e7314f
-RMD160 (mono-1.1.12.1.tar.gz) = 4e008bb159549e964e4ea8937ed95d731fb6453f
-Size (mono-1.1.12.1.tar.gz) = 17899010 bytes
-SHA1 (patch-ab) = a4338be0acf17b212dbb33bd90400ba31802d462
+SHA1 (mono-1.1.13.8.tar.gz) = c3d75aee282fce8afcec6e6a9bed5601f4149902
+RMD160 (mono-1.1.13.8.tar.gz) = c742a4f3302e184bd532b30fbce8e87cb99def44
+Size (mono-1.1.13.8.tar.gz) = 17758074 bytes
+SHA1 (patch-ab) = 00c29acc144c76ed7aa739d031288f0fc48c8786
 SHA1 (patch-ac) = 57139cd9312461db0665bd9f1cfa716f4f6ba6ef
 SHA1 (patch-ae) = f0654c3103e3d69c44158456f481e5a357350cb1
 SHA1 (patch-af) = b74d8401e9e0213a7c4418b9d989365af2f3ae30
@@ -15,6 +15,9 @@ SHA1 (patch-ak) = f053c9f38fecde2ff3f81d8d3668330a333496a2
 SHA1 (patch-al) = 96e7125b2e9046784e3cf1b1c094de26d55d073e
 SHA1 (patch-am) = 07b004da1bf0cda00b79f731fd46b440cdff01ba
 SHA1 (patch-an) = 9ebaf8024e1a5b9581e5fdf20899331308074db4
-SHA1 (patch-ao) = fdb9fe52808557fc69d0cfd15d98fd2e253cc24c
+SHA1 (patch-ao) = aa16cc813f443832488e63d9df5e17e9a1483f05
+SHA1 (patch-ap) = c063e63bea85898fc840875f9fb853d3c2170920
+SHA1 (patch-aq) = 7c43ded1ac6371df4d31a063032dd3a46d69d4a9
+SHA1 (patch-ar) = 83fed158f52b9717298c0594bc0bbef8edc7e509
 SHA1 (patch-ba) = 1aee2cf3dce0d2d378941b6cbff5600640c4d564
 SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab
index edf98ea2468..f9aace238d2 100644
--- a/lang/mono/patches/patch-ab
+++ b/lang/mono/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2006/01/03 08:03:53 recht Exp $
+$NetBSD: patch-ab,v 1.13 2006/08/03 18:15:08 drochner Exp $
 
---- configure.orig	2005-12-22 18:35:26.000000000 +0100
+--- configure.orig	2006-05-11 00:39:07.000000000 +0200
 +++ configure
-@@ -2232,13 +2232,15 @@ _ACEOF
+@@ -2233,14 +2233,16 @@ _ACEOF
  		;;
  	*-*-*netbsd*)
  		platform_win32=no
@@ -10,6 +10,7 @@ $NetBSD: patch-ab,v 1.12 2006/01/03 08:03:53 recht Exp $
 +		CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE"
  		libmono_cflags="-D_REENTRANT"
  		LDFLAGS="$LDFLAGS -pthread"
+ 		CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
  		libmono_ldflags="-pthread"
  		need_link_unlink=yes
 -		libdl=
@@ -17,7 +18,7 @@ $NetBSD: patch-ab,v 1.12 2006/01/03 08:03:53 recht Exp $
 +		libdl="-ldl /libexec/ld.elf_so"
 +		libgc_threads=pthreads
 +		with_tls=__thread
-+		with_sigaltstack=yes
++		with_sigaltstack=no
  		;;
  # these flags will work for all versions of -STABLE
  #
diff --git a/lang/mono/patches/patch-ao b/lang/mono/patches/patch-ao
index 3b187ab2bf7..b153395fb25 100644
--- a/lang/mono/patches/patch-ao
+++ b/lang/mono/patches/patch-ao
@@ -1,16 +1,15 @@
-$NetBSD: patch-ao,v 1.1 2006/07/26 10:57:41 drochner Exp $
+$NetBSD: patch-ao,v 1.2 2006/08/03 18:15:08 drochner Exp $
 
---- mono/mini/mini-x86.h.orig	2005-09-15 13:18:39.000000000 +0200
+--- mono/mini/mini-x86.h.orig	2006-05-11 00:32:02.000000000 +0200
 +++ mono/mini/mini-x86.h
-@@ -74,6 +74,11 @@ struct sigcontext {
- #define MONO_ARCH_USE_SIGACTION
- #endif
+@@ -63,6 +63,10 @@ LONG CALLBACK seh_handler(EXCEPTION_POIN
+ #		endif
+ #	endif /* BSDs */
  
++#else
 +#ifdef __NetBSD__
-+#undef HAVE_WORKING_SIGALTSTACK
 +#define MONO_ARCH_USE_SIGACTION
 +#endif
-+
- #ifndef PLATFORM_WIN32
+ #endif /* HAVE_WORKING_SIGALTSTACK */
+ #endif /* !PLATFORM_WIN32 */
  
- #ifdef HAVE_WORKING_SIGALTSTACK
diff --git a/lang/mono/patches/patch-ap b/lang/mono/patches/patch-ap
new file mode 100644
index 00000000000..e5ed382d2da
--- /dev/null
+++ b/lang/mono/patches/patch-ap
@@ -0,0 +1,19 @@
+$NetBSD: patch-ap,v 1.1 2006/08/03 18:15:08 drochner Exp $
+
+--- mcs/jay/Makefile.orig	2006-07-27 12:57:02.000000000 +0200
++++ mcs/jay/Makefile
+@@ -21,12 +21,12 @@ ifndef NO_INSTALL
+ install-local:
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/bin
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/share/jay
+-	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/share/man/man1
++	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/man/man1
+ 	$(INSTALL_BIN) jay $(DESTDIR)$(prefix)/bin
+ 	for datafile in $(datafiles) ; do \
+ 	   $(INSTALL_DATA) $$datafile $(DESTDIR)$(prefix)/share/jay ; \
+ 	done
+-	$(INSTALL_DATA) jay.1 $(DESTDIR)$(prefix)/share/man/man1
++	$(INSTALL_DATA) jay.1 $(DESTDIR)$(prefix)/man/man1
+ 
+ uninstall-local:
+ 	-rm -f $(DESTDIR)$(prefix)/bin/jay
diff --git a/lang/mono/patches/patch-aq b/lang/mono/patches/patch-aq
new file mode 100644
index 00000000000..35303ec92ba
--- /dev/null
+++ b/lang/mono/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2006/08/03 18:15:08 drochner Exp $
+
+--- data/net_1_1/Makefile.in.orig	2006-07-27 13:29:45.000000000 +0200
++++ data/net_1_1/Makefile.in
+@@ -263,7 +263,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-monodir = $(sysconfdir)/mono/1.0
++monodir = $(datadir)/examples/mono/1.0
+ EXTRA_DIST = machine.config \
+ 	     DefaultWsdlHelpGenerator.aspx
+ 
diff --git a/lang/mono/patches/patch-ar b/lang/mono/patches/patch-ar
new file mode 100644
index 00000000000..a6bb60a4fe8
--- /dev/null
+++ b/lang/mono/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2006/08/03 18:15:08 drochner Exp $
+
+--- data/net_2_0/Makefile.in.orig	2006-07-27 13:31:19.000000000 +0200
++++ data/net_2_0/Makefile.in
+@@ -263,7 +263,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-monodir = $(sysconfdir)/mono/2.0
++monodir = $(datadir)/examples/mono/2.0
+ EXTRA_DIST = machine.config \
+ 	     DefaultWsdlHelpGenerator.aspx
+