9 files changed, 24 insertions, 98 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 687018115001..21b8b75b5055 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -73,7 +73,7 @@
     SUBDIR += konverter
     SUBDIR += kplayer
     SUBDIR += ksubeditor
-    SUBDIR += ldvd9to5
+    SUBDIR += ldvd
     SUBDIR += libdivxdecore
     SUBDIR += libdivxdecore-devel
     SUBDIR += libdivxencore
diff --git a/multimedia/ldvd/Makefile b/multimedia/ldvd/Makefile
index a7408dbf25b9..ee3a4a85e858 100644
--- a/multimedia/ldvd/Makefile
+++ b/multimedia/ldvd/Makefile
@@ -5,13 +5,10 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ldvd9to5
-PORTVERSION=	1.12
-PORTREVISION=	2
+PORTNAME=	ldvd
+PORTVERSION=	2.0.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://files.gff-clan.net/pub/ldvd/
-DISTNAME=	${PORTNAME}-v${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	fehlner@gmx.de
 COMMENT=	Gui, which shall simplify shrinking a DVD-9 to a DVD-5
@@ -23,25 +20,33 @@ RUN_DEPENDS=	transcode:${PORTSDIR}/multimedia/transcode \
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
 		buffer:${PORTSDIR}/misc/buffer \
 		lsdvd:${PORTSDIR}/multimedia/lsdvd \
+		mplex:${PORTSDIR}/multimedia/mjpegtools \
 		${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 
+USE_BZIP2=	yes
 USE_PERL=	yes
 USE_REINPLACE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
-DATA=		INSTALL.de INSTALL.en README.de README.en COPYING
+DATA=		de.lang en.lang
+PORTDOCS=	AUTHORS HISTORY README.de README.en
+PLIST_FILES=	bin/ldvd etc/ldvd.conf.sample ${DATA:S|^|%%DATADIR%%/|}
+PLIST_DIRS=	%%DATADIR%%
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|LSDVD=/opt/ldvd9to5|LSDVD=${LOCALBASE}/bin|g' ${WRKSRC}/ldvd9to5.conf
-	@${REINPLACE_CMD} -e 's|/opt|${LOCALBASE}/share|g' -e 's|/etc|${LOCALBASE}/etc|g' ${WRKSRC}/ldvd9to5
+	@${REINPLACE_CMD} -e 's|ldvd-ls|lsdvd|g' \
+		${WRKSRC}/ldvd.conf ${WRKSRC}/ldvd
+	@${REINPLACE_CMD} -e 's|/usr/share/$$sh_name-$$version|${DATADIR}|g; \
+		s|/etc|${PREFIX}/etc|g' ${WRKSRC}/ldvd
 
 do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/ldvd ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/ldvd.conf ${PREFIX}/etc/ldvd.conf.sample
 	${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DATA} ${DATADIR}
-	${MKDIR} ${DATADIR}/modules
-	${CP} -rv ${WRKSRC}/modules ${DATADIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ldvd9to5.conf ${PREFIX}/etc
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ldvd9to5 ${PREFIX}/bin
+	${INSTALL_DATA} ${DATA:S|^|${WRKSRC}/|} ${DATADIR}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/ldvd/distinfo b/multimedia/ldvd/distinfo
index 18d76c78a5ef..50f10f423ae9 100644
--- a/multimedia/ldvd/distinfo
+++ b/multimedia/ldvd/distinfo
@@ -1,2 +1,2 @@
-MD5 (ldvd9to5-v1.12.tgz) = 0847b41ea7a33c411022240809287b9f
-SIZE (ldvd9to5-v1.12.tgz) = 34959
+MD5 (ldvd-2.0.1.tar.bz2) = 0cac34f3a713ee79f071a42b31cb2c93
+SIZE (ldvd-2.0.1.tar.bz2) = 26805
diff --git a/multimedia/ldvd/pkg-descr b/multimedia/ldvd/pkg-descr
index 05e81729905e..9889e5b0098d 100644
--- a/multimedia/ldvd/pkg-descr
+++ b/multimedia/ldvd/pkg-descr
@@ -1,6 +1,6 @@
-LDVD9to5 is only a Gui, which shall simplify shrinking a DVD-9 to a DVD-5.
+LDVD is only a Gui, which shall simplify shrinking a DVD-9 to a DVD-5.
 
-WWW:	http://ldvd9to5.gff-clan.net/?project=ldvd9to5
+WWW: http://projects.gff-clan.net/
 
 Andreas Fehlner
 -fehlner@gmx.de
diff --git a/multimedia/ldvd/pkg-plist b/multimedia/ldvd/pkg-plist
deleted file mode 100644
index 6fcf86dbfe90..000000000000
--- a/multimedia/ldvd/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/ldvd9to5
-etc/ldvd9to5.conf
-%%DATADIR%%/INSTALL.de
-%%DATADIR%%/INSTALL.en
-%%DATADIR%%/README.de
-%%DATADIR%%/README.en
-%%DATADIR%%/COPYING
-%%DATADIR%%/modules/extract.pm
-%%DATADIR%%/modules/info.pm
-%%DATADIR%%/modules/util.pm
-@dirrm %%DATADIR%%/modules
-@dirrm %%DATADIR%%
diff --git a/multimedia/ldvd9to5/Makefile b/multimedia/ldvd9to5/Makefile
deleted file mode 100644
index a7408dbf25b9..000000000000
--- a/multimedia/ldvd9to5/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# New ports collection makefile for:	ldvd9to5
-# Date created:		2004-10-03
-# Whom:			Andreas Fehlner <fehlner@gmx.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ldvd9to5
-PORTVERSION=	1.12
-PORTREVISION=	2
-CATEGORIES=	multimedia
-MASTER_SITES=	http://files.gff-clan.net/pub/ldvd/
-DISTNAME=	${PORTNAME}-v${PORTVERSION}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	fehlner@gmx.de
-COMMENT=	Gui, which shall simplify shrinking a DVD-9 to a DVD-5
-
-RUN_DEPENDS=	transcode:${PORTSDIR}/multimedia/transcode \
-		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		mkisofs:${PORTSDIR}/sysutils/cdrtools \
-		ifo_dump:${PORTSDIR}/multimedia/ogle \
-		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		buffer:${PORTSDIR}/misc/buffer \
-		lsdvd:${PORTSDIR}/multimedia/lsdvd \
-		${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-
-USE_PERL=	yes
-USE_REINPLACE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-NO_BUILD=	yes
-DATA=		INSTALL.de INSTALL.en README.de README.en COPYING
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|LSDVD=/opt/ldvd9to5|LSDVD=${LOCALBASE}/bin|g' ${WRKSRC}/ldvd9to5.conf
-	@${REINPLACE_CMD} -e 's|/opt|${LOCALBASE}/share|g' -e 's|/etc|${LOCALBASE}/etc|g' ${WRKSRC}/ldvd9to5
-
-do-install:
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DATA} ${DATADIR}
-	${MKDIR} ${DATADIR}/modules
-	${CP} -rv ${WRKSRC}/modules ${DATADIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ldvd9to5.conf ${PREFIX}/etc
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ldvd9to5 ${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/multimedia/ldvd9to5/distinfo b/multimedia/ldvd9to5/distinfo
deleted file mode 100644
index 18d76c78a5ef..000000000000
--- a/multimedia/ldvd9to5/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (ldvd9to5-v1.12.tgz) = 0847b41ea7a33c411022240809287b9f
-SIZE (ldvd9to5-v1.12.tgz) = 34959
diff --git a/multimedia/ldvd9to5/pkg-descr b/multimedia/ldvd9to5/pkg-descr
deleted file mode 100644
index 05e81729905e..000000000000
--- a/multimedia/ldvd9to5/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-LDVD9to5 is only a Gui, which shall simplify shrinking a DVD-9 to a DVD-5.
-
-WWW:	http://ldvd9to5.gff-clan.net/?project=ldvd9to5
-
-Andreas Fehlner
--fehlner@gmx.de
diff --git a/multimedia/ldvd9to5/pkg-plist b/multimedia/ldvd9to5/pkg-plist
deleted file mode 100644
index 6fcf86dbfe90..000000000000
--- a/multimedia/ldvd9to5/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/ldvd9to5
-etc/ldvd9to5.conf
-%%DATADIR%%/INSTALL.de
-%%DATADIR%%/INSTALL.en
-%%DATADIR%%/README.de
-%%DATADIR%%/README.en
-%%DATADIR%%/COPYING
-%%DATADIR%%/modules/extract.pm
-%%DATADIR%%/modules/info.pm
-%%DATADIR%%/modules/util.pm
-@dirrm %%DATADIR%%/modules
-@dirrm %%DATADIR%%