summaryrefslogtreecommitdiff
path: root/graphics/ImageMagick
diff options
context:
space:
mode:
authorMarcus Alves Grando <mnag@FreeBSD.org>2006-05-27 18:47:51 +0000
committerMarcus Alves Grando <mnag@FreeBSD.org>2006-05-27 18:47:51 +0000
commit70d145df9f8e3164121f0fa382e43a7e410b3b9b (patch)
treec5541974a82dfba82fdbaea8fb299407ae1592a8 /graphics/ImageMagick
parentUpdate to 0.72. (diff)
- Fix compilation when set WITHOUT_X11 and WITH_IMAGEMAGICK_FONTCONFIG
Approved by: maintainer timeout (in combination with my last 2 commits)
Notes
Notes: svn path=/head/; revision=163633
Diffstat (limited to 'graphics/ImageMagick')
-rw-r--r--graphics/ImageMagick/Makefile1
-rw-r--r--graphics/ImageMagick/files/patch-Makefile.in16
2 files changed, 16 insertions, 1 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 0594a7803ff2..9a38cb71b158 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -176,6 +176,7 @@ LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
CONFIGURE_ARGS+= --with-fontconfig
CONFIGURE_ENV+= FONTCONFIG_CFLAGS="-I${X11BASE}/include" \
FONTCONFIG_LIBS="-L${X11BASE}/lib"
+MAKE_ENV+= FONTCONFIG_CFLAGS="-I${X11BASE}/include"
.else
CONFIGURE_ARGS+= --without-fontconfig
.endif
diff --git a/graphics/ImageMagick/files/patch-Makefile.in b/graphics/ImageMagick/files/patch-Makefile.in
index e73ee9b34336..f430af6c1659 100644
--- a/graphics/ImageMagick/files/patch-Makefile.in
+++ b/graphics/ImageMagick/files/patch-Makefile.in
@@ -1,5 +1,19 @@
--- Makefile.in.orig Sat May 20 23:25:57 2006
-+++ Makefile.in Thu May 25 17:21:09 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
+
+ magick/magick_libMagick_la-type.lo: magick/type.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-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@ 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
+ @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@
+-@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
++@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
+
+ 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