Tue Dec 29 04:30:29 2015 UTC ()
pkglint, and (ahem) fix previous.


(dholland)
diff -r1.44 -r1.45 pkgsrc/print/evince3/Makefile
diff -r1.11 -r1.12 pkgsrc/print/evince3/Makefile.common
diff -r1.4 -r1.5 pkgsrc/print/evince3/options.mk
cvs diff -r1.44 -r1.45 pkgsrc/print/evince3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/evince3/Attic/Makefile 2015/11/23 10:30:17 1.44
+++ pkgsrc/print/evince3/Attic/Makefile 2015/12/29 04:30:29 1.45
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.44 2015/11/23 10:30:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.45 2015/12/29 04:30:29 dholland Exp $
2 2
3PKGREVISION= 3 3PKGREVISION= 3
4.include "../../print/evince3/Makefile.common" 4.include "../../print/evince3/Makefile.common"
5 5
6COMMENT= Document viewer 6COMMENT= Document viewer
7 7
8.include "options.mk" 8.include "options.mk"
9 9
10CONFIGURE_ARGS+= --enable-comics 10CONFIGURE_ARGS+= --enable-comics
11CONFIGURE_ARGS+= --disable-nautilus 11CONFIGURE_ARGS+= --disable-nautilus
12 12
13USE_TOOLS+= gsed 13USE_TOOLS+= gsed
14 14
15CONFIGURE_ARGS+= --disable-compile-warnings 15CONFIGURE_ARGS+= --disable-compile-warnings
16 16
17.include "../../devel/glib2/schemas.mk" 17.include "../../devel/glib2/schemas.mk"
18.include "../../graphics/librsvg/buildlink3.mk" 18.include "../../graphics/librsvg/buildlink3.mk"
19.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 19.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
20.include "../../security/libsecret/buildlink3.mk" 20.include "../../security/libsecret/buildlink3.mk"
21BUILDLINK_DEPMETHOD.libXt?= build 21BUILDLINK_DEPMETHOD.libXt= build
22.include "../../x11/libXt/buildlink3.mk" 22.include "../../x11/libXt/buildlink3.mk"
23.include "../../x11/libSM/buildlink3.mk" 23.include "../../x11/libSM/buildlink3.mk"
24 24
25.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/print/evince3/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/evince3/Attic/Makefile.common 2015/12/29 04:25:31 1.11
+++ pkgsrc/print/evince3/Attic/Makefile.common 2015/12/29 04:30:29 1.12
@@ -1,51 +1,52 @@ @@ -1,51 +1,52 @@
1# $NetBSD: Makefile.common,v 1.11 2015/12/29 04:25:31 dholland Exp $ 1# $NetBSD: Makefile.common,v 1.12 2015/12/29 04:30:29 dholland Exp $
2# 2#
3# used by print/evince3/Makefile 3# used by print/evince3/Makefile
4# would probably be used by print/evince3-nautilus/Makefile if that existed 4# would probably be used by print/evince3-nautilus/Makefile if that existed
5 5
6DISTNAME= evince-3.16.1 6DISTNAME= evince-3.16.1
7CATEGORIES= print gnome 7CATEGORIES= print gnome
8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evince/${PKGVERSION_NOREV:R}/} 8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evince/${PKGVERSION_NOREV:R}/}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://wiki.gnome.org/Apps/Evince 12HOMEPAGE= https://wiki.gnome.org/Apps/Evince
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15PATCHDIR= ../../evince3/patches 15#FILESDIR= ../../print/evince3/files
16DISTINFO_FILE= ../../evince3/distinfo 16#PATCHDIR= ../../print/evince3/patches
 17DISTINFO_FILE= ../../print/evince3/distinfo
