Hi,
here are two updated diffs. Including suggestions from alek@ and
[EMAIL PROTECTED] Thank you.
Please test and comment.
Bernd
? patches/patch-configure_ac
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.81
diff -u -r1.81 Makefile
--- Makefile 8 May 2005 18:48:28 -0000 1.81
+++ Makefile 30 May 2005 10:23:03 -0000
@@ -2,7 +2,7 @@
COMMENT= "image processing tools"
-VER= 6.2.2
+VER= 6.2.3
DASHVER= 0
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
@@ -15,12 +15,12 @@
LIB_DEPENDS+= bz2.10::archivers/bzip2 \
jbig.1.2::graphics/jbigkit \
- png.2::graphics/png \
+ png.4::graphics/png \
tiff.35::graphics/tiff \
- xml2.6::textproc/libxml \
- lcms::graphics/lcms \
- jasper::graphics/jasper \
- ltdl::devel/libtool
+ xml2.9::textproc/libxml \
+ lcms.1::graphics/lcms \
+ jasper.1::graphics/jasper \
+ ltdl.4::devel/libtool
RUN_DEPENDS ::graphics/mpeg-lib
BUILD_DEPENDS= ${RUN_DEPENDS}
@@ -33,8 +33,6 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c iconv jpeg m z
-
-SUBST_VARS= VER
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= autoconf
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 1 May 2005 07:51:28 -0000 1.5
+++ distinfo 30 May 2005 10:23:03 -0000
@@ -1,4 +1,4 @@
-MD5 (ImageMagick-6.2.2-0.tar.gz) = 5d401ac3ef7c749ded433b28a5a185e3
-RMD160 (ImageMagick-6.2.2-0.tar.gz) = 1163cdea726938e1e8d7231057b6f9922cfe9190
-SHA1 (ImageMagick-6.2.2-0.tar.gz) = d44fba9fb73217f7d15458030641ff59f115470c
-SIZE (ImageMagick-6.2.2-0.tar.gz) = 5692908
+MD5 (ImageMagick-6.2.3-0.tar.gz) = ae8728d5b7f81e6bf882eb3ce5a9385c
+RMD160 (ImageMagick-6.2.3-0.tar.gz) = 28baedc271ad9a745667ea07fb89339fc72fa758
+SHA1 (ImageMagick-6.2.3-0.tar.gz) = 05dd3792826c7c0c70ae1c84ed87b0d46e9afe62
+SIZE (ImageMagick-6.2.3-0.tar.gz) = 5737364
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 31 Mar 2005 04:23:42 -0000 1.1
+++ patches/patch-Makefile_in 30 May 2005 10:23:03 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2005/03/31 04:23:42 pvalchev Exp $
---- Makefile.in.orig Sat Jan 22 16:41:08 2005
-+++ Makefile.in Sat Jan 22 16:41:08 2005
-@@ -1888,7 +1888,7 @@ EXTRA_DIST = \
+--- Makefile.in.orig Tue May 24 00:33:09 2005
++++ Makefile.in Sun May 29 20:00:32 2005
+@@ -1910,7 +1910,7 @@ EXTRA_DIST = \
$(UTILITIES_EXTRA_DIST) \
$(WAND_EXTRA_DIST)
Index: patches/patch-ltmain_sh
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/patches/patch-ltmain_sh,v
retrieving revision 1.10
diff -u -r1.10 patch-ltmain_sh
--- patches/patch-ltmain_sh 31 Mar 2005 04:23:42 -0000 1.10
+++ patches/patch-ltmain_sh 30 May 2005 10:23:03 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.10 2005/03/31 04:23:42 pvalchev Exp $
---- ltmain.sh.orig Tue Jan 18 14:03:20 2005
-+++ ltmain.sh Tue Jan 18 14:05:20 2005
-@@ -2611,7 +2611,7 @@ EOF
+--- ltmain.sh.orig Tue May 24 00:33:09 2005
++++ ltmain.sh Sun May 29 20:00:07 2005
+@@ -2641,7 +2641,7 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
@@ -10,7 +10,7 @@
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
-@@ -5804,40 +5804,6 @@ relink_command=\"$relink_command\""
+@@ -5898,40 +5898,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
Index: patches/patch-magick_signature_c
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/patches/patch-magick_signature_c,v
retrieving revision 1.2
diff -u -r1.2 patch-magick_signature_c
--- patches/patch-magick_signature_c 31 Mar 2005 04:23:42 -0000 1.2
+++ patches/patch-magick_signature_c 30 May 2005 10:23:03 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-magick_signature_c,v 1.2 2005/03/31 04:23:42 pvalchev Exp $
---- magick/signature.c.orig Tue Jan 18 14:07:40 2005
-+++ magick/signature.c Tue Jan 18 14:12:25 2005
-@@ -368,8 +368,19 @@ static void TransformSignature(Signature
+--- magick/signature.c.orig Tue May 24 00:32:49 2005
++++ magick/signature.c Sun May 29 20:00:07 2005
+@@ -369,8 +369,19 @@ static void TransformSignature(Signature
T2,
W[64];
@@ -21,7 +21,7 @@
if (signature_info->lsb_first == MagickFalse)
{
if (sizeof(unsigned long) <= 4)
-@@ -380,12 +391,11 @@ static void TransformSignature(Signature
+@@ -381,12 +392,11 @@ static void TransformSignature(Signature
W[i]=Trunc32(T);
}
else
@@ -38,7 +38,7 @@
}
}
else
-@@ -398,15 +408,12 @@ static void TransformSignature(Signature
+@@ -399,15 +409,12 @@ static void TransformSignature(Signature
((T >> 8) & 0x0000ff00) | ((T >> 24) & 0x000000ff);
}
else
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/pkg/PFRAG.shared,v
retrieving revision 1.11
diff -u -r1.11 PFRAG.shared
--- pkg/PFRAG.shared 1 May 2005 07:51:28 -0000 1.11
+++ pkg/PFRAG.shared 30 May 2005 10:23:03 -0000
@@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.11 2005/05/01 07:51:28 robert Exp $
[EMAIL PROTECTED] lib/libMagick++.so.8.2
[EMAIL PROTECTED] lib/libMagick.so.8.2
[EMAIL PROTECTED] lib/libWand.so.8.2
[EMAIL PROTECTED] lib/libMagick++.so.8.3
[EMAIL PROTECTED] lib/libMagick.so.8.3
[EMAIL PROTECTED] lib/libWand.so.8.3
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/pkg/PLIST,v
retrieving revision 1.30
diff -u -r1.30 PLIST
--- pkg/PLIST 1 May 2005 07:51:28 -0000 1.30
+++ pkg/PLIST 30 May 2005 10:23:03 -0000
@@ -104,26 +104,23 @@
include/wand/magick_wand.h
include/wand/pixel-iterator.h
include/wand/pixel-wand.h
-lib/ImageMagick-${VER}/
-lib/ImageMagick-${VER}/config/
-lib/ImageMagick-${VER}/config/colors.xml
-lib/ImageMagick-${VER}/config/configure.xml
-lib/ImageMagick-${VER}/config/delegates.xml
-lib/ImageMagick-${VER}/config/english.xml
-lib/ImageMagick-${VER}/config/locale.xml
-lib/ImageMagick-${VER}/config/type-ghostscript.xml
-lib/ImageMagick-${VER}/config/type-solaris.xml
-lib/ImageMagick-${VER}/config/type-windows.xml
-lib/ImageMagick-${VER}/config/type.xml
[EMAIL PROTECTED] lib/ImageMagick-${VER}/modules-Q16/
[EMAIL PROTECTED] lib/ImageMagick-${VER}/modules-Q16/coders/
[EMAIL PROTECTED] lib/ImageMagick-${VER}/modules-Q16/filters/
+lib/ImageMagick/
+lib/ImageMagick/config/
+lib/ImageMagick/config/colors.xml
+lib/ImageMagick/config/configure.xml
+lib/ImageMagick/config/delegates.xml
+lib/ImageMagick/config/english.xml
+lib/ImageMagick/config/locale.xml
+lib/ImageMagick/config/type-ghostscript.xml
+lib/ImageMagick/config/type-solaris.xml
+lib/ImageMagick/config/type-windows.xml
+lib/ImageMagick/config/type.xml
[EMAIL PROTECTED] lib/ImageMagick/modules-Q16/
[EMAIL PROTECTED] lib/ImageMagick/modules-Q16/coders/
[EMAIL PROTECTED] lib/ImageMagick/modules-Q16/filters/
lib/libMagick++.a
-lib/libMagick++.la
lib/libMagick.a
-lib/libMagick.la
lib/libWand.a
-lib/libWand.la
lib/pkgconfig/
lib/pkgconfig/ImageMagick++.pc
lib/pkgconfig/ImageMagick.pc
@@ -139,157 +136,161 @@
@man man/man1/identify.1
@man man/man1/mogrify.1
@man man/man1/montage.1
-share/ImageMagick-${VER}/
-share/ImageMagick-${VER}/ChangeLog
-share/ImageMagick-${VER}/LICENSE
-share/ImageMagick-${VER}/NEWS
-share/ImageMagick-${VER}/config/
-share/ImageMagick-${VER}/config/coder.xml
-share/ImageMagick-${VER}/config/log.xml
-share/ImageMagick-${VER}/config/magic.xml
-share/ImageMagick-${VER}/images/
-share/ImageMagick-${VER}/images/background.jpg
-share/ImageMagick-${VER}/images/button.gif
-share/ImageMagick-${VER}/images/configure.jpg
-share/ImageMagick-${VER}/images/devlib.gif
-share/ImageMagick-${VER}/images/difference.png
-share/ImageMagick-${VER}/images/donate.png
-share/ImageMagick-${VER}/images/examples.jpg
-share/ImageMagick-${VER}/images/frame.jpg
-share/ImageMagick-${VER}/images/fuzzy-magick.png
-share/ImageMagick-${VER}/images/georeviews.gif
-share/ImageMagick-${VER}/images/granite.png
-share/ImageMagick-${VER}/images/label.gif
-share/ImageMagick-${VER}/images/logo.jpg
-share/ImageMagick-${VER}/images/montage.jpg
-share/ImageMagick-${VER}/images/reconstruct.jpg
-share/ImageMagick-${VER}/images/red-ball.png
-share/ImageMagick-${VER}/images/red-circle.png
-share/ImageMagick-${VER}/images/right.gif
-share/ImageMagick-${VER}/images/rose-over.png
-share/ImageMagick-${VER}/images/rose.jpg
-share/ImageMagick-${VER}/images/rose.png
-share/ImageMagick-${VER}/images/script.png
-share/ImageMagick-${VER}/images/smile.gif
-share/ImageMagick-${VER}/images/sponsor.jpg
-share/ImageMagick-${VER}/images/sprite.jpg
-share/ImageMagick-${VER}/images/travelsur.gif
-share/ImageMagick-${VER}/images/white-highlight.png
-share/ImageMagick-${VER}/index.html
-share/ImageMagick-${VER}/www/
-share/ImageMagick-${VER}/www/Magick++/
-share/ImageMagick-${VER}/www/Magick++/Blob.html
-share/ImageMagick-${VER}/www/Magick++/Cache.fig
-share/ImageMagick-${VER}/www/Magick++/Cache.png
-share/ImageMagick-${VER}/www/Magick++/Cache.svg
-share/ImageMagick-${VER}/www/Magick++/ChangeLog.html
-share/ImageMagick-${VER}/www/Magick++/CoderInfo.html
-share/ImageMagick-${VER}/www/Magick++/Color.html
-share/ImageMagick-${VER}/www/Magick++/Documentation.html
-share/ImageMagick-${VER}/www/Magick++/Drawable.html
-share/ImageMagick-${VER}/www/Magick++/Drawable_example_1.png
-share/ImageMagick-${VER}/www/Magick++/Enumerations.html
-share/ImageMagick-${VER}/www/Magick++/Exception.html
-share/ImageMagick-${VER}/www/Magick++/FormatCharacters.html
-share/ImageMagick-${VER}/www/Magick++/Future.html
-share/ImageMagick-${VER}/www/Magick++/Geometry.html
-share/ImageMagick-${VER}/www/Magick++/Image.fig
-share/ImageMagick-${VER}/www/Magick++/Image.html
-share/ImageMagick-${VER}/www/Magick++/Image.png
-share/ImageMagick-${VER}/www/Magick++/ImageDesign.html
-share/ImageMagick-${VER}/www/Magick++/ImageMagick.png
-share/ImageMagick-${VER}/www/Magick++/Install.html
-share/ImageMagick-${VER}/www/Magick++/Magick++.png
-share/ImageMagick-${VER}/www/Magick++/Montage.html
-share/ImageMagick-${VER}/www/Magick++/NEWS.html
-share/ImageMagick-${VER}/www/Magick++/PixelPacket.html
-share/ImageMagick-${VER}/www/Magick++/Pixels.html
-share/ImageMagick-${VER}/www/Magick++/README.txt
-share/ImageMagick-${VER}/www/Magick++/STL.html
-share/ImageMagick-${VER}/www/Magick++/TypeMetric.html
-share/ImageMagick-${VER}/www/Magick++/index.html
-share/ImageMagick-${VER}/www/Magick++/montage-sample-framed.jpg
-share/ImageMagick-${VER}/www/Magick++/right_triangle.png
-share/ImageMagick-${VER}/www/Magick++/thumbnail-anatomy-framed.fig
-share/ImageMagick-${VER}/www/Magick++/thumbnail-anatomy-framed.jpg
-share/ImageMagick-${VER}/www/Magick++/thumbnail-anatomy-plain.fig
-share/ImageMagick-${VER}/www/Magick++/thumbnail-anatomy-plain.jpg
-share/ImageMagick-${VER}/www/Magick++/thumbnail-sample-framed.jpg
-share/ImageMagick-${VER}/www/Magick++/thumbnail-sample-plain.jpg
-share/ImageMagick-${VER}/www/advanced-unix-installation.html
-share/ImageMagick-${VER}/www/advanced-windows-installation.html
-share/ImageMagick-${VER}/www/animate.html
-share/ImageMagick-${VER}/www/api/
-share/ImageMagick-${VER}/www/api.html
-share/ImageMagick-${VER}/www/api/animate.html
-share/ImageMagick-${VER}/www/api/annotate.html
-share/ImageMagick-${VER}/www/api/attribute.html
-share/ImageMagick-${VER}/www/api/blob.html
-share/ImageMagick-${VER}/www/api/cache.html
-share/ImageMagick-${VER}/www/api/color.html
-share/ImageMagick-${VER}/www/api/colorspace.html
-share/ImageMagick-${VER}/www/api/compare.html
-share/ImageMagick-${VER}/www/api/composite.html
-share/ImageMagick-${VER}/www/api/constitute.html
-share/ImageMagick-${VER}/www/api/decorate.html
-share/ImageMagick-${VER}/www/api/display.html
-share/ImageMagick-${VER}/www/api/draw.html
-share/ImageMagick-${VER}/www/api/drawing-wand.html
-share/ImageMagick-${VER}/www/api/effect.html
-share/ImageMagick-${VER}/www/api/enhance.html
-share/ImageMagick-${VER}/www/api/exception.html
-share/ImageMagick-${VER}/www/api/fx.html
-share/ImageMagick-${VER}/www/api/image.html
-share/ImageMagick-${VER}/www/api/list.html
-share/ImageMagick-${VER}/www/api/magick-wand.html
-share/ImageMagick-${VER}/www/api/magick.html
-share/ImageMagick-${VER}/www/api/memory.html
-share/ImageMagick-${VER}/www/api/monitor.html
-share/ImageMagick-${VER}/www/api/montage.html
-share/ImageMagick-${VER}/www/api/paint.html
-share/ImageMagick-${VER}/www/api/pixel-iterator.html
-share/ImageMagick-${VER}/www/api/pixel-wand.html
-share/ImageMagick-${VER}/www/api/profile.html
-share/ImageMagick-${VER}/www/api/quantize.html
-share/ImageMagick-${VER}/www/api/registry.html
-share/ImageMagick-${VER}/www/api/resize.html
-share/ImageMagick-${VER}/www/api/resource.html
-share/ImageMagick-${VER}/www/api/segment.html
-share/ImageMagick-${VER}/www/api/shear.html
-share/ImageMagick-${VER}/www/api/signature.html
-share/ImageMagick-${VER}/www/api/stream.html
-share/ImageMagick-${VER}/www/api/transform.html
-share/ImageMagick-${VER}/www/api/version.html
-share/ImageMagick-${VER}/www/binary-releases.html
-share/ImageMagick-${VER}/www/changelog.html
-share/ImageMagick-${VER}/www/color.html
-share/ImageMagick-${VER}/www/command-line-options.html
-share/ImageMagick-${VER}/www/command-line-processing.html
-share/ImageMagick-${VER}/www/command-line-tools.html
-share/ImageMagick-${VER}/www/compare.html
-share/ImageMagick-${VER}/www/composite.html
-share/ImageMagick-${VER}/www/conjure.html
-share/ImageMagick-${VER}/www/contact.html
-share/ImageMagick-${VER}/www/convert.html
-share/ImageMagick-${VER}/www/cvs.html
-share/ImageMagick-${VER}/www/display.html
-share/ImageMagick-${VER}/www/download.html
-share/ImageMagick-${VER}/www/examples.html
-share/ImageMagick-${VER}/www/formats.html
-share/ImageMagick-${VER}/www/identify.html
-share/ImageMagick-${VER}/www/import.html
-share/ImageMagick-${VER}/www/install-source.html
-share/ImageMagick-${VER}/www/license.html
-share/ImageMagick-${VER}/www/links.html
-share/ImageMagick-${VER}/www/magick-core.html
-share/ImageMagick-${VER}/www/magick-wand.html
-share/ImageMagick-${VER}/www/magick.css
-share/ImageMagick-${VER}/www/mailing-list.html
-share/ImageMagick-${VER}/www/miff.html
-share/ImageMagick-${VER}/www/mogrify.html
-share/ImageMagick-${VER}/www/montage.html
-share/ImageMagick-${VER}/www/perl-magick.html
-share/ImageMagick-${VER}/www/quantize.html
-share/ImageMagick-${VER}/www/resources.html
-share/ImageMagick-${VER}/www/search.html
-share/ImageMagick-${VER}/www/sponsors.html
+share/ImageMagick/
+share/ImageMagick/ChangeLog
+share/ImageMagick/LICENSE
+share/ImageMagick/NEWS
+share/ImageMagick/config/
+share/ImageMagick/config/coder.xml
+share/ImageMagick/config/log.xml
+share/ImageMagick/config/magic.xml
+share/doc/ImageMagick/
+share/doc/ImageMagick/images/
+share/doc/ImageMagick/images/background.jpg
+share/doc/ImageMagick/images/button.gif
+share/doc/ImageMagick/images/configure.jpg
+share/doc/ImageMagick/images/devlib.gif
+share/doc/ImageMagick/images/difference.png
+share/doc/ImageMagick/images/dogwaffle.jpg
+share/doc/ImageMagick/images/donate.png
+share/doc/ImageMagick/images/examples.jpg
+share/doc/ImageMagick/images/frame.jpg
+share/doc/ImageMagick/images/fuzzy-magick.png
+share/doc/ImageMagick/images/georeviews.gif
+share/doc/ImageMagick/images/granite.png
+share/doc/ImageMagick/images/label.gif
+share/doc/ImageMagick/images/logo.jpg
+share/doc/ImageMagick/images/montage.jpg
+share/doc/ImageMagick/images/reconstruct.jpg
+share/doc/ImageMagick/images/red-ball.png
+share/doc/ImageMagick/images/red-circle.png
+share/doc/ImageMagick/images/right.gif
+share/doc/ImageMagick/images/rose-over.png
+share/doc/ImageMagick/images/rose.jpg
+share/doc/ImageMagick/images/rose.png
+share/doc/ImageMagick/images/script.png
+share/doc/ImageMagick/images/smile.gif
+share/doc/ImageMagick/images/sponsor.jpg
+share/doc/ImageMagick/images/sprite.jpg
+share/doc/ImageMagick/images/travelsur.gif
+share/doc/ImageMagick/images/white-highlight.png
+share/doc/ImageMagick/index.html
+share/doc/ImageMagick/www/
+share/doc/ImageMagick/www/Magick++/
+share/doc/ImageMagick/www/Magick++/Blob.html
+share/doc/ImageMagick/www/Magick++/Cache.fig
+share/doc/ImageMagick/www/Magick++/Cache.png
+share/doc/ImageMagick/www/Magick++/Cache.svg
+share/doc/ImageMagick/www/Magick++/ChangeLog.html
+share/doc/ImageMagick/www/Magick++/CoderInfo.html
+share/doc/ImageMagick/www/Magick++/Color.html
+share/doc/ImageMagick/www/Magick++/Documentation.html
+share/doc/ImageMagick/www/Magick++/Drawable.html
+share/doc/ImageMagick/www/Magick++/Drawable_example_1.png
+share/doc/ImageMagick/www/Magick++/Enumerations.html
+share/doc/ImageMagick/www/Magick++/Exception.html
+share/doc/ImageMagick/www/Magick++/FormatCharacters.html
+share/doc/ImageMagick/www/Magick++/Future.html
+share/doc/ImageMagick/www/Magick++/Geometry.html
+share/doc/ImageMagick/www/Magick++/Image.fig
+share/doc/ImageMagick/www/Magick++/Image.html
+share/doc/ImageMagick/www/Magick++/Image.png
+share/doc/ImageMagick/www/Magick++/ImageDesign.html
+share/doc/ImageMagick/www/Magick++/ImageMagick.png
+share/doc/ImageMagick/www/Magick++/Install.html
+share/doc/ImageMagick/www/Magick++/Magick++.png
+share/doc/ImageMagick/www/Magick++/Montage.html
+share/doc/ImageMagick/www/Magick++/NEWS.html
+share/doc/ImageMagick/www/Magick++/PixelPacket.html
+share/doc/ImageMagick/www/Magick++/Pixels.html
+share/doc/ImageMagick/www/Magick++/README.txt
+share/doc/ImageMagick/www/Magick++/STL.html
+share/doc/ImageMagick/www/Magick++/TypeMetric.html
+share/doc/ImageMagick/www/Magick++/index.html
+share/doc/ImageMagick/www/Magick++/montage-sample-framed.jpg
+share/doc/ImageMagick/www/Magick++/right_triangle.png
+share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-framed.fig
+share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-framed.jpg
+share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-plain.fig
+share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-plain.jpg
+share/doc/ImageMagick/www/Magick++/thumbnail-sample-framed.jpg
+share/doc/ImageMagick/www/Magick++/thumbnail-sample-plain.jpg
+share/doc/ImageMagick/www/advanced-unix-installation.html
+share/doc/ImageMagick/www/advanced-windows-installation.html
+share/doc/ImageMagick/www/animate.html
+share/doc/ImageMagick/www/api/
+share/doc/ImageMagick/www/api.html
+share/doc/ImageMagick/www/api/animate.html
+share/doc/ImageMagick/www/api/annotate.html
+share/doc/ImageMagick/www/api/attribute.html
+share/doc/ImageMagick/www/api/blob.html
+share/doc/ImageMagick/www/api/cache.html
+share/doc/ImageMagick/www/api/color.html
+share/doc/ImageMagick/www/api/colorspace.html
+share/doc/ImageMagick/www/api/compare.html
+share/doc/ImageMagick/www/api/composite.html
+share/doc/ImageMagick/www/api/constitute.html
+share/doc/ImageMagick/www/api/decorate.html
+share/doc/ImageMagick/www/api/display.html
+share/doc/ImageMagick/www/api/draw.html
+share/doc/ImageMagick/www/api/drawing-wand.html
+share/doc/ImageMagick/www/api/effect.html
+share/doc/ImageMagick/www/api/enhance.html
+share/doc/ImageMagick/www/api/exception.html
+share/doc/ImageMagick/www/api/fx.html
+share/doc/ImageMagick/www/api/image.html
+share/doc/ImageMagick/www/api/list.html
+share/doc/ImageMagick/www/api/magick-attribute.html
+share/doc/ImageMagick/www/api/magick-image.html
+share/doc/ImageMagick/www/api/magick-wand.html
+share/doc/ImageMagick/www/api/magick.html
+share/doc/ImageMagick/www/api/memory.html
+share/doc/ImageMagick/www/api/monitor.html
+share/doc/ImageMagick/www/api/montage.html
+share/doc/ImageMagick/www/api/paint.html
+share/doc/ImageMagick/www/api/pixel-iterator.html
+share/doc/ImageMagick/www/api/pixel-wand.html
+share/doc/ImageMagick/www/api/profile.html
+share/doc/ImageMagick/www/api/quantize.html
+share/doc/ImageMagick/www/api/registry.html
+share/doc/ImageMagick/www/api/resize.html
+share/doc/ImageMagick/www/api/resource.html
+share/doc/ImageMagick/www/api/segment.html
+share/doc/ImageMagick/www/api/shear.html
+share/doc/ImageMagick/www/api/signature.html
+share/doc/ImageMagick/www/api/stream.html
+share/doc/ImageMagick/www/api/transform.html
+share/doc/ImageMagick/www/api/version.html
+share/doc/ImageMagick/www/binary-releases.html
+share/doc/ImageMagick/www/changelog.html
+share/doc/ImageMagick/www/color.html
+share/doc/ImageMagick/www/command-line-options.html
+share/doc/ImageMagick/www/command-line-processing.html
+share/doc/ImageMagick/www/command-line-tools.html
+share/doc/ImageMagick/www/compare.html
+share/doc/ImageMagick/www/composite.html
+share/doc/ImageMagick/www/conjure.html
+share/doc/ImageMagick/www/contact.html
+share/doc/ImageMagick/www/convert.html
+share/doc/ImageMagick/www/cvs.html
+share/doc/ImageMagick/www/display.html
+share/doc/ImageMagick/www/download.html
+share/doc/ImageMagick/www/examples.html
+share/doc/ImageMagick/www/formats.html
+share/doc/ImageMagick/www/identify.html
+share/doc/ImageMagick/www/import.html
+share/doc/ImageMagick/www/install-source.html
+share/doc/ImageMagick/www/license.html
+share/doc/ImageMagick/www/links.html
+share/doc/ImageMagick/www/magick-core.html
+share/doc/ImageMagick/www/magick-wand.html
+share/doc/ImageMagick/www/magick.css
+share/doc/ImageMagick/www/mailing-list.html
+share/doc/ImageMagick/www/miff.html
+share/doc/ImageMagick/www/mogrify.html
+share/doc/ImageMagick/www/montage.html
+share/doc/ImageMagick/www/perl-magick.html
+share/doc/ImageMagick/www/quantize.html
+share/doc/ImageMagick/www/resources.html
+share/doc/ImageMagick/www/search.html
+share/doc/ImageMagick/www/sponsors.html
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/p5-PerlMagick/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 15 May 2005 21:02:46 -0000 1.8
+++ Makefile 30 May 2005 10:50:35 -0000
@@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2005/05/15 21:02:46 naddy Exp $
-NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
+SHARED_ONLY= Yes
COMMENT= "object-oriented Perl interface to ImageMagick"
-VER= 6.2.2
+VER= 6.2.3
DASHVER= 0
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= p5-PerlMagick-${VER}.${DASHVER}
@@ -15,7 +15,7 @@
BUILD_DEPENDS= :ImageMagick-${VER}.${DASHVER}:graphics/ImageMagick
RUN_DEPENDS= :ImageMagick-${VER}.${DASHVER}:graphics/ImageMagick
-LIB_DEPENDS= Magick.6::graphics/ImageMagick
+LIB_DEPENDS= Magick.8::graphics/ImageMagick
MAINTAINER= Dan Brosemer <[EMAIL PROTECTED]>
@@ -31,5 +31,18 @@
WRKDIST= ${WRKDIR}/${DISTNAME:S/-${DASHVER}$//}
WRKSRC= ${WRKDIST}/PerlMagick
+
+post-patch:
+ @perl -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \
+ s|%%X11BASE%%|${X11BASE}|g;' ${WRKSRC}/Makefile.PL
+
+pre-regress:
+ @perl -pi -e 's|[EMAIL PROTECTED]@|${WRKDIST}|g; \
+ s|[EMAIL PROTECTED]@|${WRKDIST}|g; \
+ s|[EMAIL PROTECTED]@|${WRKDIST}/coder|g; \
+ s|[EMAIL PROTECTED]@|${WRKDIST}/config|g; \
+ s|[EMAIL PROTECTED]@|${WRKDIST}/config|g; \
+ s|[EMAIL PROTECTED]@|${WRKDIST}/filters|g;'\
+ < ${WRKDIST}/magick.sh.in > ${WRKDIST}/magick.sh
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/p5-PerlMagick/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 15 May 2005 21:02:46 -0000 1.5
+++ distinfo 30 May 2005 10:50:35 -0000
@@ -1,4 +1,4 @@
-MD5 (ImageMagick-6.2.2-0.tar.gz) = 5d401ac3ef7c749ded433b28a5a185e3
-RMD160 (ImageMagick-6.2.2-0.tar.gz) = 1163cdea726938e1e8d7231057b6f9922cfe9190
-SHA1 (ImageMagick-6.2.2-0.tar.gz) = d44fba9fb73217f7d15458030641ff59f115470c
-SIZE (ImageMagick-6.2.2-0.tar.gz) = 5692908
+MD5 (ImageMagick-6.2.3-0.tar.gz) = ae8728d5b7f81e6bf882eb3ce5a9385c
+RMD160 (ImageMagick-6.2.3-0.tar.gz) = 28baedc271ad9a745667ea07fb89339fc72fa758
+SHA1 (ImageMagick-6.2.3-0.tar.gz) = 05dd3792826c7c0c70ae1c84ed87b0d46e9afe62
+SIZE (ImageMagick-6.2.3-0.tar.gz) = 5737364
Index: patches/patch-PerlMagick_Makefile_PL
===================================================================
RCS file:
/cvs/ports/graphics/p5-PerlMagick/patches/patch-PerlMagick_Makefile_PL,v
retrieving revision 1.4
diff -u -r1.4 patch-PerlMagick_Makefile_PL
--- patches/patch-PerlMagick_Makefile_PL 15 May 2005 21:02:47 -0000
1.4
+++ patches/patch-PerlMagick_Makefile_PL 30 May 2005 10:50:35 -0000
@@ -1,29 +1,29 @@
$OpenBSD: patch-PerlMagick_Makefile_PL,v 1.4 2005/05/15 21:02:47 naddy Exp $
---- PerlMagick/Makefile.PL.orig Fri May 6 10:27:01 2005
-+++ PerlMagick/Makefile.PL Fri May 6 10:27:05 2005
+--- PerlMagick/Makefile.PL.orig Tue May 24 00:47:27 2005
++++ PerlMagick/Makefile.PL Sun May 29 12:11:49 2005
@@ -44,13 +44,13 @@ WriteMakefile
'DEFINE' => ' -DHAVE_CONFIG_H', # e.g., '-DHAVE_SOMETHING'
# Header search specfication and preprocessor flags
- 'INC' => '-I../ -I.. -I/usr/include/freetype2 -I/usr/X11R6/include
-I/usr/X11R6/include/X11 -I/usr/include/libxml2',
-+ 'INC' => '-I../ -I.. -I/usr/X11R6/include -I/usr/X11R6/include/X11',
++ 'INC' => '-I../ -I.. -I%%X11BASE%%/include -I%%X11BASE%%/include/X11',
# C pre-processor flags (e.g. -I & -D options)
- # 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/include/freetype2
-I/usr/X11R6/include -I/usr/X11R6/include/X11 -I/usr/include/libxml2",
-+ # 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/X11R6/include
-I/usr/X11R6/include/X11",
++ # 'CPPFLAGS' => "$Config{'cppflags'} -I%%X11BASE%%/include
-I%%X11BASE%%/include/X11",
# C compiler flags (e.g. -O -g)
- 'CCFLAGS' => "$Config{'ccflags'} -O3 -g -Wall -pthread",
+ 'CCFLAGS' => "$Config{'ccflags'} -O2 -Wall",
# Linker flags for building an executable
- 'LDFLAGS' => "-L/usr/local/lib $Config{'ldflags'}",
+ 'LDFLAGS' => "-L/usr/lib $Config{'ldflags'}",
@@ -62,7 +62,7 @@ WriteMakefile
- 'INSTALLBIN' => '/usr/local/bin',
+ 'INSTALLBIN' => '/usr/bin',
# Library specification
-- 'LIBS' => ['-L/usr/local/lib -lMagick -L/usr/X11R6/lib64 -L/usr/lib64
-Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz -L/usr/lib -ltiff -lfreetype -ljpeg
-lpng -ldpstk -ldps -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm
-lpthread'],
-+ 'LIBS' => ['-L/usr/local/lib -lMagick -L/usr/X11R6/lib -ljbig -llcms
-ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2
-liconv -lz -lm'],
+- 'LIBS' => ['-L/usr/lib -lMagick -L/usr/X11R6/lib64 -L/usr/lib64
-Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz -L/usr/lib -ltiff -lfreetype -ljpeg
-lpng -ldpstk -ldps -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm
-lpthread'],
++ 'LIBS' => ['-L%%LOCALBASE%%/lib -lMagick -ljbig -llcms -ltiff
-L%%X11BASE%%/lib -lfreetype -ljasper -ljpeg -lpng -lXext -lSM -lICE -lX11
-lbz2 -lxml2 -liconv -lz -lm'],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',
