diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2017-11-19 09:10:35 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2017-11-19 09:10:35 +0000 |
| commit | 81b931df493048d5e9fff3dfc760b1ec0b820867 (patch) | |
| tree | e4f8c7495104a43ffea40b0f76c61354be7d20ef /editors/emacs-devel | |
| parent | 2984ed3847671d92e6e8490e5d9d64bd956b58df (diff) | |
| download | ports-81b931df493048d5e9fff3dfc760b1ec0b820867.tar.gz ports-81b931df493048d5e9fff3dfc760b1ec0b820867.zip | |
- 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]
Notes
Notes:
svn path=/head/; revision=454481
Diffstat (limited to 'editors/emacs-devel')
| -rw-r--r-- | editors/emacs-devel/Makefile | 15 | ||||
| -rw-r--r-- | editors/emacs-devel/distinfo | 6 | ||||
| -rw-r--r-- | editors/emacs-devel/pkg-plist | 2 |
3 files changed, 18 insertions, 5 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 250ff2dbcb0c..5a316f9c0901 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -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 @@ -180,6 +180,17 @@ 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) diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo index 7d5946244be6..62b1c98cd0a8 100644 --- a/editors/emacs-devel/distinfo +++ b/editors/emacs-devel/distinfo @@ -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 diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist index 1dcba7f2c543..65fbfe4497ac 100644 --- a/editors/emacs-devel/pkg-plist +++ b/editors/emacs-devel/pkg-plist @@ -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 |