CVS commit: pkgsrc/print/evince

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 10 06:23:57 UTC 2024

Modified Files:
        pkgsrc/print/evince: Makefile PLIST options.mk

Log Message:
evince: use both desktopdb.mk and buildlink3.mk

desktopdb.mk has the install logic, buildlink3.mk doesn't.

While here, fix some pkglint.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 pkgsrc/print/evince/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/print/evince/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/evince/options.mk

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

Modified files:

Index: pkgsrc/print/evince/Makefile
diff -u pkgsrc/print/evince/Makefile:1.171 pkgsrc/print/evince/Makefile:1.172
--- pkgsrc/print/evince/Makefile:1.171  Tue Jan  9 10:14:52 2024
+++ pkgsrc/print/evince/Makefile        Wed Jan 10 06:23:56 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.171 2024/01/09 10:14:52 prlw1 Exp $
+# $NetBSD: Makefile,v 1.172 2024/01/10 06:23:56 wiz Exp $
 
 DISTNAME=      evince-45.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    print gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/evince/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -42,6 +42,7 @@ BUILDLINK_API_DEPENDS.libhandy+=      libhand
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 BUILDLINK_API_DEPENDS.poppler+=        poppler>=23.12.0
 .include "../../print/poppler/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/desktop-file-utils/buildlink3.mk"
 # PDF backend no longer requires libxml2 (others do)
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/print/evince/PLIST
diff -u pkgsrc/print/evince/PLIST:1.35 pkgsrc/print/evince/PLIST:1.36
--- pkgsrc/print/evince/PLIST:1.35      Sun Dec 31 13:58:15 2023
+++ pkgsrc/print/evince/PLIST   Wed Jan 10 06:23:56 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2023/12/31 13:58:15 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.36 2024/01/10 06:23:56 wiz Exp $
 bin/evince
 bin/evince-previewer
 bin/evince-thumbnailer
@@ -52,17 +52,17 @@ include/evince/3.0/libview/ev-stock-icon
 include/evince/3.0/libview/ev-view-presentation.h
 include/evince/3.0/libview/ev-view-type-builtins.h
 include/evince/3.0/libview/ev-view.h
-lib/evince/4/backends/libpdfdocument.so
-lib/evince/4/backends/pdfdocument.evince-backend
-${PLIST.djvu}lib/evince/4/backends/libdjvudocument.so
 ${PLIST.djvu}lib/evince/4/backends/djvudocument.evince-backend
-${PLIST.dvi}lib/evince/4/backends/libdvidocument.so
 ${PLIST.dvi}lib/evince/4/backends/dvidocument.evince-backend
+${PLIST.djvu}lib/evince/4/backends/libdjvudocument.so
+${PLIST.dvi}lib/evince/4/backends/libdvidocument.so
+lib/evince/4/backends/libpdfdocument.so
 ${PLIST.ps}lib/evince/4/backends/libpsdocument.so
-${PLIST.ps}lib/evince/4/backends/psdocument.evince-backend
 ${PLIST.tiff}lib/evince/4/backends/libtiffdocument.so
-${PLIST.tiff}lib/evince/4/backends/tiffdocument.evince-backend
 ${PLIST.xps}lib/evince/4/backends/libxpsdocument.so
+lib/evince/4/backends/pdfdocument.evince-backend
+${PLIST.ps}lib/evince/4/backends/psdocument.evince-backend
+${PLIST.tiff}lib/evince/4/backends/tiffdocument.evince-backend
 ${PLIST.xps}lib/evince/4/backends/xpsdocument.evince-backend
 lib/girepository-1.0/EvinceDocument-3.0.typelib
 lib/girepository-1.0/EvinceView-3.0.typelib

Index: pkgsrc/print/evince/options.mk
diff -u pkgsrc/print/evince/options.mk:1.8 pkgsrc/print/evince/options.mk:1.9
--- pkgsrc/print/evince/options.mk:1.8  Tue Oct 25 08:38:09 2022
+++ pkgsrc/print/evince/options.mk      Wed Jan 10 06:23:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2022/10/25 08:38:09 prlw1 Exp $
+# $NetBSD: options.mk,v 1.9 2024/01/10 06:23:56 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.evince
 PKG_SUPPORTED_OPTIONS= dbus djvu dvi gstreamer ps tiff xps
@@ -20,7 +20,6 @@ MESON_ARGS+=  -Ddbus=false
 
 .if !empty(PKG_OPTIONS:Mdjvu)
 PLIST.djvu=    yes
-BUILDLINK_API_DEPENDS.djvulibre-lib+=  djvulibre-lib>=3.5.22
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .else
 MESON_ARGS+=   -Ddjvu=disabled