6 files changed, 47 insertions, 54 deletions

diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index 3eff69cb0fcd..8c619d123507 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -1,22 +1,25 @@
-# New ports collection makefile for:	vcdimager
-# Date created:				16 April 2001
-# Whom:					Harold Gutch <logix@foobar.franken.de>
+# New ports collection makefile for:   vcdimager
+# Date created:                                16 April 2001
+# Whom:                                        Harold Gutch <logix@foobar.franken.de>
 #
 # $FreeBSD$
 
 PORTNAME=	vcdimager
-PORTVERSION=	0.6.0
+PORTVERSION=	0.7.12
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.hvrlab.org/pub/vcdimager/vcdimager-0.6/
+MASTER_SITES=	http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7_UNSTABLE/
 
-MAINTAINER=	logix@foobar.franken.de
+MAINTAINER=	freebsdports@arved.de
 
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
+		xml2:${PORTSDIR}/textproc/libxml2
+
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
 
-GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=	vcdimager.1 vcdrip.1
+MAN1=		vcdimager.1 vcdxminfo.1 vcdxrip.1 vcdxgen.1 vcdxbuild.1 vcddebug.1
 
 .include <bsd.port.mk>
diff --git a/multimedia/vcdimager/distinfo b/multimedia/vcdimager/distinfo
index 28b90adf3dbd..af2f7ff9e675 100644
--- a/multimedia/vcdimager/distinfo
+++ b/multimedia/vcdimager/distinfo
@@ -1 +1 @@
-MD5 (vcdimager-0.6.0.tar.gz) = 1ac3dac3efc0fd629fada495ee839837
+MD5 (vcdimager-0.7.12.tar.gz) = c1ec3525acc0254cd48ab3da0dd4b5e7
diff --git a/multimedia/vcdimager/files/patch-aa b/multimedia/vcdimager/files/patch-aa
deleted file mode 100644
index 1b59f11aae70..000000000000
--- a/multimedia/vcdimager/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- frontends/cli/vcdimager.c.orig	Sun Mar 18 01:13:01 2001
-+++ frontends/cli/vcdimager.c	Mon Apr 16 01:12:00 2001
-@@ -32,6 +32,7 @@
- #include <string.h>
- #include <sys/mman.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <unistd.h>
- 
- #include "vcd_types.h"
diff --git a/multimedia/vcdimager/files/patch-ab b/multimedia/vcdimager/files/patch-ab
deleted file mode 100644
index 52561da039aa..000000000000
--- a/multimedia/vcdimager/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- libvcd/vcd_types.h.orig	Fri Mar  9 02:02:38 2001
-+++ libvcd/vcd_types.h	Mon Apr 16 01:22:17 2001
-@@ -44,6 +44,15 @@
- /* fixme */
- #endif /* HAVE_STDINT_H */
- 
-+# define INT8_C(c)     c
-+# define INT16_C(c)    c
-+# define INT32_C(c)    c
-+# define INT64_C(c)    c ## LL
-+# define UINT8_C(c)    c ## U
-+# define UINT16_C(c)   c ## U
-+# define UINT32_C(c)   c ## U
-+# define UINT64_C(c)   c ## ULL
-+
- #if defined(HAVE_STDBOOL_H)
- #include <stdbool.h>
- #else
diff --git a/multimedia/vcdimager/pkg-descr b/multimedia/vcdimager/pkg-descr
index 0c85eb757f9a..c34d7840f738 100644
--- a/multimedia/vcdimager/pkg-descr
+++ b/multimedia/vcdimager/pkg-descr
@@ -1,19 +1,23 @@
-VCDImager is a "little" program which allows direct making of VideoCD
-BIN/CUE CD images from MPEG files, which can be played on standalone
-VCD players or DVD players.  BIN/CUE images can be burned with cdrdao.
-
-VCDImager supports the VideoCD 1.1, VideoCD 2.0 audn Super VideoCD 2.0
-standards.
-
-Also included in the package is the vcdrip-tool, which performs the
-opposite task.
-
-This set actually consists of a backend library and a commandline
-frontend for it.
+GNU VCDImager is a full-featured mastering suite for
+authoring, disassembling and analyzing Video CD's and Super
+Video CD's. The core functionality consists of directly making Video CD
+BIN/CUE-style CD images from mpeg files.
 
+Features
+- Free software available under the GNU Public License
+- Support for Video CD 1.1 and 2.0 disc formats
+- Support for the Super Video CD 1.0 disc format
+- Full PBC (playback control) support
+- Support for segment play items
+- Automatic padding of MPEG streams on the fly
+- Support for 99-minute (out-of-specification) CD-R media
+- Extraction of Video CD's into files (incl. the PBC information)
+- Use of XML for the description of Video CD's
 
+Author: Herbert Valerio Riedel <hvr@gnu.org>
 WWW: http://www.gnu.org/vcdimager/
-     http://www.hvrlab.org/~hvr/vcdimager/
+     http://www.vcdimager.org/
+
 
-- Harold Gutch
-logix@foobar.franken.de
+- arved
+freebsdports@arved.de
diff --git a/multimedia/vcdimager/pkg-plist b/multimedia/vcdimager/pkg-plist
index 24b9be4b674c..e17d2b07925b 100644
--- a/multimedia/vcdimager/pkg-plist
+++ b/multimedia/vcdimager/pkg-plist
@@ -1,5 +1,19 @@
 bin/vcdimager
-bin/vcdrip
+bin/vcddebug
+bin/cdxa2mpeg
+bin/vcdxbuild
+bin/vcdxgen
+bin/vcdxrip
+bin/vcdxminfo
 @unexec install-info --delete %D/info/vcdimager.info %D/info/dir
+@unexec install-info --delete %D/info/vcdimager.info-1 %D/info/dir
+@unexec install-info --delete %D/info/vcdimager.info-2 %D/info/dir
+@unexec install-info --delete %D/info/vcdimager.info-3 %D/info/dir
 info/vcdimager.info
+info/vcdimager.info-1
+info/vcdimager.info-2
+info/vcdimager.info-3
 @exec install-info %D/info/vcdimager.info %D/info/dir
+@exec install-info %D/info/vcdimager.info-1 %D/info/dir
+@exec install-info %D/info/vcdimager.info-2 %D/info/dir
+@exec install-info %D/info/vcdimager.info-3 %D/info/dir