4 files changed, 37 insertions, 195 deletions

diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index 472665b5ce2d..4940f2507d54 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	tumbler
-PORTVERSION=	0.1.30
-PORTREVISION=	6
+PORTVERSION=	0.1.31
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 PKGNAMEPREFIX=	xfce4-
 DIST_SUBDIR=	xfce4
 
@@ -19,163 +17,43 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-USES=		pathfix pkgconfig gmake libtool tar:bzip2
+USES=		pathfix pkgconfig gmake libtool gettext-tools xfce tar:bzip2
 GNU_CONFIGURE=	yes
-USE_GNOME=	glib20 intltool intlhack
+USE_GNOME=	glib20 intltool intlhack gdkpixbuf2
 USE_LDCONFIG=	yes
-USE_XFCE=	configenv
 
 CONFIGURE_ARGS=	--enable-xdg-cache \
-		--disable-gtk-doc-html
+		--enable-pixbuf-thumbnailer \
+		--disable-gtk-doc-html \
+		--without-html-dir
+
+OPTIONS_DEFINE=	NLS FONTS JPEG FFMPEG POPPLER \
+		GSTREAMER ODF COVER
+OPTIONS_DEFAULT=	FONTS JPEG POPPLER GSTREAMER ODF
 
-OPTIONS_DEFINE=	DOCS NLS PIXBUF FONTS JPEG FFMPEG POPPLER \
-		GSTREAMER ODF OPENRAW COVER
-OPTIONS_DEFAULT=	PIXBUF FONTS JPEG POPPLER ODF
 FONTS_DESC=	Fonts thumbnailer plugin
 COVER_DESC=	Open Movie Database thumbnailer plugin
 GSTREAMER_DESC=	GStreamer (1.0) thumbnailer plugin
 
-SUB_FILES=	pkg-message
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	APIDOCS=""
-.else
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.else
-CONFIGURE_ARGS+=--disable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFONTS}
-# PIXBUF needs to be set
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
-CONFIGURE_ARGS+=--enable-font-thumbnailer
-PLIST_SUB+=	FONTS=""
-.else
-CONFIGURE_ARGS+=--disable-font-thumbnailer
-PLIST_SUB+=	FONTS="@comment "
-.endif
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+FONTS_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FONTS_CONFIGURE_ENABLE=	font-thumbnailer
+JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+	libexif.so:${PORTSDIR}/graphics/libexif
+JPEG_CONFIGURE_ENABLE=	jpeg-thumbnailer
+FFMPEG_LIB_DEPENDS=	libffmpegthumbnailer.so:${PORTSDIR}/multimedia/ffmpegthumbnailer
+FFMPEG_CONFIGURE_ENABLE=	ffmpeg-thumbnailer
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+POPPLER_CONFIGURE_ENABLE=	poppler-thumbnailer
+GSTREAMER_USE=	gstreamer1=yes
+GSTREAMER_CONFIGURE_ENABLE=	gstreamer-thumbnailer
+ODF_USE=	gnome=libgsf
+ODF_CONFIGURE_ENABLE=	odf-thumbnailer
+COVER_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+COVER_CONFIGURE_ENABLE=	cover-thumbnailer
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MJPEG}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-CONFIGURE_ARGS+=--enable-jpeg-thumbnailer
-PLIST_SUB+=	JPEG=""
-.else
-CONFIGURE_ARGS+=--disable-jpeg-thumbnailer
-PLIST_SUB+=	JPEG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFFMPEG}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-LIB_DEPENDS+=	libffmpegthumbnailer.so:${PORTSDIR}/multimedia/ffmpegthumbnailer
-CONFIGURE_ARGS+=--enable-ffmpeg-thumbnailer
-PLIST_SUB+=	FFMPEG=""
-.else
-CONFIGURE_ARGS+=--disable-ffmpeg-thumbnailer
-PLIST_SUB+=	FFMPEG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPOPPLER}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-LIB_DEPENDS+=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
-CONFIGURE_ARGS+=--enable-poppler-thumbnailer
-PLIST_SUB+=	POPPLER=""
-.else
-CONFIGURE_ARGS+=--disable-poppler-thumbnailer
-PLIST_SUB+=	POPPLER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGSTREAMER}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-USE_GSTREAMER1=	yes
-CONFIGURE_ARGS+=--enable-gstreamer-thumbnailer
-PLIST_SUB+=	GSTREAMER=""
-.else
-CONFIGURE_ARGS+=--disable-gstreamer-thumbnailer
-PLIST_SUB+=	GSTREAMER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MODF}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-USE_GNOME+=	libgsf
-CONFIGURE_ARGS+=--enable-odf-thumbnailer
-PLIST_SUB+=	ODF=""
-.else
-CONFIGURE_ARGS+=--disable-odf-thumbnailer
-PLIST_SUB+=	ODF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOPENRAW}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-LIB_DEPENDS+=	libopenraw.so:${PORTSDIR}/graphics/libopenraw
-CONFIGURE_ARGS+=--enable-raw-thumbnailer
-PLIST_SUB+=	RAW=""
-.else
-CONFIGURE_ARGS+=--disable-raw-thumbnailer
-PLIST_SUB+=	RAW="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCOVER}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=--enable-cover-thumbnailer
-PLIST_SUB+=	COVER=""
-.else
-CONFIGURE_ARGS+=--disable-cover-thumbnailer
-PLIST_SUB+=	COVER="@comment "
-.endif
+SUB_FILES=	pkg-message
 
 .include <bsd.port.mk>
