On Tue, Sep 18, 2007 at 12:11:46AM +0100, Stuart Henderson wrote:
> To save duplication of effort, it would be really useful if people
> submitting new or updated ports would say which architecture/s they
> have tested. Even if it's only i386.
>
You are right, diffs fixed, on i386 regression fails on both Imagemagick
and Perlmagick, Imagemagick's tools work as expected.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.97
diff -u -r1.97 Makefile
--- Makefile 15 Sep 2007 20:09:40 -0000 1.97
+++ Makefile 18 Sep 2007 12:47:10 -0000
@@ -2,13 +2,13 @@
COMMENT= image processing tools
-VER= 6.3.4
-DASHVER= 1
+VER= 6.3.5
+DASHVER= 9
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
-SHARED_LIBS= Magick++ 12.0 \
- Magick 12.0 \
- Wand 12.0
+SHARED_LIBS= Magick++ 13.0 \
+ Magick 13.0 \
+ Wand 13.0
CATEGORIES= graphics
@@ -76,6 +76,8 @@
.endif
WRKDIST= ${WRKDIR}/${DISTNAME:S/-${DASHVER}$//}
+
+NO_REGRESS= Yes
post-extract:
@rm -f ${WRKDIST}/utilities/*.1
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 20 May 2007 19:44:47 -0000 1.13
+++ distinfo 18 Sep 2007 12:47:10 -0000
@@ -1,5 +1,5 @@
-MD5 (ImageMagick-6.3.4-1.tar.gz) = FtFX3hOHDfeLcFObpDH7XQ==
-RMD160 (ImageMagick-6.3.4-1.tar.gz) = F67VHu+HJbwNy1ThOopvpqEe/ug=
-SHA1 (ImageMagick-6.3.4-1.tar.gz) = aiYcNf3febMBmdK8e1ef5d/zSvc=
-SHA256 (ImageMagick-6.3.4-1.tar.gz) =
fXXwTf7JuXJpH4TL2COj1kl7eBu+mHDPBOp3STgB5gE=
-SIZE (ImageMagick-6.3.4-1.tar.gz) = 6893715
+MD5 (ImageMagick-6.3.5-9.tar.gz) = I9hjitYr9O0NLXchT6H0ng==
+RMD160 (ImageMagick-6.3.5-9.tar.gz) = X3SWeHZDk2aMIvEU07EeJkRM7sw=
+SHA1 (ImageMagick-6.3.5-9.tar.gz) = u/3/XexHtpdcgLCbfPFJurPrvjQ=
+SHA256 (ImageMagick-6.3.5-9.tar.gz) =
6fiLWyRpU4iThWMJFkiFIN/nrFengYPdkMs5U0rfcUs=
+SIZE (ImageMagick-6.3.5-9.tar.gz) = 9310482
Index: patches/patch-coders_png_c
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/patches/patch-coders_png_c,v
retrieving revision 1.4
diff -u -r1.4 patch-coders_png_c
--- patches/patch-coders_png_c 20 May 2007 19:44:47 -0000 1.4
+++ patches/patch-coders_png_c 18 Sep 2007 12:47:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-coders_png_c,v 1.4 2007/05/20 19:44:47 steven Exp $
---- coders/png.c.orig Sat May 5 02:42:11 2007
-+++ coders/png.c Wed May 16 17:41:56 2007
-@@ -1768,7 +1768,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
+--- coders/png.c.orig Mon Sep 17 22:18:06 2007
++++ coders/png.c Mon Sep 17 22:18:35 2007
+@@ -1763,7 +1763,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
png_set_read_user_chunk_fn(ping, image, read_vpag_chunk_callback);
#endif
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/patches/patch-configure_ac,v
retrieving revision 1.7
diff -u -r1.7 patch-configure_ac
--- patches/patch-configure_ac 20 May 2007 19:44:47 -0000 1.7
+++ patches/patch-configure_ac 18 Sep 2007 12:47:10 -0000
@@ -1,20 +1,15 @@
-$OpenBSD: patch-configure_ac,v 1.7 2007/05/20 19:44:47 steven Exp $
---- configure.ac.orig Sat Apr 28 02:41:46 2007
-+++ configure.ac Wed May 16 17:42:57 2007
-@@ -354,9 +354,9 @@ AM_CONDITIONAL(WITH_MODULES, test "$with_modules" != '
- # Enable building/use of libltdl if we are building shared libraries
regardless
- # of whether modules are built or not.
- with_ltdl='no'
--if test "$libtool_build_shared_libs" != 'no' ; then
-- with_ltdl='yes'
--fi
-+#if test "$libtool_build_shared_libs" != 'no' ; then
-+# with_ltdl='yes'
-+#fi
+$OpenBSD$
+--- configure.ac.orig Tue Sep 11 20:19:52 2007
++++ configure.ac Mon Sep 17 23:14:21 2007
+@@ -390,6 +390,7 @@ with_ltdl='no'
+ if test "$libtool_build_shared_libs" != 'no'; then
+ with_ltdl='yes'
+ fi
++with_ltdl='no'
AM_CONDITIONAL(WITH_LTDL, test "$with_ltdl" != 'no')
- if test "$with_ltdl" != 'no' ; then
-@@ -1997,7 +1997,7 @@ AC_SUBST(PERLMAINCC)
+ if test "$with_ltdl" != 'no'; then
+@@ -2076,7 +2077,7 @@ AC_SUBST(PERLMAINCC)
#
# Subdirectory under lib to place ImageMagick lib files
@@ -23,7 +18,7 @@
AC_DEFINE_UNQUOTED(MagickLibSubdir,"$MagickLibSubdir",Subdirectory of lib
where ImageMagick architecture dependent files are installed)
# Path to ImageMagick bin directory
-@@ -2055,7 +2055,7 @@ AC_SUBST(MagickFilterModulesPath)
+@@ -2134,7 +2135,7 @@ AC_SUBST(MagickFilterModulesPath)
#
# Path to ImageMagick document files
@@ -32,7 +27,7 @@
MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
MagickDocumentPathDefine="${MagickDocumentPath}/"
if test "$native_win32_build" = 'yes'; then
-@@ -2066,7 +2066,7 @@ AC_SUBST(MagickDocumentPath)
+@@ -2145,7 +2146,7 @@ AC_SUBST(MagickDocumentPath)
#
# Path to ImageMagick share files
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/pkg/PLIST,v
retrieving revision 1.36
diff -u -r1.36 PLIST
--- pkg/PLIST 20 May 2007 19:44:47 -0000 1.36
+++ pkg/PLIST 18 Sep 2007 12:47:10 -0000
@@ -49,6 +49,7 @@
include/magick/delegate.h
include/magick/deprecate.h
include/magick/display.h
+include/magick/distort.h
include/magick/draw.h
include/magick/effect.h
include/magick/enhance.h
@@ -67,6 +68,7 @@
include/magick/magick-config.h
include/magick/magick-type.h
include/magick/magick.h
+include/magick/matrix.h
include/magick/memory_.h
include/magick/methods.h
include/magick/mime.h
@@ -83,6 +85,7 @@
include/magick/quantum.h
include/magick/random_.h
include/magick/registry.h
+include/magick/resample.h
include/magick/resize.h
include/magick/resource_.h
include/magick/segment.h
@@ -131,6 +134,7 @@
lib/ImageMagick/config/configure.xml
lib/ImageMagick/config/delegates.xml
lib/ImageMagick/config/english.xml
+lib/ImageMagick/config/francais.xml
lib/ImageMagick/config/locale.xml
lib/ImageMagick/config/type-ghostscript.xml
lib/ImageMagick/config/type-solaris.xml
@@ -197,7 +201,9 @@
share/doc/ImageMagick/images/logo.jpg
share/doc/ImageMagick/images/montage.jpg
share/doc/ImageMagick/images/navy.png
+share/doc/ImageMagick/images/networkredux.png
share/doc/ImageMagick/images/piechart.png
+share/doc/ImageMagick/images/radial-gradient.png
share/doc/ImageMagick/images/reconstruct.jpg
share/doc/ImageMagick/images/red-ball.png
share/doc/ImageMagick/images/red-circle.png
@@ -210,6 +216,7 @@
share/doc/ImageMagick/images/smile.gif
share/doc/ImageMagick/images/sponsor.jpg
share/doc/ImageMagick/images/sprite.jpg
+share/doc/ImageMagick/images/t-shirt.png
share/doc/ImageMagick/images/travelsur.gif
share/doc/ImageMagick/images/tricks.png
share/doc/ImageMagick/images/wand.ico
@@ -264,6 +271,7 @@
share/doc/ImageMagick/www/api/animate.html
share/doc/ImageMagick/www/api/annotate.html
share/doc/ImageMagick/www/api/blob.html
+share/doc/ImageMagick/www/api/cache-view.html
share/doc/ImageMagick/www/api/cache.html
share/doc/ImageMagick/www/api/color.html
share/doc/ImageMagick/www/api/colorspace.html
@@ -271,6 +279,7 @@
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/deprecate.html
share/doc/ImageMagick/www/api/display.html
share/doc/ImageMagick/www/api/draw.html
share/doc/ImageMagick/www/api/drawing-wand.html
@@ -281,6 +290,7 @@
share/doc/ImageMagick/www/api/image.html
share/doc/ImageMagick/www/api/layer.html
share/doc/ImageMagick/www/api/list.html
+share/doc/ImageMagick/www/api/magick-deprecate.html
share/doc/ImageMagick/www/api/magick-image.html
share/doc/ImageMagick/www/api/magick-property.html
share/doc/ImageMagick/www/api/magick-wand.html
@@ -293,6 +303,7 @@
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/property.html
share/doc/ImageMagick/www/api/quantize.html
share/doc/ImageMagick/www/api/registry.html
share/doc/ImageMagick/www/api/resize.html
@@ -315,7 +326,6 @@
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
@@ -335,6 +345,7 @@
share/doc/ImageMagick/www/magick.css
share/doc/ImageMagick/www/mailing-list.html
share/doc/ImageMagick/www/miff.html
+share/doc/ImageMagick/www/mirrors.html
share/doc/ImageMagick/www/mogrify.html
share/doc/ImageMagick/www/montage.html
share/doc/ImageMagick/www/motion-picture.html
@@ -346,3 +357,4 @@
share/doc/ImageMagick/www/sponsors.html
share/doc/ImageMagick/www/stream.html
share/doc/ImageMagick/www/subversion.html
+share/doc/ImageMagick/www/t-shirt.html
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/p5-PerlMagick/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile 15 Sep 2007 20:09:42 -0000 1.18
+++ Makefile 18 Sep 2007 12:47:23 -0000
@@ -4,8 +4,8 @@
COMMENT= object-oriented Perl interface to ImageMagick
-VER= 6.3.4
-DASHVER= 1
+VER= 6.3.5
+DASHVER= 9
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= p5-PerlMagick-${VER}.${DASHVER}
CATEGORIES= graphics devel
@@ -33,6 +33,8 @@
WRKSRC= ${WRKDIST}/PerlMagick
CFLAGS+= -I${WRKDIR}
+
+NO_REGRESS= Yes
pre-configure:
@cd ${WRKDIR} && ln -s print/ghostscript/gnu/ghostscript-8.54-gpl/src
ghostscript
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/p5-PerlMagick/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 20 May 2007 19:44:47 -0000 1.13
+++ distinfo 18 Sep 2007 12:47:23 -0000
@@ -1,5 +1,5 @@
-MD5 (ImageMagick-6.3.4-1.tar.gz) = FtFX3hOHDfeLcFObpDH7XQ==
-RMD160 (ImageMagick-6.3.4-1.tar.gz) = F67VHu+HJbwNy1ThOopvpqEe/ug=
-SHA1 (ImageMagick-6.3.4-1.tar.gz) = aiYcNf3febMBmdK8e1ef5d/zSvc=
-SHA256 (ImageMagick-6.3.4-1.tar.gz) =
fXXwTf7JuXJpH4TL2COj1kl7eBu+mHDPBOp3STgB5gE=
-SIZE (ImageMagick-6.3.4-1.tar.gz) = 6893715
+MD5 (ImageMagick-6.3.5-9.tar.gz) = I9hjitYr9O0NLXchT6H0ng==
+RMD160 (ImageMagick-6.3.5-9.tar.gz) = X3SWeHZDk2aMIvEU07EeJkRM7sw=
+SHA1 (ImageMagick-6.3.5-9.tar.gz) = u/3/XexHtpdcgLCbfPFJurPrvjQ=
+SHA256 (ImageMagick-6.3.5-9.tar.gz) =
6fiLWyRpU4iThWMJFkiFIN/nrFengYPdkMs5U0rfcUs=
+SIZE (ImageMagick-6.3.5-9.tar.gz) = 9310482
Index: patches/patch-PerlMagick_Makefile_PL
===================================================================
RCS file:
/cvs/ports/graphics/p5-PerlMagick/patches/patch-PerlMagick_Makefile_PL,v
retrieving revision 1.10
diff -u -r1.10 patch-PerlMagick_Makefile_PL
--- patches/patch-PerlMagick_Makefile_PL 20 May 2007 19:44:47 -0000
1.10
+++ patches/patch-PerlMagick_Makefile_PL 18 Sep 2007 12:47:23 -0000
@@ -1,28 +1,28 @@
$OpenBSD: patch-PerlMagick_Makefile_PL,v 1.10 2007/05/20 19:44:47 steven Exp $
---- PerlMagick/Makefile.PL.orig Sat May 12 06:05:24 2007
-+++ PerlMagick/Makefile.PL Wed May 16 18:07:03 2007
+--- PerlMagick/Makefile.PL.orig Sun Sep 16 02:14:07 2007
++++ PerlMagick/Makefile.PL Mon Sep 17 23:40:44 2007
@@ -44,13 +44,13 @@ WriteMakefile
'DEFINE' => ' -D_LARGE_FILES=1 -DHAVE_CONFIG_H', # e.g.,
'-DHAVE_SOMETHING'
# Header search specfication and preprocessor flags
- 'INC' => '-I../ -I.. -I/usr/include/freetype2 -I/usr/include/libxml2',
-+ 'INC' => '-I../ -I.. -I%%X11BASE%%/include -I%%X11BASE%%/include/X11',
++ 'INC' => '-I../ -I.. -I%%X11BASE%%/include/freetype2
-I%%X11BASE%%/include/libxml2',
# C pre-processor flags (e.g. -I & -D options)
# 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/include/freetype2
-I/usr/include/libxml2",
# C compiler flags (e.g. -O -g)
-- 'CCFLAGS' => "$Config{'ccflags'} -O3 -g -Wall -W -pthread",
+- 'CCFLAGS' => "$Config{'ccflags'} -O3 -g -Wall -W -pthread -fopenmp",
+ 'CCFLAGS' => "$Config{'ccflags'} %%CFLAGS%%",
# Linker flags for building an executable
- 'LDFLAGS' => "-L../magick/.libs -lMagick $Config{'ldflags'}",
+ 'LDFLAGS' => "-L../magick/.libs -lMagick $Config{'ldflags'} -fopenmp
-L/usr/lib64 -lfreetype",
@@ -62,7 +62,7 @@ WriteMakefile
'INSTALLBIN' => '/usr/bin',
# Library specification
-- 'LIBS' => [ '-L/usr/lib -L../magick/.libs -lMagick -L/usr/lib64
-lfreetype -llcms -ltiff -lfreetype -ljpeg -lfontconfig -lXext -lSM -lICE -lX11
-lXt -lbz2 -lz -lpthread -lm -lpthread' ],
-+ 'LIBS' => [ '-L%%LOCALBASE%%/lib -lMagick -L%%X11BASE%%/lib -ljbig
-llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lXt -lSM -lICE -lX11
-lbz2 -lxml2 -lz -lm' ],
+- 'LIBS' => [ '-L/usr/lib -L../magick/.libs -lMagick' ],
++ 'LIBS' => [ '-L%%LOCALBASE%%/lib -L%%X11BASE%%/lib -L../magick/.libs
-lMagick' ],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',
