Re: ImageMagic distfile

2007-11-20 Thread Okan Demirmen
ImageMagick and p5-PerlMagic updates:
- update to 6.3.6-10
- add libwmf support
- fix-up WANTLIB
 
note: need the recent ghostscript update.

comments?
Index: Makefile
===
RCS file: /data/OpenBSD/cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.99
diff -u -p -r1.99 Makefile
--- Makefile22 Oct 2007 14:23:08 -  1.99
+++ Makefile19 Nov 2007 19:28:05 -
@@ -2,13 +2,13 @@
 
 COMMENT=   image processing tools
 
-VER=   6.3.5
-DASHVER=   9
+VER=   6.3.6
+DASHVER=   10
 DISTNAME=  ImageMagick-${VER}-${DASHVER}
 PKGNAME=   ImageMagick-${VER}.${DASHVER}
-SHARED_LIBS=   Magick++12.0\
-   Magick  12.0\
-   Wand12.0
+SHARED_LIBS=   Magick++12.1\
+   Magick  12.1\
+   Wand12.1
 
 CATEGORIES=graphics
 
@@ -32,7 +32,8 @@ LIB_DEPENDS=  bz2.=10::archivers/bzip2 
tiff.=36::graphics/tiff \
xml2.=9::textproc/libxml \
lcms.=1::graphics/lcms \
-   jasper.=1::graphics/jasper
+   jasper.=1::graphics/jasper \
+   wmflite.=7::graphics/libwmf
 
 RUN_DEPENDS=   :netpbm-*:graphics/netpbm
 BUILD_DEPENDS= :netpbm-*:graphics/netpbm
@@ -53,7 +54,7 @@ CONFIGURE_ARGS+=  --with-quantum-depth=16
--without-threads \
--without-perl \
--without-rsvg \
-   --without-wmf \
+   --with-wmf \
--disable-ltdl-install
 
 CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include/libpng 
-I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include \
Index: distinfo
===
RCS file: /data/OpenBSD/cvs/ports/graphics/ImageMagick/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo19 Sep 2007 18:46:55 -  1.14
+++ distinfo16 Nov 2007 18:53:26 -
@@ -1,5 +1,5 @@
-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
+MD5 (ImageMagick-6.3.6-10.tar.gz) = mycQYgC9yHnQWDNVvIBS+g==
+RMD160 (ImageMagick-6.3.6-10.tar.gz) = yy5MWV5nQ+s3i6O6Tb319ttiHPE=
+SHA1 (ImageMagick-6.3.6-10.tar.gz) = a+X4sSW5Cq1YxNK9hvwEIgEIsS0=
+SHA256 (ImageMagick-6.3.6-10.tar.gz) = 
Dfj2txKR0Y3DXdCXXW3+kOsmuOq57UB3MfM48INOde8=
+SIZE (ImageMagick-6.3.6-10.tar.gz) = 9100940
Index: pkg/PLIST
===
RCS file: /data/OpenBSD/cvs/ports/graphics/ImageMagick/pkg/PLIST,v
retrieving revision 1.37
diff -u -p -r1.37 PLIST
--- pkg/PLIST   19 Sep 2007 18:46:55 -  1.37
+++ pkg/PLIST   16 Nov 2007 18:53:26 -
@@ -33,6 +33,7 @@ include/magick/PreRvIcccm.h
 include/magick/animate.h
 include/magick/annotate.h
 include/magick/api.h
+include/magick/artifact.h
 include/magick/blob.h
 include/magick/cache-view.h
 include/magick/cache.h
Index: Makefile
===
RCS file: /data/OpenBSD/cvs/ports/graphics/p5-PerlMagick/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile19 Nov 2007 20:11:41 -  1.20
+++ Makefile21 Nov 2007 03:13:34 -
@@ -4,10 +4,10 @@ SHARED_ONLY=  Yes
 
 COMMENT=   object-oriented Perl interface to ImageMagick
 
-VER=   6.3.5
-DASHVER=   9
+VER=   6.3.6
+DASHVER=   10
 DISTNAME=  ImageMagick-${VER}-${DASHVER}
