4 files changed, 45 insertions, 15 deletions

diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 6731bb8aff25..a50b55c140b6 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libexo
-PORTVERSION=	0.10.7
+PORTVERSION=	0.12.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/src/xfce/${PORTNAME:C/lib//}/${PORTVERSION:R}
 DISTNAME=	exo-${PORTVERSION}
@@ -16,6 +16,8 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 BUILD_DEPENDS=	p5-URI>=1.60:net/p5-URI
 RUN_DEPENDS=	p5-URI>=1.60:net/p5-URI
 
@@ -25,13 +27,13 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 USES=		desktop-file-utils gmake libtool pathfix perl5 \
-		pkgconfig gettext-tools xfce tar:bzip2
-USE_GNOME=	glib20 gtk20 intltool intlhack
+		pkgconfig gettext-tools xfce:gtk3 tar:bzip2
+USE_GNOME=	cairo glib20 gtk20 gtk30 intltool intlhack
 USE_LDCONFIG=	yes
 USE_XFCE=	libmenu
-USE_XORG=	x11
+USE_XORG=	ice sm x11
 
-CONFIGURE_ARGS=--without-html-dir
+CONFIGURE_ARGS=--without-html-dir --disable-silent-rules
 
 OPTIONS_DEFINE=	NLS
 NLS_USES=	gettext-runtime
diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo
index f70119f71f78..1a36f4456798 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/exo-0.10.7.tar.bz2) = 521581481128af93e815f9690020998181f947ac9e9c2b232b1f144d76b1b35c
-SIZE (xfce4/exo-0.10.7.tar.bz2) = 1262301
+TIMESTAMP = 1518594955
+SHA256 (xfce4/exo-0.12.0.tar.bz2) = 64b88271a37d0ec7dca062c7bc61ca323116f7855092ac39698c421a2f30a18f
+SIZE (xfce4/exo-0.12.0.tar.bz2) = 1310691
diff --git a/x11/libexo/files/patch-configure b/x11/libexo/files/patch-configure
index 367b6553c4ec..21c974be517f 100644
--- a/x11/libexo/files/patch-configure
+++ b/x11/libexo/files/patch-configure
@@ -1,6 +1,6 @@
---- ./configure.orig	2012-12-27 12:50:36.000000000 +0000
-+++ ./configure	2013-05-05 20:55:42.000000000 +0000
-@@ -633,6 +633,9 @@
+--- configure.orig	2018-02-14 03:55:48 UTC
++++ configure
+@@ -633,6 +633,9 @@ ac_includes_default="\
  #endif
  #ifdef HAVE_UNISTD_H
  # include <unistd.h>
@@ -10,7 +10,7 @@
  #endif"
  
  ac_header_list=
-@@ -13802,7 +13805,7 @@
+@@ -14496,7 +14499,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
  
      fi
    fi
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index f816ae359c60..e8a7040898c1 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -27,12 +27,36 @@ include/exo-1/exo/exo-utils.h
 include/exo-1/exo/exo-wrap-table.h
 include/exo-1/exo/exo-xsession-client.h
 include/exo-1/exo/exo.h
+include/exo-2/exo/exo-binding.h
+include/exo-2/exo/exo-cell-renderer-icon.h
+include/exo-2/exo/exo-config.h
+include/exo-2/exo/exo-enum-types.h
+include/exo-2/exo/exo-execute.h
+include/exo-2/exo/exo-gdk-pixbuf-extensions.h
+include/exo-2/exo/exo-gobject-extensions.h
+include/exo-2/exo/exo-gtk-extensions.h
+include/exo-2/exo/exo-icon-chooser-dialog.h
+include/exo-2/exo/exo-icon-chooser-model.h
+include/exo-2/exo/exo-icon-view.h
+include/exo-2/exo/exo-job.h
+include/exo-2/exo/exo-simple-job.h
+include/exo-2/exo/exo-string.h
+include/exo-2/exo/exo-thumbnail-preview.h
+include/exo-2/exo/exo-thumbnail.h
+include/exo-2/exo/exo-toolbars-model.h
+include/exo-2/exo/exo-tree-view.h
+include/exo-2/exo/exo-utils.h
+include/exo-2/exo/exo.h
 lib/libexo-1.so
 lib/libexo-1.so.0
 lib/libexo-1.so.0.1.0
+lib/libexo-2.so
+lib/libexo-2.so.0
+lib/libexo-2.so.0.1.0
 lib/xfce4/exo-1/exo-compose-mail-1
 lib/xfce4/exo-1/exo-helper-1
 libdata/pkgconfig/exo-1.pc
+libdata/pkgconfig/exo-2.pc
 man/man1/exo-csource.1.gz
 man/man1/exo-open.1.gz
 share/applications/exo-file-manager.desktop
@@ -42,8 +66,7 @@ share/applications/exo-terminal-emulator.desktop
 share/applications/exo-web-browser.desktop
 share/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
 share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
-share/icons/hicolor/48x48/categories/applications-internet.png
-share/icons/hicolor/48x48/categories/applications-other.png
+%%NLS%%share/locale/am/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/be/LC_MESSAGES/exo-1.mo
@@ -70,6 +93,7 @@ share/icons/hicolor/48x48/categories/applications-other.png
 %%NLS%%share/locale/it/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/kn/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/exo-1.mo
@@ -90,9 +114,9 @@ share/icons/hicolor/48x48/categories/applications-other.png
 %%NLS%%share/locale/sq/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/exo-1.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/te/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/th/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/exo-1.mo
@@ -105,6 +129,7 @@ share/pixmaps/exo-1/exo-thumbnail-frame.png
 share/xfce4/helpers/Thunar.desktop
 share/xfce4/helpers/aterm.desktop
 share/xfce4/helpers/balsa.desktop
+share/xfce4/helpers/brave.desktop
 share/xfce4/helpers/caja.desktop
 share/xfce4/helpers/chromium.desktop
 share/xfce4/helpers/debian-sensible-browser.desktop
@@ -116,7 +141,9 @@ share/xfce4/helpers/eterm.desktop
 share/xfce4/helpers/evolution.desktop
 share/xfce4/helpers/firefox.desktop
 share/xfce4/helpers/galeon.desktop
+share/xfce4/helpers/geary.desktop
 share/xfce4/helpers/gnome-terminal.desktop
+share/xfce4/helpers/google-chrome.desktop
 share/xfce4/helpers/icecat.desktop
 share/xfce4/helpers/icedove.desktop
 share/xfce4/helpers/iceweasel.desktop
@@ -133,7 +160,6 @@ share/xfce4/helpers/nautilus.desktop
 share/xfce4/helpers/netscape-navigator.desktop
 share/xfce4/helpers/nxterm.desktop
 share/xfce4/helpers/opera-browser.desktop
-share/xfce4/helpers/opera-mailer.desktop
 share/xfce4/helpers/pcmanfm.desktop
 share/xfce4/helpers/qterminal.desktop
 share/xfce4/helpers/qtfm.desktop
@@ -144,6 +170,7 @@ share/xfce4/helpers/sakura.desktop
 share/xfce4/helpers/surf.desktop
 share/xfce4/helpers/sylpheed-claws.desktop
 share/xfce4/helpers/sylpheed.desktop
+share/xfce4/helpers/terminator.desktop
 share/xfce4/helpers/thunderbird.desktop
 share/xfce4/helpers/urxvt.desktop
 share/xfce4/helpers/vimprobable2.desktop