[pkgsrc/pkgsrc-2016Q2]: pkgsrc/misc/calibre1 Pullup ticket #5054 - requested ...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/93b9e6d03551
branches:  pkgsrc-2016Q2
changeset: 408839:93b9e6d03551
user:      spz <spz%pkgsrc.org@localhost>
date:      Sun Jul 10 07:45:58 2016 +0000

description:
Pullup ticket #5054 - requested by wiz
misc/calibre1: build fix

Revisions pulled up:
- misc/calibre1/Makefile                                        1.17

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Sat Jul  2 08:51:40 UTC 2016

   Modified Files:
        pkgsrc/misc/calibre1: Makefile

   Log Message:
   Switch to ImageMagick6 to make this build again.

   Bump PKGREVISION.


   To generate a diff of this commit:
   cvs rdiff -u -r1.16 -r1.17 pkgsrc/misc/calibre1/Makefile

diffstat:

 misc/calibre1/Makefile |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (24 lines):

diff -r debc1e5101ed -r 93b9e6d03551 misc/calibre1/Makefile
--- a/misc/calibre1/Makefile    Thu Jun 30 16:36:16 2016 +0000
+++ b/misc/calibre1/Makefile    Sun Jul 10 07:45:58 2016 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2016/05/22 18:20:47 wiz Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2016/07/10 07:45:58 spz Exp $
 
 DISTNAME=      calibre-1.48.0
-PKGREVISION=   17
+PKGREVISION=   18
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=  .tar.xz
@@ -125,8 +125,8 @@
 BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ImageMagick+=    ImageMagick>=6.5.9
-.include "../../graphics/ImageMagick/buildlink3.mk"
+BUILDLINK_API_DEPENDS.ImageMagick6+=   ImageMagick6>=6.5.9
+.include "../../graphics/ImageMagick6/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pyimaging+=      ${PYPKGPREFIX}-imaging>=1.1.6
 .include "../../graphics/py-imaging/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8