[Midnightbsd-cvs] CVS Commit: graphics/ImageMagick: A long needed upate to ImageMagick.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Aug 14 00:10:08 EDT 2007 

Log Message:
-----------
A long needed upate to ImageMagick.  This fixes some security issues.  The perl man page is not installed as there is a bug I haven't sorted out yet.

Modified Files:
--------------
    mports/graphics/ImageMagick:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/graphics/ImageMagick/files:
        patch-Makefile.in (r1.1 -> r1.2)
        patch-configure (r1.1 -> r1.2)

Added Files:
-----------
    mports/graphics/ImageMagick/files:
        patch-wand-Wand-config.in (r1.1)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/graphics/ImageMagick/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lgraphics/ImageMagick/pkg-plist -Lgraphics/ImageMagick/pkg-plist -u -r1.1 -r1.2
--- graphics/ImageMagick/pkg-plist
+++ graphics/ImageMagick/pkg-plist
@@ -31,7 +31,6 @@
 include/magick/animate.h
 include/magick/annotate.h
 include/magick/api.h
-include/magick/attribute.h
 include/magick/blob.h
 include/magick/cache.h
 include/magick/cache-view.h
@@ -68,6 +67,7 @@
 include/magick/magick-type.h
 include/magick/memory_.h
 include/magick/methods.h
+include/magick/mime.h
 include/magick/module.h
 include/magick/monitor.h
 include/magick/montage.h
@@ -76,6 +76,7 @@
 include/magick/pixel.h
 include/magick/prepress.h
 include/magick/profile.h
+include/magick/property.h
 include/magick/quantum.h
 include/magick/quantize.h
 include/magick/random_.h
@@ -110,8 +111,8 @@
 include/wand/display.h
 include/wand/identify.h
 include/wand/import.h
-include/wand/magick-attribute.h
 include/wand/magick-image.h
+include/wand/magick-property.h
 include/wand/magick_wand.h
 include/wand/magick-wand.h
 include/wand/mogrify.h
@@ -448,6 +449,9 @@
 %%DATADIR%%/config/coder.xml
 %%DATADIR%%/config/log.xml
 %%DATADIR%%/config/magic.xml
+%%DATADIR%%/config/mime.xml
+%%DATADIR%%/config/sRGB.icm
+%%DATADIR%%/config/thresholds.xml
 %%DATADIR%%-%%PORTVERSION%%/LICENSE
 %%DATADIR%%-%%PORTVERSION%%/ChangeLog
 %%DATADIR%%-%%PORTVERSION%%/NEWS
@@ -463,6 +467,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/images/examples.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/frame.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/fuzzy-magick.png
+%%PORTDOCS%%%%DOCSDIR%%/images/gaussian-blur.png
 %%PORTDOCS%%%%DOCSDIR%%/images/granite.png
 %%PORTDOCS%%%%DOCSDIR%%/images/label.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/logo.eps
@@ -487,6 +492,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/images/wand.ico
 %%PORTDOCS%%%%DOCSDIR%%/images/white-highlight.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ImageMagickObject.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Blob.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.fig
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.png
@@ -532,7 +538,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/www/architecture.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/animate.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/annotate.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/attribute.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/blob.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/cache.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/color.html
@@ -553,8 +558,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/www/api/list.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/magick-wand.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/magick.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/magick-attribute.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/magick-image.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/magick-property.php
+%%PORTDOCS%%%%DOCSDIR%%/www/api/magick-property.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/memory.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/module.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/monitor.html
@@ -609,6 +615,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/www/quantize.html
 %%PORTDOCS%%%%DOCSDIR%%/www/resources.html
 %%PORTDOCS%%%%DOCSDIR%%/www/search.html
+%%PORTDOCS%%%%DOCSDIR%%/www/sitemap.html
 %%PORTDOCS%%%%DOCSDIR%%/www/sponsors.html
 %%PORTDOCS%%%%DOCSDIR%%/www/stream.html
 %%PORTDOCS%%%%DOCSDIR%%/www/subversion.html
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/ImageMagick/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lgraphics/ImageMagick/Makefile -Lgraphics/ImageMagick/Makefile -u -r1.1 -r1.2
--- graphics/ImageMagick/Makefile
+++ graphics/ImageMagick/Makefile
@@ -2,12 +2,13 @@
 # Date created:		15 November 1994
 # Whom:			torstenb
 #
-# $FreeBSD: ports/graphics/ImageMagick/Makefile,v 1.224 2006/09/04 18:36:59 pav Exp $
 # $MidnightBSD$
