- fix build to work with recently updated libxml

- bump PKGNAME

"looks ok" brad@

graphics/ImageMagick/Makefile

@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.58 2003/04/19 13:30:47 espie Exp $
+# $OpenBSD: Makefile,v 1.59 2003/06/30 20:41:14 sturm Exp $
 
 COMMENT=	"display and manipulate images under X11"
 
 DISTNAME=	ImageMagick-5.2.9
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=     graphics
 MASTER_SITES=	ftp://openbsd.comstyle.com/pub/brad/source/
 
@@ -38,8 +39,8 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static --enable-lzw --enable-16bit-pixel \
 		 --without-perl --without-modules --without-dps \
 		 --without-fpx --without-hdf --without-lcms \
-		 --without-ttf --without-wmf --without-threads
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/freetype1/freetype -I${LOCALBASE}/include" \
+		 --without-ttf --without-wmf
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/freetype1/freetype -I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>

graphics/ImageMagick/patches/patch-configure

@@ -0,0 +1,29 @@
+$OpenBSD: patch-configure,v 1.1 2003/06/30 20:41:15 sturm Exp $
+--- configure.orig	Fri Feb 23 23:09:56 2001
++++ configure	Sat Jun 28 21:35:29 2003
+@@ -4220,13 +4220,13 @@ LIB_THREAD=''
+ if test "$with_threads" != 'no'
+ then
+ 
+-echo "$as_me:4223: checking for pthread_attr_init in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_attr_init in -lpthread... $ECHO_C" >&6
++echo "$as_me:4223: checking for pthread_attr_init in -pthread" >&5
++echo $ECHO_N "checking for pthread_attr_init in -pthread... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="-pthread  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 4231 "configure"
+ #include "confdefs.h"
+@@ -4274,7 +4274,7 @@ cat >>confdefs.h <<\EOF
+ #define HasPTHREADS
+ EOF
+ 
+-     LIB_THREAD="-lpthread"
++     LIB_THREAD="-pthread"
+      DEF_THREAD="-D_REENTRANT"
+ fi
+ 

graphics/ImageMagick/patches/patch-ltmain_sh

@@ -1,6 +1,6 @@
-$OpenBSD: patch-ltmain_sh,v 1.6 2002/09/15 03:52:04 brad Exp $
---- ltmain.sh.orig	Sun Dec 10 19:02:22 2000
-+++ ltmain.sh	Wed Feb 21 09:59:59 2001
+$OpenBSD: patch-ltmain_sh,v 1.7 2003/06/30 20:41:15 sturm Exp $
+--- ltmain.sh.orig	Mon Dec 11 01:02:00 2000
++++ ltmain.sh	Sat Jun 28 22:04:17 2003
 @@ -1097,7 +1097,18 @@ EOF
  	    # These systems don't actually have c library (as such)
  	    continue
@@ -31,7 +31,17 @@ $OpenBSD: patch-ltmain_sh,v 1.6 2002/09/15 03:52:04 brad Exp $
        -module)
  	module=yes
  	continue
-@@ -2602,6 +2617,9 @@ EOF
+@@ -1682,6 +1697,9 @@ EOF
+ 	  fi
+ 	  continue
+ 	  ;;
++	-pthread)
++	  continue
++	  ;;
+ 	%DEPLIBS%)
+ 	  alldeplibs=yes
+ 	  continue
+@@ -2602,6 +2620,9 @@ EOF
  	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
  	    # these systems don't actually have a c library (as such)!
  	    ;;
@@ -41,7 +51,7 @@ $OpenBSD: patch-ltmain_sh,v 1.6 2002/09/15 03:52:04 brad Exp $
  	  *)
   	    # Add libc to deplibs on all other systems if necessary.
   	    if test $build_libtool_need_lc = "yes"; then
-@@ -4505,40 +4523,6 @@ relink_command=\"$relink_command\""
+@@ -4505,40 +4526,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0
  

graphics/ImageMagick/patches/patch-utilities_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-utilities_Makefile_in,v 1.1 2003/06/30 20:41:15 sturm Exp $
+--- utilities/Makefile.in.orig	Fri Dec 29 05:41:59 2000
++++ utilities/Makefile.in	Sun Jun 29 10:06:31 2003
+@@ -221,7 +221,7 @@ bin_PROGRAMS = cgimagick combine convert
+ @WITH_MODULES_TRUE@COMMONLDADD = @WITH_MODULES_TRUE@$(MAGICK_LIB) $(top_builddir)/ltdl/libltdlc.la
+ @WITH_MODULES_FALSE@COMMONLDADD = @WITH_MODULES_FALSE@$(MAGICK_LIB)
+ @WITH_MODULES_TRUE@COMMONLDFLAGS = @WITH_MODULES_TRUE@@LDFLAGS@ @DLLDFLAGS@
+-@WITH_MODULES_FALSE@COMMONLDFLAGS = @WITH_MODULES_FALSE@@LDFLAGS@
++@WITH_MODULES_FALSE@COMMONLDFLAGS = @WITH_MODULES_FALSE@@LDFLAGS@ -pthread
+ 
+ animate_LDADD = $(COMMONLDADD)
+ animate_LDFLAGS = $(COMMONLDFLAGS)