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