diff options
| author | obache <obache@pkgsrc.org> | 2010-06-05 13:30:33 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2010-06-05 13:30:33 +0000 |
| commit | 2865b9f45ee5e52bd319a20719ad705ce80630b1 (patch) | |
| tree | 760dab60ba28b2d4f5f252c6535b64cec3386877 | |
| parent | 380e984edf47ce372c437dbbe28b0f2461256513 (diff) | |
| download | pkgsrc-2865b9f45ee5e52bd319a20719ad705ce80630b1.tar.gz | |
* 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).
| -rw-r--r-- | graphics/GraphicsMagick/Makefile | 11 | ||||
| -rw-r--r-- | graphics/GraphicsMagick/buildlink3.mk | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 623800594b9..b960760f3bb 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -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 @@ HOMEPAGE= http://www.graphicsmagick.org/ 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_LIBTOOL= yes 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 @@ CONFIGURE_ARGS+= --without-perl 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 --git a/graphics/GraphicsMagick/buildlink3.mk b/graphics/GraphicsMagick/buildlink3.mk index 4c862080277..e4a14da45b2 100644 --- a/graphics/GraphicsMagick/buildlink3.mk +++ b/graphics/GraphicsMagick/buildlink3.mk @@ -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 @@ BUILDLINK_TREE+= GraphicsMagick 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" |