Index: head/devel/ninja/Makefile =================================================================== --- head/devel/ninja/Makefile (revision 499108) +++ head/devel/ninja/Makefile (revision 499109) @@ -1,59 +1,58 @@ # Created by: Grzegorz Blach # $FreeBSD$ PORTNAME= ninja -PORTVERSION= 1.8.2 +PORTVERSION= 1.9.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org COMMENT= Ninja is a small build system closest in spirit to Make LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING USE_GITHUB= yes GH_ACCOUNT= ninja-build CONFLICTS= irc/ninja-[0-9]* USES= python PLIST_FILES= bin/ninja PORTDOCS= HACKING.md README manual.asciidoc OPTIONS_DEFINE= DOCS BASH ZSH OPTIONS_DEFAULT= BASH ZSH BASH_PLIST_FILES= share/bash-completion/completions/ninja ZSH_PLIST_FILES= share/zsh/site-functions/_ninja post-patch: @${REINPLACE_CMD} "s/'-g', //" ${WRKSRC}/configure.py do-build: @(cd ${WRKSRC} && \ CXX="${CXX}" CFLAGS="${CXXFLAGS}" ${PYTHON_CMD} configure.py --bootstrap) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && \ ${INSTALL_DATA} HACKING.md README doc/manual.asciidoc \ ${STAGEDIR}${DOCSDIR}) do-install-BASH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ ${INSTALL_DATA} ${WRKSRC}/misc/bash-completion \ ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ninja do-install-ZSH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKSRC}/misc/zsh-completion \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_ninja do-test: build cd ${WRKSRC} && ./ninja ninja_test && ./ninja_test .include Index: head/devel/ninja/distinfo =================================================================== --- head/devel/ninja/distinfo (revision 499108) +++ head/devel/ninja/distinfo (revision 499109) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505991412 -SHA256 (ninja-build-ninja-v1.8.2_GH0.tar.gz) = 86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4 -SIZE (ninja-build-ninja-v1.8.2_GH0.tar.gz) = 185226 +TIMESTAMP = 1548892741 +SHA256 (ninja-build-ninja-v1.9.0_GH0.tar.gz) = 5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9 +SIZE (ninja-build-ninja-v1.9.0_GH0.tar.gz) = 190860 Index: head/multimedia/totem/Makefile =================================================================== --- head/multimedia/totem/Makefile (revision 499108) +++ head/multimedia/totem/Makefile (revision 499109) @@ -1,87 +1,84 @@ # Created by: Hendrik Scholz # $FreeBSD$ PORTNAME= totem PORTVERSION= 3.26.2 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Gstreamer-based video player for the GNOME 3 Desktop LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ pylint:devel/pylint \ appstream-glib>=0:devel/appstream-glib \ itstool:textproc/itstool \ grilo-plugins>=0:net/grilo-plugins LIB_DEPENDS= libgdata.so:devel/libgdata \ libcogl.so:graphics/cogl \ libclutter-1.0.so:graphics/clutter \ libclutter-gst-3.0.so:multimedia/clutter-gst3 \ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ libpeas-1.0.so:devel/libpeas \ libjson-glib-1.0.so:devel/json-glib \ libgrilo-0.3.so:net/grilo \ libzeitgeist-2.0.so:sysutils/zeitgeist \ libtotem-plparser.so:multimedia/totem-pl-parser RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} \ gnome-settings-daemon>=2.91.0:sysutils/gnome-settings-daemon \ gnome-icon-theme-symbolic>=2.91.0:x11-themes/gnome-icon-theme-symbolic \ grilo-plugins>=0:net/grilo-plugins PORTSCOUT= limitw:1,even USES= desktop-file-utils gettext gl gnome localbase meson \ pkgconfig python:3.4+ tar:xz USE_GNOME= cairo gtk30 intlhack introspection libxml2 nautilus3 \ pygobject3 USE_XORG= x11 xorgproto xtst ice sm USE_GSTREAMER1= core good bad soup ugly INSTALLS_ICONS= yes USE_GL= egl USE_LDCONFIG= yes BINARY_ALIAS= python3=${PYTHON_VERSION} GLIB_SCHEMAS= org.gnome.totem.enums.xml \ org.gnome.totem.gschema.xml \ org.gnome.totem.plugins.opensubtitles.gschema.xml \ org.gnome.totem.plugins.pythonconsole.gschema.xml +# There is an upstream issue in meson which makes the build of totem +# fail when using vala, due to badly created targets. +# https://gitlab.gnome.org/GNOME/totem/issues/272 # https://bugzilla.gnome.org/show_bug.cgi?id=786248 # https://github.com/mesonbuild/meson/issues/1994 -MAKE_JOBS_UNSAFE=yes - -.include - -.if ${ARCH} == i386 +# Until upstream fixes this, remove vala support from totem. MESON_ARGS= -Denable-vala=no PLIST_SUB+= VALA="@comment " -.else -BUILD_DEPENDS+= valac:lang/vala -PLIST_SUB+= VALA="" -.endif + +.include .if defined(WITH_DVD_DEVICE) DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} .else DEFAULT_DVD_DEVICE=/dev/cd0 .endif pre-everything:: @${ECHO_MSG} "===> The default DVD device is ${DEFAULT_DVD_DEVICE}" @${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default" @${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'" .if exists(/usr/lib/libstdc++.so) post-patch: ${REINPLACE_CMD} -e '/-Wno-unused-but-set-variable/d' \ ${WRKSRC}/src/plugins/meson.build .endif .include