+# $FreeBSD: ports/graphics/ImageMagick/Makefile,v 1.240 2007/08/07 16:38:36 dinoex Exp $
 #
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.2.9-3
+DISTVERSION=	6.3.3-5
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.imagemagick.org/pub/ImageMagick/ \
 		ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
@@ -35,7 +36,7 @@
 USE_AUTOTOOLS=	libtool:15 libltdl:15
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--enable-shared
+CONFIGURE_ARGS=	--enable-shared --without-dps --prefix=${PREFIX} 
 USE_LDCONFIG=	yes
 
 MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 Wand-config.1 \
@@ -47,11 +48,38 @@
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION:R}
 
+OPTIONS=	X11				"X11 support" on \
+		IMAGEMAGICK_PERL		"Perl support" on \
+		IMAGEMAGICK_MODULES		"Modules support" off \
+		IMAGEMAGICK_BZLIB		"Bzlib support" on \
+		IMAGEMAGICK_16BIT_PIXEL		"16bit pixel support" on \
+		IMAGEMAGICK_LCMS		"LCMS support" on \
+		IMAGEMAGICK_TTF			"Freetype support" on \
+		IMAGEMAGICK_FONTCONFIG		"Fontconfig support" on \
+		IMAGEMAGICK_JPEG		"JPG format support" on \
+		IMAGEMAGICK_PNG			"PNG format support" on \
+		IMAGEMAGICK_TIFF		"TIFF format support" on \
+		IMAGEMAGICK_FPX			"FPX format support" on \
+		IMAGEMAGICK_JBIG		"JBIG format support" on \
+		IMAGEMAGICK_JPEG2000		"JPEG2000 format support" on \
+		IMAGEMAGICK_DOT		"GraphViz dot graphs support" off \
+		IMAGEMAGICK_WMF			"WMF format support" off \
+		IMAGEMAGICK_SVG			"SVG format support" off \
+		IMAGEMAGICK_PDF			"PDF format support" on \
+		IMAGEMAGICK_MPEG2		"MPEG2 format support" on \
+		IMAGEMAGICK_GSLIB	"libgs (Postscript SHLIB) support" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GHOSTSCRIPT_GNU)
+IGNORE=		requires newer version of ghostscript
+.endif
+
 .if !defined(WITHOUT_IMAGEMAGICK_PERL)
 CONFIGURE_ARGS+=	--with-perl=${PERL5}
 PLIST_SUB+=		WITH_PERL=''
-MAN3=			Image::Magick.3
-MAN3PREFIX=		${TARGETDIR}/lib/perl5/${PERL_VER}
+#MAN3=			Image::Magick.3
+#MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
 .else
 CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=		WITH_PERL='@comment '
@@ -61,7 +89,9 @@
 .if defined(WITH_IMAGEMAGICK_THREADS) || \
     (!defined(WITHOUT_IMAGEMAGICK_PERL) && \
      defined(PERL_THREADED) && ${PERL_THREADED} == "true")
-CONFIGURE_ARGS+=	--with-threads
+CONFIGURE_ARGS+=	--with-threads --build=${ARCH}-portbld-freebsd6.0 \
+			--host=${ARCH}-portbld-freebsd6.0 --prefix=${PREFIX} \
+			--mandir=${PREFIX}/man
 CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 LDFLAGS+=		${PTHREAD_LIBS}
 WITH_IMAGEMAGICK_THREADS=yes
@@ -116,6 +146,13 @@
 PLIST_SUB+=		TIFF="@comment "
 .endif
 
+.if defined(WITH_IMAGEMAGICK_GSLIB)
+CONFIGURE_ARGS+=	--with-gslib
+USE_GHOSTSCRIPT=	yes
+.else
+CONFIGURE_ARGS+=	--without-gslib
+.endif
+
 # Produce BZip compressed MIFF images
 .if defined(WITHOUT_IMAGEMAGICK_BZLIB)
 CONFIGURE_ARGS+=	--without-bzlib
@@ -150,8 +187,9 @@
 
 # GraphViz dot graphs
 .if defined(WITH_IMAGEMAGICK_DOT)
-BUILD_DEPENDS+=		dot:${PORTSDIR}/graphics/graphviz
-RUN_DEPENDS+=		dot:${PORTSDIR}/graphics/graphviz
+LIB_DEPENDS+=		gvc:${PORTSDIR}/graphics/graphviz
+CFLAGS+=		-I${LOCALBASE}/include/graphviz
+LDFLAGS+=		-L${LOCALBASE}/lib/graphviz
 .else
 CONFIGURE_ARGS+=	--without-dot --without-gvc
 .endif
