From c2595f452cc95ef57883a9ca501dfb587ad756cd Mon Sep 17 00:00:00 2001 From: Mikhail Teterin Date: Fri, 28 Sep 2007 02:23:16 +0000 Subject: Remove FPX from the default configuration. The unmaintained library is too buggy for general use :( Initiate the lists of options whose presence (or absence) break self-tests, and set IGNORE, if any such conflict is found. Reported by: numerous --- graphics/ImageMagick/Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index d9b7bec2ed50..246587133348 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -61,7 +61,7 @@ OPTIONS= X11 "X11 support" on \ IMAGEMAGICK_JPEG "JPG format support" on \ IMAGEMAGICK_PNG "PNG format support" on \ IMAGEMAGICK_TIFF "TIFF format support" on \ - IMAGEMAGICK_FPX "FPX format support" on \ + IMAGEMAGICK_FPX "FPX format support" off \ IMAGEMAGICK_JBIG "JBIG format support" on \ IMAGEMAGICK_JPEG2000 "JPEG2000 format support" on \ IMAGEMAGICK_DOT "GraphViz dot graphs support" off \ @@ -322,6 +322,16 @@ test check: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check .if !defined(WITHOUT_IMAGEMAGICK_TESTS) +. for m in TTF +. if defined(WITHOUT_IMAGEMAGICK_$m) +IGNORE+= Absence of $m breaks self-tests. Enable $m or disable automatic tests. +. endif +. endfor +. for m in FPX +. if defined(WITH_IMAGEMAGICK_$m) +IGNORE+= Presence of $m breaks self-tests. Disable $m or disable automatic tests. +. endif +. endfor post-build: test .endif -- cgit v1.2.3