The continuing story of mono 2.4 update

5 files changed, 39 insertions, 26 deletions

diff --git a/www/mono-xsp/Makefile b/www/mono-xsp/Makefile
index f41567133b0..b1eb10b3701 100644
--- a/www/mono-xsp/Makefile
+++ b/www/mono-xsp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2009/03/25 22:37:15 he Exp $
+# $NetBSD: Makefile,v 1.12 2009/04/07 11:29:52 kefren Exp $
 
-DISTNAME=	xsp-2.2
+DISTNAME=	xsp-2.4
 PKGNAME=	mono-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/xsp/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/mono-xsp/PLIST b/www/mono-xsp/PLIST
index 2f6a67f5910..1d9f84d1b06 100644
--- a/www/mono-xsp/PLIST
+++ b/www/mono-xsp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/01/20 13:46:23 kefren Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/04/07 11:29:52 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.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/mono/gac/fastcgi-mono-server/2.4.0.0__0738eb9f132ed756/fastcgi-mono-server.exe
+lib/mono/gac/fastcgi-mono-server/2.4.0.0__0738eb9f132ed756/fastcgi-mono-server.exe.mdb
+lib/mono/gac/fastcgi-mono-server2/2.4.0.0__0738eb9f132ed756/fastcgi-mono-server2.exe
+lib/mono/gac/fastcgi-mono-server2/2.4.0.0__0738eb9f132ed756/fastcgi-mono-server2.exe.mdb
+lib/mono/gac/mod-mono-server/2.4.0.0__0738eb9f132ed756/mod-mono-server.exe
+lib/mono/gac/mod-mono-server/2.4.0.0__0738eb9f132ed756/mod-mono-server.exe.mdb
+lib/mono/gac/mod-mono-server2/2.4.0.0__0738eb9f132ed756/mod-mono-server2.exe
+lib/mono/gac/mod-mono-server2/2.4.0.0__0738eb9f132ed756/mod-mono-server2.exe.mdb
+lib/mono/gac/xsp/2.4.0.0__0738eb9f132ed756/xsp.exe
+lib/mono/gac/xsp/2.4.0.0__0738eb9f132ed756/xsp.exe.mdb
+lib/mono/gac/xsp2/2.4.0.0__0738eb9f132ed756/xsp2.exe
+lib/mono/gac/xsp2/2.4.0.0__0738eb9f132ed756/xsp2.exe.mdb
 lib/pkgconfig/xsp-2.pc
 lib/pkgconfig/xsp.pc
 lib/xsp/1.0/asp-state.exe
@@ -231,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.2.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/xsp2/2.4.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/xsp2
-@dirrm lib/mono/gac/xsp/2.2.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/xsp/2.4.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/xsp
-@dirrm lib/mono/gac/mod-mono-server2/2.2.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/mod-mono-server2/2.4.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/mod-mono-server2
-@dirrm lib/mono/gac/mod-mono-server/2.2.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/mod-mono-server/2.4.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/mod-mono-server
-@dirrm lib/mono/gac/fastcgi-mono-server2/2.2.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/fastcgi-mono-server2/2.4.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/fastcgi-mono-server2
-@dirrm lib/mono/gac/fastcgi-mono-server/2.2.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/fastcgi-mono-server/2.4.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 a607129bfdf..8454a3b0ff7 100644
--- a/www/mono-xsp/distinfo
+++ b/www/mono-xsp/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2009/01/20 13:46:23 kefren Exp $
+$NetBSD: distinfo,v 1.6 2009/04/07 11:29:52 kefren Exp $
 
-SHA1 (xsp-2.2.tar.bz2) = bce15651f0b7db796128696c338555a0995757d6
-RMD160 (xsp-2.2.tar.bz2) = 9b3b953938e7c8679459b408a5ade0913576ac49
-Size (xsp-2.2.tar.bz2) = 254675 bytes
+SHA1 (xsp-2.4.tar.bz2) = ccb6db44d179a182b6a5f5a134c8fa45dd3e04e4
+RMD160 (xsp-2.4.tar.bz2) = 73e1cb9732fe91e509cb38c4a0f26450bfd1aa18
+Size (xsp-2.4.tar.bz2) = 258444 bytes
 SHA1 (patch-aa) = 309ea56b58eed03f7a115b332f9218319751bc4b
+SHA1 (patch-ab) = 46a9dd17ab315abd9102fff5d8296c6d8e01c1bb
diff --git a/www/mono-xsp/patches/patch-aa b/www/mono-xsp/patches/patch-aa
index f5ffe92bf4f..8114886adaf 100644
--- a/www/mono-xsp/patches/patch-aa
+++ b/www/mono-xsp/patches/patch-aa
@@ -1,3 +1,4 @@
+$NetBSD: patch-aa,v 1.2 2009/04/07 11:29:52 kefren Exp $
 --- 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 @@
diff --git a/www/mono-xsp/patches/patch-ab b/www/mono-xsp/patches/patch-ab
new file mode 100644
index 00000000000..781421ff137
--- /dev/null
+++ b/www/mono-xsp/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2009/04/07 11:29:52 kefren Exp $
+--- Makefile.in.orig	2009-04-07 14:26:25.000000000 +0300
++++ Makefile.in	2009-04-07 14:26:34.000000000 +0300
+@@ -163,7 +163,7 @@
+ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = man src test tools scripts docs packaging unittests
++SUBDIRS = man src test tools scripts docs packaging
+ all: all-recursive
+ 
+ .SUFFIXES: