Changes 0.4.1:

New Features:
* New complete translation: German (de); thanks to Chris Leick
Bug fixes:
* Fix offset bug (which results in wrong .vob files)
* Fix typos and improve wording

Changes 0.4:
New Features:
* Added new translations from Launchpad: French (fr), Galician (gl),
  Italian (it), Norwegian Bokmål (nb), Russian (ru) and Spanish (es)
Changes:
* Use C99 standard and compile with -pedantic flag.
* Code cleanup
Bug fixes:
* Fixed typos
* Fixed compiler warnings
* Added missing header file

5 files changed, 14 insertions, 249 deletions

diff --git a/multimedia/dvdbackup/Makefile b/multimedia/dvdbackup/Makefile
index fb485d93108..6d9ff6f04e6 100644
--- a/multimedia/dvdbackup/Makefile
+++ b/multimedia/dvdbackup/Makefile
@@ -1,29 +1,18 @@
-# $NetBSD: Makefile,v 1.6 2011/02/28 14:52:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/09 20:56:27 adam Exp $
 
-DISTNAME=	dvdbackup-0.1.1
-PKGREVISION=	5
+DISTNAME=	dvdbackup-0.4.1
 CATEGORIES=	multimedia
-MASTER_SITES=	http://dvd-create.sourceforge.net/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvdbackup/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://dvd-create.sourceforge.net/
+HOMEPAGE=	http://dvdbackup.sourceforge.net/
 COMMENT=	DVD backup utility
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/dvdbackup/src
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-do-build:
-	cd ${WRKSRC}; \
-	${CC} -o dvdbackup dvdbackup.c ${CFLAGS} ${LDFLAGS} -ldvdread
-
-do-install:
-	cd ${WRKSRC}; \
-	${INSTALL_PROGRAM} dvdbackup ${DESTDIR}${PREFIX}/bin;
-	${INSTALL_MAN} ${FILESDIR}/dvdbackup.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+GNU_CONFIGURE=		yes
 
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/dvdbackup/PLIST b/multimedia/dvdbackup/PLIST
index 2d1149fba6f..082f7f9a172 100644
--- a/multimedia/dvdbackup/PLIST
+++ b/multimedia/dvdbackup/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2006/10/18 01:16:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/08/09 20:56:27 adam Exp $
 bin/dvdbackup
 man/man1/dvdbackup.1
+share/doc/dvdbackup/NEWS
+share/doc/dvdbackup/README
diff --git a/multimedia/dvdbackup/distinfo b/multimedia/dvdbackup/distinfo
index 78b3121c3f5..ab9d2e65652 100644
--- a/multimedia/dvdbackup/distinfo
+++ b/multimedia/dvdbackup/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/08/22 22:05:23 abs Exp $
+$NetBSD: distinfo,v 1.3 2011/08/09 20:56:27 adam Exp $
 
