update to 0.7.20

changes:
-uses libcdio for HW access now
-some cleanup and restructuring
-bugfixes

5 files changed, 30 insertions, 57 deletions

diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index f4e50a2dc3c..9e0a1c4e43e 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2004/02/14 17:21:53 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/08 17:45:47 drochner Exp $
 #
 
-DISTNAME=	vcdimager-0.7.12
-PKGREVISION=	4
+DISTNAME=	vcdimager-0.7.20
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://alpha.gnu.org/gnu/vcdimager/
+MASTER_SITES=	http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7_UNSTABLE/
 
 MAINTAINER=	ben@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/software/vcdimager/
+HOMEPAGE=	http://www.vcdimager.org/
 COMMENT=	Mastering suite for Video CDs
 
 USE_BUILDLINK2=	YES
@@ -17,5 +16,7 @@ USE_LIBTOOL=	yes
 INFO_FILES=	vcdimager.info
 
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../misc/libcdio/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vcdimager-devel/PLIST b/sysutils/vcdimager-devel/PLIST
index 4dc5d94c4b5..309469ca9da 100644
--- a/sysutils/vcdimager-devel/PLIST
+++ b/sysutils/vcdimager-devel/PLIST
@@ -1,14 +1,32 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/10 01:37:00 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/04/08 17:45:47 drochner Exp $
 bin/cdxa2mpeg
-bin/vcddebug
+bin/vcd-info
 bin/vcdimager
 bin/vcdxbuild
 bin/vcdxgen
 bin/vcdxminfo
 bin/vcdxrip
+include/libvcd/files.h
+include/libvcd/files_private.h
+include/libvcd/inf.h
+include/libvcd/info.h
+include/libvcd/logging.h
+include/libvcd/sector.h
+include/libvcd/types.h
+include/libvcd/version.h
+info/vcd-info.info
+info/vcdxrip.info
+lib/libvcdinfo.a
+lib/libvcdinfo.la
+lib/libvcdinfo.so
+lib/libvcdinfo.so.0
+lib/libvcdinfo.so.0.1
+lib/pkgconfig/libvcdinfo.pc
+man/man1/cdxa2mpeg.1
+man/man1/vcd-info.1
 man/man1/vcdimager.1
-man/man1/vcddebug.1
 man/man1/vcdxbuild.1
 man/man1/vcdxgen.1
 man/man1/vcdxminfo.1
 man/man1/vcdxrip.1
+@dirrm include/libvcd
diff --git a/sysutils/vcdimager-devel/distinfo b/sysutils/vcdimager-devel/distinfo
index e6776329c12..9eac95c61c2 100644
--- a/sysutils/vcdimager-devel/distinfo
+++ b/sysutils/vcdimager-devel/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/10/28 00:40:38 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/04/08 17:45:47 drochner Exp $
 
-SHA1 (vcdimager-0.7.12.tar.gz) = bea4b5f8fd5ad9165219e5fdcf40890b1698d9db
-Size (vcdimager-0.7.12.tar.gz) = 520829 bytes
-SHA1 (patch-aa) = 6e9a9a38952840593affd5d8dba449cdd406f46b
-SHA1 (patch-ab) = 397644b04c25eedb7fb4146867d062856ea5b7e6
+SHA1 (vcdimager-0.7.20.tar.gz) = b75c9253bbd9f72f8b64b739e0c15bed5ac83bde
+Size (vcdimager-0.7.20.tar.gz) = 954324 bytes
diff --git a/sysutils/vcdimager-devel/patches/patch-aa b/sysutils/vcdimager-devel/patches/patch-aa
deleted file mode 100644
index 2072e5dc8f2..00000000000
--- a/sysutils/vcdimager-devel/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/10/28 00:40:38 wiz Exp $
-
---- aclocal.m4.orig	2002-01-04 12:30:38.000000000 -0800
-+++ aclocal.m4
-@@ -4246,7 +4246,7 @@ dnl
-       AC_TRY_RUN([
- #include <stdlib.h>
- #include <stdio.h>
--#include <xmlversion.h>
-+#include <libxml/xmlversion.h>
- 
- int 
- main()
-@@ -4341,7 +4341,7 @@ main()
-           CFLAGS="$CFLAGS $XML_CFLAGS"
-           LIBS="$LIBS $XML_LIBS"
-           AC_TRY_LINK([
--#include <xmlversion.h>
-+#include <libxml/xmlversion.h>
- #include <stdio.h>
- ],      [ LIBXML_TEST_VERSION; return 0;],
-         [ echo "*** The test program compiled, but did not run. This usually means"
diff --git a/sysutils/vcdimager-devel/patches/patch-ab b/sysutils/vcdimager-devel/patches/patch-ab
deleted file mode 100644
index b9809496afb..00000000000
--- a/sysutils/vcdimager-devel/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/10/28 00:40:38 wiz Exp $
-
---- configure.orig	2002-01-04 12:30:49.000000000 -0800
-+++ configure
-@@ -7790,7 +7790,7 @@ else
- 
- #include <stdlib.h>
- #include <stdio.h>
--#include <xmlversion.h>
-+#include <libxml/xmlversion.h>
- 
- int
- main()
-@@ -7911,7 +7911,7 @@ echo "${ECHO_T}no" >&6
- #line 7911 "configure"
- #include "confdefs.h"
- 
--#include <xmlversion.h>
-+#include <libxml/xmlversion.h>
- #include <stdio.h>
- 
- #ifdef F77_DUMMY_MAIN