Make build again after recent ImageMagick update.

While here switch to buildlink2.
Bump PKGREVISION

7 files changed, 88 insertions, 6 deletions

diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index 4eddbfe1f4c..a39c05b404d 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2002/03/13 17:36:44 fredb Exp $
+# $NetBSD: Makefile,v 1.18 2002/09/10 12:35:07 markd Exp $
 #
 
 DISTNAME=	psiconv-0.8.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	converters
 MASTER_SITES=	http://huizen.dds.nl/~frodol/psiconv/
 
@@ -10,8 +10,9 @@ MAINTAINER=	sakamoto@netbsd.org
 HOMEPAGE=	http://huizen.dds.nl/~frodol/psiconv/
 COMMENT=	PSION 5 file format data conversion utilities
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
+USE_X11=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		YES
 CPPFLAGS+=		-DIMAGEMAGICK
@@ -24,6 +25,5 @@ post-install:
 		${INSTALL_DATA} $${file} ${DOCDIR};			\
 	done
 
-.include "../../graphics/ImageMagick/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/ImageMagick/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/psiconv/distinfo b/converters/psiconv/distinfo
index f0dd0927157..7cda0d1f138 100644
--- a/converters/psiconv/distinfo
+++ b/converters/psiconv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/12/19 20:08:51 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/09/10 12:35:08 markd Exp $
 
 SHA1 (psiconv-0.8.2.tar.gz) = 4512aac15db4e1a129a3131a2b0b3fa149e88811
 Size (psiconv-0.8.2.tar.gz) = 304322 bytes
@@ -6,3 +6,8 @@ SHA1 (patch-aa) = b7ef8a4916df1c13324b00a2fefff620dc99fa32
 SHA1 (patch-ab) = cff4e1d6bbfadb5c47b69b07cde8896f5b423c9a
 SHA1 (patch-ac) = 05769fdcb271937396fd9cd9929e46ab77e7a852
 SHA1 (patch-ad) = af772d87f3764081d717f07e4b0ac9f8a20cf47e
+SHA1 (patch-ae) = 9a79cddedca2d14e6e8aa43016b196354ba639d1
+SHA1 (patch-af) = 59e098cf8ea3a44bae13a970822bacb7d4177e30
+SHA1 (patch-ag) = 125d770e565defd6b1904e8cd2f37dee449a93e6
+SHA1 (patch-ah) = a35166070aa15b56f4d5e30f07411bc42556eaeb
+SHA1 (patch-ai) = 67b10faed835925865ab19911f7ad97225f4daad
diff --git a/converters/psiconv/patches/patch-ae b/converters/psiconv/patches/patch-ae
new file mode 100644
index 00000000000..9252dfe691d
--- /dev/null
+++ b/converters/psiconv/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1 2002/09/10 12:35:08 markd Exp $
+
+--- configure.in.orig	Tue Jul 17 05:48:02 2001
++++ configure.in	Tue Sep 10 23:20:40 2002
+@@ -79,7 +79,11 @@
+     LIBS="$LIBS `Magick-config --libs`"
+ 
+     AC_MSG_CHECKING(whether GetMagickInfo works)
+-    AC_TRY_RUN([ #include <magick/magick.h>
++    AC_TRY_RUN([ #include <stdio.h>
++                 #include <string.h>
++                 #include <time.h>
++                 #include <sys/types.h>
++                 #include <magick/api.h>
+                  int main(void) { ExceptionInfo exception;
+                  GetExceptionInfo(&exception);
+                  OpenModules(&exception);
diff --git a/converters/psiconv/patches/patch-af b/converters/psiconv/patches/patch-af
new file mode 100644
index 00000000000..a48650dd410
--- /dev/null
+++ b/converters/psiconv/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.1 2002/09/10 12:35:08 markd Exp $
+
+--- configure.orig	Tue Jul 17 05:51:56 2001
++++ configure	Tue Sep 10 23:03:21 2002
+@@ -6261,7 +6261,11 @@
+   cat >conftest.$ac_ext <<_ACEOF
+ #line 6262 "configure"
+ #include "confdefs.h"
+- #include <magick/magick.h>
++ #include <stdio.h>
++ #include <string.h>
++ #include <time.h>
++ #include <sys/types.h>
++ #include <magick/api.h>
+                  int main(void) { ExceptionInfo exception;
+                  GetExceptionInfo(&exception);
+                  OpenModules(&exception);
diff --git a/converters/psiconv/patches/patch-ag b/converters/psiconv/patches/patch-ag
new file mode 100644
index 00000000000..414ce1eafeb
--- /dev/null
+++ b/converters/psiconv/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.1 2002/09/10 12:35:08 markd Exp $
+
+--- program/psiconv/magick-aux.h.orig	Mon Dec 11 05:44:47 2000
++++ program/psiconv/magick-aux.h	Mon Sep  9 23:14:27 2002
+@@ -21,7 +21,11 @@
+ 
+ #if IMAGEMAGICK
+ 
+-#include <magick/magick.h>
++#include <stdio.h>
++#include <string.h>
++#include <time.h>
++#include <sys/types.h>
++#include <magick/api.h>
+ 
+ extern MagickInfo * GetMagickFileList(void);
+ 
diff --git a/converters/psiconv/patches/patch-ah b/converters/psiconv/patches/patch-ah
new file mode 100644
index 00000000000..c069067bd14
--- /dev/null
+++ b/converters/psiconv/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2002/09/10 12:35:08 markd Exp $
+
+--- program/psiconv/psiconv.c.orig	Sat Feb 17 07:37:37 2001
++++ program/psiconv/psiconv.c	Mon Sep  9 23:04:44 2002
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ #ifdef IMAGEMAGICK
+-#include <magick/magick.h>
++#include <magick/api.h>
+ #endif
+ 
+ #include "psiconv/data.h"
diff --git a/converters/psiconv/patches/patch-ai b/converters/psiconv/patches/patch-ai
new file mode 100644
index 00000000000..552c17a14e4
--- /dev/null
+++ b/converters/psiconv/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2002/09/10 12:35:08 markd Exp $
+
+--- program/psiconv/magick-aux.c.orig	Sun Jul  1 01:36:00 2001
++++ program/psiconv/magick-aux.c	Mon Sep  9 23:11:25 2002
+@@ -23,7 +23,7 @@
+ 
+ #include "magick-aux.h"
+ #include <magick/magick.h>
+-#include <magick/config.h>
++#include <magick/magick_config.h>
+ 
+ /* This used to be very ugly, but nowadays it is much better */
+