From b12ee55c6cb0dc096e656b8d5a7880b741e218b9 Mon Sep 17 00:00:00 2001 From: marc Date: Sun, 7 Jun 1998 19:25:41 +0000 Subject: [PATCH] update to version 4.0.6 --- graphics/ImageMagick/Makefile | 6 ++--- graphics/ImageMagick/files/md5 | 2 +- graphics/ImageMagick/patches/patch-aa | 39 +++++++++++++-------------- graphics/ImageMagick/pkg/PLIST | 2 +- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index dd3e1520362..19204a1e98c 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,12 +1,12 @@ # OpenBSD makefile for: ImageMagick -# Version required: 4.0.5 +# Version required: 4.0.6 # Date created: 1998-Apr-21 # Whom: marc@OpenBSD.ORG # -# $OpenBSD: Makefile,v 1.1.1.1 1998/05/23 19:00:10 marc Exp $ +# $OpenBSD: Makefile,v 1.2 1998/06/07 19:25:41 marc Exp $ # -DISTNAME= ImageMagick-4.0.5 +DISTNAME= ImageMagick-4.0.6 CATEGORIES= graphics x11 MAINTAINER= marc@openbsd.org diff --git a/graphics/ImageMagick/files/md5 b/graphics/ImageMagick/files/md5 index 00aaf092ff1..daa668e3108 100644 --- a/graphics/ImageMagick/files/md5 +++ b/graphics/ImageMagick/files/md5 @@ -1 +1 @@ -MD5 (ImageMagick-4.0.5.tar.gz) = bdb3f9e033afeeda94605158940c7c8a +MD5 (ImageMagick-4.0.6.tar.gz) = 710c254b35c61bd0550ec3a14c80b237 diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa index 482641dc7bc..864b71e9772 100644 --- a/graphics/ImageMagick/patches/patch-aa +++ b/graphics/ImageMagick/patches/patch-aa @@ -1,57 +1,56 @@ ---- configure.~1~ Tue Apr 21 09:53:37 1998 -+++ configure Tue Apr 21 23:02:48 1998 -@@ -4611,16 +4611,16 @@ - echo "configure:4612: checking for TIFF support ..." >&5 +--- configure.~1~ Mon May 18 07:11:59 1998 ++++ configure Sun Jun 7 11:19:49 1998 +@@ -5083,16 +5083,16 @@ + echo "configure:5084: checking for TIFF support ..." >&5 failed=0; passed=0; - ac_safe=`echo "tiff.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for tiff.h""... $ac_c" 1>&6 --echo "configure:4617: checking for tiff.h" >&5 +-echo "configure:5089: checking for tiff.h" >&5 + ac_safe=`echo "tiff34.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for tiff34.h""... $ac_c" 1>&6 -+echo "configure:4617: checking for tiff34.h" >&5 ++echo "configure:5089: checking for tiff34.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:4627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -4645,16 +4645,16 @@ + { (eval echo configure:5099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +@@ -5117,16 +5117,16 @@ failed=`expr $failed + 1` fi - ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 --echo "configure:4651: checking for tiffio.h" >&5 +-echo "configure:5123: checking for tiffio.h" >&5 + ac_safe=`echo "tiffio34.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for tiffio34.h""... $ac_c" 1>&6 -+echo "configure:4651: checking for tiffio34.h" >&5 ++echo "configure:5123: checking for tiffio34.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:4661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -4679,14 +4679,14 @@ + { (eval echo configure:5133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +@@ -5151,14 +5151,14 @@ failed=`expr $failed + 1` fi - echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6 --echo "configure:4684: checking for TIFFOpen in -ltiff" >&5 --ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` +-echo "configure:5156: checking for TIFFOpen in -ltiff" >&5 + echo $ac_n "checking for TIFFOpen in -ltiff34""... $ac_c" 1>&6 -+echo "configure:4684: checking for TIFFOpen in -ltiff34" >&5 -+ac_lib_var=`echo tiff34'_'TIFFOpen | sed 'y%./+-%__p_%'` ++echo "configure:5156: checking for TIFFOpen in -ltiff34" >&5 + ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -59,9 +58,9 @@ -LIBS="-ltiff $TRAILING_LIBS $LIBS" +LIBS="-ltiff34 $TRAILING_LIBS $LIBS" cat > conftest.$ac_ext <&6 else diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST index 5a4cef8f397..0d3499c1743 100644 --- a/graphics/ImageMagick/pkg/PLIST +++ b/graphics/ImageMagick/pkg/PLIST @@ -7,7 +7,7 @@ bin/identify bin/import bin/mogrify bin/montage -lib/libMagick.so.4.5 +lib/libMagick.so.4.6 lib/libMagick.la lib/libMagick.a man/man1/xtp.1