3 files changed, 22 insertions, 37 deletions

diff --git a/www/xsp/Makefile b/www/xsp/Makefile
index 7492c5ebc123..e1ee6f931415 100644
--- a/www/xsp/Makefile
+++ b/www/xsp/Makefile
@@ -2,8 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	xsp
-PORTVERSION=	3.0.11
+PORTVERSION=	4.2
 CATEGORIES=	www
+MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Mono based web server
@@ -13,16 +14,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAKE_JOBS_UNSAFE=	yes
 
-GH_ACCOUNT=	mono
-USE_GITHUB=	yes
-USES=		gmake mono pathfix pkgconfig sqlite
+USES=		gmake libtool mono pathfix pkgconfig sqlite
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
-USE_AUTOTOOLS=	automake autoconf aclocal
-PATHFIX_MAKEFILEIN=Makefile.am
-
-AUTOMAKE_ARGS=	--add-missing --copy
-ACLOCAL_ARGS=	-I build/m4/shamrock -I build/m4/shave
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
diff --git a/www/xsp/distinfo b/www/xsp/distinfo
index 6092c2170658..b43f7a163035 100644
--- a/www/xsp/distinfo
+++ b/www/xsp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mono-xsp-3.0.11_GH0.tar.gz) = 290e302a03396c5cff7eb53dae008e9f79dd00aca15ad1e62865907220483baa
-SIZE (mono-xsp-3.0.11_GH0.tar.gz) = 266344
+TIMESTAMP = 1465472151
+SHA256 (xsp-4.2.tar.gz) = 6b8ce6a16e32ba852481700bbf14b1fe0356b4a831ce84845f64ceb8059b3efc
+SIZE (xsp-4.2.tar.gz) = 722345
diff --git a/www/xsp/pkg-plist b/www/xsp/pkg-plist
index 6269c3f2211d..062a8f353657 100644
--- a/www/xsp/pkg-plist
+++ b/www/xsp/pkg-plist
@@ -10,43 +10,36 @@ 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/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/libfpm_helper.a
+lib/libfpm_helper.so
+lib/libfpm_helper.so.0
+lib/libfpm_helper.so.0.0.0
 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/3.0.0.0__0738eb9f132ed756/fastcgi-mono-server2.exe
-lib/mono/gac/fastcgi-mono-server2/3.0.0.0__0738eb9f132ed756/fastcgi-mono-server2.exe.mdb
-lib/mono/gac/fastcgi-mono-server4/3.0.0.0__0738eb9f132ed756/fastcgi-mono-server4.exe
-lib/mono/gac/fastcgi-mono-server4/3.0.0.0__0738eb9f132ed756/fastcgi-mono-server4.exe.mdb
-lib/mono/gac/mod-mono-server2/3.0.0.0__0738eb9f132ed756/mod-mono-server2.exe
-lib/mono/gac/mod-mono-server2/3.0.0.0__0738eb9f132ed756/mod-mono-server2.exe.mdb
-lib/mono/gac/mod-mono-server4/3.0.0.0__0738eb9f132ed756/mod-mono-server4.exe
-lib/mono/gac/mod-mono-server4/3.0.0.0__0738eb9f132ed756/mod-mono-server4.exe.mdb
-lib/mono/gac/xsp2/3.0.0.0__0738eb9f132ed756/xsp2.exe
-lib/mono/gac/xsp2/3.0.0.0__0738eb9f132ed756/xsp2.exe.mdb
-lib/mono/gac/xsp4/3.0.0.0__0738eb9f132ed756/xsp4.exe
-lib/mono/gac/xsp4/3.0.0.0__0738eb9f132ed756/xsp4.exe.mdb
+lib/mono/gac/fastcgi-mono-server4/%%PORTVERSION%%.0.0__0738eb9f132ed756/fastcgi-mono-server4.exe
+lib/mono/gac/fastcgi-mono-server4/%%PORTVERSION%%.0.0__0738eb9f132ed756/fastcgi-mono-server4.exe.mdb
+lib/mono/gac/mod-mono-server4/%%PORTVERSION%%.0.0__0738eb9f132ed756/mod-mono-server4.exe
+lib/mono/gac/mod-mono-server4/%%PORTVERSION%%.0.0__0738eb9f132ed756/mod-mono-server4.exe.mdb
+lib/mono/gac/mono-fpm/%%PORTVERSION%%.0.0__0738eb9f132ed756/mono-fpm.exe
+lib/mono/gac/mono-fpm/%%PORTVERSION%%.0.0__0738eb9f132ed756/mono-fpm.exe.mdb
+lib/mono/gac/xsp4/%%PORTVERSION%%.0.0__0738eb9f132ed756/xsp4.exe
+lib/mono/gac/xsp4/%%PORTVERSION%%.0.0__0738eb9f132ed756/xsp4.exe.mdb
 lib/monodoc/sources/Mono.FastCGI.source
 lib/monodoc/sources/Mono.FastCGI.tree
 lib/monodoc/sources/Mono.FastCGI.zip
 lib/monodoc/sources/Mono.WebServer.source
 lib/monodoc/sources/Mono.WebServer.tree
 lib/monodoc/sources/Mono.WebServer.zip
-lib/xsp/2.0/asp-state2.exe
-lib/xsp/2.0/asp-state2.exe.config
-lib/xsp/2.0/dbsessmgr2.exe
-lib/xsp/2.0/dbsessmgr2.exe.config
 lib/xsp/4.0/asp-state4.exe
 lib/xsp/4.0/asp-state4.exe.config
 lib/xsp/4.0/dbsessmgr4.exe
@@ -104,10 +97,7 @@ lib/xsp/test/1.1/index.aspx
 lib/xsp/test/1.1/webcontrols/calendar.aspx
 lib/xsp/test/1.1/webcontrols/datalist.aspx
 lib/xsp/test/1.1/webcontrols/dbpage1.aspx
-lib/xsp/test/1.1/webcontrols/dbpage1.sqlite
 lib/xsp/test/1.1/webcontrols/dbpage2.aspx
-lib/xsp/test/1.1/webcontrols/dbpage2.sqlite
-lib/xsp/test/1.1/webcontrols/dbpage_test_setup.exe
 lib/xsp/test/1.1/webcontrols/index.aspx
 lib/xsp/test/1.1/webcontrols/listitem.aspx
 lib/xsp/test/1.1/webcontrols/people.xml
@@ -216,4 +206,4 @@ man/man1/dbsessmgr.1.gz
 man/man1/fastcgi-mono-server.1.gz
 man/man1/mod-mono-server.1.gz
 man/man1/xsp.1.gz
-@dir www/xsp
+@dir %%WWWDIR%%