Fix path for convert and other ImageMagick tools. Addresses pkg/11313.

Also comment out broken parts of libpng and libjpeg tests (though it
doesn't seem to change much).

3 files changed, 96 insertions, 5 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index c08bebc4688..f3577a1f98e 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2001/03/04 09:06:12 tron Exp $
+# $NetBSD: Makefile,v 1.46 2001/03/10 13:04:07 wiz Exp $
 #
 
 DISTNAME=		imlib-1.9.8.1
@@ -35,6 +35,8 @@ CPPFLAGS=		-DENABLE_NLS
 CPPFLAGS+=		-I${LOCALBASE}/include
 
 pre-configure:
+	cd ${WRKSRC} && ${SED} "s|@LOCALBASE@|${LOCALBASE}|" configure.in \
+		> configure.in.tmp && ${MV} configure.in.tmp configure.in
 	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf && ${LOCALBASE}/bin/automake
 
 post-install:
diff --git a/graphics/imlib/files/patch-sum b/graphics/imlib/files/patch-sum
index 77915664824..619250b4bc4 100644
--- a/graphics/imlib/files/patch-sum
+++ b/graphics/imlib/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.7 2000/06/27 01:13:48 wiz Exp $
+$NetBSD: patch-sum,v 1.8 2001/03/10 13:04:08 wiz Exp $
 
-MD5 (patch-aa) = 1a4d46ccad38707e83ee787b0fd0f341
-MD5 (patch-ab) = bc854a96aaa65d7548862dee8a2303b2
-MD5 (patch-ac) = d7e5c25a0bfbc4fc7f8b28c1da0563ab
+SHA1 (patch-aa) = 29cbcd677f8dfb53af7ed14f933f26fde345c2cf
+SHA1 (patch-ab) = d493a50b32956d7594b3d3bfe752a4a2519c0928
+SHA1 (patch-ac) = 4eee2bf33d047d7c267883d6e7f590222f879d8b
+SHA1 (patch-ad) = 11a6551af023a2cc106783ee06525c6e82e7350f
diff --git a/graphics/imlib/patches/patch-ad b/graphics/imlib/patches/patch-ad
new file mode 100644
index 00000000000..570562a718e
--- /dev/null
+++ b/graphics/imlib/patches/patch-ad
@@ -0,0 +1,88 @@
+$NetBSD: patch-ad,v 1.3 2001/03/10 13:04:08 wiz Exp $
+
+--- configure.in.orig	Sat May 20 08:24:10 2000
++++ configure.in
+@@ -98,10 +98,12 @@
+ AC_PATH_PROG(DJPEG_PROG, djpeg)
+ AC_PATH_PROG(CJPEG_PROG, cjpeg)
+ 
+-AC_PATH_PROG(CONVERT_PROG, convert)
+-echo "CONVERT_PROG is $CONVERT_PROG"
+-CONVERT_PATH=`echo $CONVERT_PROG | sed 's/\/convert//'`
+-echo "CONVERT_PATH is $CONVERT_PATH"
++#AC_PATH_PROG(CONVERT_PROG, convert)
++#echo "CONVERT_PROG is $CONVERT_PROG"
++#CONVERT_PATH=`echo $CONVERT_PROG | sed 's/\/convert//'`
++#echo "CONVERT_PATH is $CONVERT_PATH"
++echo "overriding CONVERT_PATH=@LOCALBASE@/bin"
++CONVERT_PATH=@LOCALBASE@/bin
+ AC_SUBST(CONVERT_PATH)
+ 
+ AC_PATH_PROG(GIFTOPNM_PROG, giftopnm)
+@@ -228,23 +230,23 @@
+   jpeg_ok=yes,
+   jpeg_ok=no
+   AC_MSG_WARN(*** Native JPEG support will not be built (JPEG library not found) ***), $GX_LIBS)
+-if test "$jpeg_ok" = yes; then
+-  AC_MSG_CHECKING([for jpeglib.h])
+-  AC_TRY_CPP(
+-[#include <stdio.h>
++#if test "$jpeg_ok" = yes; then
++#  AC_MSG_CHECKING([for jpeglib.h])
++#  AC_TRY_CPP(
++#[#include <stdio.h>
+ #undef PACKAGE
+ #undef VERSION
+ #include <jpeglib.h>],
+-    jpeg_ok=yes,
+-    jpeg_ok=no)
+-  AC_MSG_RESULT($jpeg_ok)
++#    jpeg_ok=yes,
++#    jpeg_ok=no)
++#  AC_MSG_RESULT($jpeg_ok)
+   if test "$jpeg_ok" = yes; then 
+     JPEGLIBS="-ljpeg"
+     SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; AC_DEFINE(HAVE_LIBJPEG)
+   else
+     AC_MSG_WARN(*** Native JPEG support will not be built (JPEG header file not found) ***)
+   fi
+-fi
++#fi
+ 
+ dnl Test for libtiff
+ AC_CHECK_LIB(tiff, TIFFReadScanline,
+@@ -284,20 +286,20 @@
+     png_ok=yes,
+     png_ok=no),
+   AC_MSG_WARN(*** Native PNG support will not be built (PNG library not found) ***), -lz -lm $GX_LIBS)
+-if test "$png_ok" = yes; then
+-  AC_MSG_CHECKING([for png_structp in png.h])
+-  AC_TRY_COMPILE([#include <png.h>],
+-    [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct
+-; png_set_IHDR;],
+-    png_ok=yes,
+-    png_ok=no)
+-  AC_MSG_RESULT($png_ok)
+-  if test "$png_ok" = no; then
+-    AC_MSG_WARN(*** Native PNG support will not be built (PNG library is too old) ***)
+-  fi
+-else
+-  AC_MSG_WARN(*** Native PNG support will not be built (PNG header file not found) ***)
+-fi
++#if test "$png_ok" = yes; then
++#  AC_MSG_CHECKING([for png_structp in png.h])
++#  AC_TRY_COMPILE([#include <png.h>],
++#    [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct
++#; png_set_IHDR;],
++#    png_ok=yes,
++#    png_ok=no)
++#  AC_MSG_RESULT($png_ok)
++#  if test "$png_ok" = no; then
++#    AC_MSG_WARN(*** Native PNG support will not be built (PNG library is too old) ***)
++#  fi
++#else
++#  AC_MSG_WARN(*** Native PNG support will not be built (PNG header file not found) ***)
++#fi
+ 
+ dnl If we HAVE libpng at all, we make this check :)
+ #if test "$png_ok" = yes; then