From caec1424fa96c024488fbf0443990afe92dc1eaf Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 12 Sep 2011 16:48:06 +0000 Subject: [PATCH] For the no_x11 FLAVOR, depend on djvulibre,no_x11. ok giovanni@ --- graphics/ImageMagick/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 0fc69163583..b08881e3ca6 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.113 2011/07/07 01:06:59 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.114 2011/09/12 16:48:06 ajacoutot Exp $ SHARED_ONLY= Yes @@ -8,7 +8,7 @@ VER= 6.6.6 DASHVER= 10 DISTNAME= ImageMagick-${VER}-${DASHVER} PKGNAME= ImageMagick-${VER}.${DASHVER} -REVISION= 0 +REVISION= 1 SHARED_LIBS += Magick++ 14.0 # .1.0 SHARED_LIBS += MagickCore 2.0 # .1.0 @@ -38,7 +38,6 @@ WANTLIB = c bz2>=10 djvulibre fftw3 jasper>=1 jbig>=1.2 jpeg \ LIB_DEPENDS = archivers/bzip2 \ archivers/xz \ devel/libtool,-ltdl \ - graphics/djvulibre \ graphics/jbigkit \ graphics/png \ graphics/tiff \ @@ -78,6 +77,7 @@ FLAVORS= no_x11 FLAVOR?= .if ${FLAVOR:L:Mno_x11} +LIB_DEPENDS += graphics/djvulibre,no_x11 RUN_DEPENDS += print/ghostscript/gnu,no_x11 BUILD_DEPENDS += print/ghostscript/gnu,no_x11 CONFIGURE_ENV += ac_cv_path_FIGDecodeDelegate=no @@ -90,7 +90,8 @@ WANTLIB += ICE SM X11 Xau Xdmcp Xext Xt expat fontconfig \ freetype pthread-stubs xcb wmf wmflite>=7 \ xml2>=9 LIB_DEPENDS += graphics/libwmf \ - textproc/libxml + textproc/libxml \ + graphics/djvulibre RUN_DEPENDS += print/ghostscript/gnu RUN_DEPENDS += print/transfig BUILD_DEPENDS += print/ghostscript/gnu