diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile index bf78cebb931..e03620435e7 100644 --- a/graphics/p5-PerlMagick/Makefile +++ b/graphics/p5-PerlMagick/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.20 2007/11/19 20:11:41 kili Exp $ +# $OpenBSD: Makefile,v 1.21 2007/11/22 17:20:56 okan Exp $ 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.1,Wand.>=12.1::graphics/ImageMagick USE_X11= Yes MODULES= cpan diff --git a/graphics/p5-PerlMagick/distinfo b/graphics/p5-PerlMagick/distinfo index b0ffb39c767..caf6e07c874 100644 --- a/graphics/p5-PerlMagick/distinfo +++ b/graphics/p5-PerlMagick/distinfo @@ -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 diff --git a/graphics/p5-PerlMagick/patches/patch-PerlMagick_Makefile_PL b/graphics/p5-PerlMagick/patches/patch-PerlMagick_Makefile_PL index 4f622335fc6..2497bd4adce 100644 --- a/graphics/p5-PerlMagick/patches/patch-PerlMagick_Makefile_PL +++ b/graphics/p5-PerlMagick/patches/patch-PerlMagick_Makefile_PL @@ -1,7 +1,7 @@ -$OpenBSD: patch-PerlMagick_Makefile_PL,v 1.11 2007/09/19 18:52:05 sthen Exp $ ---- 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 +$OpenBSD: patch-PerlMagick_Makefile_PL,v 1.12 2007/11/22 17:20:56 okan Exp $ +--- PerlMagick/Makefile.PL.orig Tue Nov 6 21:29:54 2007 ++++ PerlMagick/Makefile.PL Mon Nov 19 15:24:16 2007 +@@ -59,13 +59,13 @@ WriteMakefile 'DEFINE' => ' -D_LARGE_FILES=1 -DHAVE_CONFIG_H', # e.g., '-DHAVE_SOMETHING' # Header search specfication and preprocessor flags @@ -12,17 +12,17 @@ $OpenBSD: patch-PerlMagick_Makefile_PL,v 1.11 2007/09/19 18:52:05 sthen Exp $ # '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 -fopenmp", +- 'CCFLAGS' => "$Config{'ccflags'} -O3 -g -Wall -W -pthread", + 'CCFLAGS' => "$Config{'ccflags'} %%CFLAGS%%", # Linker flags for building an executable - 'LDFLAGS' => "-L../magick/.libs -lMagick $Config{'ldflags'} -fopenmp -L/usr/lib64 -lfreetype", -@@ -62,7 +62,7 @@ WriteMakefile + 'LDFLAGS' => "-L../magick/.libs -lMagick -L../wand/.libs -lWand $Config{'ldflags'} -L/usr/lib64 -lfreetype", +@@ -77,7 +77,7 @@ WriteMakefile 'INSTALLBIN' => '/usr/bin', # Library specification -- 'LIBS' => [ '-L/usr/lib -L../magick/.libs -lMagick' ], -+ 'LIBS' => [ '-L%%LOCALBASE%%/lib -L%%X11BASE%%/lib -L../magick/.libs -lMagick' ], +- 'LIBS' => [ '-L/usr/lib -L../magick/.libs -lMagick -L../wand/.libs -lWand' ], ++ 'LIBS' => [ '-L%%LOCALBASE%%/lib -L%%X11BASE%%/lib -L../magick/.libs -lMagick -L../wand/.libs -lWand' ], # Perl binary name (if a Perl binary is built) 'MAP_TARGET' => 'PerlMagick',