Update to 0.6.9.

10 files changed, 18 insertions, 65 deletions

diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index c7868f030bdd..22c0e0f44c1f 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dvdauthor
-PORTVERSION=	0.6.8
+PORTVERSION=	0.6.9
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,6 +16,7 @@ COMMENT=	Makes a DVD file structure from one or more MPEG2 streams
 
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
 LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread \
+		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
 		png.5:${PORTSDIR}/graphics/png \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
diff --git a/multimedia/dvdauthor/distinfo b/multimedia/dvdauthor/distinfo
index 17c0ef23b6f6..8bd9665bddb2 100644
--- a/multimedia/dvdauthor/distinfo
+++ b/multimedia/dvdauthor/distinfo
@@ -1 +1 @@
-MD5 (dvdauthor-0.6.8.tar.gz) = b4e591f28e5f7d10623104fba2d08ef3
+MD5 (dvdauthor-0.6.9.tar.gz) = f01c7d62faf67a14695022349e2bb78d
diff --git a/multimedia/dvdauthor/files/patch-Makefile.in b/multimedia/dvdauthor/files/patch-Makefile.in
index c85398be3d0e..63813b66cb11 100644
--- a/multimedia/dvdauthor/files/patch-Makefile.in
+++ b/multimedia/dvdauthor/files/patch-Makefile.in
@@ -1,10 +1,10 @@
---- Makefile.in.orig	Thu Dec 11 19:52:20 2003
-+++ Makefile.in	Wed Dec 17 00:58:53 2003
+--- Makefile.in.orig	Thu Jan 15 20:42:47 2004
++++ Makefile.in	Tue Jan 20 17:24:46 2004
 @@ -13,6 +13,7 @@
  FLEX=flex
  
  CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\""
 +LDFLAGS += -L@libdir@
- LIBS = @LIBS@
+ LIBS = @LIBS@ @LIBICONV@
  XML_LIBS = @XML_LIBS@
  MAGICK_LIBS = @MAGICK_LIBS@
diff --git a/multimedia/dvdauthor/files/patch-da-internal.h b/multimedia/dvdauthor/files/patch-da-internal.h
deleted file mode 100644
index 3a6abc7b71d2..000000000000
--- a/multimedia/dvdauthor/files/patch-da-internal.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/da-internal.h.orig	Tue Dec  9 22:43:52 2003
-+++ src/da-internal.h	Wed Dec 17 00:28:03 2003
-@@ -20,6 +20,8 @@
- #ifndef __DA_INTERNAL_H_
- #define __DA_INTERNAL_H_
- 
-+#include <sys/types.h>
-+
- enum {VM_NONE=0,VM_MPEG1=1,VM_MPEG2=2};
- enum {VS_NONE=0,VS_720H=1,VS_704H=2,VS_352H=3,VS_352L=4};
- enum {VF_NONE=0,VF_NTSC=1,VF_PAL=2};
diff --git a/multimedia/dvdauthor/files/patch-dvdauthor.c b/multimedia/dvdauthor/files/patch-dvdauthor.c
new file mode 100644
index 000000000000..bdd616336660
--- /dev/null
+++ b/multimedia/dvdauthor/files/patch-dvdauthor.c
@@ -0,0 +1,11 @@
+--- src/dvdauthor.c.orig	Fri Jan 16 20:55:42 2004
++++ src/dvdauthor.c	Tue Jan 20 17:59:45 2004
+@@ -340,7 +340,7 @@
+     if( ch>=va->numaudiotracks )
+         va->numaudiotracks=ch+1;
+ 
+-    audiodesc_set_audio_attr(&va->ad[ch],&va->adwarn[ch],attr,s);
++    return audiodesc_set_audio_attr(&va->ad[ch],&va->adwarn[ch],attr,s);
+ }
+ 
+ static int vobgroup_set_subpic_attr(struct vobgroup *va,int attr,char *s,int ch)
diff --git a/multimedia/dvdauthor/files/patch-dvdcompile.c b/multimedia/dvdauthor/files/patch-dvdcompile.c
deleted file mode 100644
index b7c77cde21f5..000000000000
--- a/multimedia/dvdauthor/files/patch-dvdcompile.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/dvdcompile.c.orig       Sat Dec  6 04:44:53 2003
-+++ src/dvdcompile.c    Wed Dec 17 01:51:22 2003
-@@ -20,7 +20,9 @@
- #include "config.h"
- 
- #include <stdio.h>
-+#ifdef HAVE_STDINT
- #include <stdint.h>
-+#endif
- 
- #include "dvdauthor.h"
- #include "da-internal.h"
diff --git a/multimedia/dvdauthor/files/patch-subfont.c b/multimedia/dvdauthor/files/patch-subfont.c
deleted file mode 100644
index ee9ffd425566..000000000000
--- a/multimedia/dvdauthor/files/patch-subfont.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/subfont.c.orig	Sat Dec  6 06:01:08 2003
-+++ src/subfont.c	Wed Dec 17 01:44:32 2003
-@@ -41,6 +41,7 @@
- #include <stdlib.h>
- #include <math.h>
- #include <string.h>
-+#include <sys/types.h>
- 
- #include <iconv.h>
- 
diff --git a/multimedia/dvdauthor/files/patch-subrender.c b/multimedia/dvdauthor/files/patch-subrender.c
deleted file mode 100644
index c0045bcb96ac..000000000000
--- a/multimedia/dvdauthor/files/patch-subrender.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/subrender.c.orig	Sun Dec 14 19:20:54 2003
-+++ src/subrender.c	Wed Dec 17 00:37:46 2003
-@@ -25,11 +25,12 @@
- 
- #include "config.h"
- 
--#include <malloc.h>
-+/* #include <malloc.h> */
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- 
-+#include "compat.h"
- #include "subconfig.h"
- 
- #include "subglobals.h"
diff --git a/multimedia/dvdauthor/files/patch-textsub.c b/multimedia/dvdauthor/files/patch-textsub.c
deleted file mode 100644
index 469ce27d1b2e..000000000000
--- a/multimedia/dvdauthor/files/patch-textsub.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/textsub.c.orig	Sun Dec 14 19:20:55 2003
-+++ src/textsub.c	Wed Dec 17 00:28:39 2003
-@@ -34,6 +34,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <strings.h>
-+#include <sys/types.h>
- 
- #undef TEXTSUB_DEBUG
- 
diff --git a/multimedia/dvdauthor/pkg-plist b/multimedia/dvdauthor/pkg-plist
index 9c8e86d9f1ca..91ce57bf7aed 100644
--- a/multimedia/dvdauthor/pkg-plist
+++ b/multimedia/dvdauthor/pkg-plist
@@ -1,5 +1,5 @@
 bin/dvdauthor
-bin/dvddirgen
+bin/dvddirdel
 bin/dvdunauthor
 bin/mpeg2desc
 bin/spumux