Update to ImageMagick and p5-PerlMagick version 6.2.6.0.

help, testing and "go ahead" steven@
This commit is contained in:
bernd 2006-01-27 17:40:05 +00:00
parent 946f8e74d9
commit 770c8c4d0c
10 changed files with 146 additions and 161 deletions

View File

@ -1,36 +1,22 @@
# $OpenBSD: Makefile,v 1.87 2006/01/15 14:24:21 steven Exp $
# $OpenBSD: Makefile,v 1.88 2006/01/27 17:40:05 bernd Exp $
COMMENT= "image processing tools"
COMMENT= "image processing tools"
VER= 6.2.3
DASHVER= 3
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}p2
SHARED_LIBS= Magick++ 9.0 \
Magick 8.3 \
Wand 8.3
CATEGORIES= graphics
VER= 6.2.6
DASHVER= 0
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
SHARED_LIBS= Magick++ 10.0 \
Magick 10.0 \
Wand 10.0
HOMEPAGE= http://www.imagemagick.org
CATEGORIES= graphics
MAINTAINER= Bernd Ahlers <bernd@openbsd.org>
MASTER_SITES= ${HOMEPAGE}/download/ \
${MASTER_SITE_SOURCEFORGE:=imagemagick/}
HOMEPAGE= http://www.imagemagick.org
LIB_DEPENDS+= bz2.10::archivers/bzip2 \
jbig.1.2::graphics/jbigkit \
png.4::graphics/png \
tiff.36::graphics/tiff \
xml2.9::textproc/libxml \
lcms.1::graphics/lcms \
jasper.1::graphics/jasper \
ltdl.4::devel/libtool,-ltdl
RUN_DEPENDS= ::graphics/mpeg-lib
BUILD_DEPENDS= ${RUN_DEPENDS}
REGRESS_DEPENDS= ::graphics/p5-PerlMagick
MAINTAINER= Bernd Ahlers <b.ahlers@ba-net.org>
MASTER_SITES= ${HOMEPAGE}/download/ \
${MASTER_SITE_SOURCEFORGE:=imagemagick/}
# http://www.imagemagick.org/www/Copyright.html
PERMIT_PACKAGE_CDROM= Yes
@ -39,46 +25,55 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c iconv jpeg m z
USE_LIBTOOL= Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --with-quantum-depth=16 \
--without-dot \
--without-dps \
--without-fpx \
--without-modules \
--without-threads \
--without-perl \
--without-wmf \
--disable-ltdl-install
LIB_DEPENDS= bz2.10::archivers/bzip2 \
jbig.1.2::graphics/jbigkit \
png.4::graphics/png \
tiff.36::graphics/tiff \
xml2.9::textproc/libxml \
lcms.1::graphics/lcms \
jasper.1::graphics/jasper
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \
LDFLAGS="-L${WRKBUILD}/magick/.libs -L${WRKBUILD}/wand/.libs -L${LOCALBASE}/lib" \
ac_cv_path_LaunchDelegate=no
RUN_DEPENDS= :netpbm-*:graphics/netpbm
BUILD_DEPENDS= :netpbm-*:graphics/netpbm
REGRESS_DEPENDS= ::graphics/p5-PerlMagick
FLAVORS= no_x11
USE_LIBTOOL= Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --with-quantum-depth=16 \
--without-dot \
--without-dps \
--without-fpx \
--without-modules \
--without-threads \
--without-perl \
--without-wmf \
--disable-ltdl-install
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \
LDFLAGS="-L${WRKBUILD}/magick/.libs -L${WRKBUILD}/wand/.libs -L${LOCALBASE}/lib" \
ac_cv_path_LaunchDelegate=no
FLAVORS= no_x11
FLAVOR?=
.if ${FLAVOR:L:Mno_x11}
BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu,no_x11
RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu,no_x11
CONFIGURE_ARGS+= --without-x --without-ttf
CONFIGURE_ENV+= ac_cv_path_FIGDecodeDelegate=no
BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu,no_x11
RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu,no_x11
CONFIGURE_ARGS+= --without-x --without-ttf
CONFIGURE_ENV+= ac_cv_path_FIGDecodeDelegate=no
.else
BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
USE_X11= Yes
RUN_DEPENDS+= :transfig-*:print/transfig
BUILD_DEPENDS+= :transfig-*:print/transfig
WANTLIB+= ICE SM X11 Xext Xt freetype
BUILD_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
USE_X11= Yes
RUN_DEPENDS+= :transfig-*:print/transfig
BUILD_DEPENDS+= :transfig-*:print/transfig
WANTLIB+= ICE SM X11 Xext Xt freetype
.endif
RUN_DEPENDS+= :netpbm-*:graphics/netpbm
BUILD_DEPENDS+= :netpbm-*:graphics/netpbm
WRKDIST= ${WRKDIR}/${DISTNAME:S/-${DASHVER}$//}
WRKDIST= ${WRKDIR}/${DISTNAME:S/-${DASHVER}$//}
post-install:
@perl -pi -e s#'-L${WRKBUILD}/(magick|wand)/.libs '#''#g \

View File

@ -1,4 +1,4 @@
MD5 (ImageMagick-6.2.3-3.tar.gz) = f5547da751d83123febcf483347ad819
RMD160 (ImageMagick-6.2.3-3.tar.gz) = add377da4f92793ce0d1afbae0bf13ae657443b3
SHA1 (ImageMagick-6.2.3-3.tar.gz) = 4a9b60a7aaf78d913d88d00710aa5fcca42c26c6
SIZE (ImageMagick-6.2.3-3.tar.gz) = 5733162
MD5 (ImageMagick-6.2.6-0.tar.gz) = 7e43d2a0ef3798596f49b04a39d27d58
RMD160 (ImageMagick-6.2.6-0.tar.gz) = 0837bdd378a1c7a5a8133478adc1614fbaa06dd1
SHA1 (ImageMagick-6.2.6-0.tar.gz) = c7e59c728b72192b4297af66fc780ebbde0509c2
SIZE (ImageMagick-6.2.6-0.tar.gz) = 6374497

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.4 2006/01/15 14:24:22 steven Exp $
--- Makefile.in.orig Fri Jun 24 06:07:35 2005
+++ Makefile.in Wed Dec 28 11:39:40 2005
@@ -1914,7 +1914,7 @@ EXTRA_DIST = \
$(UTILITIES_EXTRA_DIST) \
$(WAND_EXTRA_DIST)
-lib_LTLIBRARIES = $(LIBLTDL) $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP)
+lib_LTLIBRARIES = $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP)
# Where architecture-independent configuration files get installed
# (share/ImageMagick-version)

