aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--graphics/ImageMagick/Makefile19
-rw-r--r--graphics/ImageMagick/distinfo2
-rw-r--r--graphics/ImageMagick/files/patch-al16
-rw-r--r--graphics/ImageMagick/pkg-plist3
4 files changed, 32 insertions, 8 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index f82adaa0f133..268253766bc0 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,16 +6,15 @@
#
PORTNAME= ImageMagick
-PORTVERSION= 5.2.3
+PORTVERSION= 5.2.7
CATEGORIES= graphics perl5
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \
+MASTER_SITES= ftp://ftp.simplesystems.org/pub/ImageMagick/ \
+ ftp://ftp.cdrom.com/pub/ImageMagick/ \
ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/ \
ftp://ftp.fifi.org/pub/ImageMagick/ \
ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
ftp://ftp.ms.mff.cuni.cz/MIRRORS/ftp.wizards.dupont.com/pub/ImageMagick/ \
ftp://ftp.oce.nl/pub/Internet/audio+video/ImageMagick/
-MASTER_SITE_SUBDIR= jseger
MAINTAINER= jseger@FreeBSD.org
@@ -23,8 +22,10 @@ LIB_DEPENDS= bz2.1:${PORTSDIR}/archivers/bzip2 \
df.1:${PORTSDIR}/graphics/hdf \
jbig.1:${PORTSDIR}/graphics/jbigkit \
jpeg.9:${PORTSDIR}/graphics/jpeg \
+ wmf.1:${PORTSDIR}/graphics/libwmf \
png.4:${PORTSDIR}/graphics/png \
- tiff.4:${PORTSDIR}/graphics/tiff
+ tiff.4:${PORTSDIR}/graphics/tiff \
+ freetype.6:${PORTSDIR}/print/freetype2
BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript55 \
mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \
picttoppm:${PORTSDIR}/graphics/netpbm \
@@ -36,15 +37,19 @@ RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript55 \
USE_PERL5= yes
USE_XLIB= yes
-USE_FREETYPE= yes
USE_LIBTOOL= yes
USE_AUTOCONF= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --enable-shared --enable-16bit-pixel --without-modules \
+CONFIGURE_ARGS= --enable-shared --without-modules \
+ --with-threads --without-magick-plus-plus \
--with-perl=${PERL5} --without-xml
INSTALLS_SHLIB= yes
+.if defined(WITH_16BIT_PIXEL)
+CONFIGURE_ARGS+= --enable-16bit-pixel
+.endif
+
.if defined(HAVE_UNISYS_LICENSE)
CONFIGURE_ARGS+= --enable-lzw
.endif
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 4f091046fd8b..a2b28c919c1a 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1 +1 @@
-MD5 (ImageMagick-5.2.3.tar.gz) = 98d1a57c155aa017ed67505b6ca36a86
+MD5 (ImageMagick-5.2.7.tar.gz) = 2f0cf45da38e5613b7d8d426a5ddcd3a
diff --git a/graphics/ImageMagick/files/patch-al b/graphics/ImageMagick/files/patch-al
new file mode 100644
index 000000000000..44d2a4409968
--- /dev/null
+++ b/graphics/ImageMagick/files/patch-al
@@ -0,0 +1,16 @@
+--- configure.in.orig Fri Dec 1 02:14:22 2000
++++ configure.in Tue Dec 5 02:43:13 2000
+@@ -471,10 +471,10 @@
+ LIB_THREAD=''
+ if test "$with_threads" != 'no'
+ then
+- AC_CHECK_LIB(pthread,pthread_attr_init,
++ AC_CHECK_LIB(c_r,pthread_attr_init,
+ [AC_DEFINE(HasPTHREADS,,Define if you have Posix thread methods.)
+- LIB_THREAD="-lpthread"
+- DEF_THREAD="-D_REENTRANT"],,)
++ LIB_THREAD="-pthread"
++ DEF_THREAD="-D_THREAD_SAFE"],,)
+ LIBS="$LIB_THREAD $LIBS"
+ CPPFLAGS="$DEF_THREAD $CPPFLAGS"
+ fi
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 6ce7dca63967..c3fc0e82bb30 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -1,10 +1,12 @@
bin/Magick-config
bin/animate
+bin/cgimagick
bin/combine
bin/convert
bin/display
bin/identify
bin/import
+bin/iptcutil
bin/mogrify
bin/montage
include/magick/PreRvIcccm.h
@@ -17,6 +19,7 @@ include/magick/classify.h
include/magick/compress.h
include/magick/config.h
include/magick/delegates.h
+include/magick/draw.h
include/magick/error.h
include/magick/gems.h
include/magick/image.h