Move inclusion of buildlink.mk files to end of Makefile. Also patch

configure script to not add -L${PREFIX}/lib, -I${PREFIX}/include to
LDFLAGS, CFLAGS to encapsulate build.

4 files changed, 38 insertions, 8 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index d356b30ec28..27c1d311090 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2001/06/26 16:30:57 jlam Exp $
+# $NetBSD: Makefile,v 1.74 2001/07/02 16:48:31 jlam Exp $
 
 DISTNAME=		ImageMagick-5.2.8
 CATEGORIES=		graphics
@@ -24,17 +24,13 @@ USE_X11=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+.include "../../mk/bsd.prefs.mk"
+
 # Avoid compiler bug on "arm32"
 .if (${MACHINE_ARCH} == arm32)
 CFLAGS=			-O
 .endif
 
-.include "../../mk/bsd.prefs.mk"
-.include "../../archivers/bzip2/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
-
 # For things for which we do not specify an explicit dependency above, disable
 # so that we don't cause implicit "hidden" dependencies.  Users may reenable
 # any of these manually as desired (PerlMagick should probably be a separate
@@ -47,4 +43,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Copyright.txt ${WRKSRC}/QuickStart.txt \
 		${PREFIX}/share/ImageMagick
 
+.include "../../archivers/bzip2/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/tiff/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 42b31e9c216..7e280025260 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:07 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/07/02 16:48:31 jlam Exp $
 
 SHA1 (ImageMagick-5.2.8.tar.bz2) = 8e173577afe0f0314087c7419397674fd52e0d95
 Size (ImageMagick-5.2.8.tar.bz2) = 2302009 bytes
 SHA1 (patch-aa) = 9c2deaa7323e13219a6b8e5b1dd22c211ba087b1
 SHA1 (patch-ab) = e87a955bb2e28da426e355f5aa6e5e0677cd6fc3
 SHA1 (patch-ac) = 47c01798066affb13707a61b92ca8b140a55cf5c
+SHA1 (patch-ad) = 83e78c89ff45d814c1b509dfc71e37a96aa5d6e7
+SHA1 (patch-ae) = 3b71f2ab7cb02aa547c6f50cbef775d06c011af2
diff --git a/graphics/ImageMagick/patches/patch-ad b/graphics/ImageMagick/patches/patch-ad
new file mode 100644
index 00000000000..5114556ef20
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.4 2001/07/02 16:48:32 jlam Exp $
+
+--- configure.orig	Sat Jan 27 12:09:13 2001
++++ configure
+@@ -4079,9 +4079,6 @@
+ eval "eval INFO_DIR=$infodir"
+ eval "eval MAN_DIR=$mandir"
+ 
+-LDFLAGS="$LDFLAGS -L$LIB_DIR"
+-CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
+-
+ # Extend includedir to include magick subdirectory offset
+ includedir="$includedir/magick"
+ 
diff --git a/graphics/ImageMagick/patches/patch-ae b/graphics/ImageMagick/patches/patch-ae
new file mode 100644
index 00000000000..8c6bfb670b9
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2001/07/02 16:48:32 jlam Exp $
+
+--- configure.in.orig	Sat Jan 27 12:09:13 2001
++++ configure.in
+@@ -408,9 +408,6 @@
+ eval "eval MAN_DIR=$mandir"
+ 
+ 
+-LDFLAGS="$LDFLAGS -L$LIB_DIR"
+-CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
+-
+ # Extend includedir to include magick subdirectory offset
+ includedir="$includedir/magick"
+