@@ -208,6 +246,9 @@
 CONFIGURE_ARGS+=	--without-xml
 .endif
 .if defined(WITH_IMAGEMAGICK_SVG)
+.if defined(WITHOUT_X11)
+IGNORE=			SVG support requires X11 libraries, please unset WITHOUT_X11
+.endif
 LIB_DEPENDS+=		rsvg-2.2:${PORTSDIR}/graphics/librsvg2
 CONFIGURE_ARGS+=	--with-rsvg
 CONFIGURE_ENV+=		RSVG_CFLAGS="-I${X11BASE}/include/librsvg-2" \
@@ -216,19 +257,9 @@
 CONFIGURE_ARGS+=	--without-rsvg
 .endif
 
-# DPS (Display PostScript) support
-.if !defined(WITHOUT_IMAGEMAGICK_DPS)
-CONFIGURE_ARGS+=	--with-dps
-.else
-CONFIGURE_ARGS+=	--without-dps
-.endif
-
 # PDF (Adobe Portable Document Format) support
 .if !defined(WITHOUT_IMAGEMAGICK_PDF)
-CONFIGURE_ARGS+=	--with-gslib
 USE_GHOSTSCRIPT=	yes
-.else
-CONFIGURE_ARGS+=	--without-gslib
 .endif
 
 .if defined(WITHOUT_X11)
