3 files changed, 18 insertions, 19 deletions

diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index 764ef926853a..339384ee96e1 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -1,15 +1,11 @@
-# New ports collection makefile for:	tumbler
-# Date created:				2010-12-03
-# Whom:					Olivier Duchateau <duchateau.olivier@gmail.com>
-#
 # $FreeBSD$
 #
 
 PORTNAME=	tumbler
-PORTVERSION=	0.1.25
-PORTREVISION=	2
+PORTVERSION=	0.1.26
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 PKGNAMEPREFIX=	xfce4-
 DIST_SUBDIR=	xfce4
 
@@ -17,8 +13,8 @@ MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Thumbnail service for Xfce desktop
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+		freetype:${PORTSDIR}/print/freetype2 \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -33,7 +29,9 @@ CONFIGURE_ARGS=	--enable-xdg-cache \
 
 OPTIONS_DEFINE=	DOCS NLS PIXBUF FONTS JPEG FFMPEG POPPLER GSTREAMER ODF RAW
 OPTIONS_DEFAULT=	PIXBUF FONTS JPEG POPPLER GSTREAMER ODF
-FONTS_DESC=	Enable fonts plugin thumbnailer
+# GStreamer thumbnailer needs new 1.0 API
+OPTIONS_EXCLUDE=	GSTREAMER
+FONTS_DESC=	Fonts thumbnailer plugin
 
 .include <bsd.port.options.mk>
 
@@ -72,8 +70,8 @@ PLIST_SUB+=	FONTS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MJPEG}
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		exif.12:${PORTSDIR}/graphics/exif
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
+		exif:${PORTSDIR}/graphics/exif
 CONFIGURE_ARGS+=--enable-jpeg-thumbnailer
 PLIST_SUB+=	JPEG=""
 .else
@@ -82,7 +80,7 @@ PLIST_SUB+=	JPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	ffmpegthumbnailer.4:${PORTSDIR}/multimedia/ffmpegthumbnailer
+LIB_DEPENDS+=	ffmpegthumbnailer:${PORTSDIR}/multimedia/ffmpegthumbnailer
 CONFIGURE_ARGS+=--enable-ffmpeg-thumbnailer
 PLIST_SUB+=	FFMPEG=""
 .else
@@ -91,7 +89,7 @@ PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPOPPLER}
-LIB_DEPENDS+=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS+=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
 CONFIGURE_ARGS+=--enable-poppler-thumbnailer
 PLIST_SUB+=	POPPLER=""
 .else
@@ -118,7 +116,7 @@ PLIST_SUB+=	ODF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MRAW}
-LIB_DEPENDS+=	openraw.6:${PORTSDIR}/graphics/libopenraw
+LIB_DEPENDS+=	openraw:${PORTSDIR}/graphics/libopenraw
 CONFIGURE_ARGS+=--enable-raw-thumbnailer
 PLIST_SUB+=	RAW=""
 .else
@@ -126,8 +124,8 @@ CONFIGURE_ARGS+=--disable-raw-thumbnailer
 PLIST_SUB+=	RAW="@comment "
 .endif
 
-.if empty(PORT_OPTIONS:MNLS)
 post-patch:
+.if empty(PORT_OPTIONS:MNLS)
 	@${REINPLACE_CMD} -e 's|	po||' ${WRKSRC}/Makefile.in
 .endif
 
diff --git a/deskutils/xfce4-tumbler/distinfo b/deskutils/xfce4-tumbler/distinfo
index fdd329fcb4a0..4ec603c17f9a 100644
--- a/deskutils/xfce4-tumbler/distinfo
+++ b/deskutils/xfce4-tumbler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/tumbler-0.1.25.tar.bz2) = 02d5de508d8c18692a25a832a9280c2043f6b7c90dd3fcbd87f5955337015546
-SIZE (xfce4/tumbler-0.1.25.tar.bz2) = 478618
+SHA256 (xfce4/tumbler-0.1.26.tar.bz2) = 6602ce700160d09edd88ea0b9bcb16abbc28974f372e646709e0ed8fbacc8a78
+SIZE (xfce4/tumbler-0.1.26.tar.bz2) = 482470
diff --git a/deskutils/xfce4-tumbler/pkg-plist b/deskutils/xfce4-tumbler/pkg-plist
index 09545494da6c..9cf55169ed29 100644
--- a/deskutils/xfce4-tumbler/pkg-plist
+++ b/deskutils/xfce4-tumbler/pkg-plist
@@ -27,8 +27,8 @@ lib/tumbler-1/plugins/cache/tumbler-xdg-cache.so
 %%FONTS%%lib/tumbler-1/plugins/tumbler-font-thumbnailer.so
 %%JPEG%%lib/tumbler-1/plugins/tumbler-jpeg-thumbnailer.la
 %%JPEG%%lib/tumbler-1/plugins/tumbler-jpeg-thumbnailer.so
-%%GSTREAMER%%lib/tumbler-1/plugins/tumbler-gst-thumbnailer.la
-%%GSTREAMER%%lib/tumbler-1/plugins/tumbler-gst-thumbnailer.so
+@comment %%GSTREAMER%%lib/tumbler-1/plugins/tumbler-gst-thumbnailer.la
+@comment %%GSTREAMER%%lib/tumbler-1/plugins/tumbler-gst-thumbnailer.so
 %%ODF%%lib/tumbler-1/plugins/tumbler-odf-thumbnailer.la
 %%ODF%%lib/tumbler-1/plugins/tumbler-odf-thumbnailer.so
 %%PIXBUF%%lib/tumbler-1/plugins/tumbler-pixbuf-thumbnailer.la
@@ -104,6 +104,7 @@ share/dbus-1/services/org.xfce.Tumbler.Thumbnailer1.service
 %%NLS%%share/locale/ru/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/si/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/tumbler.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/te/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/tumbler.mo