diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 2446ff63560..4ded23d4018 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.38 2000/07/04 02:09:17 krw Exp $ +# $OpenBSD: Makefile,v 1.39 2000/07/25 07:16:59 brad Exp $ -DISTNAME= ImageMagick-5.2.0 +DISTNAME= ImageMagick-5.2.1 CATEGORIES= graphics NEED_VERSION= 1.310 MASTER_SITES= ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \ @@ -35,10 +35,9 @@ PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --enable-static \ - --enable-lzw \ - --enable-16bit-pixel \ - --without-perl +CONFIGURE_ARGS+= --enable-static --enable-lzw --enable-16bit-pixel \ + --without-perl --without-modules --without-dps \ + --without-fpx --without-hdf --without-xml --without-lcms CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/ImageMagick/files/md5 b/graphics/ImageMagick/files/md5 index a146c1b0387..96ae0d94c87 100644 --- a/graphics/ImageMagick/files/md5 +++ b/graphics/ImageMagick/files/md5 @@ -1,3 +1,3 @@ -MD5 (ImageMagick-5.2.0.tar.gz) = e16d7e7e03ba17849edf8c92d2efef17 -RMD160 (ImageMagick-5.2.0.tar.gz) = 448687e20cc183c8c59b9130b80d207f36c9b0b0 -SHA1 (ImageMagick-5.2.0.tar.gz) = fa479577b0a6887d1609982a10c34fcd212454c4 +MD5 (ImageMagick-5.2.1.tar.gz) = 66f741908c1c5e17de1bb67f4a50ed08 +RMD160 (ImageMagick-5.2.1.tar.gz) = 26cf0d6ca2d02846331797b4c07040349a178205 +SHA1 (ImageMagick-5.2.1.tar.gz) = 37178ae87373eec9200b63432b558b421f9fc93d diff --git a/graphics/ImageMagick/patches/patch-ltconfig b/graphics/ImageMagick/patches/patch-ltconfig index 74e9f5dfa3d..445cd2e57a8 100644 --- a/graphics/ImageMagick/patches/patch-ltconfig +++ b/graphics/ImageMagick/patches/patch-ltconfig @@ -1,6 +1,6 @@ ---- ltconfig.orig Mon Jun 12 13:52:21 2000 -+++ ltconfig Mon Jun 12 13:53:17 2000 -@@ -2004,6 +2004,7 @@ +--- ltconfig.orig Tue Jun 27 16:55:26 2000 ++++ ltconfig Mon Jul 24 18:20:29 2000 +@@ -1128,6 +1128,7 @@ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH diff --git a/graphics/ImageMagick/patches/patch-ltmain_sh b/graphics/ImageMagick/patches/patch-ltmain_sh index 57b0ff8c66d..9ddf312734a 100644 --- a/graphics/ImageMagick/patches/patch-ltmain_sh +++ b/graphics/ImageMagick/patches/patch-ltmain_sh @@ -1,6 +1,6 @@ ---- ltmain.sh.orig Tue Jan 11 10:44:46 2000 -+++ ltmain.sh Mon Jun 12 13:52:02 2000 -@@ -3558,40 +3558,6 @@ +--- ltmain.sh.orig Tue Jun 27 16:55:26 2000 ++++ ltmain.sh Mon Jul 24 18:20:30 2000 +@@ -4439,40 +4439,6 @@ # Exit here if they wanted silent mode. test "$show" = : && exit 0 diff --git a/graphics/ImageMagick/patches/patch-magick_magick_h b/graphics/ImageMagick/patches/patch-magick_magick_h index a4653407018..1a2872b0ee4 100644 --- a/graphics/ImageMagick/patches/patch-magick_magick_h +++ b/graphics/ImageMagick/patches/patch-magick_magick_h @@ -1,7 +1,7 @@ ---- magick/magick.h.orig Tue Jun 20 21:43:45 2000 -+++ magick/magick.h Tue Jun 20 21:44:13 2000 -@@ -6,8 +6,10 @@ - +--- magick/magick.h.orig Sat Jul 15 22:19:37 2000 ++++ magick/magick.h Mon Jul 24 18:20:30 2000 +@@ -9,8 +9,10 @@ + */ #define __EXTENSIONS__ 1 #define _POSIX_C_SOURCE 199506L +#ifndef __OpenBSD__ @@ -9,5 +9,5 @@ #define _XOPEN_SOURCE_EXTENDED 1 +#endif - /* - System include declarations. + #include + #include diff --git a/graphics/ImageMagick/pkg/PFRAG.shared b/graphics/ImageMagick/pkg/PFRAG.shared index 7a7b469714a..e508241b3f1 100644 --- a/graphics/ImageMagick/pkg/PFRAG.shared +++ b/graphics/ImageMagick/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2000/07/04 02:09:17 krw Exp $ -lib/libMagick.so.5.20 +@comment $OpenBSD: PFRAG.shared,v 1.3 2000/07/25 07:17:00 brad Exp $ +lib/libMagick.so.5.21 DYNLIBDIR(%B) diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST index 7b946320329..44c6d4e04bd 100644 --- a/graphics/ImageMagick/pkg/PLIST +++ b/graphics/ImageMagick/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.17 2000/06/20 23:32:47 brad Exp $ +@comment $OpenBSD: PLIST,v 1.18 2000/07/25 07:17:00 brad Exp $ bin/Magick-config bin/animate bin/combine @@ -24,9 +24,11 @@ include/magick/image.h include/magick/magick.h include/magick/monitor.h include/magick/quantize.h +include/magick/semaphore.h include/magick/timer.h include/magick/utility.h include/magick/version.h +include/magick/widget.h include/magick/xwindows.h lib/libMagick.a lib/libMagick.la @@ -43,5 +45,6 @@ man/man1/montage.1 man/man4/miff.4 man/man5/quantize.5 share/ImageMagick/delegates.mgk +share/ImageMagick/magic.mgk @dirrm include/magick @dirrm share/ImageMagick