@@ -295,4 +326,4 @@
 	@${TOUCH} ${PREFIX}/lib/ImageMagick/modules-Q16/filters/.keep
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/ImageMagick/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lgraphics/ImageMagick/distinfo -Lgraphics/ImageMagick/distinfo -u -r1.1 -r1.2
--- graphics/ImageMagick/distinfo
+++ graphics/ImageMagick/distinfo
@@ -1,3 +1,3 @@
-MD5 (ImageMagick-6.2.9-3.tar.bz2) = 535a9304f0307cbd5a552b7b106d7f94
-SHA256 (ImageMagick-6.2.9-3.tar.bz2) = 2b55f53aba0cb83c0fea0352de76b4828920c68445f08cfdb3e3ceeb23ce0fa5
-SIZE (ImageMagick-6.2.9-3.tar.bz2) = 5365841
+MD5 (ImageMagick-6.3.3-5.tar.bz2) = 16b376defdb7c3feb14a59644bf63a20
+SHA256 (ImageMagick-6.3.3-5.tar.bz2) = 306b8dfef26bc0a16f264cf3eaa99eb00fb4c8de4a53896ee6c5f7e878d3003d
+SIZE (ImageMagick-6.3.3-5.tar.bz2) = 5622230
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/graphics/ImageMagick/files/patch-configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lgraphics/ImageMagick/files/patch-configure -Lgraphics/ImageMagick/files/patch-configure -u -r1.1 -r1.2
--- graphics/ImageMagick/files/patch-configure
+++ graphics/ImageMagick/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.bak	Fri Feb  6 09:19:49 2004
-+++ configure	Wed Apr 21 16:47:25 2004
-@@ -23161,6 +23161,7 @@
+--- configure.orig	Tue Apr  3 21:30:12 2007
++++ configure	Tue Apr  3 21:31:01 2007
+@@ -18904,6 +18904,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,30 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -34622,7 +34623,7 @@
+ #define HasFONTCONFIG 1
+ _ACEOF
+ 
+-    if test "$with_modules" == 'no' ; then
++    if test "$with_modules" = 'no' ; then
+     CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS"
+     fi
+ fi
+@@ -36794,7 +36795,7 @@
+ #define HasGVC 1
+ _ACEOF
+ 
+-    if test "$with_modules" == 'no' ; then
++    if test "$with_modules" = 'no' ; then
+         CPPFLAGS="$GVC_CFLAGS $CPPFLAGS"
+     fi
+ fi
+@@ -37337,7 +37338,7 @@
+ #define HasRSVG 1
+ _ACEOF
+ 
+-    if test "$with_modules" == 'no' ; then
++    if test "$with_modules" = 'no' ; then
+         CPPFLAGS="$RSVG_CFLAGS $CPPFLAGS"
+     fi
+ fi
--- /dev/null
+++ graphics/ImageMagick/files/patch-wand-Wand-config.in
@@ -0,0 +1,11 @@
+--- wand/Wand-config.in.orig	Tue Apr  3 22:32:19 2007
++++ wand/Wand-config.in	Tue Apr  3 22:31:54 2007
+@@ -21,7 +21,7 @@
+       pkg-config --variable exec_prefix Wand
+       ;;
+     --version)
+-      pkg-config --modversion Wan
++      pkg-config --modversion Wand
+       ;;
+     --cflags)
+       pkg-config --cflags Wand
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/graphics/ImageMagick/files/patch-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lgraphics/ImageMagick/files/patch-Makefile.in -Lgraphics/ImageMagick/files/patch-Makefile.in -u -r1.1 -r1.2
--- graphics/ImageMagick/files/patch-Makefile.in
+++ graphics/ImageMagick/files/patch-Makefile.in
@@ -1,39 +1,105 @@
---- Makefile.in.orig	Sat May 20 23:25:57 2006
-+++ Makefile.in	Sat May 27 15:31:14 2006
-@@ -8118,11 +8118,11 @@
- @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagick_la-transform.lo `test -f 'magick/transform.c' || echo '$(srcdir)/'`magick/transform.c
+--- Makefile.in.orig	Mon Aug 13 22:35:40 2007
++++ Makefile.in	Mon Aug 13 23:45:41 2007
+@@ -1876,7 +1876,7 @@
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-distdir = $(PACKAGE)-$(VERSION)
++distdir = $(PACKAGE)
+ top_distdir = $(distdir)
+ am__remove_distdir = \
+   { test ! -d $(distdir) \
+@@ -1899,20 +1899,20 @@
+ BZIPDelegate = @BZIPDelegate@
+ BZLIB_LIBS = @BZLIB_LIBS@
+ BrowseDelegate = @BrowseDelegate@
+-CC = @CC@
++CC ?= @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CCMALLOCDelegate = @CCMALLOCDelegate@
+-CFLAGS = @CFLAGS@
++CFLAGS ?= @CFLAGS@
+ CGMDecodeDelegate = @CGMDecodeDelegate@
+ CONFIGURE_ARGS = @CONFIGURE_ARGS@
+ CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
++CPP ?= @CPP@
++CPPFLAGS ?= @CPPFLAGS@
+ CRWDecodeDelegate = @CRWDecodeDelegate@
+-CXX = @CXX@
++CXX ?= @CXX@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS ?= @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ CatDelegate = @CatDelegate@
+ ConvertDelegate = @ConvertDelegate@
+@@ -1973,7 +1973,7 @@
+ JPEG_LIBS = @JPEG_LIBS@
+ LCMS_LIBS = @LCMS_LIBS@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS ?= @LDFLAGS@
+ LFS_CPPFLAGS = @LFS_CPPFLAGS@
+ LIBADD_DL = @LIBADD_DL@
+ LIBEXEC_DIR = @LIBEXEC_DIR@
+@@ -2143,7 +2143,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-mandir = @mandir@
++mandir = ${prefix}/man
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+@@ -4953,9 +4953,9 @@
+ #
+ 
+ # Install HTML files
+-pkgdocdir = $(MagickDocumentPath)
++pkgdocdir = /usr/local/share/doc/ImageMagick/
+ DOCDIRS = images www www/api www/Magick++
+-HTML_INSTALL_DATA_TARGETS = install-data-html
++HTML_INSTALL_DATA_TARGETS =
+ 
+ # Uninstall HTML files
+ HTML_UNINSTALL_DATA_TARGETS = uninstall-data-html
+@@ -8545,11 +8545,11 @@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagick_la-threshold.lo `test -f 'magick/threshold.c' || echo '$(srcdir)/'`magick/threshold.c
  
  magick/magick_libMagick_la-type.lo: magick/type.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagick_la-type.lo -MD -MP -MF "magick/$(DEPDIR)/magick_libMagick_la-type.Tpo" -c -o magick/magick_libMagick_la-type.lo `test -f 'magick/type.c' || echo '$(srcdir)/'`magick/type.c; \
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FONTCONFIG_CFLAGS) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagick_la-type.lo -MD -MP -MF "magick/$(DEPDIR)/magick_libMagick_la-type.Tpo" -c -o magick/magick_libMagick_la-type.lo `test -f 'magick/type.c' || echo '$(srcdir)/'`magick/type.c; \
- @am__fastdepCC_TRUE@	then mv -f "magick/$(DEPDIR)/magick_libMagick_la-type.Tpo" "magick/$(DEPDIR)/magick_libMagick_la-type.Plo"; else rm -f "magick/$(DEPDIR)/magick_libMagick_la-type.Tpo"; exit 1; fi
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagick_la-type.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagick_la-type.Tpo -c -o magick/magick_libMagick_la-type.lo `test -f 'magick/type.c' || echo '$(srcdir)/'`magick/type.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FONTCONFIG_CFLAGS) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagick_la-type.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagick_la-type.Tpo -c -o magick/magick_libMagick_la-type.lo `test -f 'magick/type.c' || echo '$(srcdir)/'`magick/type.c
+ @am__fastdepCC_TRUE@	mv -f magick/$(DEPDIR)/magick_libMagick_la-type.Tpo magick/$(DEPDIR)/magick_libMagick_la-type.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='magick/type.c' object='magick/magick_libMagick_la-type.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagick_la-type.lo `test -f 'magick/type.c' || echo '$(srcdir)/'`magick/type.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FONTCONFIG_CFLAGS) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagick_la-type.lo `test -f 'magick/type.c' || echo '$(srcdir)/'`magick/type.c
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagick_la-type.lo `test -f 'magick/type.c' || echo '$(srcdir)/'`magick/type.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FONTCONFIG_CFLAGS) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagick_la-type.lo `test -f 'magick/type.c' || echo '$(srcdir)/'`magick/type.c
  
  magick/magick_libMagick_la-utility.lo: magick/utility.c
