- adapt for updated ImageMagick

- sync PLIST (@bin markers)
- fixup WANTLIB

ok kili@

comms/xastir/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2008/06/01 17:17:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2008/11/20 13:31:36 okan Exp $
 
 COMMENT=	X amateur station tracking and info reporting
 
 DISTNAME=	xastir-1.8.2
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=    	comms hamradio geo
 
 HOMEPAGE=	http://www.xastir.org/
@@ -46,8 +46,7 @@ WANTLIB=	ICE SM c pthread freetype Xt Xpm jpeg Xext m Xp X11 z	\
 LIB_DEPENDS=	curl::net/curl						\
 		shp::devel/shapelib					\
 		geotiff::devel/geotiff					\
-		Magick::graphics/ImageMagick				\
-		Wand::graphics/ImageMagick				\
+		MagickCore.>=1,MagickWand.>=1::graphics/ImageMagick	\
 		lib/db4/db.>=4:db-4.*:databases/db/v4			\
 		intl::devel/gettext					\
 		pcre::devel/pcre

comms/xastir/distinfo

@@ -1,4 +1,5 @@
-MD5 (xastir-1.8.2.tar.gz) = 77b2c60cd59de17c2caccb13f95d4993
-RMD160 (xastir-1.8.2.tar.gz) = 244db44988a5bddb2f3fec6f14b0a558d4100008
-SHA1 (xastir-1.8.2.tar.gz) = 00e0bef7c205a08b86c26d0e930aab9ae1523b92
+MD5 (xastir-1.8.2.tar.gz) = d7LGDNWd4XwsrMsT+V1Jkw==
+RMD160 (xastir-1.8.2.tar.gz) = JE20SYilvdsvP+xvFLClWNQQAAg=
+SHA1 (xastir-1.8.2.tar.gz) = AOC+98IFoIuGwm0OkwqrmuFSO5I=
+SHA256 (xastir-1.8.2.tar.gz) = ZTCFGDCAGjMepfuHTj4AIRmUt7Z1T2OWs49tPWSUeNc=
 SIZE (xastir-1.8.2.tar.gz) = 1642849

comms/xastir/patches/patch-acinclude_m4

@@ -0,0 +1,12 @@
+$OpenBSD: patch-acinclude_m4,v 1.1 2008/11/20 13:31:36 okan Exp $
+--- acinclude.m4.orig	Thu Feb  9 16:27:57 2006
++++ acinclude.m4	Tue Nov  4 07:58:42 2008
+@@ -360,7 +360,7 @@ if test "$use_imagemagick" = "yes"; then
+     if test "$use_imagemagick" = "no"; then
+       AC_MSG_WARN(*** Cannot find ImageMagick include files:  Building w/o ImageMagick support. ***)
+     else
+-      AC_CHECK_LIB([Magick], [WriteImage], AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Imagemagick image library]), use_imagemagick="no")
++      AC_SEARCH_LIBS([WriteImage],[Magick MagickCore], AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Imagemagick image library]), use_imagemagick="no")
+       if test "$use_imagemagick" = "no"; then
+         AC_MSG_WARN(*** Cannot find ImageMagick library files:  Building w/o ImageMagick support. ***)
+       fi

multimedia/dvdauthor/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2008/06/01 08:21:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2008/11/20 13:35:11 okan Exp $
 
 COMMENT=		creates DVD file structures
 DISTNAME=		dvdauthor-0.6.11
-PKGNAME=		${DISTNAME}p4
+PKGNAME=		${DISTNAME}p5
 CATEGORIES=		multimedia
 
 HOMEPAGE=		http://dvdauthor.sourceforge.net/
@@ -17,10 +17,9 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dvdauthor/}
 LIB_DEPENDS=		dvdread.>=3::devel/libdvdread \
 			fribidi::devel/fribidi \
 			xml2.>=5::textproc/libxml \
-			Magick.>=6,Wand.>=6::graphics/ImageMagick
+			MagickCore.>=1,MagickWand.>=1::graphics/ImageMagick
 
-WANTLIB=		ICE SM X11 Xext Xt bz2 c freetype iconv jasper jbig \
-			jpeg lcms m png tiff z expat fontconfig wmflite
+WANTLIB=		c freetype iconv m png z 
 
 USE_X11=		Yes
 USE_GMAKE=		Yes

multimedia/dvdauthor/pkg/PLIST

@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.3 2005/12/08 06:21:30 jakemsr Exp $
-bin/dvdauthor
+@comment $OpenBSD: PLIST,v 1.4 2008/11/20 13:35:11 okan Exp $
+@bin bin/dvdauthor
 bin/dvddirdel
-bin/dvdunauthor
-bin/mpeg2desc
-bin/spumux
-bin/spuunmux
+@bin bin/dvdunauthor
+@bin bin/mpeg2desc
+@bin bin/spumux
+@bin bin/spuunmux
 @man man/man1/dvdauthor.1
 @man man/man1/spumux.1
 share/doc/dvdauthor/