Update xsp and ap-mono to the latest and the greatest from mono-project

Apache 2.4 linking of ap-mono is now possible

7 files changed, 48 insertions, 41 deletions

diff --git a/www/ap-mono/DESCR b/www/ap-mono/DESCR
index 398a3225606..6e694b115b1 100644
--- a/www/ap-mono/DESCR
+++ b/www/ap-mono/DESCR
@@ -1,4 +1,4 @@
-Mod_Mono is an Apache 1.3/2.0/2.2 module that provides ASP.NET support for the
+Mod_Mono is an Apache 1.x/2.x module that provides ASP.NET support for the
 web's favorite server, Apache.
 The module passes off requests for ASP.NET pages to an external program,
 mod-mono-server, which actually handles the requests. The communication between
diff --git a/www/ap-mono/Makefile b/www/ap-mono/Makefile
index 30cd6ff2181..a8001481e18 100644
--- a/www/ap-mono/Makefile
+++ b/www/ap-mono/Makefile
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.30 2015/04/06 08:17:39 adam Exp $
+# $NetBSD: Makefile,v 1.31 2015/05/23 06:28:58 kefren Exp $
 
-DISTNAME=	mod_mono-2.10
+DISTNAME=	mod_mono-3.12
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
-PKGREVISION=	10
 CATEGORIES=	www
-MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/mod_mono/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	http://download.mono-project.com/sources/mod_mono/
 
 MAINTAINER=	kefren@NetBSD.org
 HOMEPAGE=	http://www.mono-project.com/Mod_mono
 COMMENT=	Apache module that provides ASP.NET support
 
 APACHE_MODULE=		yes
-PKG_APACHE_ACCEPTED=	apache22
 
 CONF_FILES=		${PREFIX}/share/examples/httpd/mod_mono.conf\
 			${PKG_SYSCONFDIR}/httpd/mod_mono.conf
@@ -23,7 +20,7 @@ USE_TOOLS+=	gmake pkg-config
 USE_LIBTOOL=	yes
 MAKE_JOBS_SAFE=	no
 
-.include "../../lang/mono2/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
 .include "../../www/mono-xsp/buildlink3.mk"
 .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-mono/distinfo b/www/ap-mono/distinfo
index 30df08cb16c..5db55c8edf8 100644
--- a/www/ap-mono/distinfo
+++ b/www/ap-mono/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2011/04/25 14:06:40 kefren Exp $
+$NetBSD: distinfo,v 1.11 2015/05/23 06:28:58 kefren Exp $
 
-SHA1 (mod_mono-2.10.tar.bz2) = e7aadbbe47cf8f2c0882fca51ac8dbbb4ae0153e
-RMD160 (mod_mono-2.10.tar.bz2) = 6f2b6df968a529af116eff67b4c98a7f5c82a899
-Size (mod_mono-2.10.tar.bz2) = 259321 bytes
+SHA1 (mod_mono-3.12.tar.gz) = e50a106ba7210dffacb3b76ddbe81a61974954a1
+RMD160 (mod_mono-3.12.tar.gz) = c8f26e196fc796c8ab07fdcb5400bf67ba653ad4
+Size (mod_mono-3.12.tar.gz) = 377395 bytes
 SHA1 (patch-aa) = b14fbf2752676b0b3ead4e8c3910785cc00ba4cc
diff --git a/www/mono-xsp/Makefile b/www/mono-xsp/Makefile
index 0a2c1dcfa3e..c2a8bcf5bce 100644
--- a/www/mono-xsp/Makefile
+++ b/www/mono-xsp/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2015/04/06 08:17:17 adam Exp $
+# $NetBSD: Makefile,v 1.36 2015/05/23 06:28:58 kefren Exp $
 
-DISTNAME=	xsp-2.10.2
+DISTNAME=	xsp-3.8
 PKGNAME=	mono-${DISTNAME}
-PKGREVISION=	10
 CATEGORIES=	www
-MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/xsp/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	http://download.mono-project.com/sources/xsp/
 
 MAINTAINER=	kefren@NetBSD.org
 HOMEPAGE=	http://www.mono-project.com/ASP.NET
@@ -25,6 +23,12 @@ 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,'
 
+SUBST_CLASSES+=         fix-mcs
+SUBST_STAGE.fix-mcs=    post-patch
+SUBST_MESSAGE.fix-mcs=  Fix compiler name
+SUBST_FILES.fix-mcs=    configure
+SUBST_SED.fix-mcs=      -e 's,gmcs,mcs,'
+
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../lang/mono2/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 73ab63fb9f8..24d2d311f39 100644
--- a/www/mono-xsp/PLIST
+++ b/www/mono-xsp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2011/06/10 04:12:38 kefren Exp $
+@comment $NetBSD: PLIST,v 1.17 2015/05/23 06:28:58 kefren Exp $
 bin/asp-state
 bin/asp-state2
 bin/asp-state4
@@ -11,33 +11,39 @@ bin/fastcgi-mono-server4
 bin/mod-mono-server
 bin/mod-mono-server2
 bin/mod-mono-server4
+bin/mono-fpm
+bin/shim
 bin/xsp
 bin/xsp2
 bin/xsp4
+lib/libfpm_helper.la
 lib/mono/2.0/Mono.WebServer2.dll
 lib/mono/2.0/fastcgi-mono-server2.exe
 lib/mono/2.0/mod-mono-server2.exe
 lib/mono/2.0/xsp2.exe