-PKGNAME=   p5-PerlMagick-${VER}.${DASHVER}p0
+PKGNAME=   p5-PerlMagick-${VER}.${DASHVER}
 CATEGORIES=graphics devel
 
 HOMEPAGE=  http://www.imagemagick.org
@@ -18,13 +18,12 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
-WANTLIB=   ICE SM X11 Xext bz2 freetype jasper jbig jpeg \
-   lcms m png tiff xml2 z Xt
+WANTLIB=   freetype
 
 RUN_DEPENDS=   :ImageMagick-${VER}.${DASHVER}:graphics/ImageMagick
 BUILD_DEPENDS= ${RUN_DEPENDS} \
::print/ghostscript/gnu:patch
-LIB_DEPENDS=   Magick.=10::graphics/ImageMagick
+LIB_DEPENDS=   Magick.=12,Wand.=12::graphics/ImageMagick
 USE_X11=   Yes
 
 MODULES=   cpan
Index: distinfo

Re: ImageMagic distfile

2007-11-19 Thread Okan Demirmen
On Fri 2007.11.16 at 14:56 -0500, Okan Demirmen wrote:
 On Thu 2007.11.15 at 10:16 +0100, Giovanni Bechis wrote:
  On Wed, Nov 14, 2007 at 11:02:33AM -0500, Okan Demirmen wrote:
   MASTER_SITES needs an update, as well as the whole port. are you working
   on that?
   
  Imagemagick updated to latest version, ports tested @i386.
   Comments ? Ok ?
Giovanni
 
 thanks.
 
 regress on p5-PerlMagick fails - need to add to REGRESS_DEPENDS.

instead of adding to depends, how about adding libwmf to both
ImageMagick and p5-PerlMagick?

you'll need the recent ghostscript update.

Index: Makefile
===
RCS file: /data/OpenBSD/cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.99
diff -u -p -r1.99 Makefile
--- Makefile22 Oct 2007 14:23:08 -  1.99
+++ Makefile19 Nov 2007 19:28:05 -
@@ -2,13 +2,13 @@
 
 COMMENT=   image processing tools
 
-VER=   6.3.5
-DASHVER=   9
+VER=   6.3.6
+DASHVER=   10
 DISTNAME=  ImageMagick-${VER}-${DASHVER}
 PKGNAME=   ImageMagick-${VER}.${DASHVER}
-SHARED_LIBS=   Magick++12.0\
-   Magick  12.0\
-   Wand12.0
+SHARED_LIBS=   Magick++12.1\
+   Magick  12.1\
+   Wand12.1
 
 CATEGORIES=graphics
 
@@ -32,7 +32,8 @@ LIB_DEPENDS=  bz2.=10::archivers/bzip2 
tiff.=36::graphics/tiff \
xml2.=9::textproc/libxml \
lcms.=1::graphics/lcms \
-   jasper.=1::graphics/jasper
+   jasper.=1::graphics/jasper \
+   wmflite.=7::graphics/libwmf
 
 RUN_DEPENDS=   :netpbm-*:graphics/netpbm
 BUILD_DEPENDS= :netpbm-*:graphics/netpbm
@@ -53,7 +54,7 @@ CONFIGURE_ARGS+=  --with-quantum-depth=16
--without-threads \
--without-perl \
--without-rsvg \
-   --without-wmf \
+   --with-wmf \
--disable-ltdl-install
 
 CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include/libpng 