-SHA1 (dvdbackup-0.1.1.tar.gz) = 11bbbd0182f80bff1974b86bb989e9a2ab89f717
-RMD160 (dvdbackup-0.1.1.tar.gz) = bd0d1824df92b493e4ea5ab4f24740c41ca826ef
-Size (dvdbackup-0.1.1.tar.gz) = 24806 bytes
-SHA1 (patch-aa) = c6cc236681856e5f02182241d0b6c4d027a78fd2
+SHA1 (dvdbackup-0.4.1.tar.bz2) = d40b738917cac62a46405f6566a66359504f9a73
+RMD160 (dvdbackup-0.4.1.tar.bz2) = a302bbdf6cb3b169784c326e095b1345e5f56538
+Size (dvdbackup-0.4.1.tar.bz2) = 188496 bytes
diff --git a/multimedia/dvdbackup/files/dvdbackup.1 b/multimedia/dvdbackup/files/dvdbackup.1
deleted file mode 100644
index a8765776e48..00000000000
--- a/multimedia/dvdbackup/files/dvdbackup.1
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" (do I need this?)  \# -*- coding: utf-8 -*-
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH DVDBACKUP 1 "July  7, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-dvdbackup \- Tool to backup dvd's
-.SH SYNOPSIS
-.B dvdbackup
-.RI [ options ] " files" ...
-.SH DESCRIPTION
-This manual page documents briefly the
-.B dvdbackup
-command.
-This manual page was written for the Debian distribution
-because the original program does not have a manual page.
-\fBdvdbackup\fP is a tool to extract data from video dvds.  It has the advantages
-of being small, fast, and easy to use.
-.SH OPTIONS
-A summary of options is included below.
-.TP
-.B \-i DEVICE
-where device is your dvd device
-.TP
-.B \-v X
-where X is the amount of verbosity
-.TP
-.B \-I
-for information about the DVD
-.TP
-.B \-o directory
-where directory is your backup target
-.TP
-.B \-n name
-(optional) set the title \- useful if autodetection fails
-.TP
-.B \-M
-backup the whole DVD
-.TP
-.B \-F
-backup the main feature of the DVD
-.TP
-.B \-T X
-backup title set X
-.TP
-.B \-t X
-backup title X
-.TP
-.B \-s X
-backup from chapter X
-.TP
-.B \-e X
-backup to chapter X
-.TP
-.B \-a 0
-to get aspect ratio 4:3 instead of 16:9 if both are present
-.TP
-.B \-h
-print a brief usage message
-.TP
-.B \-?
-print a brief usage message
-.SH Option notes
-\-i is mandatory
-.br
-\-o is mandatory except if you use \-I
-.br
-\-a is option to the \-F switch and has no effect on other options
-.br
-\-s and \-e should preferably be used together with \-t
-.SH Usage:
-To gather info about the dvd:
-.br
-dvdbackup \-i /dev/dvd \-I
-.SH General backup information:
-.br
-If your backup directory is /my/dvd/backup/dir/ specified with the "\-o" flag. Then dvdbackup will create a DVD\-Video structure under /my/dvd/backup/dir/TITLE_NAME/VIDEO_TS.
-.sp 2
-Since the title is "unique" you can use the same directory for all your DVD backups. If it happens to have a generic title dvdbackup will exit with a return value of 2, and you will need to specify a title name with the \-n switch.
-.sp 2
-dvdbackup will always mimic the original DVD\-Video structure. Hence if you e.g. use the \-M (mirror) you will get an exact duplicate of the original. This means that every file will have the same size as the original one. Likewise also for the \-F and the \-T switch.
-.sp 2
-However the \-t and (\-t \-s/\-e) switch is a bit different the titles sectors will be written to the original file but not at the same offset as the original one since there may be gaps in the cell structure that we don't fill.
-.SH To backup the whole DVD
-dvdbackup \-M \-i/dev/dvd \-o/my/dvd/backup/dir/
-This action creates a valid DVD\-Video structure that can be burned to a DVD\-/+R(W) with help of mkisofs version 1.11a27 or later
-.SH To backup the main feature of the DVD:
-dvdbackup \-F \-i/dev/dvd \-o/my/dvd/backup/dir/
-.sp 2
-This action creates a valid DVD\-Video structure of the feature title set.  Note that this will not result in an image immediately watchable - you will need another program like dvdauthor to help construct the IFO files.
-.sp 2
-dvdbackup defaults to get the 16:9 version of the main feature if a 4:3 is also present on the DVD.  To get the 4:3 version use \-a 0.
-.sp 2
-dvdbackup makes it best to make a intelligent guess what is the main feature of the DVD \- in case it fails please send a bug report.
-.SH To backup a title set
-dvdbackup \-T 2 \-i/dev/dvd \-o/my/dvd/backup/dir/
-.sp 2
-where "\-T 2" specifies that you want to backup title set 2 i.e. all VTS_02_X.XXX files. This action creates a valid DVD\-Video structure of the specified title set.  Note that this will not result in an image immediately watchable - you will need another program like dvdauthor to help construct the IFO files.
-.SH To backup a title:
-dvdbackup \-t 1 \-i/dev/dvd \-o/my/dvd/backup/dir
-.sp 2
-This action backups all cells that forms the specified title. Note that there can be sector gaps in between one cell and another. dvdbackup will backup all sectors that belongs to the title but will skip sectors that aren't a part of the title.
-.SH To backup a specific chapter or chapters from a title:
-dvdbackup \-t 1 \-s 20 \-e 25 \-i/dev/dvd \-o/my/dvd/backup/dir
-.sp 2
-This action will backup chapter 20 to 25 in title 1, as with the backup of a title there can be sector gaps between one chapter (cell) and on other.  dvdbackup will backup all sectors that belongs to the title 1 chapter 20 to 25 but will skip sectors that aren't a part of the title 1 chapter 20 to 25.
-.br
-To backup a single chapter e.g. chapter 20 do \-s 20 \-e 20
-.br
-To backup from chapter 20 to the end chapter use only \-s 20
-.br
-To backup to chapter 20 from the first chapter use only \-e 20
-.sp 2
-You can skip the \-t switch and let the program guess the title although it's not recommended.
-.sp 2
-If you specify a chapter that is higher than the last chapter of the title dvdbackup will truncate to the highest chapter of the title.
-.SH Return values:
-0 on success
-.br
-1 on usage error
-.br
-2 on title name error
-.br
-\-1 on failure
-.SH Todo \- i.e. what's on the agenda.
-Make the main feature guessing algorithm better. Not that it doesn't do it's job, but it's implementation isn't that great. I would also like to preserve more information about the main feature since that would let me perform better implementations in other functions that depends on the titles_info_t and title_set_info_t structures. Make it possible to extract cells in a title not just chapters (very easy so it will definitely be in the next version).
-.sp 2
-Make a split mirror (\-S) option that divides a DVD\-9 to two valid DVD\-5 video structures. This is not a trivial hack and it's my main goal the in next month or so. It involves writing ifoedit and vobedit libraries in order to be able to manipulate both the IFO structures and the VOB files. Out of this will most probably also come tscreate and vtscreate which will enable you to make a very simple DVD\-Video from MPEG\-1/2 source.
-.br
-.SH AUTHOR
-DVDBackup was written by Olaf Beck <olaf_sc@yahoo.com>, but now appears to be dead upstream, and is unmaintained (as far as I know) outside of Debian.
-This manual page was written by Stephen Gran <sgran@debian.org>, for the Debian project (but may be used by others).
diff --git a/multimedia/dvdbackup/patches/patch-aa b/multimedia/dvdbackup/patches/patch-aa
deleted file mode 100644
index 33009b328b4..00000000000
--- a/multimedia/dvdbackup/patches/patch-aa
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/08/22 22:05:24 abs Exp $
-
---- dvdbackup.c.orig	2002-08-05 07:08:39.000000000 +0100
-+++ dvdbackup.c
-@@ -20,6 +20,7 @@
- 
- 
- #include <stdio.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/errno.h>
-@@ -782,7 +783,7 @@ titles_info_t * DVDGetInfo(dvd_reader_t 
- 	 to consider the second one a feature title we are doing two checks (biggest  + biggest - second) /second == 1
- 	 and biggest%second * 3 < biggest */
- 
--	if ( CheckSizeArray(size_size_array, 0, 1)  == 1 ) {
-+	if ( title_sets > 1 && CheckSizeArray(size_size_array, 0, 1)  == 1 ) {
- 		/* We have a dual DVD with two feature films - now lets see if they have the same amount of chapters*/
- 
- 		chapters_1 = 0;
-@@ -1519,30 +1520,32 @@ int DVDGetTitleName(const char *device, 
- {
- 	/* Variables for filehandel and title string interaction */
- 
--	int  filehandle, i, last;
-+	FILE *filehandle;
-+	int i, last;
- 
- 	/* Open DVD device */
- 
--	if ( !(filehandle = open(device, O_RDONLY)) ) {
-+	if ( !(filehandle = fopen(device, "r")) ) {
- 		fprintf(stderr, "Can't open secified device %s - check your DVD device\n", device);
- 		return(1);
- 	}
- 
- 	/* Seek to title of first track, which is at (track_no * 32768) + 40 */
- 
--	if ( 32808 != lseek(filehandle, 32808, SEEK_SET) ) {
--		close(filehandle);
-+	if ( fseek(filehandle, 32808, SEEK_SET) ) {
-+		fclose(filehandle);
- 		fprintf(stderr, "Can't seek DVD device %s - check your DVD device\n", device);
- 		return(1);
- 	}
- 
- 	/* Read the DVD-Video title */
- 
--	if ( 32 != read(filehandle, title, 32)) {
--		close(filehandle);
-+	if ( 32 != fread(title, 1, 32, filehandle)) {
-+		fclose(filehandle);
- 		fprintf(stderr, "Can't read title from DVD device %s\n", device);
- 		return(1);
- 	}
-+	fclose(filehandle);
- 
- 	/* Terminate the title string */
- 
-@@ -2464,6 +2467,10 @@ int main(int argc, char *argv[]){
- #endif
- 
- 
-+	/* On at least NetBSD5 we cannot fopen the dvd device during DVDOpen */
-+	if (provided_title_name == NULL)
-+		DVDGetTitleName(dvd,title_name);
-+
- 	_dvd = DVDOpen(dvd);
- 	if(!_dvd) exit(-1);
- 
-@@ -2476,7 +2483,7 @@ int main(int argc, char *argv[]){
- 
- 
- 	if(provided_title_name == NULL) {
--		if (DVDGetTitleName(dvd,title_name) != 0) {
-+		if (title_name[0] == 0) {
- 			fprintf(stderr,"You must provide a title name when you read your DVD-Video structure direct from the HD\n");
- 			DVDClose(_dvd);
- 			exit(1);