View | Details | Raw Unified | Return to bug 238089 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-9 / +19 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/lang/mono/Makefile 507372 2019-07-26 20:46:53Z gerald $
2
# $FreeBSD: head/lang/mono/Makefile 507372 2019-07-26 20:46:53Z gerald $
3
3
4
PORTNAME=	mono
4
PORTNAME=	mono
5
PORTVERSION=	5.10.1.57
5
PORTVERSION=	6.4.0.198
6
PORTREVISION=	2
6
PORTREVISION=	0
7
CATEGORIES=	lang
7
CATEGORIES=	lang
8
MASTER_SITES=	https://download.mono-project.com/sources/mono/
8
MASTER_SITES=	https://download.mono-project.com/sources/mono/
9
DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
9
DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
Lines 14-33 Link Here
14
LICENSE=	MIT
14
LICENSE=	MIT
15
LICENSE_FILE=	${WRKSRC}/LICENSE
15
LICENSE_FILE=	${WRKSRC}/LICENSE
16
16
17
ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 powerpc
17
ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 powerpc powerpc64
18
18
19
BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
19
BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
20
		bash:shells/bash \
20
		bash:shells/bash \
21
		cmake>0:devel/cmake
21
		cmake>0:devel/cmake
22
LIB_DEPENDS=	libinotify.so:devel/libinotify
22
LIB_DEPENDS=	libinotify.so:devel/libinotify
23
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
23
RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
24
		ca_root_nss>=0:security/ca_root_nss
25
24
26
CONFLICTS_INSTALL=	czmq-3*
25
OPTIONS_DEFINE=		MONOLITE NLS X11 HEAPVIZ
27
28
OPTIONS_DEFINE=		MONOLITE NLS X11
29
OPTIONS_DEFAULT=	MONOLITE X11
26
OPTIONS_DEFAULT=	MONOLITE X11
30
OPTIONS_SUB=	yes
27
OPTIONS_SUB=	yes
28
29
HEAPVIZ_DESC=	Install mono-heapviz debug tool (requires py-pillow)
30
HEAPVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
31
31
32
MONOLITE_DESC=		Use monolite to bootstrap mcs (otherwise use installed mcs)
32
MONOLITE_DESC=		Use monolite to bootstrap mcs (otherwise use installed mcs)
33
MONOLITE_DISTFILES=	monolite-linux-${MONOLITE_VERSION}-latest.tar.gz:monolite
33
MONOLITE_DISTFILES=	monolite-linux-${MONOLITE_VERSION}-latest.tar.gz:monolite
Lines 40-46 Link Here
40
X11_USES=	display:test
40
X11_USES=	display:test
41
41
42
USES=	autoreconf bison compiler:c11 cpe gmake iconv libtool \
42
USES=	autoreconf bison compiler:c11 cpe gmake iconv libtool \
43
	pathfix perl5 python:2.7 shebangfix tar:bzip2
43
	pathfix perl5 python shebangfix tar:xz
44
USE_PERL5=	build
44
USE_PERL5=	build
45
GNU_CONFIGURE=	yes
45
GNU_CONFIGURE=	yes
46
USE_LDCONFIG=	yes
46
USE_LDCONFIG=	yes
Lines 49-58 Link Here
49
49
50
CONFIGURE_ARGS=	--disable-dtrace --enable-btls
50
CONFIGURE_ARGS=	--disable-dtrace --enable-btls
51
CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no
51
CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no
52
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
52
53
53
MAKE_ENV=	MONO_SHARED_DIR="${WRKDIR}" \
54
MAKE_ENV=	MONO_SHARED_DIR="${WRKDIR}" \
54
		INSTALL_STRIP_FLAG="${STRIP}" \
55
		INSTALL_STRIP_FLAG="${STRIP}" \
55
		TZ=UTC
56
		TZ=UTC
57
58
.include <bsd.port.pre.mk>
59
60
.if ${ARCH} == "powerpc" || "powerpc64" 
61
CONFIGURE_ARGS=	--disable-dtrace --disable-btls
62
# CFLAGS+=	
63
CPPFLAGS+=	-O2 -fno-strict-aliasing -Wno-missing-declarations -Wno-maybe-uninitialized -pipe -D_LARGE_FILES -D_ALL_SOURCE -D_THREAD_SAFE -D_REENTRANT
64
# LDFLAGS+=	
65
.endif
56
66
57
TEST_ARGS=	-k
67
TEST_ARGS=	-k
58
TEST_TARGET=	check
68
TEST_TARGET=	check
(-)files/patch-configure.ac (-16 / +18 lines)
Lines 1-20 Link Here
1
--- configure.ac.orig	2018-04-18 10:51:42.000000000 +0300
1
--- configure.ac.orig	2018-04-18 10:51:42.000000000 +0300
2
+++ configure.ac	2018-06-24 02:38:19.860780000 +0300
2
+++ configure.ac	2018-06-24 02:38:19.860780000 +0300
3
@@ -3271,6 +3271,8 @@
3
@@ -301,6 +301,10 @@
4
 			BTLS_PLATFORM=i386
4
 			with_gc=sgen
5
 			;;
5
 			;;
6
 		  openbsd*|freebsd*|kfreebsd-gnu*)
6
 		powerpc*-*-linux*)
7
+			BTLS_SUPPORTED=yes
7
+			# https://bugzilla.novell.com/show_bug.cgi?id=504411
8
+			BTLS_PLATFORM=i386
8
+			disable_munmap=yes
9
 		        ;;
9
+			;;
10
 		esac
10
+		powerpc*-*-freebsd*)
11
 			# https://bugzilla.novell.com/show_bug.cgi?id=504411
12
 			disable_munmap=yes
13
 			;;
14
@@ -4039,7 +4044,7 @@
11
 		;;
15
 		;;
12
@@ -3295,6 +3297,8 @@
16
 	macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \
13
 			boehm_supported=false
17
         powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | \
14
 			;;
18
-        powerpc-*-freebsd* | powerpc*-*-aix* | powerpc*-*-os400* )
15
 		  openbsd*|freebsd*|kfreebsd-gnu*)
19
+        powerpc*-*-freebsd* | powerpc*-*-aix* | powerpc*-*-os400* )
16
+                        BTLS_SUPPORTED=yes
20
 		if test "x$ac_cv_sizeof_void_p" = "x8"; then
17
+                        BTLS_PLATFORM=x86_64
21
 			TARGET=POWERPC64;
18
 			;;
22
 			CPPFLAGS="$CPPFLAGS -D__mono_ppc__ -D__mono_ppc64__"
19
 		  mingw*)
20
 			;;

Return to bug 238089