- Revert GSTREAMER option

- Add description for GSTREAMER, because it depends of new API (1.0)
- Convert to USES= pathfix
- Merge 'post-patch' target with configure patch (when NLS is unset)

3 files changed, 18 insertions, 15 deletions

diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index a8939888398b..b8c92b8a740d 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tumbler
 PORTVERSION=	0.1.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
@@ -16,11 +16,11 @@ COMMENT=	Thumbnail service for Xfce desktop
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
-USES=		pkgconfig
+USES=		pathfix pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib20 gnomehack intltool intlhack
+USE_GNOME=	glib20 intltool intlhack
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv
 
@@ -29,11 +29,10 @@ CONFIGURE_ARGS=	--enable-xdg-cache \
 
 OPTIONS_DEFINE=	DOCS NLS PIXBUF FONTS JPEG FFMPEG POPPLER \
 	GSTREAMER ODF RAW COVER
-OPTIONS_DEFAULT=	PIXBUF FONTS JPEG POPPLER GSTREAMER ODF
-# GStreamer thumbnailer needs new 1.0 API
-OPTIONS_EXCLUDE=	GSTREAMER
+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
 
@@ -129,7 +128,7 @@ USE_GNOME+=	gdkpixbuf2
 CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
 PLIST_SUB+=	PIXBUF=""
 .endif
-USE_GSTREAMER=	yes
+USE_GSTREAMER1=	yes
 CONFIGURE_ARGS+=--enable-gstreamer-thumbnailer
 PLIST_SUB+=	GSTREAMER=""
 .else
@@ -179,11 +178,6 @@ CONFIGURE_ARGS+=--disable-cover-thumbnailer
 PLIST_SUB+=	COVER="@comment "
 .endif
 
-post-patch:
-.if empty(PORT_OPTIONS:MNLS)
-	@${REINPLACE_CMD} -e 's|	po||' ${WRKSRC}/Makefile.in
-.endif
-
 post-install:
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
diff --git a/deskutils/xfce4-tumbler/files/patch-configure b/deskutils/xfce4-tumbler/files/patch-configure
index 07f4f0640a7e..3d901172185d 100644
--- a/deskutils/xfce4-tumbler/files/patch-configure
+++ b/deskutils/xfce4-tumbler/files/patch-configure
@@ -1,5 +1,5 @@
 --- ./configure.orig	2013-01-12 11:14:34.000000000 +0000
-+++ ./configure	2013-01-12 18:25:40.000000000 +0000
++++ ./configure	2013-04-28 11:32:14.000000000 +0000
 @@ -915,9 +915,10 @@
  enable_gtk_doc
  enable_gtk_doc_html
@@ -12,6 +12,15 @@
  enable_ffmpeg_thumbnailer
  enable_gstreamer_thumbnailer
  enable_odf_thumbnailer
+@@ -13879,7 +13880,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++#     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no
 @@ -15618,9 +15619,9 @@
  fi
  
diff --git a/deskutils/xfce4-tumbler/pkg-plist b/deskutils/xfce4-tumbler/pkg-plist
index 38544deba504..505784f45ebb 100644
--- a/deskutils/xfce4-tumbler/pkg-plist
+++ b/deskutils/xfce4-tumbler/pkg-plist
@@ -30,8 +30,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
-@comment %%GSTREAMER%%lib/tumbler-1/plugins/tumbler-gst-thumbnailer.la
-@comment %%GSTREAMER%%lib/tumbler-1/plugins/tumbler-gst-thumbnailer.so
+%%GSTREAMER%%lib/tumbler-1/plugins/tumbler-gst-thumbnailer.la
+%%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