Update to mono 2.2

7 files changed, 50 insertions, 46 deletions

diff --git a/www/ap-mono/Makefile b/www/ap-mono/Makefile
index 0cc5b47997f..1785e75ea91 100644
--- a/www/ap-mono/Makefile
+++ b/www/ap-mono/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2008/10/07 13:25:55 kefren Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/20 13:47:12 kefren Exp $
 
-DISTNAME=	mod_mono-${MOD_MONO_VER}
-PKGNAME=	ap-mono-${MOD_MONO_VER}
+DISTNAME=	mod_mono-2.2
+PKGNAME=	ap-mono-2.2
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/mod_mono/
 EXTRACT_SUFX=	.tar.bz2
-MOD_MONO_VER=	2.0
 
 MAINTAINER=	kefren@NetBSD.org
 HOMEPAGE=	http://www.mono-project.com/Mod_mono
diff --git a/www/ap-mono/PLIST b/www/ap-mono/PLIST
index 83e7f52a6df..49708c0e374 100644
--- a/www/ap-mono/PLIST
+++ b/www/ap-mono/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/10/06 10:52:29 kefren Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/20 13:47:12 kefren Exp $
 lib/httpd/mod_mono.so
 lib/httpd/mod_mono.so.0.0
 man/man8/mod_mono.8
+share/examples/httpd/mod_mono.conf
diff --git a/www/ap-mono/distinfo b/www/ap-mono/distinfo
index 0b69629d157..7063ad54b5a 100644
--- a/www/ap-mono/distinfo
+++ b/www/ap-mono/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/10/07 13:25:55 kefren Exp $
+$NetBSD: distinfo,v 1.3 2009/01/20 13:47:12 kefren Exp $
 
-SHA1 (mod_mono-2.0.tar.bz2) = 0302f945371356110d28d80fb3b77ceba6f230c8
-RMD160 (mod_mono-2.0.tar.bz2) = 3b311d23afcf85069e293314932bf0728f093d26
-Size (mod_mono-2.0.tar.bz2) = 254709 bytes
+SHA1 (mod_mono-2.2.tar.bz2) = a422024cbd5c2b7bb406ae504b49da44599d2a02
+RMD160 (mod_mono-2.2.tar.bz2) = 444841cdae619d2670d1f15879d1d44791d430c4
+Size (mod_mono-2.2.tar.bz2) = 268107 bytes
 SHA1 (patch-aa) = b14fbf2752676b0b3ead4e8c3910785cc00ba4cc
diff --git a/www/mono-xsp/Makefile b/www/mono-xsp/Makefile
index 05500e862a2..91abeae913a 100644
--- a/www/mono-xsp/Makefile
+++ b/www/mono-xsp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2008/10/07 13:25:12 kefren Exp $
+# $NetBSD: Makefile,v 1.10 2009/01/20 13:46:22 kefren Exp $
 