-I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include \
Index: distinfo
===
RCS file: /data/OpenBSD/cvs/ports/graphics/ImageMagick/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo19 Sep 2007 18:46:55 -  1.14
+++ distinfo16 Nov 2007 18:53:26 -
@@ -1,5 +1,5 @@
-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
+MD5 (ImageMagick-6.3.6-10.tar.gz) = mycQYgC9yHnQWDNVvIBS+g==
+RMD160 (ImageMagick-6.3.6-10.tar.gz) = yy5MWV5nQ+s3i6O6Tb319ttiHPE=
+SHA1 (ImageMagick-6.3.6-10.tar.gz) = a+X4sSW5Cq1YxNK9hvwEIgEIsS0=
+SHA256 (ImageMagick-6.3.6-10.tar.gz) = 
Dfj2txKR0Y3DXdCXXW3+kOsmuOq57UB3MfM48INOde8=
+SIZE (ImageMagick-6.3.6-10.tar.gz) = 9100940
Index: pkg/PLIST
===
RCS file: /data/OpenBSD/cvs/ports/graphics/ImageMagick/pkg/PLIST,v
retrieving revision 1.37
diff -u -p -r1.37 PLIST
--- pkg/PLIST   19 Sep 2007 18:46:55 -  1.37
+++ pkg/PLIST   16 Nov 2007 18:53:26 -
@@ -33,6 +33,7 @@ include/magick/PreRvIcccm.h
 include/magick/animate.h
 include/magick/annotate.h
 include/magick/api.h
+include/magick/artifact.h
 include/magick/blob.h
 include/magick/cache-view.h
 include/magick/cache.h
Index: Makefile
===
RCS file: /data/OpenBSD/cvs/ports/graphics/p5-PerlMagick/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile19 Nov 2007 20:11:41 -  1.20
+++ Makefile19 Nov 2007 20:18:22 -
@@ -4,10 +4,10 @@ SHARED_ONLY=  Yes
 
 COMMENT=   object-oriented Perl interface to ImageMagick
 
-VER=   6.3.5
-DASHVER=   9
+VER=   6.3.6
+DASHVER=   10
 DISTNAME=  ImageMagick-${VER}-${DASHVER}
-PKGNAME=   p5-PerlMagick-${VER}.${DASHVER}p0
+PKGNAME=   p5-PerlMagick-${VER}.${DASHVER}
 CATEGORIES=graphics devel
 
 HOMEPAGE=  http://www.imagemagick.org
@@ -19,7 +19,7 @@ PERMIT_PACKAGE_FTP=   Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 WANTLIB=   ICE SM X11 Xext bz2 freetype jasper jbig jpeg \
-   lcms m png tiff xml2 z Xt
+   lcms m png tiff xml2 z Xt Wand
 
 RUN_DEPENDS=

Re: ImageMagic distfile

2007-11-16 Thread Okan Demirmen
On Thu 2007.11.15 at 10:16 +0100, Giovanni Bechis wrote:
 On Wed, Nov 14, 2007 at 11:02:33AM -0500, Okan Demirmen wrote:
  MASTER_SITES needs an update, as well as the whole port. are you working
  on that?
  
 Imagemagick updated to latest version, ports tested @i386.
  Comments ? Ok ?
   Giovanni

thanks.

regress on p5-PerlMagick fails - need to add to REGRESS_DEPENDS.



Re: ImageMagic distfile

2007-11-15 Thread Giovanni Bechis
On Wed, Nov 14, 2007 at 11:02:33AM -0500, Okan Demirmen wrote:
 MASTER_SITES needs an update, as well as the whole port. are you working
 on that?
 
Imagemagick updated to latest version, ports tested @i386.
 Comments ? Ok ?
  Giovanni
Index: Makefile
===
RCS file: /cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.99
diff -u -r1.99 Makefile
--- Makefile22 Oct 2007 14:23:08 -  1.99
+++ Makefile15 Nov 2007 09:06:42 -
@@ -2,13 +2,13 @@
 
 COMMENT=   image processing tools
 
-VER=   6.3.5
-DASHVER=   9
+VER=   6.3.6
+DASHVER=   10
 DISTNAME=  ImageMagick-${VER}-${DASHVER}
 PKGNAME=   ImageMagick-${VER}.${DASHVER}