diff --git a/deskutils/xfce4-tumbler/distinfo b/deskutils/xfce4-tumbler/distinfo
index 076266d39f4b..b1cc29e6b842 100644
--- a/deskutils/xfce4-tumbler/distinfo
+++ b/deskutils/xfce4-tumbler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/tumbler-0.1.30.tar.bz2) = e7c20d79c830465f8b3b792893f05e8b8d5ba90aec4973e7517e07ef31537304
-SIZE (xfce4/tumbler-0.1.30.tar.bz2) = 515676
+SHA256 (xfce4/tumbler-0.1.31.tar.bz2) = d0fd329273ff6ac98885eade4c3d8c87a4dd0816f713646130808bfa90b87173
+SIZE (xfce4/tumbler-0.1.31.tar.bz2) = 550650
diff --git a/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc b/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc
index 6f182e75be82..0084f724b3ba 100644
--- a/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc
+++ b/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc
@@ -1,6 +1,6 @@
---- ./tumblerd/tumbler.rc.orig	2013-01-12 11:14:28.000000000 +0000
-+++ ./tumblerd/tumbler.rc	2013-01-12 22:12:40.000000000 +0000
-@@ -37,7 +37,7 @@
+--- tumblerd/tumbler.rc.orig	2015-02-28 15:23:08 UTC
++++ tumblerd/tumbler.rc
+@@ -37,7 +37,7 @@ MaxFileSize=0
  
  # RAW image files using libopenraw
  [RawThumbnailer]
@@ -9,7 +9,7 @@
  Priority=1
  Locations=
  MaxFileSize=0
-@@ -58,14 +58,14 @@
+@@ -58,7 +58,7 @@ MaxFileSize=0
  
  # ffmpegthumbnailer plugin
  [FfmegThumbnailer]
@@ -18,11 +18,3 @@
  Priority=2
  Locations=
  MaxFileSize=0
- 
- # GStreamer plugin
- [GstThumbnailer]
--Disabled=false
-+Disabled=true
- Priority=1
- Locations=
- MaxFileSize=0
diff --git a/deskutils/xfce4-tumbler/pkg-plist b/deskutils/xfce4-tumbler/pkg-plist
index c8e046a8ac1c..0bfa3d4c0227 100644
--- a/deskutils/xfce4-tumbler/pkg-plist
+++ b/deskutils/xfce4-tumbler/pkg-plist
@@ -27,42 +27,13 @@ lib/tumbler-1/plugins/cache/tumbler-xdg-cache.so
 %%JPEG%%lib/tumbler-1/plugins/tumbler-jpeg-thumbnailer.so
 %%GSTREAMER%%lib/tumbler-1/plugins/tumbler-gst-thumbnailer.so
 %%ODF%%lib/tumbler-1/plugins/tumbler-odf-thumbnailer.so
-%%PIXBUF%%lib/tumbler-1/plugins/tumbler-pixbuf-thumbnailer.so
+lib/tumbler-1/plugins/tumbler-pixbuf-thumbnailer.so
 %%POPPLER%%lib/tumbler-1/plugins/tumbler-poppler-thumbnailer.so
-%%RAW%%lib/tumbler-1/plugins/tumbler-raw-thumbnailer.so
 lib/tumbler-1/tumblerd
 libdata/pkgconfig/tumbler-1.pc
 share/dbus-1/services/org.xfce.Tumbler.Cache1.service
 share/dbus-1/services/org.xfce.Tumbler.Manager1.service
 share/dbus-1/services/org.xfce.Tumbler.Thumbnailer1.service
-%%APIDOCS%%share/gtk-doc/html/tumbler/TumblerAbstractThumbnailer.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/TumblerCache.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/TumblerThumbnail.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/TumblerThumbnailerProvider.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/api-index-full.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/extension-api.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/extension-tutorial.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/home.png
-%%APIDOCS%%share/gtk-doc/html/tumbler/index.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/index.sgml
-%%APIDOCS%%share/gtk-doc/html/tumbler/left-insensitive.png
-%%APIDOCS%%share/gtk-doc/html/tumbler/left.png
-%%APIDOCS%%share/gtk-doc/html/tumbler/miscellaneous.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/object-tree.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/pt01.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/right-insensitive.png
-%%APIDOCS%%share/gtk-doc/html/tumbler/right.png
-%%APIDOCS%%share/gtk-doc/html/tumbler/style.css
-%%APIDOCS%%share/gtk-doc/html/tumbler/thumbnails.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-Error-Domain-and-Types.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-Various-Enumeration-Types.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-Version-Information-and-Compatibility-Checks.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-tumbler-file-info.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-tumbler-provider-factory.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-tumbler-provider-plugin.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler.devhelp2
-%%APIDOCS%%share/gtk-doc/html/tumbler/up-insensitive.png
-%%APIDOCS%%share/gtk-doc/html/tumbler/up.png
 %%NLS%%share/locale/ar/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/tumbler.mo
@@ -80,6 +51,7 @@ share/dbus-1/services/org.xfce.Tumbler.Thumbnailer1.service
 %%NLS%%share/locale/fr/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/he/LC_MESSAGES/tumbler.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/id/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/is/LC_MESSAGES/tumbler.mo