ports/91345: Port graphics/ImageMagick does not link when GraphViz 2.6 is installed
Arjan van Leeuwen
avleeuwen at piwebs.com
Wed Jan 25 18:00:16 UTC 2006
The following reply was made to PR ports/91345; it has been noted by GNATS.
From: Arjan van Leeuwen <avleeuwen at piwebs.com>
To: bug-followup at freebsd.org,
sven at ilse.net,
edwin at freebsd.org
Cc:
Subject: Re: ports/91345: Port graphics/ImageMagick does not link when GraphViz 2.6 is installed
Date: Wed, 25 Jan 2006 18:56:05 +0100
--Boundary-00=_1u71DpYmAzofSgi
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
The attached patch updates ImageMagick to 6.2.6.
This version brings another library version bump, and PORTREVISIONs of
dependant ports should be bumped too - I don't know how to do this quickly :
(.
The patch also fixes the pkg-plist when WITHOUT_X11 is defined (reported by
Kris).
Arjan
--Boundary-00=_1u71DpYmAzofSgi
Content-Type: text/x-diff;
charset="us-ascii";
name="ImageMagick.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="ImageMagick.diff"
diff -urN /usr/ports/graphics/ImageMagick/Makefile ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile Thu Jan 5 13:15:21 2006
+++ ImageMagick/Makefile Tue Jan 24 12:30:45 2006
@@ -6,10 +6,22 @@
#
PORTNAME= ImageMagick
-PORTVERSION= 6.2.5.5
+PORTVERSION= 6.2.6.0
CATEGORIES= graphics perl5
MASTER_SITES= ftp://ftp.nluug.nl/pub/ImageMagick/ \
- ${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/}
+ ftp://mirror.aarnet.edu.au/pub/ImageMagick/ \
+ ftp://ftp.carnet.hr/misc/imagemagick/ \
+ ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \
+ ftp://ftp.eos.hokudai.ac.jp/pub/graphics/ImageMagick/ \
+ ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org/ \
+ http://ftp.surfnet.nl/pub/ImageMagick/ \
+ ftp://ftp.fifi.org/pub/ImageMagick/ \
+ ftp://ftp.rge.com/pub/multimedia/imagemagick/ \
+ ftp://ftp.imagemagick.org/pub/ImageMagick/ \
+ ftp://ftp.imagemagick.net/pub/ImageMagick/ \
+ ftp://giswitch.sggw.waw.pl/pub/graphics/ImageMagick/ \
+ ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
+ ftp://www.rx-host.net/pub/graphics/ImageMagick/
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= avleeuwen at piwebs.com
@@ -28,11 +40,14 @@
INSTALLS_SHLIB= yes
MAN1= ImageMagick.1 Magick++-config.1 Magick-config.1 Wand-config.1 \
- compare.1 composite.1 convert.1 identify.1 mogrify.1 montage.1
+ compare.1 composite.1 convert.1 identify.1 mogrify.1 montage.1 \
+ animate.1 display.1 import.1
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
+CONFLICTS+= display-*
+
PLIST_SUB+= PORTVERSION=${PORTVERSION:R}
.if !defined(WITHOUT_IMAGEMAGICK_PERL)
@@ -189,13 +204,9 @@
.if defined(WITHOUT_X11)
PKGNAMESUFFIX+= -nox11
CONFIGURE_ARGS+= --without-x --without-mpeg2
-PLIST_SUB+= X11='@comment '
.else
-CONFLICTS+= display
CONFIGURE_ARGS+= --with-x
USE_XLIB= yes
-MAN1+= animate.1 display.1 import.1
-PLIST_SUB+= X11=''
.if !defined(WITHOUT_IMAGEMAGICK_MPEG2)
RUN_DEPENDS+= mpeg2encode:${PORTSDIR}/multimedia/mpeg2codec
.endif
diff -urN /usr/ports/graphics/ImageMagick/distinfo ImageMagick/distinfo
--- /usr/ports/graphics/ImageMagick/distinfo Sun Jan 22 13:34:42 2006
+++ ImageMagick/distinfo Tue Jan 24 12:18:49 2006
@@ -1,3 +1,3 @@
-MD5 (ImageMagick-6.2.5-5.tar.bz2) = eaee90992c8cf36f1f5fc6c887d73897
-SHA256 (ImageMagick-6.2.5-5.tar.bz2) = f8a3c192d33f93f0f83c4ead0ec0cbb1c9fbdb8d183e340ea59a7032054dd0d4
-SIZE (ImageMagick-6.2.5-5.tar.bz2) = 5044679
+MD5 (ImageMagick-6.2.6-0.tar.bz2) = 4ff40a92bba825d8cb9447ca454698a0
+SHA256 (ImageMagick-6.2.6-0.tar.bz2) = 385bbf2c07678696796d20f152ab0dc3c81ff73c1ed775cf00beaf46eb3d76c7
+SIZE (ImageMagick-6.2.6-0.tar.bz2) = 5139235
diff -urN /usr/ports/graphics/ImageMagick/pkg-plist ImageMagick/pkg-plist
--- /usr/ports/graphics/ImageMagick/pkg-plist Sun Jan 22 06:52:18 2006
+++ ImageMagick/pkg-plist Wed Jan 25 18:50:03 2006
@@ -1,14 +1,14 @@
bin/Magick++-config
bin/Magick-config
bin/Wand-config
-%%X11%%bin/animate
+bin/animate
bin/compare
bin/composite
%%WITH_CONJURE%%bin/conjure
bin/convert
-%%X11%%bin/display
+bin/display
bin/identify
-%%X11%%bin/import
+bin/import
bin/mogrify
bin/montage
include/Magick++.h
@@ -25,6 +25,7 @@
include/Magick++/STL.h
include/Magick++/TypeMetric.h
include/magick/ImageMagick.h
+include/magick/MagickCore.h
include/magick/PreRvIcccm.h
include/magick/animate.h
include/magick/annotate.h
@@ -41,9 +42,7 @@
include/magick/composite.h
include/magick/compress.h
include/magick/configure.h
-include/magick/conjure.h
include/magick/constitute.h
-include/magick/convert.h
include/magick/decorate.h
include/magick/delegate.h
include/magick/deprecate.h
@@ -58,7 +57,6 @@
include/magick/hashmap.h
include/magick/identify.h
include/magick/image.h
-include/magick/import.h
include/magick/list.h
include/magick/locale_.h
include/magick/log.h
@@ -69,7 +67,6 @@
include/magick/memory_.h
include/magick/methods.h
include/magick/module.h
-include/magick/mogrify.h
include/magick/monitor.h
include/magick/montage.h
include/magick/option.h
@@ -98,12 +95,25 @@
include/magick/utility.h
include/magick/version.h
include/magick/widget.h
+include/magick/xml-tree.h
include/magick/xwindow.h
+include/wand/MagickWand.h
+include/wand/animate.h
+include/wand/compare.h
+include/wand/composite.h
+include/wand/conjure.h
+include/wand/convert.h
+include/wand/display.h
include/wand/drawing-wand.h
+include/wand/identify.h
+include/wand/import.h
include/wand/magick-attribute.h
include/wand/magick-image.h
include/wand/magick_wand.h
include/wand/magick-wand.h
+include/wand/mogrify.h
+include/wand/montage.h
+include/wand/wand-config.h
include/wand/pixel-iterator.h
include/wand/pixel-wand.h
lib/ImageMagick/config/colors.xml
@@ -313,13 +323,13 @@
%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/filters/analyze.so
lib/libMagick++.a
lib/libMagick++.so
-lib/libMagick++.so.9
+lib/libMagick++.so.10
lib/libMagick.a
lib/libMagick.so
-lib/libMagick.so.9
+lib/libMagick.so.10
lib/libWand.a
lib/libWand.so
-lib/libWand.so.9
+lib/libWand.so.10
libdata/pkgconfig/ImageMagick++.pc
libdata/pkgconfig/ImageMagick.pc
libdata/pkgconfig/Wand.pc
--Boundary-00=_1u71DpYmAzofSgi--
More information about the freebsd-ports-bugs
mailing list