-SHARED_LIBS=   Magick++12.0\
-   Magick  12.0\
-   Wand12.0
+SHARED_LIBS=   Magick++12.1\
+   Magick  12.1\
+   Wand12.1
 
 CATEGORIES=graphics
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/ImageMagick/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo19 Sep 2007 18:46:55 -  1.14
+++ distinfo15 Nov 2007 09:06:42 -
@@ -1,5 +1,5 @@
-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
+MD5 (ImageMagick-6.3.6-10.tar.gz) = mycQYgC9yHnQWDNVvIBS+g==
+RMD160 (ImageMagick-6.3.6-10.tar.gz) = yy5MWV5nQ+s3i6O6Tb319ttiHPE=
+SHA1 (ImageMagick-6.3.6-10.tar.gz) = a+X4sSW5Cq1YxNK9hvwEIgEIsS0=
+SHA256 (ImageMagick-6.3.6-10.tar.gz) = 
Dfj2txKR0Y3DXdCXXW3+kOsmuOq57UB3MfM48INOde8=
+SIZE (ImageMagick-6.3.6-10.tar.gz) = 9100940
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/ImageMagick/pkg/PLIST,v
retrieving revision 1.37
diff -u -r1.37 PLIST
--- pkg/PLIST   19 Sep 2007 18:46:55 -  1.37
+++ pkg/PLIST   15 Nov 2007 09:06:43 -
@@ -33,6 +33,7 @@
 include/magick/animate.h
 include/magick/annotate.h
 include/magick/api.h
+include/magick/artifact.h
 include/magick/blob.h
 include/magick/cache-view.h
 include/magick/cache.h
Index: Makefile
===
RCS file: /cvs/ports/graphics/p5-PerlMagick/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile19 Sep 2007 18:52:05 -  1.19
+++ Makefile15 Nov 2007 09:07:36 -
@@ -4,8 +4,8 @@
 
 COMMENT=   object-oriented Perl interface to ImageMagick
 
-VER=   6.3.5
-DASHVER=   9
+VER=   6.3.6
+DASHVER=   10
 DISTNAME=  ImageMagick-${VER}-${DASHVER}
 PKGNAME=   p5-PerlMagick-${VER}.${DASHVER}
 CATEGORIES=graphics devel
Index: distinfo
===
RCS file: /cvs/ports/graphics/p5-PerlMagick/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo19 Sep 2007 18:52:05 -  1.14
+++ distinfo15 Nov 2007 09:07:36 -
@@ -1,5 +1,5 @@
-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
+MD5 (ImageMagick-6.3.6-10.tar.gz) = mycQYgC9yHnQWDNVvIBS+g==
+RMD160 (ImageMagick-6.3.6-10.tar.gz) = yy5MWV5nQ+s3i6O6Tb319ttiHPE=
+SHA1 (ImageMagick-6.3.6-10.tar.gz) = a+X4sSW5Cq1YxNK9hvwEIgEIsS0=
+SHA256 (ImageMagick-6.3.6-10.tar.gz) = 
Dfj2txKR0Y3DXdCXXW3+kOsmuOq57UB3MfM48INOde8=
+SIZE (ImageMagick-6.3.6-10.tar.gz) = 9100940
Index: patches/patch-PerlMagick_Makefile_PL
===
RCS file: 
/cvs/ports/graphics/p5-PerlMagick/patches/patch-PerlMagick_Makefile_PL,v
retrieving revision 1.11
diff -u -r1.11 patch-PerlMagick_Makefile_PL
--- patches/patch-PerlMagick_Makefile_PL19 Sep 2007 18:52:05 -  
1.11
+++ patches/patch-PerlMagick_Makefile_PL15 Nov 2007 09:07:36 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-PerlMagick_Makefile_PL,v 1.11 2007/09/19 18:52:05 sthen Exp $
 PerlMagick/Makefile.PL.origSun Sep 16 02:14:07 2007
-+++ PerlMagick/Makefile.PL Mon Sep 17 23:40:44 2007
-@@ -44,13 +44,13 @@ WriteMakefile
+--- PerlMagick/Makefile.PL.origWed Nov  7 03:29:54 2007
 PerlMagick/Makefile.PL Wed Nov 14 22:08:29 2007
+@@ -59,13 +59,13 @@ WriteMakefile
 

Re: ImageMagic distfile

2007-11-14 Thread Giovanni Bechis
On Wed, Nov 14, 2007 at 11:02:33AM -0500, Okan Demirmen wrote:
 MASTER_SITES needs an update, as well as the whole port. are you working
 on that?
 
I am working on update to version 6.3.6-10 (latest version).
  Giovanni