CVS commit: [pkgsrc-2016Q2] pkgsrc/misc/calibre1

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sun Jul 10 07:45:58 UTC 2016

Modified Files:
        pkgsrc/misc/calibre1 [pkgsrc-2016Q2]: Makefile

Log Message:
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


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

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

Modified files:

Index: pkgsrc/misc/calibre1/Makefile
diff -u pkgsrc/misc/calibre1/Makefile:1.15 pkgsrc/misc/calibre1/Makefile:1.15.2.1
--- pkgsrc/misc/calibre1/Makefile:1.15  Sun May 22 18:20:47 2016
+++ pkgsrc/misc/calibre1/Makefile       Sun Jul 10 07:45:58 2016
@@ -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 @@ post-install:
 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