17 18
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 20USE_LIBTOOL= yes
20USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
21USE_TOOLS+= gmake intltool msgfmt pkg-config 22USE_TOOLS+= gmake intltool msgfmt pkg-config
22USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
23 24
24CONFIGURE_ARGS+= --disable-browser-plugin 25CONFIGURE_ARGS+= --disable-browser-plugin
25# Disable thumbnail cache 26# Disable thumbnail cache
26CONFIGURE_ARGS+= --disable-libgnome-desktop 27CONFIGURE_ARGS+= --disable-libgnome-desktop
27 28
28BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen 29BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
29BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool 30BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
30 31
31# XXX fake for "configure" to allow build w/o a gs installed 32# XXX fake for "configure" to allow build w/o a gs installed
32# (avoid hard dependency on a specific version) 33# (avoid hard dependency on a specific version)
33CONFIGURE_ARGS+= --with-gs=${LOCALBASE}/bin/gs 34CONFIGURE_ARGS+= --with-gs=${PREFIX}/bin/gs
34pre-configure: 35pre-configure:
35 ${ECHO} "echo 8.51" >${BUILDLINK_DIR}/bin/gs 36 ${ECHO} "echo 8.51" >${BUILDLINK_DIR}/bin/gs
36 ${CHMOD} +x ${BUILDLINK_DIR}/bin/gs 37 ${CHMOD} +x ${BUILDLINK_DIR}/bin/gs
37 38
38.include "../../databases/shared-mime-info/buildlink3.mk" 39.include "../../databases/shared-mime-info/buildlink3.mk"
39BUILDLINK_API_DEPENDS.glib2+= glib2>=2.36.0 40BUILDLINK_API_DEPENDS.glib2+= glib2>=2.36.0
40.include "../../devel/glib2/buildlink3.mk" 41.include "../../devel/glib2/buildlink3.mk"
41BUILDLINK_API_DEPENDS.adwaita-icon-theme+= adwaita-icon-theme>=2.17.1 42BUILDLINK_API_DEPENDS.adwaita-icon-theme+= adwaita-icon-theme>=2.17.1
42.include "../../graphics/adwaita-icon-theme/buildlink3.mk" 43.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
43.include "../../graphics/tiff/buildlink3.mk" 44.include "../../graphics/tiff/buildlink3.mk"
44.include "../../print/libspectre/buildlink3.mk" 45.include "../../print/libspectre/buildlink3.mk"
45BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.24.0 46BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.24.0
46.include "../../print/poppler-glib/buildlink3.mk" 47.include "../../print/poppler-glib/buildlink3.mk"
47.include "../../sysutils/desktop-file-utils/desktopdb.mk" 48.include "../../sysutils/desktop-file-utils/desktopdb.mk"
48.include "../../textproc/gnome-doc-utils/buildlink3.mk" 49.include "../../textproc/gnome-doc-utils/buildlink3.mk"
49.include "../../textproc/libxml2/buildlink3.mk" 50.include "../../textproc/libxml2/buildlink3.mk"
50BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.15.3 51BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.15.3
51.include "../../x11/gtk3/buildlink3.mk" 52.include "../../x11/gtk3/buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/print/evince3/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/print/evince3/Attic/options.mk 2014/01/27 18:49:45 1.4
+++ pkgsrc/print/evince3/Attic/options.mk 2015/12/29 04:30:29 1.5
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: options.mk,v 1.4 2014/01/27 18:49:45 wiz Exp $ 1# $NetBSD: options.mk,v 1.5 2015/12/29 04:30:29 dholland Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.evince 3PKG_OPTIONS_VAR= PKG_OPTIONS.evince
4PKG_SUPPORTED_OPTIONS= dbus djvu dvi xps 4PKG_SUPPORTED_OPTIONS= dbus djvu dvi xps
5PKG_SUGGESTED_OPTIONS= dbus 5PKG_SUGGESTED_OPTIONS= dbus
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 9PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
10 10
11.if !empty(PKG_OPTIONS:Mdbus) 11.if !empty(PKG_OPTIONS:Mdbus)
12PLIST.dbus= yes 12PLIST.dbus= yes
13.include "../../sysutils/dbus/buildlink3.mk" 13.include "../../sysutils/dbus/buildlink3.mk"
14BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70 14BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70
15.include "../../sysutils/dbus-glib/buildlink3.mk" 15.include "../../sysutils/dbus-glib/buildlink3.mk"
16.else 16.else
17CONFIGURE_ARGS+= --disable-dbus 17CONFIGURE_ARGS+= --disable-dbus
18.endif 18.endif
19 19
20.if !empty(PKG_OPTIONS:Mdvi) 20.if !empty(PKG_OPTIONS:Mdvi)
21PLIST.dvi= yes 21PLIST.dvi= yes
22.include "../../print/kpathsea/buildlink3.mk" 22.include "../../print/kpathsea/buildlink3.mk"
23.else 23.else
24CONFIGURE_ARGS+= --disable-dvi 24CONFIGURE_ARGS+= --disable-dvi
25.endif 25.endif
26 26
27.if !empty(PKG_OPTIONS:Mdjvu) 27.if !empty(PKG_OPTIONS:Mdjvu)