[pkgsrc/trunk]: pkgsrc/graphics/GraphicsMagick * enable jbig support, add dep...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/23f1301d4070
branches:  trunk
changeset: 576287:23f1301d4070
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Jun 05 13:30:33 2010 +0000

description:
* enable jbig support, add dependency to jbigkit.
* ghostscript-font-std part had been moved from ghostscript-fonts to
  urw-fonts.  add dependency on urw-fonts and adjust gs-font-dir.

Bump PKGREVISION (and ABI bump).

diffstat:

 graphics/GraphicsMagick/Makefile      |  11 +++++++++--
 graphics/GraphicsMagick/buildlink3.mk |   5 +++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (69 lines):

diff -r e6392581466f -r 23f1301d4070 graphics/GraphicsMagick/Makefile
--- a/graphics/GraphicsMagick/Makefile  Sat Jun 05 13:30:26 2010 +0000
+++ b/graphics/GraphicsMagick/Makefile  Sat Jun 05 13:30:33 2010 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2010/06/05 12:36:08 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/05 13:30:33 obache Exp $
 #
 
 DISTNAME=      GraphicsMagick-1.3.12
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=graphicsmagick/} \
                ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
@@ -11,6 +12,8 @@
 COMMENT=       X application for displaying and manipulating images
 #LICENSE=      mit AND # see ${WRKSRC}/Copyright.txt
 
+DEPENDS+=      urw-fonts-[0-9]*:../../fonts/urw-fonts
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_LANGUAGES= c c++
@@ -18,7 +21,7 @@
 USE_TOOLS+=    gmake pkg-config gs
 USE_FEATURES=  vsnprintf               # optional but recommended for security
 GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=       --with-gs-font-dir=${LOCALBASE}/share/ghostscript/fonts/
+CONFIGURE_ARGS+=       --with-gs-font-dir=${URW_FONTS_DIR}/share/fonts/urw
 
 PKGCONFIG_OVERRIDE+=   magick/GraphicsMagick.pc.in \
                        wand/GraphicsMagickWand.pc.in \
@@ -28,9 +31,13 @@
 
 TEST_TARGET=   check
 
+FIND_PREFIX:=  URW_FONTS_DIR=urw-fonts
+.include "../../mk/find-prefix.mk"
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jbigkit/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
diff -r e6392581466f -r 23f1301d4070 graphics/GraphicsMagick/buildlink3.mk
--- a/graphics/GraphicsMagick/buildlink3.mk     Sat Jun 05 13:30:26 2010 +0000
+++ b/graphics/GraphicsMagick/buildlink3.mk     Sat Jun 05 13:30:33 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2010/01/18 09:58:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/05 13:30:33 obache Exp $
 
 BUILDLINK_TREE+=       GraphicsMagick
 
@@ -6,12 +6,13 @@
 GRAPHICSMAGICK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.GraphicsMagick+= GraphicsMagick>=1.2
-BUILDLINK_ABI_DEPENDS.GraphicsMagick?= GraphicsMagick>=1.3.7nb1
+BUILDLINK_ABI_DEPENDS.GraphicsMagick?= GraphicsMagick>=1.3.12nb1
 BUILDLINK_PKGSRCDIR.GraphicsMagick?=   ../../graphics/GraphicsMagick
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jbigkit/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"