Sat Jan 19 01:51:15 2019 UTC ()
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.


(gutteridge)
diff -r1.57 -r1.58 pkgsrc/x11/xfce4-tumbler/Makefile
diff -r1.4 -r1.5 pkgsrc/x11/xfce4-tumbler/PLIST
cvs diff -r1.57 -r1.58 pkgsrc/x11/xfce4-tumbler/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-tumbler/Makefile 2019/01/18 14:00:40 1.57
+++ pkgsrc/x11/xfce4-tumbler/Makefile 2019/01/19 01:51:15 1.58
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.57 2019/01/18 14:00:40 youri Exp $ 1# $NetBSD: Makefile,v 1.58 2019/01/19 01:51:15 gutteridge Exp $
2 2
3.include "../../meta-pkgs/xfce4/Makefile.common" 3.include "../../meta-pkgs/xfce4/Makefile.common"
4 4
5VERSION= 0.2.3 5VERSION= 0.2.3
6DISTNAME= tumbler-${VERSION} 6DISTNAME= tumbler-${VERSION}
7PKGNAME= xfce4-tumbler-${VERSION} 7PKGNAME= xfce4-tumbler-${VERSION}
8CATEGORIES= x11 8CATEGORIES= x11
9MASTER_SITES= http://archive.xfce.org/src/xfce/tumbler/0.2/ 9MASTER_SITES= http://archive.xfce.org/src/xfce/tumbler/0.2/
10 10
11HOMEPAGE= http://docs.xfce.org/xfce/thunar/tumbler 11HOMEPAGE= http://docs.xfce.org/xfce/thunar/tumbler
12COMMENT= D-Bus thumbnailing service 12COMMENT= D-Bus thumbnailing service
13 13
14TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen 14TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
@@ -29,19 +29,18 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/tumbler @@ -29,19 +29,18 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}/tumbler
29 29
30CONF_FILES= ${EGDIR}/tumbler.rc \ 30CONF_FILES= ${EGDIR}/tumbler.rc \
31 ${PKG_SYSCONFDIR}/tumbler/tumbler.rc 31 ${PKG_SYSCONFDIR}/tumbler/tumbler.rc
32 32
33INSTALL_UNSTRIPPED= yes 33INSTALL_UNSTRIPPED= yes
34CFLAGS+= -g 34CFLAGS+= -g
35 35
36.include "options.mk" 36.include "options.mk"
37 37
38.include "../../graphics/freetype2/buildlink3.mk" 38.include "../../graphics/freetype2/buildlink3.mk"
39.include "../../graphics/openjpeg/buildlink3.mk" 39.include "../../graphics/openjpeg/buildlink3.mk"
40.include "../../graphics/png/buildlink3.mk" 40.include "../../graphics/png/buildlink3.mk"
41.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 41.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
42.include "../../multimedia/ffmpeg3/buildlink3.mk" 
43.include "../../sysutils/dbus/buildlink3.mk" 42.include "../../sysutils/dbus/buildlink3.mk"
44.include "../../sysutils/dbus-glib/buildlink3.mk" 43.include "../../sysutils/dbus-glib/buildlink3.mk"
45.include "../../www/curl/buildlink3.mk" 44.include "../../www/curl/buildlink3.mk"
46.include "../../mk/pthread.buildlink3.mk" 45.include "../../mk/pthread.buildlink3.mk"
47.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/x11/xfce4-tumbler/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/xfce4-tumbler/PLIST 2018/05/15 22:22:02 1.4
+++ pkgsrc/x11/xfce4-tumbler/PLIST 2019/01/19 01:51:15 1.5
@@ -1,43 +1,43 @@ @@ -1,43 +1,43 @@
1@comment $NetBSD: PLIST,v 1.4 2018/05/15 22:22:02 youri Exp $ 1@comment $NetBSD: PLIST,v 1.5 2019/01/19 01:51:15 gutteridge Exp $
2include/tumbler-1/tumbler/tumbler-abstract-thumbnailer.h 2include/tumbler-1/tumbler/tumbler-abstract-thumbnailer.h
3include/tumbler-1/tumbler/tumbler-cache-plugin.h 3include/tumbler-1/tumbler/tumbler-cache-plugin.h
4include/tumbler-1/tumbler/tumbler-cache.h 4include/tumbler-1/tumbler/tumbler-cache.h
5include/tumbler-1/tumbler/tumbler-config.h 5include/tumbler-1/tumbler/tumbler-config.h
6include/tumbler-1/tumbler/tumbler-enum-types.h 6include/tumbler-1/tumbler/tumbler-enum-types.h
7include/tumbler-1/tumbler/tumbler-error.h 7include/tumbler-1/tumbler/tumbler-error.h
8include/tumbler-1/tumbler/tumbler-file-info.h 8include/tumbler-1/tumbler/tumbler-file-info.h
9include/tumbler-1/tumbler/tumbler-glib-extensions.h 9include/tumbler-1/tumbler/tumbler-glib-extensions.h
10include/tumbler-1/tumbler/tumbler-marshal.h 10include/tumbler-1/tumbler/tumbler-marshal.h
11include/tumbler-1/tumbler/tumbler-provider-factory.h 11include/tumbler-1/tumbler/tumbler-provider-factory.h
12include/tumbler-1/tumbler/tumbler-provider-plugin.h 12include/tumbler-1/tumbler/tumbler-provider-plugin.h
13include/tumbler-1/tumbler/tumbler-thumbnail-flavor.h 13include/tumbler-1/tumbler/tumbler-thumbnail-flavor.h
14include/tumbler-1/tumbler/tumbler-thumbnail.h 14include/tumbler-1/tumbler/tumbler-thumbnail.h
15include/tumbler-1/tumbler/tumbler-thumbnailer-provider.h 15include/tumbler-1/tumbler/tumbler-thumbnailer-provider.h
16include/tumbler-1/tumbler/tumbler-thumbnailer.h 16include/tumbler-1/tumbler/tumbler-thumbnailer.h
17include/tumbler-1/tumbler/tumbler-util.h 17include/tumbler-1/tumbler/tumbler-util.h
18include/tumbler-1/tumbler/tumbler.h 18include/tumbler-1/tumbler/tumbler.h
19lib/libtumbler-1.la 19lib/libtumbler-1.la
20lib/pkgconfig/tumbler-1.pc 20lib/pkgconfig/tumbler-1.pc
21lib/tumbler-1/plugins/cache/tumbler-cache-plugin.so 21lib/tumbler-1/plugins/cache/tumbler-cache-plugin.so
22lib/tumbler-1/plugins/cache/tumbler-xdg-cache.la 22lib/tumbler-1/plugins/cache/tumbler-xdg-cache.la
23lib/tumbler-1/plugins/tumbler-cover-thumbnailer.la 23lib/tumbler-1/plugins/tumbler-cover-thumbnailer.la
24lib/tumbler-1/plugins/tumbler-desktop-thumbnailer.la 24lib/tumbler-1/plugins/tumbler-desktop-thumbnailer.la
25lib/tumbler-1/plugins/tumbler-ffmpeg-thumbnailer.la 25${PLIST.ffmpegthumbnailer}lib/tumbler-1/plugins/tumbler-ffmpeg-thumbnailer.la
26lib/tumbler-1/plugins/tumbler-font-thumbnailer.la 26lib/tumbler-1/plugins/tumbler-font-thumbnailer.la
27lib/tumbler-1/plugins/tumbler-jpeg-thumbnailer.la 27${PLIST.jpeg}lib/tumbler-1/plugins/tumbler-jpeg-thumbnailer.la
28lib/tumbler-1/plugins/tumbler-odf-thumbnailer.la 28${PLIST.odf}lib/tumbler-1/plugins/tumbler-odf-thumbnailer.la
29lib/tumbler-1/plugins/tumbler-pixbuf-thumbnailer.la 29lib/tumbler-1/plugins/tumbler-pixbuf-thumbnailer.la
30lib/tumbler-1/plugins/tumbler-poppler-thumbnailer.la 30${PLIST.pdf}lib/tumbler-1/plugins/tumbler-poppler-thumbnailer.la
31lib/tumbler-1/tumblerd 31lib/tumbler-1/tumblerd
32share/dbus-1/services/org.xfce.Tumbler.Cache1.service 32share/dbus-1/services/org.xfce.Tumbler.Cache1.service
33share/dbus-1/services/org.xfce.Tumbler.Manager1.service 33share/dbus-1/services/org.xfce.Tumbler.Manager1.service
34share/dbus-1/services/org.xfce.Tumbler.Thumbnailer1.service 34share/dbus-1/services/org.xfce.Tumbler.Thumbnailer1.service
35share/examples/xfce4/tumbler.rc 35share/examples/xfce4/tumbler.rc
36share/gtk-doc/html/tumbler/TumblerAbstractThumbnailer.html 36share/gtk-doc/html/tumbler/TumblerAbstractThumbnailer.html
37share/gtk-doc/html/tumbler/TumblerCache.html 37share/gtk-doc/html/tumbler/TumblerCache.html
38share/gtk-doc/html/tumbler/TumblerThumbnail.html 38share/gtk-doc/html/tumbler/TumblerThumbnail.html
39share/gtk-doc/html/tumbler/TumblerThumbnailerProvider.html 39share/gtk-doc/html/tumbler/TumblerThumbnailerProvider.html
40share/gtk-doc/html/tumbler/api-index-full.html 40share/gtk-doc/html/tumbler/api-index-full.html
41share/gtk-doc/html/tumbler/extension-api.html 41share/gtk-doc/html/tumbler/extension-api.html
42share/gtk-doc/html/tumbler/extension-tutorial.html 42share/gtk-doc/html/tumbler/extension-tutorial.html
43share/gtk-doc/html/tumbler/home.png 43share/gtk-doc/html/tumbler/home.png