CVS commit: pkgsrc/x11/xfce4-tumbler

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sat Jan 19 01:51:15 UTC 2019

Modified Files:
        pkgsrc/x11/xfce4-tumbler: Makefile PLIST

Log Message:
x11/xfce4-tumbler: fix PLIST so it handles options correctly

The PLIST was not reflecting optional dependencies correctly. (It was
also not necessary to include ffmpeg3 as a fixed dependency in the make
file. That gets pulled in via ffmpegthumbnailer anyway, which is an
option.) No PKGREVISION, because this doesn't affect the default build.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/x11/xfce4-tumbler/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xfce4-tumbler/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xfce4-tumbler/Makefile
diff -u pkgsrc/x11/xfce4-tumbler/Makefile:1.57 pkgsrc/x11/xfce4-tumbler/Makefile:1.58
--- pkgsrc/x11/xfce4-tumbler/Makefile:1.57      Fri Jan 18 14:00:40 2019
+++ pkgsrc/x11/xfce4-tumbler/Makefile   Sat Jan 19 01:51:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2019/01/18 14:00:40 youri Exp $
+# $NetBSD: Makefile,v 1.58 2019/01/19 01:51:15 gutteridge Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -39,7 +39,6 @@ CFLAGS+=              -g
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"

Index: pkgsrc/x11/xfce4-tumbler/PLIST
diff -u pkgsrc/x11/xfce4-tumbler/PLIST:1.4 pkgsrc/x11/xfce4-tumbler/PLIST:1.5
--- pkgsrc/x11/xfce4-tumbler/PLIST:1.4  Tue May 15 22:22:02 2018
+++ pkgsrc/x11/xfce4-tumbler/PLIST      Sat Jan 19 01:51:15 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/05/15 22:22:02 youri Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/01/19 01:51:15 gutteridge Exp $
 include/tumbler-1/tumbler/tumbler-abstract-thumbnailer.h
 include/tumbler-1/tumbler/tumbler-cache-plugin.h
 include/tumbler-1/tumbler/tumbler-cache.h
@@ -22,12 +22,12 @@ lib/tumbler-1/plugins/cache/tumbler-cach
 lib/tumbler-1/plugins/cache/tumbler-xdg-cache.la
 lib/tumbler-1/plugins/tumbler-cover-thumbnailer.la
 lib/tumbler-1/plugins/tumbler-desktop-thumbnailer.la
-lib/tumbler-1/plugins/tumbler-ffmpeg-thumbnailer.la
+${PLIST.ffmpegthumbnailer}lib/tumbler-1/plugins/tumbler-ffmpeg-thumbnailer.la
 lib/tumbler-1/plugins/tumbler-font-thumbnailer.la
-lib/tumbler-1/plugins/tumbler-jpeg-thumbnailer.la
-lib/tumbler-1/plugins/tumbler-odf-thumbnailer.la
+${PLIST.jpeg}lib/tumbler-1/plugins/tumbler-jpeg-thumbnailer.la
+${PLIST.odf}lib/tumbler-1/plugins/tumbler-odf-thumbnailer.la
 lib/tumbler-1/plugins/tumbler-pixbuf-thumbnailer.la
-lib/tumbler-1/plugins/tumbler-poppler-thumbnailer.la
+${PLIST.pdf}lib/tumbler-1/plugins/tumbler-poppler-thumbnailer.la
 lib/tumbler-1/tumblerd
 share/dbus-1/services/org.xfce.Tumbler.Cache1.service
 share/dbus-1/services/org.xfce.Tumbler.Manager1.service