-lib/mono/4.0/Mono.WebServer2.dll
-lib/mono/4.0/fastcgi-mono-server4.exe
-lib/mono/4.0/mod-mono-server4.exe
-lib/mono/4.0/xsp4.exe
+lib/mono/4.5/Mono.WebServer2.dll
+lib/mono/4.5/fastcgi-mono-server4.exe
+lib/mono/4.5/mod-mono-server4.exe
+lib/mono/4.5/mono-fpm.exe
+lib/mono/4.5/xsp4.exe
 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/Mono.WebServer2/0.4.0.0__0738eb9f132ed756/Mono.WebServer2.dll
 lib/mono/gac/Mono.WebServer2/0.4.0.0__0738eb9f132ed756/Mono.WebServer2.dll.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/fastcgi-mono-server4/${PKGVERSION}.0__0738eb9f132ed756/fastcgi-mono-server4.exe
-lib/mono/gac/fastcgi-mono-server4/${PKGVERSION}.0__0738eb9f132ed756/fastcgi-mono-server4.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/mod-mono-server4/${PKGVERSION}.0__0738eb9f132ed756/mod-mono-server4.exe
-lib/mono/gac/mod-mono-server4/${PKGVERSION}.0__0738eb9f132ed756/mod-mono-server4.exe.mdb
-lib/mono/gac/xsp2/${PKGVERSION}.0__0738eb9f132ed756/xsp2.exe
-lib/mono/gac/xsp2/${PKGVERSION}.0__0738eb9f132ed756/xsp2.exe.mdb
-lib/mono/gac/xsp4/${PKGVERSION}.0__0738eb9f132ed756/xsp4.exe
-lib/mono/gac/xsp4/${PKGVERSION}.0__0738eb9f132ed756/xsp4.exe.mdb
+lib/mono/gac/fastcgi-mono-server2/${PKGVERSION}.0.0__0738eb9f132ed756/fastcgi-mono-server2.exe
+lib/mono/gac/fastcgi-mono-server2/${PKGVERSION}.0.0__0738eb9f132ed756/fastcgi-mono-server2.exe.mdb
+lib/mono/gac/fastcgi-mono-server4/${PKGVERSION}.0.0__0738eb9f132ed756/fastcgi-mono-server4.exe
+lib/mono/gac/fastcgi-mono-server4/${PKGVERSION}.0.0__0738eb9f132ed756/fastcgi-mono-server4.exe.mdb
+lib/mono/gac/mod-mono-server2/${PKGVERSION}.0.0__0738eb9f132ed756/mod-mono-server2.exe
+lib/mono/gac/mod-mono-server2/${PKGVERSION}.0.0__0738eb9f132ed756/mod-mono-server2.exe.mdb
+lib/mono/gac/mod-mono-server4/${PKGVERSION}.0.0__0738eb9f132ed756/mod-mono-server4.exe
+lib/mono/gac/mod-mono-server4/${PKGVERSION}.0.0__0738eb9f132ed756/mod-mono-server4.exe.mdb
+lib/mono/gac/mono-fpm/${PKGVERSION}.0.0__0738eb9f132ed756/mono-fpm.exe
+lib/mono/gac/mono-fpm/${PKGVERSION}.0.0__0738eb9f132ed756/mono-fpm.exe.mdb
+lib/mono/gac/xsp2/${PKGVERSION}.0.0__0738eb9f132ed756/xsp2.exe
+lib/mono/gac/xsp2/${PKGVERSION}.0.0__0738eb9f132ed756/xsp2.exe.mdb
+lib/mono/gac/xsp4/${PKGVERSION}.0.0__0738eb9f132ed756/xsp4.exe
+lib/mono/gac/xsp4/${PKGVERSION}.0.0__0738eb9f132ed756/xsp4.exe.mdb
 lib/monodoc/sources/Mono.FastCGI.source
 lib/monodoc/sources/Mono.FastCGI.tree
 lib/monodoc/sources/Mono.FastCGI.zip
diff --git a/www/mono-xsp/buildlink3.mk b/www/mono-xsp/buildlink3.mk
index 388004e920e..d539df5c9cd 100644
--- a/www/mono-xsp/buildlink3.mk
+++ b/www/mono-xsp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2015/04/06 08:17:17 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2015/05/23 06:28:58 kefren Exp $
 
 BUILDLINK_TREE+=	mono-xsp
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.mono-xsp+=	mono-xsp>=2.10.2nb10
 BUILDLINK_PKGSRCDIR.mono-xsp?=	../../www/mono-xsp
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../lang/mono2/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
 .endif # MONO_XSP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-mono-xsp
diff --git a/www/mono-xsp/distinfo b/www/mono-xsp/distinfo
index c5392ad83af..f6ed496d0e5 100644
--- a/www/mono-xsp/distinfo
+++ b/www/mono-xsp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2011/06/10 04:12:38 kefren Exp $
+$NetBSD: distinfo,v 1.17 2015/05/23 06:28:58 kefren Exp $
 
-SHA1 (xsp-2.10.2.tar.bz2) = cab9218c56bb9f6e1a8e8e56c3b97ac2eac27bec
-RMD160 (xsp-2.10.2.tar.bz2) = 9d1097b3d841f48764480d144dc8aff0b8011ce2
-Size (xsp-2.10.2.tar.bz2) = 284801 bytes
+SHA1 (xsp-3.8.tar.gz) = 10b24a2a7edd279dcec0a6e0a0ca8127d70ec24e
+RMD160 (xsp-3.8.tar.gz) = 6f963e24a74005ef69065960dbf1e1cd92d9472a
+Size (xsp-3.8.tar.gz) = 735140 bytes
 SHA1 (patch-aa) = 309ea56b58eed03f7a115b332f9218319751bc4b