View File

@ -1,7 +1,20 @@
$OpenBSD: patch-configure_ac,v 1.1 2005/06/04 14:39:21 naddy Exp $
--- configure.ac.orig Sun May 29 20:01:17 2005
+++ configure.ac Sun May 29 20:01:46 2005
@@ -1908,7 +1908,7 @@ AC_SUBST(PERLMAINCC)
$OpenBSD: patch-configure_ac,v 1.2 2006/01/27 17:40:05 bernd Exp $
--- configure.ac.orig Thu Jan 5 11:02:55 2006
+++ configure.ac Mon Jan 23 12:38:27 2006
@@ -351,9 +351,9 @@ AM_CONDITIONAL(WITH_MODULES, test "$with
# 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
AM_CONDITIONAL(WITH_LTDL, test "$with_ltdl" != 'no')
if test "$with_ltdl" != 'no' ; then
@@ -1984,7 +1984,7 @@ AC_SUBST(PERLMAINCC)
#
# Subdirectory under lib to place ImageMagick lib files
@ -10,7 +23,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2005/06/04 14:39:21 naddy Exp $
AC_DEFINE_UNQUOTED(MagickLibSubdir,"$MagickLibSubdir",Subdirectory of lib where ImageMagick architecture dependent files are installed)
# Path to ImageMagick bin directory
@@ -1971,7 +1971,7 @@ AC_SUBST(MagickFilterModulesPath)
@@ -2047,7 +2047,7 @@ AC_SUBST(MagickFilterModulesPath)
#
# Path to ImageMagick document files
@ -19,7 +32,7 @@ $OpenBSD: patch-configure_ac,v 1.1 2005/06/04 14:39:21 naddy Exp $
MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
MagickDocumentPathDefine="${MagickDocumentPath}/"
if test "$native_win32_build" = 'yes'
@@ -1983,7 +1983,7 @@ AC_SUBST(MagickDocumentPath)
@@ -2059,7 +2059,7 @@ AC_SUBST(MagickDocumentPath)
#
# Path to ImageMagick share files

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-magick_signature_c,v 1.3 2005/06/04 14:39:21 naddy Exp $
--- 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
$OpenBSD: patch-magick_signature_c,v 1.4 2006/01/27 17:40:05 bernd Exp $
--- magick/signature.c.orig Sun Oct 9 03:55:52 2005
+++ magick/signature.c Tue Jan 17 13:16:17 2006
@@ -366,8 +366,19 @@ static void TransformSignature(Signature
T2,
W[64];
@ -21,7 +21,7 @@ $OpenBSD: patch-magick_signature_c,v 1.3 2005/06/04 14:39:21 naddy Exp $
if (signature_info->lsb_first == MagickFalse)
{
if (sizeof(unsigned long) <= 4)
@@ -381,12 +392,11 @@ static void TransformSignature(Signature
@@ -378,12 +389,11 @@ static void TransformSignature(Signature
W[i]=Trunc32(T);
}
else
@ -38,7 +38,7 @@ $OpenBSD: patch-magick_signature_c,v 1.3 2005/06/04 14:39:21 naddy Exp $
}
}
else
@@ -399,15 +409,12 @@ static void TransformSignature(Signature
@@ -396,15 +406,12 @@ static void TransformSignature(Signature
((T >> 8) & 0x0000ff00) | ((T >> 24) & 0x000000ff);
}
else

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.32 2005/06/28 18:08:23 naddy Exp $
@comment $OpenBSD: PLIST,v 1.33 2006/01/27 17:40:05 bernd Exp $
!%%no_x11%%
%%SHARED%%
bin/Magick++-config
@ -27,6 +27,7 @@ include/Magick++/STL.h
include/Magick++/TypeMetric.h
include/magick/
include/magick/ImageMagick.h
include/magick/MagickCore.h
include/magick/PreRvIcccm.h
include/magick/animate.h
include/magick/annotate.h
@ -43,9 +44,7 @@ include/magick/compare.h
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
@ -60,7 +59,6 @@ include/magick/geometry.h
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
@ -71,7 +69,6 @@ include/magick/magick.h
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
@ -80,6 +77,7 @@ include/magick/pixel.h
include/magick/prepress.h
include/magick/profile.h
include/magick/quantize.h
include/magick/quantum.h
include/magick/random_.h
include/magick/registry.h
include/magick/resize.h
@ -99,15 +97,28 @@ include/magick/type.h
include/magick/utility.h
include/magick/version.h
include/magick/widget.h
include/magick/xml-tree.h
include/magick/xwindow.h
include/wand/
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/pixel-iterator.h
include/wand/pixel-wand.h
include/wand/wand-config.h
lib/ImageMagick/
lib/ImageMagick/config/
lib/ImageMagick/config/colors.xml
@ -123,8 +134,11 @@ lib/ImageMagick/config/type.xml
@comment lib/ImageMagick/modules-Q16/coders/
@comment 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
@ -150,6 +164,7 @@ share/ImageMagick/config/log.xml
share/ImageMagick/config/magic.xml
share/doc/ImageMagick/
share/doc/ImageMagick/images/
share/doc/ImageMagick/images/arc.png
share/doc/ImageMagick/images/background.jpg
share/doc/ImageMagick/images/button.gif
share/doc/ImageMagick/images/configure.jpg
@ -163,8 +178,10 @@ 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.eps
share/doc/ImageMagick/images/logo.jpg
share/doc/ImageMagick/images/montage.jpg
share/doc/ImageMagick/images/piechart.png
share/doc/ImageMagick/images/reconstruct.jpg
share/doc/ImageMagick/images/red-ball.png
share/doc/ImageMagick/images/red-circle.png
@ -177,6 +194,7 @@ 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/wand.ico
share/doc/ImageMagick/images/white-highlight.png
share/doc/ImageMagick/index.html
share/doc/ImageMagick/www/
@ -283,10 +301,12 @@ 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/index.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-vector-graphics.html
share/doc/ImageMagick/www/magick-wand.html
share/doc/ImageMagick/www/magick.css
share/doc/ImageMagick/www/mailing-list.html
@ -298,3 +318,4 @@ share/doc/ImageMagick/www/quantize.html
share/doc/ImageMagick/www/resources.html
share/doc/ImageMagick/www/search.html
share/doc/ImageMagick/www/sponsors.html
share/doc/ImageMagick/www/subversion.html

View File

@ -1,40 +1,41 @@
# $OpenBSD: Makefile,v 1.10 2005/06/28 18:08:23 naddy Exp $
# $OpenBSD: Makefile,v 1.11 2006/01/27 17:40:05 bernd Exp $
SHARED_ONLY= Yes
SHARED_ONLY= Yes
COMMENT= "object-oriented Perl interface to ImageMagick"
COMMENT= "object-oriented Perl interface to ImageMagick"
VER= 6.2.3
DASHVER= 3
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= p5-PerlMagick-${VER}.${DASHVER}
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=imagemagick/}
VER= 6.2.6
DASHVER= 0
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= p5-PerlMagick-${VER}.${DASHVER}
CATEGORIES= graphics devel
HOMEPAGE= http://www.imagemagick.org
HOMEPAGE= http://www.imagemagick.org
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=imagemagick/}
BUILD_DEPENDS= :ImageMagick-${VER}.${DASHVER}:graphics/ImageMagick
RUN_DEPENDS= :ImageMagick-${VER}.${DASHVER}:graphics/ImageMagick
LIB_DEPENDS= Magick.8::graphics/ImageMagick
MAINTAINER= Bernd Ahlers <b.ahlers@ba-net.org>
MAINTAINER= Bernd Ahlers <bernd@openbsd.org>
# http://www.imagemagick.org/www/Copyright.html
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext bz2 freetype iconv jasper jbig jpeg \
lcms m png tiff xml2 z
WANTLIB= ICE SM X11 Xext bz2 freetype jasper jbig jpeg \
lcms m png tiff xml2 z Xt
CONFIGURE_STYLE= perl
RUN_DEPENDS= :ImageMagick-${VER}.${DASHVER}:graphics/ImageMagick
BUILD_DEPENDS= ${RUN_DEPENDS}
LIB_DEPENDS= Magick.10::graphics/ImageMagick
USE_X11= Yes
CONFIGURE_STYLE= perl
WRKDIST= ${WRKDIR}/${DISTNAME:S/-${DASHVER}$//}
WRKSRC= ${WRKDIST}/PerlMagick
WRKDIST= ${WRKDIR}/${DISTNAME:S/-${DASHVER}$//}
WRKSRC= ${WRKDIST}/PerlMagick
post-patch:
pre-configure:
@perl -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \
s|%%X11BASE%%|${X11BASE}|g;' ${WRKSRC}/Makefile.PL
s|%%X11BASE%%|${X11BASE}|g; \
s|%%CFLAGS%%|${CFLAGS}|g;' ${WRKSRC}/Makefile.PL
pre-regress:
@perl -pi -e 's|\@abs_top_srcdir\@|${WRKDIST}|g; \

View File

@ -1,4 +1,4 @@
MD5 (ImageMagick-6.2.3-3.tar.gz) = f5547da751d83123febcf483347ad819
RMD160 (ImageMagick-6.2.3-3.tar.gz) = add377da4f92793ce0d1afbae0bf13ae657443b3
SHA1 (ImageMagick-6.2.3-3.tar.gz) = 4a9b60a7aaf78d913d88d00710aa5fcca42c26c6
SIZE (ImageMagick-6.2.3-3.tar.gz) = 5733162
MD5 (ImageMagick-6.2.6-0.tar.gz) = 7e43d2a0ef3798596f49b04a39d27d58
RMD160 (ImageMagick-6.2.6-0.tar.gz) = 0837bdd378a1c7a5a8133478adc1614fbaa06dd1
SHA1 (ImageMagick-6.2.6-0.tar.gz) = c7e59c728b72192b4297af66fc780ebbde0509c2
SIZE (ImageMagick-6.2.6-0.tar.gz) = 6374497

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-PerlMagick_Magick_pm,v 1.1 2005/05/15 21:02:47 naddy Exp $
--- PerlMagick/Magick.pm.orig Fri May 6 10:37:37 2005
+++ PerlMagick/Magick.pm Fri May 6 10:38:15 2005
@@ -90,13 +90,13 @@ Image::Magick - Perl extension for calli
=head1 SYNOPSIS
use Image::Magick;
- p = new Image::Magick;
- p->Read("imagefile");
- p->Set(attribute => value, ...)
- ($a, ...) = p->Get("attribute", ...)
- p->routine(parameter => value, ...)
- p->Mogrify("Routine", parameter => value, ...)
- p->Write("filename");
+ $p = new Image::Magick;
+ $p->Read("imagefile");
+ $p->Set(attribute => value, ...)
+ ($a, ...) = $p->Get("attribute", ...)
+ $p->routine(parameter => value, ...)
+ $p->Mogrify("Routine", parameter => value, ...)
+ $p->Write("filename");
=head1 DESCRIPTION
@@ -106,7 +106,7 @@ It was originally developed to be used b
A Web page has been set up for this extension. See:
- http://www.imagemagick.org/www/perl.html
+ http://www.imagemagick.org/script/perl-magick.php
=head1 AUTHOR

View File

@ -1,19 +1,19 @@
$OpenBSD: patch-PerlMagick_Makefile_PL,v 1.6 2005/06/28 18:08:23 naddy Exp $
--- PerlMagick/Makefile.PL.orig Mon Jun 27 10:55:55 2005
+++ PerlMagick/Makefile.PL Mon Jun 27 10:58:52 2005
$OpenBSD: patch-PerlMagick_Makefile_PL,v 1.7 2006/01/27 17:40:05 bernd Exp $
--- PerlMagick/Makefile.PL.orig Wed Jan 18 20:39:17 2006
+++ PerlMagick/Makefile.PL Mon Jan 23 13:42:18 2006
@@ -44,13 +44,13 @@ WriteMakefile
'DEFINE' => ' -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H', # e.g., '-DHAVE_SOMETHING'
'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/graphviz -I/usr/include/libxml2',
- 'INC' => '-I../ -I.. -I/usr/include/freetype2 -I/usr/include/libxml2',
+ '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/graphviz -I/usr/include/libxml2",
# 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/include/freetype2 -I/usr/include/libxml2",
# C compiler flags (e.g. -O -g)
- 'CCFLAGS' => "$Config{'ccflags'} -O3 -g -Wall -pthread",
+ 'CCFLAGS' => "$Config{'ccflags'} -O2 -Wall",
+ 'CCFLAGS' => "$Config{'ccflags'} %%CFLAGS%%",
# Linker flags for building an executable
'LDFLAGS' => "-L/usr/lib $Config{'ldflags'}",
@ -21,8 +21,8 @@ $OpenBSD: patch-PerlMagick_Makefile_PL,v 1.6 2005/06/28 18:08:23 naddy Exp $
'INSTALLBIN' => '/usr/bin',
# Library specification
- 'LIBS' => ['-L/usr/lib -lMagick -L/usr/X11R6/lib -L/usr/lib/graphviz -lfreetype -lz -L/usr/lib -ltiff -lfreetype -ljpeg -lpng -ldpstk -ldps -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -ldotneato -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'],
- 'LIBS' => ['-L/usr/lib -L../magick/.libs -lMagick -L/usr/lib64 -lfreetype -lz -L/usr/lib -llcms -ltiff -lfreetype -ljpeg -lpng -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -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'],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',