Update to dvdauthor-0.7.0 (and unbreak build with newer fribidi)

From Brad
OK nigel@

multimedia/dvdauthor/Makefile

@@ -1,36 +1,38 @@
-# $OpenBSD: Makefile,v 1.16 2011/09/16 10:31:23 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2011/11/08 08:00:21 dcoppa Exp $
 
-COMMENT=		creates DVD file structures
-DISTNAME=		dvdauthor-0.6.14
-REVISION=		1
-CATEGORIES=		multimedia
+COMMENT=	creates DVD file structures
 
-HOMEPAGE=		http://dvdauthor.sourceforge.net/
+DISTNAME=	dvdauthor-0.7.0
+CATEGORIES=	multimedia
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvdauthor/}
 
-# GPLv2
+HOMEPAGE=	http://dvdauthor.sourceforge.net/
+
+# GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dvdauthor/}
+WANTLIB+=	ICE MagickCore SM X11 Xext Xt bz2 c djvulibre dvdread
+WANTLIB+=	expat fftw3 fontconfig freetype fribidi jasper jbig
+WANTLIB+=	jpeg lcms2 ltdl lzma m png pthread tiff wmf wmflite
+WANTLIB+=	xml2 z
 
-MODULES=		converters/libiconv
+MODULES=	converters/libiconv
+LIB_DEPENDS=	devel/fribidi>=0.19.2 \
+		devel/libdvdread \
+		graphics/ImageMagick \
+		textproc/libxml
 
-LIB_DEPENDS=		devel/libdvdread \
-			devel/fribidi \
-			textproc/libxml \
-			graphics/ImageMagick
+MAKE_FLAGS+=	BISON="yacc"
 
-WANTLIB += c freetype m png z dvdread fribidi xml2 MagickCore MagickWand
+USE_GMAKE=	Yes
+CONFIGURE_STYLE= gnu
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
 
-USE_GMAKE=		Yes
-USE_GROFF=		Yes
-CONFIGURE_STYLE=	gnu
-
-CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib" \
-			CFLAGS="${CFLAGS} -I${LOCALBASE}/include/libpng"
-MAKE_FLAGS+=		BISON="yacc" LDFLAGS="-L${LOCALBASE}/lib"
+WRKDIST=	${WRKDIR}/dvdauthor
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dvdauthor

multimedia/dvdauthor/distinfo

@@ -1,5 +1,5 @@
-MD5 (dvdauthor-0.6.14.tar.gz) = vWRrR5UMQJH/14HUP9LF6Q==
-RMD160 (dvdauthor-0.6.14.tar.gz) = tddbYTw74eQepcPyR6mTcjQwl3o=
-SHA1 (dvdauthor-0.6.14.tar.gz) = STQSvxAwabkmGvO+G8I9pW19ESo=
-SHA256 (dvdauthor-0.6.14.tar.gz) = 3RsVEvPtZJONQFQbH1r/ZoKJh4JGmZLYyqgeJYekjvQ=
-SIZE (dvdauthor-0.6.14.tar.gz) = 319371
+MD5 (dvdauthor-0.7.0.tar.gz) = M6RH+5irMpOsQPhp7twX/w==
+RMD160 (dvdauthor-0.7.0.tar.gz) = +kX5LPwYqfMyer08W5T65tTeItA=
+SHA1 (dvdauthor-0.7.0.tar.gz) = OVAfgmrpzGszQWDrucAc6ckbMdQ=
+SHA256 (dvdauthor-0.7.0.tar.gz) = rqave5nro4/6ncWtFSHCzGUuBDzqDnSC4jnSo/wvNNA=
+SIZE (dvdauthor-0.7.0.tar.gz) = 414191

multimedia/dvdauthor/patches/patch-src_readxml_c

@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_readxml_c,v 1.4 2010/07/30 19:57:12 sthen Exp $
---- src/readxml.c.orig	Thu Jan 11 01:43:37 2007
-+++ src/readxml.c	Fri Jul 30 20:55:22 2010
-@@ -34,6 +34,7 @@
- #include <langinfo.h>
- #include <locale.h>
- #endif
-+#include <localcharset.h>
- 
- 
- int parser_err=0, parser_acceptbody=0;
-@@ -227,7 +228,7 @@ static iconv_t get_conv()
-             }
-         } else
-             fprintf(stderr,"WARN: Error reading locale (%m), assuming C\n");
--        enc=nl_langinfo(CODESET);
-+        enc=locale_charset();
-         fprintf(stderr,"INFO: Converting filenames to %s\n",enc);
-         ic=iconv_open(enc,"UTF-8");
-         if( ic==((iconv_t)-1) ) {

multimedia/dvdauthor/patches/patch-src_spuunmux_c

@@ -1,23 +1,23 @@
-$OpenBSD: patch-src_spuunmux_c,v 1.1 2011/07/08 20:38:00 naddy Exp $
+$OpenBSD: patch-src_spuunmux_c,v 1.2 2011/11/08 08:00:21 dcoppa Exp $
 
 Fix build with png-1.5.
 
---- src/spuunmux.c.orig	Wed Jul  6 18:17:03 2011
-+++ src/spuunmux.c	Wed Jul  6 18:17:41 2011
-@@ -35,6 +35,7 @@
+--- src/spuunmux.c.orig	Mon May 10 03:27:55 2010
++++ src/spuunmux.c	Mon Nov  7 14:56:32 2011
+@@ -39,6 +39,7 @@
  #include <netinet/in.h>
  
  #include <png.h>
 +#include <zlib.h>
  
  #include "rgb.h"
- 
-@@ -460,7 +461,7 @@ static int write_png(char *file_name,struct spu *s,str
- 	return -1;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	fclose(fp);
- 	return -1;
+ #include "common.h"
+@@ -610,7 +611,7 @@ static int write_png
+         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+         return -1;
+       } /*if*/
+-    if (setjmp(png_ptr->jmpbuf))
++    if (png_jmpbuf(png_ptr))
+       {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         fclose(fp);