Convert to USES=libtool

Use USES=compiler:c11 to enforce modern compiler (and clang version > 3.3)
Drop printing pkg-message it is done automatically by stage
Sharpen the sed on configure to fix in case of isinf it was making __thread testing hanging
Remove useless include of bsd.mono.mk

2 files changed, 12 insertions, 35 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index dac4b3ab60da..8c2a37a67c22 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mono
 PORTVERSION=	3.4.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
 
@@ -10,9 +11,9 @@ MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Open source implementation of .NET Development Framework
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-    		bash:${PORTSDIR}/shells/bash
+		bash:${PORTSDIR}/shells/bash
 
-USES=		bison gettext gmake iconv pathfix perl5 tar:bzip2
+USES=		bison compiler:c11 gettext gmake iconv libtool pathfix perl5 tar:bzip2
 USE_GNOME=	glib20
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
@@ -35,27 +36,6 @@ MAKE_ENV=	MONO_SHARED_DIR="${MONO_SHARED_DIR}" \
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
 
-.include <bsd.port.pre.mk>
-
-# Base GCC used to cause problems, so compile using clang which is usualy in
-# base. However, the clang version shipped with some older FreeBSD version will
-# not compile Mono, in such a case, compile using a clang port.
-.if ${OPSYS} == FreeBSD
-.if ${OSVERSION} >= 902001 && exists(/usr/bin/clang)
-CC=	/usr/bin/clang
-CXX=	/usr/bin/clang++
-CPP=	/usr/bin/clang-cpp
-.else
-BUILD_DEPENDS+=	clang33:${PORTSDIR}/lang/clang33
-CC=	clang33
-CXX=	clang33
-CPP=	clang-cpp33
-.endif
-.endif
-
-pre-everything::
-	@${CAT} ${PKGMESSAGE}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/bin/sh|g' \
 		${WRKSRC}/mcs/class/Managed.Windows.Forms/build-csproj \
@@ -67,7 +47,7 @@ post-patch:
 		${WRKSRC}/scripts/mono-test-install
 	@${FIND} ${WRKSRC} -name '*.sh' | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|^#!/bin/bash|#!/bin/sh|g'
-	@${REINPLACE_CMD} 's/(1)/(1.0)/g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} 's/isinf (1)/isinf (1.0)/g' ${WRKSRC}/configure
 
 tests: build
 	@${ECHO_MSG} "===> Running mono regression tests"
@@ -78,5 +58,4 @@ post-configure:
 	@${REINPLACE_CMD} -e 's|share\/man|man|g' \
 		${WRKSRC}/mcs/jay/Makefile
 
-.include "${PORTSDIR}/lang/mono/bsd.mono.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index b3c9d9dbd4ce..fcd9f2757dcf 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -133,42 +133,40 @@ include/mono-2.0/mono/utils/mono-error.h
 include/mono-2.0/mono/utils/mono-logger.h
 include/mono-2.0/mono/utils/mono-publib.h
 lib/libMonoPosixHelper.a
-lib/libMonoPosixHelper.la
 lib/libMonoPosixHelper.so
 lib/libMonoSupportW.a
-lib/libMonoSupportW.la
 lib/libMonoSupportW.so
 lib/libikvm-native.a
-lib/libikvm-native.la
 lib/libikvm-native.so
 lib/libmono-2.0.a
 lib/libmono-2.0.la
 lib/libmono-2.0.so
 lib/libmono-2.0.so.1
+lib/libmono-2.0.so.1.0.0
 lib/libmono-profiler-aot.a
-lib/libmono-profiler-aot.la
 lib/libmono-profiler-aot.so
 lib/libmono-profiler-aot.so.0
+lib/libmono-profiler-aot.so.0.0.0
 lib/libmono-profiler-cov.a
-lib/libmono-profiler-cov.la
 lib/libmono-profiler-cov.so
 lib/libmono-profiler-cov.so.0
+lib/libmono-profiler-cov.so.0.0.0
 lib/libmono-profiler-iomap.a
-lib/libmono-profiler-iomap.la
 lib/libmono-profiler-iomap.so
 lib/libmono-profiler-iomap.so.0
+lib/libmono-profiler-iomap.so.0.0.0
 lib/libmono-profiler-log.a
-lib/libmono-profiler-log.la
 lib/libmono-profiler-log.so
 lib/libmono-profiler-log.so.0
+lib/libmono-profiler-log.so.0.0.0
 lib/libmonoboehm-2.0.a
-lib/libmonoboehm-2.0.la
 lib/libmonoboehm-2.0.so
 lib/libmonoboehm-2.0.so.1
+lib/libmonoboehm-2.0.so.1.0.0
 lib/libmonosgen-2.0.a
-lib/libmonosgen-2.0.la
 lib/libmonosgen-2.0.so
 lib/libmonosgen-2.0.so.1
+lib/libmonosgen-2.0.so.1.0.0
 lib/mono-source-libs/Options.cs
 lib/mono-source-libs/getline.cs
 lib/mono/2.0/Accessibility.dll