Date: Sun, 19 Nov 2017 09:10:35 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454481 - head/editors/emacs-devel Message-ID: <201711190910.vAJ9AZam057934@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ashish Date: Sun Nov 19 09:10:35 2017 New Revision: 454481 URL: https://svnweb.freebsd.org/changeset/ports/454481 Log: - Update to git snapshot 6b8e9b7 - Fix broken behaviour when port is compiled with IMAGEMAGICK option and ImageMagick is built with OPENMP option[1] PR: 223518[1] Submitted by: Kalten <kalten@gmx.at>[1] Modified: head/editors/emacs-devel/Makefile head/editors/emacs-devel/distinfo head/editors/emacs-devel/pkg-plist Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Sun Nov 19 09:05:18 2017 (r454480) +++ head/editors/emacs-devel/Makefile Sun Nov 19 09:10:35 2017 (r454481) @@ -17,10 +17,10 @@ CONFLICTS= emacs25-[0-9]* emacs-nox11-[0-9]* USE_GITHUB= yes GH_ACCOUNT= emacs-mirror -GH_TAGNAME= 00995c8 +GH_TAGNAME= 6b8e9b7 EMACS_VER= 27.0.50 -EMACS_REV= 20171109 +EMACS_REV= 20171118 GNU_CONFIGURE= yes USES= autoreconf:build cpe gmake makeinfo ncurses pkgconfig INFO_PATH= ${DATADIR_REL}/info @@ -179,6 +179,17 @@ XWIDGETS_USE= XORG=xcomposite XWIDGETS_CONFIGURE_WITH=xwidgets XWIDGETS_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 XWIDGETS_IMPLIES= GTK3 + +.include <bsd.port.options.mk> + +# has graphics/ImageMagick been compiled with OPENMP? +.if ${PORT_OPTIONS:MMAGICK} && ${:!${GREP} -sc " \-fopenmp " ${LOCALBASE}/libdata/pkgconfig/ImageMagick.pc || true!} == "1" +_MAGICK_WITH_OPENMP= true +.endif + +.ifdef _MAGICK_WITH_OPENMP +USES+= compiler:openmp +.endif pre-configure: @(cd ${WRKSRC} && ./autogen.sh all) Modified: head/editors/emacs-devel/distinfo ============================================================================== --- head/editors/emacs-devel/distinfo Sun Nov 19 09:05:18 2017 (r454480) +++ head/editors/emacs-devel/distinfo Sun Nov 19 09:10:35 2017 (r454481) @@ -1,3 +1,3 @@ -TIMESTAMP = 1510228929 -SHA256 (emacs-mirror-emacs-27.0.50.20171109-00995c8_GH0.tar.gz) = 651c88c9f2662acc40b25b2e771205ee3ed6403c2d5143520b81af9d114a9640 -SIZE (emacs-mirror-emacs-27.0.50.20171109-00995c8_GH0.tar.gz) = 39830345 +TIMESTAMP = 1510982076 +SHA256 (emacs-mirror-emacs-27.0.50.20171118-6b8e9b7_GH0.tar.gz) = 8b52b9a2e6c6a2f6c4cc37ed093f42656dc19541e91f207fc7a2735597349309 +SIZE (emacs-mirror-emacs-27.0.50.20171118-6b8e9b7_GH0.tar.gz) = 39857493 Modified: head/editors/emacs-devel/pkg-plist ============================================================================== --- head/editors/emacs-devel/pkg-plist Sun Nov 19 09:05:18 2017 (r454480) +++ head/editors/emacs-devel/pkg-plist Sun Nov 19 09:10:35 2017 (r454481) @@ -495,6 +495,7 @@ share/applications/emacs.desktop %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/48x48/apps/emacs.png %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/48x48/apps/emacs22.png %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/48x48/apps/emacs23.png +%%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/scalable/apps/emacs.ico %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/scalable/apps/emacs.svg %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/scalable/apps/emacs23.svg %%DATADIR%%/%%EMACS_VER%%/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg @@ -4104,6 +4105,7 @@ share/icons/hicolor/16x16/apps/emacs.png share/icons/hicolor/24x24/apps/emacs.png share/icons/hicolor/32x32/apps/emacs.png share/icons/hicolor/48x48/apps/emacs.png +share/icons/hicolor/scalable/apps/emacs.ico share/icons/hicolor/scalable/apps/emacs.svg share/icons/hicolor/scalable/mimetypes/emacs-document.svg share/icons/hicolor/scalable/mimetypes/emacs-document23.svg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711190910.vAJ9AZam057934>