CVS commit: pkgsrc/print/atril

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jul  7 12:45:54 UTC 2017

Modified Files:
        pkgsrc/print/atril: Makefile PLIST

Log Message:
Restore options.mk include and fix PLIST to actually work with option
combinations.  Bump PKGREVISION to ensure user preferences are respected.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/print/atril/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/atril/PLIST

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

Modified files:

Index: pkgsrc/print/atril/Makefile
diff -u pkgsrc/print/atril/Makefile:1.12 pkgsrc/print/atril/Makefile:1.13
--- pkgsrc/print/atril/Makefile:1.12    Fri Jun 23 17:05:52 2017
+++ pkgsrc/print/atril/Makefile Fri Jul  7 12:45:54 2017
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2017/06/23 17:05:52 youri Exp $
+# $NetBSD: Makefile,v 1.13 2017/07/07 12:45:54 jperkin Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      atril-${VERSION}
+PKGREVISION=   1
 CATEGORIES=    print
 
 COMMENT=       Simple multi-page document viewer for the MATE environment
@@ -14,6 +15,8 @@ PKGCONFIG_OVERRIDE+=  atril-view.pc.in
 
 CONFIGURE_ARGS+=       --disable-introspection
 
+.include "options.mk"
+
 .include "../../devel/glib2/schemas.mk"
 
 .include "../../sysutils/caja/buildlink3.mk"

Index: pkgsrc/print/atril/PLIST
diff -u pkgsrc/print/atril/PLIST:1.4 pkgsrc/print/atril/PLIST:1.5
--- pkgsrc/print/atril/PLIST:1.4        Thu Jul  6 08:42:04 2017
+++ pkgsrc/print/atril/PLIST    Fri Jul  7 12:45:54 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2017/07/06 08:42:04 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/07/07 12:45:54 jperkin Exp $
 bin/atril
 bin/atril-previewer
 bin/atril-thumbnailer
@@ -52,16 +52,26 @@ include/atril/1.5.0/libview/ev-view.h
 include/atril/1.5.0/libview/ev-web-view.h
 lib/atril/3/backends/comicsdocument.atril-backend
 lib/atril/3/backends/libcomicsdocument.la
-lib/atril/3/backends/libpdfdocument.la
+${PLIST.djvu}lib/atril/3/backends/djvudocument.atril-backend
+${PLIST.dvi}lib/atril/3/backends/dvidocument.atril-backend
+${PLIST.djvu}lib/atril/3/backends/libdjvudocument.la
+${PLIST.dvi}lib/atril/3/backends/libdvidocument.la
+${PLIST.pdf}lib/atril/3/backends/libpdfdocument.la
+${PLIST.pixbuf}lib/atril/3/backends/libpixbufdocument.la
+${PLIST.ps}lib/atril/3/backends/libpsdocument.la
 ${PLIST.tiff}lib/atril/3/backends/libtiffdocument.la
-lib/atril/3/backends/pdfdocument.atril-backend
+${PLIST.xps}lib/atril/3/backends/libxpsdocument.la
+${PLIST.pdf}lib/atril/3/backends/pdfdocument.atril-backend
+${PLIST.pixbuf}lib/atril/3/backends/pixbufdocument.atril-backend
+${PLIST.ps}lib/atril/3/backends/psdocument.atril-backend
 ${PLIST.tiff}lib/atril/3/backends/tiffdocument.atril-backend
+${PLIST.xps}lib/atril/3/backends/xpsdocument.atril-backend
 lib/caja/extensions-2.0/libatril-properties-page.la
 lib/libatrildocument.la
 lib/libatrilview.la
 lib/pkgconfig/atril-document-1.5.0.pc
 lib/pkgconfig/atril-view-1.5.0.pc
-libexec/atrild
+${PLIST.dbus}libexec/atrild
 man/man1/atril-previewer.1
 man/man1/atril-thumbnailer.1
 man/man1/atril.1
@@ -111,7 +121,7 @@ share/atril/icons/hicolor/scalable/actio
 share/atril/icons/hicolor/scalable/actions/object-rotate-right.svg
 share/atril/icons/hicolor/scalable/mimetypes/x-office-presentation.svg
 share/caja/extensions/libatril-properties-page.caja-extension
-share/dbus-1/services/org.mate.atril.Daemon.service
+${PLIST.dbus}share/dbus-1/services/org.mate.atril.Daemon.service
 share/glib-2.0/schemas/org.mate.Atril.gschema.xml
 share/gtk-doc/html/atril/EggFindBar.html
 share/gtk-doc/html/atril/EvFileMonitor.html