- @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagick_la-utility.lo -MD -MP -MF "magick/$(DEPDIR)/magick_libMagick_la-utility.Tpo" -c -o magick/magick_libMagick_la-utility.lo `test -f 'magick/utility.c' || echo '$(srcdir)/'`magick/utility.c; \
-@@ -8643,11 +8643,11 @@
- @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagick_la-sun.lo `test -f 'coders/sun.c' || echo '$(srcdir)/'`coders/sun.c
+ @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagick_la-utility.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagick_la-utility.Tpo -c -o magick/magick_libMagick_la-utility.lo `test -f 'magick/utility.c' || echo '$(srcdir)/'`magick/utility.c
+@@ -9070,11 +9070,11 @@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagick_la-sun.lo `test -f 'coders/sun.c' || echo '$(srcdir)/'`coders/sun.c
  
  coders/magick_libMagick_la-svg.lo: coders/svg.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagick_la-svg.lo -MD -MP -MF "coders/$(DEPDIR)/magick_libMagick_la-svg.Tpo" -c -o coders/magick_libMagick_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c; \
-+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(coders_svg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagick_la-svg.lo -MD -MP -MF "coders/$(DEPDIR)/magick_libMagick_la-svg.Tpo" -c -o coders/magick_libMagick_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c; \
- @am__fastdepCC_TRUE@	then mv -f "coders/$(DEPDIR)/magick_libMagick_la-svg.Tpo" "coders/$(DEPDIR)/magick_libMagick_la-svg.Plo"; else rm -f "coders/$(DEPDIR)/magick_libMagick_la-svg.Tpo"; exit 1; fi
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagick_la-svg.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagick_la-svg.Tpo -c -o coders/magick_libMagick_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c
++ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(coders_svg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagick_la-svg.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagick_la-svg.Tpo -c -o coders/magick_libMagick_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c
+ @am__fastdepCC_TRUE@	mv -f coders/$(DEPDIR)/magick_libMagick_la-svg.Tpo coders/$(DEPDIR)/magick_libMagick_la-svg.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='coders/svg.c' object='coders/magick_libMagick_la-svg.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagick_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(coders_svg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagick_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagick_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(coders_svg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagick_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c
  
  coders/magick_libMagick_la-tga.lo: coders/tga.c
- @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagick_la-tga.lo -MD -MP -MF "coders/$(DEPDIR)/magick_libMagick_la-tga.Tpo" -c -o coders/magick_libMagick_la-tga.lo `test -f 'coders/tga.c' || echo '$(srcdir)/'`coders/tga.c; \
-@@ -9722,7 +9722,7 @@
+ @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagick_la-tga.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagick_la-tga.Tpo -c -o coders/magick_libMagick_la-tga.lo `test -f 'coders/tga.c' || echo '$(srcdir)/'`coders/tga.c
+@@ -10171,7 +10171,7 @@
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
  
  @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE at install-exec-perl: $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
-- at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' install && \
-+ at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' pure_install && \
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) clean && rm -f  Makefile.old )
+- at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
++ at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' pure_install
  
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE at all-perl:
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE at all-perl: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'

More information about the Midnightbsd-cvs mailing list