diff options
| author | dholland <dholland@pkgsrc.org> | 2015-12-29 04:30:29 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2015-12-29 04:30:29 +0000 |
| commit | ed68e0788eeb4d65e2c1a411188b70d43224df36 (patch) | |
| tree | 3a422b97d6e0420edd1d26f876cb7102c75e9ebd | |
| parent | a88cbb645320c669b3a7917656aa48b35fa15650 (diff) | |
| download | pkgsrc-ed68e0788eeb4d65e2c1a411188b70d43224df36.tar.gz | |
pkglint, and (ahem) fix previous.
| -rw-r--r-- | print/evince3/Makefile | 4 | ||||
| -rw-r--r-- | print/evince3/Makefile.common | 11 | ||||
| -rw-r--r-- | print/evince3/options.mk | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/print/evince3/Makefile b/print/evince3/Makefile index c85fedfdaa6..d347b63dfbb 100644 --- a/print/evince3/Makefile +++ b/print/evince3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2015/11/23 10:30:17 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2015/12/29 04:30:29 dholland Exp $ PKGREVISION= 3 .include "../../print/evince3/Makefile.common" @@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --disable-compile-warnings .include "../../graphics/librsvg/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../security/libsecret/buildlink3.mk" -BUILDLINK_DEPMETHOD.libXt?= build +BUILDLINK_DEPMETHOD.libXt= build .include "../../x11/libXt/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" diff --git a/print/evince3/Makefile.common b/print/evince3/Makefile.common index 8b99efa9578..7322cef52ea 100644 --- a/print/evince3/Makefile.common +++ b/print/evince3/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2015/12/29 04:25:31 dholland Exp $ +# $NetBSD: Makefile.common,v 1.12 2015/12/29 04:30:29 dholland Exp $ # # used by print/evince3/Makefile # would probably be used by print/evince3-nautilus/Makefile if that existed @@ -12,8 +12,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://wiki.gnome.org/Apps/Evince LICENSE= gnu-gpl-v2 -PATCHDIR= ../../evince3/patches -DISTINFO_FILE= ../../evince3/distinfo +#FILESDIR= ../../print/evince3/files +#PATCHDIR= ../../print/evince3/patches +DISTINFO_FILE= ../../print/evince3/distinfo GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -30,13 +31,13 @@ BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool # XXX fake for "configure" to allow build w/o a gs installed # (avoid hard dependency on a specific version) -CONFIGURE_ARGS+= --with-gs=${LOCALBASE}/bin/gs +CONFIGURE_ARGS+= --with-gs=${PREFIX}/bin/gs pre-configure: ${ECHO} "echo 8.51" >${BUILDLINK_DIR}/bin/gs ${CHMOD} +x ${BUILDLINK_DIR}/bin/gs .include "../../databases/shared-mime-info/buildlink3.mk" -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.36.0 +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.36.0 .include "../../devel/glib2/buildlink3.mk" BUILDLINK_API_DEPENDS.adwaita-icon-theme+= adwaita-icon-theme>=2.17.1 .include "../../graphics/adwaita-icon-theme/buildlink3.mk" diff --git a/print/evince3/options.mk b/print/evince3/options.mk index 039fd56d293..0818b2460bc 100644 --- a/print/evince3/options.mk +++ b/print/evince3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2014/01/27 18:49:45 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2015/12/29 04:30:29 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.evince PKG_SUPPORTED_OPTIONS= dbus djvu dvi xps @@ -11,7 +11,7 @@ PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} .if !empty(PKG_OPTIONS:Mdbus) PLIST.dbus= yes .include "../../sysutils/dbus/buildlink3.mk" -BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70 +BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70 .include "../../sysutils/dbus-glib/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-dbus |