Update to mono-xsp 2.0, part of mono 2.0

4 files changed, 43 insertions, 28 deletions

diff --git a/www/mono-xsp/Makefile b/www/mono-xsp/Makefile
index f102880b4dc..05500e862a2 100644
--- a/www/mono-xsp/Makefile
+++ b/www/mono-xsp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2008/05/30 11:07:22 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2008/10/07 13:25:12 kefren Exp $
 
-DISTNAME=	xsp-1.9.1
+DISTNAME=	xsp-2.0
 PKGNAME=	mono-${DISTNAME}
 CATEGORIES=	www
-MASTER_SITES=	http://go-mono.com/sources/xsp/
+MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/xsp/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	kefren@NetBSD.org
@@ -14,6 +14,16 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake pkg-config
 MAKE_JOBS_SAFE=	no
 
+PKGCONFIG_OVERRIDE+=	src/Mono.WebServer/xsp.pc.in
+PKGCONFIG_OVERRIDE+=	src/Mono.WebServer/xsp-2.pc.in
+
+SUBST_CLASSES+=			unwrap_mk
+SUBST_STAGE.unwrap_mk=		pre-install
+SUBST_MESSAGE.unwrap_mk=	Unwrapping Tests.XSP.Security/Makefile
+SUBST_FILES.unwrap_mk=		unittests/Tests.XSP.Security/Makefile
+SUBST_SED.unwrap_mk=		-e 's,^MAKEINFO = .*,MAKEINFO = makeinfo,'
+SUBST_SED.unwrap_mk+=		-e 's,^PKG_CONFIG = .*,PKG_CONFIG = ${PREFIX}/bin/pkg-config,'
+
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/mono-xsp/PLIST b/www/mono-xsp/PLIST
index a0d7915cbae..284b09b93ba 100644
--- a/www/mono-xsp/PLIST
+++ b/www/mono-xsp/PLIST
@@ -1,13 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2008/04/25 08:26:45 kefren Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/10/07 13:25:12 kefren Exp $
 bin/asp-state
+bin/asp-state1
 bin/asp-state2
 bin/dbsessmgr
+bin/dbsessmgr1
 bin/dbsessmgr2
 bin/fastcgi-mono-server
+bin/fastcgi-mono-server1
 bin/fastcgi-mono-server2
 bin/mod-mono-server
+bin/mod-mono-server1
 bin/mod-mono-server2
 bin/xsp
+bin/xsp1
 bin/xsp2
 lib/mono/1.0/Mono.WebServer.dll
 lib/mono/1.0/fastcgi-mono-server.exe
@@ -21,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/${PKGVERSION}.0__0738eb9f132ed756/fastcgi-mono-server.exe
-lib/mono/gac/fastcgi-mono-server/${PKGVERSION}.0__0738eb9f132ed756/fastcgi-mono-server.exe.mdb
-lib/mono/gac/fastcgi-mono-server2/${PKGVERSION}.0__0738eb9f132ed756/fastcgi-mono-server2.exe
-lib/mono/gac/fastcgi-mono-server2/${PKGVERSION}.0__0738eb9f132ed756/fastcgi-mono-server2.exe.mdb
-lib/mono/gac/mod-mono-server/${PKGVERSION}.0__0738eb9f132ed756/mod-mono-server.exe
-lib/mono/gac/mod-mono-server/${PKGVERSION}.0__0738eb9f132ed756/mod-mono-server.exe.mdb
-lib/mono/gac/mod-mono-server2/${PKGVERSION}.0__0738eb9f132ed756/mod-mono-server2.exe
-lib/mono/gac/mod-mono-server2/${PKGVERSION}.0__0738eb9f132ed756/mod-mono-server2.exe.mdb
-lib/mono/gac/xsp/${PKGVERSION}.0__0738eb9f132ed756/xsp.exe
-lib/mono/gac/xsp/${PKGVERSION}.0__0738eb9f132ed756/xsp.exe.mdb
-lib/mono/gac/xsp2/${PKGVERSION}.0__0738eb9f132ed756/xsp2.exe
-lib/mono/gac/xsp2/${PKGVERSION}.0__0738eb9f132ed756/xsp2.exe.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/pkgconfig/xsp-2.pc
 lib/pkgconfig/xsp.pc
 lib/xsp/1.0/asp-state.exe
@@ -238,17 +243,17 @@ man/man1/xsp.1
 @dirrm lib/xsp/2.0
 @dirrm lib/xsp/1.0
 @dirrm lib/xsp
-@dirrm lib/mono/gac/xsp2/${PKGVERSION}.0__0738eb9f132ed756
+@dirrm lib/mono/gac/xsp2/2.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/xsp2
-@dirrm lib/mono/gac/xsp/${PKGVERSION}.0__0738eb9f132ed756
+@dirrm lib/mono/gac/xsp/2.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/xsp
-@dirrm lib/mono/gac/mod-mono-server2/${PKGVERSION}.0__0738eb9f132ed756
+@dirrm lib/mono/gac/mod-mono-server2/2.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/mod-mono-server2
-@dirrm lib/mono/gac/mod-mono-server/${PKGVERSION}.0__0738eb9f132ed756
+@dirrm lib/mono/gac/mod-mono-server/2.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/mod-mono-server
-@dirrm lib/mono/gac/fastcgi-mono-server2/${PKGVERSION}.0__0738eb9f132ed756
+@dirrm lib/mono/gac/fastcgi-mono-server2/2.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/fastcgi-mono-server2
-@dirrm lib/mono/gac/fastcgi-mono-server/${PKGVERSION}.0__0738eb9f132ed756
+@dirrm lib/mono/gac/fastcgi-mono-server/2.0.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/buildlink3.mk b/www/mono-xsp/buildlink3.mk
index 0e6bb940d85..523f2c898d4 100644
--- a/www/mono-xsp/buildlink3.mk
+++ b/www/mono-xsp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/10/06 16:10:48 kefren Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/10/07 13:25:12 kefren Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MONO_XSP_BUILDLINK3_MK:=	${MONO_XSP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	mono-xsp
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono-xsp
 
 .if ${MONO_XSP_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.mono-xsp+=	mono-xsp>=1.9.1
+BUILDLINK_API_DEPENDS.mono-xsp+=	mono-xsp>=2.0
 BUILDLINK_PKGSRCDIR.mono-xsp?=	../../www/mono-xsp
 .endif	# MONO_XSP_BUILDLINK3_MK
 
diff --git a/www/mono-xsp/distinfo b/www/mono-xsp/distinfo
index eb5bb7ab128..e4ff52688b0 100644
--- a/www/mono-xsp/distinfo
+++ b/www/mono-xsp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/04/25 08:26:45 kefren Exp $
+$NetBSD: distinfo,v 1.4 2008/10/07 13:25:12 kefren Exp $
 
-SHA1 (xsp-1.9.1.tar.bz2) = 1ee1e8950631e695dae867adcd0328c6562693ad
-RMD160 (xsp-1.9.1.tar.bz2) = a976861dca1b68a566c6c614d40c521794b3528d
-Size (xsp-1.9.1.tar.bz2) = 241700 bytes
+SHA1 (xsp-2.0.tar.bz2) = 1bb76d5cae5e5a175427a88a885963a344095a4b
+RMD160 (xsp-2.0.tar.bz2) = 9d662fe4e37ffe40787214a924877fb139804049
+Size (xsp-2.0.tar.bz2) = 244700 bytes