-DISTNAME=	xsp-2.0
+DISTNAME=	xsp-2.2
 PKGNAME=	mono-${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/xsp/
diff --git a/www/mono-xsp/PLIST b/www/mono-xsp/PLIST
index 284b09b93ba..2f6a67f5910 100644
--- a/www/mono-xsp/PLIST
+++ b/www/mono-xsp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/10/07 13:25:12 kefren Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/01/20 13:46:23 kefren Exp $
 bin/asp-state
 bin/asp-state1
 bin/asp-state2
@@ -26,18 +26,18 @@ lib/mono/gac/Mono.WebServer/0.1.0.0__0738eb9f132ed756/Mono.WebServer.dll
 lib/mono/gac/Mono.WebServer/0.1.0.0__0738eb9f132ed756/Mono.WebServer.dll.mdb
 lib/mono/gac/Mono.WebServer2/0.2.0.0__0738eb9f132ed756/Mono.WebServer2.dll
 lib/mono/gac/Mono.WebServer2/0.2.0.0__0738eb9f132ed756/Mono.WebServer2.dll.mdb
-lib/mono/gac/fastcgi-mono-server/2.0.0.0__0738eb9f132ed756/fastcgi-mono-server.exe
-lib/mono/gac/fastcgi-mono-server/2.0.0.0__0738eb9f132ed756/fastcgi-mono-server.exe.mdb
-lib/mono/gac/fastcgi-mono-server2/2.0.0.0__0738eb9f132ed756/fastcgi-mono-server2.exe
-lib/mono/gac/fastcgi-mono-server2/2.0.0.0__0738eb9f132ed756/fastcgi-mono-server2.exe.mdb
-lib/mono/gac/mod-mono-server/2.0.0.0__0738eb9f132ed756/mod-mono-server.exe
-lib/mono/gac/mod-mono-server/2.0.0.0__0738eb9f132ed756/mod-mono-server.exe.mdb
-lib/mono/gac/mod-mono-server2/2.0.0.0__0738eb9f132ed756/mod-mono-server2.exe
-lib/mono/gac/mod-mono-server2/2.0.0.0__0738eb9f132ed756/mod-mono-server2.exe.mdb
-lib/mono/gac/xsp/2.0.0.0__0738eb9f132ed756/xsp.exe
-lib/mono/gac/xsp/2.0.0.0__0738eb9f132ed756/xsp.exe.mdb
-lib/mono/gac/xsp2/2.0.0.0__0738eb9f132ed756/xsp2.exe
-lib/mono/gac/xsp2/2.0.0.0__0738eb9f132ed756/xsp2.exe.mdb
+lib/mono/gac/fastcgi-mono-server/2.2.0.0__0738eb9f132ed756/fastcgi-mono-server.exe
+lib/mono/gac/fastcgi-mono-server/2.2.0.0__0738eb9f132ed756/fastcgi-mono-server.exe.mdb
+lib/mono/gac/fastcgi-mono-server2/2.2.0.0__0738eb9f132ed756/fastcgi-mono-server2.exe
+lib/mono/gac/fastcgi-mono-server2/2.2.0.0__0738eb9f132ed756/fastcgi-mono-server2.exe.mdb
+lib/mono/gac/mod-mono-server/2.2.0.0__0738eb9f132ed756/mod-mono-server.exe
+lib/mono/gac/mod-mono-server/2.2.0.0__0738eb9f132ed756/mod-mono-server.exe.mdb
+lib/mono/gac/mod-mono-server2/2.2.0.0__0738eb9f132ed756/mod-mono-server2.exe
+lib/mono/gac/mod-mono-server2/2.2.0.0__0738eb9f132ed756/mod-mono-server2.exe.mdb
+lib/mono/gac/xsp/2.2.0.0__0738eb9f132ed756/xsp.exe
+lib/mono/gac/xsp/2.2.0.0__0738eb9f132ed756/xsp.exe.mdb
+lib/mono/gac/xsp2/2.2.0.0__0738eb9f132ed756/xsp2.exe
+lib/mono/gac/xsp2/2.2.0.0__0738eb9f132ed756/xsp2.exe.mdb
 lib/pkgconfig/xsp-2.pc
 lib/pkgconfig/xsp.pc
 lib/xsp/1.0/asp-state.exe
@@ -205,23 +205,11 @@ lib/xsp/test/sample.webapp
 lib/xsp/test/small-icon.png
 lib/xsp/test/web.config
 lib/xsp/test/xsp.exe.config
-lib/xsp/unittests/ChangeLog
-lib/xsp/unittests/NOACCESS
-lib/xsp/unittests/README
-lib/xsp/unittests/Tests.XSP.Security/DirectoryTraversalTest.cs
-lib/xsp/unittests/Tests.XSP.Security/FileExtensionsTest.cs
-lib/xsp/unittests/Tests.XSP.Security/Makefile
-lib/xsp/unittests/Tests.XSP.Security/Tests.XSP.Security.dll
-lib/xsp/unittests/Tests.XSP.Security/WebTestHelper.cs
-lib/xsp/unittests/webroot/index.aspx
 man/man1/asp-state.1
 man/man1/dbsessmgr.1
 man/man1/fastcgi-mono-server.1
 man/man1/mod-mono-server.1
 man/man1/xsp.1
-@dirrm lib/xsp/unittests/webroot
-@dirrm lib/xsp/unittests/Tests.XSP.Security
-@dirrm lib/xsp/unittests
 @dirrm lib/xsp/test/controls
 @dirrm lib/xsp/test/bin
 @dirrm lib/xsp/test/App_Code
@@ -243,17 +231,17 @@ man/man1/xsp.1
 @dirrm lib/xsp/2.0
 @dirrm lib/xsp/1.0
 @dirrm lib/xsp
-@dirrm lib/mono/gac/xsp2/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/xsp2/2.2.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/xsp2
-@dirrm lib/mono/gac/xsp/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/xsp/2.2.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/xsp
-@dirrm lib/mono/gac/mod-mono-server2/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/mod-mono-server2/2.2.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/mod-mono-server2
-@dirrm lib/mono/gac/mod-mono-server/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/mod-mono-server/2.2.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/mod-mono-server
-@dirrm lib/mono/gac/fastcgi-mono-server2/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/fastcgi-mono-server2/2.2.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/fastcgi-mono-server2
-@dirrm lib/mono/gac/fastcgi-mono-server/2.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/fastcgi-mono-server/2.2.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/fastcgi-mono-server
 @dirrm lib/mono/gac/Mono.WebServer2/0.2.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.WebServer2
diff --git a/www/mono-xsp/distinfo b/www/mono-xsp/distinfo
index e4ff52688b0..a607129bfdf 100644
--- a/www/mono-xsp/distinfo
+++ b/www/mono-xsp/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/10/07 13:25:12 kefren Exp $
+$NetBSD: distinfo,v 1.5 2009/01/20 13:46:23 kefren Exp $
 
-SHA1 (xsp-2.0.tar.bz2) = 1bb76d5cae5e5a175427a88a885963a344095a4b
-RMD160 (xsp-2.0.tar.bz2) = 9d662fe4e37ffe40787214a924877fb139804049
-Size (xsp-2.0.tar.bz2) = 244700 bytes
+SHA1 (xsp-2.2.tar.bz2) = bce15651f0b7db796128696c338555a0995757d6
+RMD160 (xsp-2.2.tar.bz2) = 9b3b953938e7c8679459b408a5ade0913576ac49
+Size (xsp-2.2.tar.bz2) = 254675 bytes
+SHA1 (patch-aa) = 309ea56b58eed03f7a115b332f9218319751bc4b
diff --git a/www/mono-xsp/patches/patch-aa b/www/mono-xsp/patches/patch-aa
new file mode 100644
index 00000000000..f5ffe92bf4f
--- /dev/null
+++ b/www/mono-xsp/patches/patch-aa
@@ -0,0 +1,15 @@
+--- test/2.0/treeview/Makefile.in.orig	2009-01-20 15:33:32.000000000 +0200
++++ test/2.0/treeview/Makefile.in	2009-01-20 15:34:40.000000000 +0200
+@@ -381,10 +381,12 @@
+ 	$(GMCS) -r:System.Web.dll -t:library -out:$@ $^
+ 
+ dist-hook:
++	chmod 644 $(srcdir)/TreeLineImages/*gif
+ 	$(mkinstalldirs) $(distdir)/TreeLineImages
+ 	cp -p $(srcdir)/TreeLineImages/*gif $(distdir)/TreeLineImages
+ 
+ install-data-hook:
++	chmod 644 $(srcdir)/TreeLineImages/*gif
+ 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)/test/2.0/treeview/TreeLineImages
+ 	cp $(srcdir)/TreeLineImages/*gif $(DESTDIR)$(pkglibdir)/test/2.0/treeview/TreeLineImages
+