- Update to 0.4.2

- Now that we have svn rename patch with ancient naming schema

PR:		170212
Submitted by:	Fabian Keil <fk@fabiankeil.de>

5 files changed, 34 insertions, 53 deletions

diff --git a/sysutils/dvdbackup/Makefile b/sysutils/dvdbackup/Makefile
index 95d5775bc88a..8c0915d04c10 100644
--- a/sysutils/dvdbackup/Makefile
+++ b/sysutils/dvdbackup/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dvdbackup
-PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTVERSION=	0.4.2
 CATEGORIES=	sysutils multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -16,7 +15,7 @@ COMMENT=	Backup content from DVD to hard disk
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread:${PORTSDIR}/multimedia/libdvdread
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -27,7 +26,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAN1=		dvdbackup.1
 PORTDOCS=	NEWS README
 
-DEFAULT_DVD_DEVICE?=	/dev/acd0
+DEFAULT_DVD_DEVICE?=	/dev/cd0
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff --git a/sysutils/dvdbackup/distinfo b/sysutils/dvdbackup/distinfo
index 70eca05bab80..6c3e308ad0ab 100644
--- a/sysutils/dvdbackup/distinfo
+++ b/sysutils/dvdbackup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dvdbackup-0.4.1.tar.gz) = ac9138b3265ef7f113d139e68130663937ce25322ae00922f74bab55aa63347b
-SIZE (dvdbackup-0.4.1.tar.gz) = 232885
+SHA256 (dvdbackup-0.4.2.tar.gz) = 0a37c31cc6f2d3c146ec57064bda8a06cf5f2ec90455366cb250506bab964550
+SIZE (dvdbackup-0.4.2.tar.gz) = 267049
diff --git a/sysutils/dvdbackup/files/patch-src::dvdbackup.c b/sysutils/dvdbackup/files/patch-src::dvdbackup.c
deleted file mode 100644
index 5c509eb9d873..000000000000
--- a/sysutils/dvdbackup/files/patch-src::dvdbackup.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/dvdbackup.c.orig	2010-09-16 22:10:04.307951355 +0200
-+++ src/dvdbackup.c	2010-09-16 22:19:49.112413564 +0200
-@@ -99,7 +99,8 @@
- 
- 
- static int CheckSizeArray(const int size_array[], int reference, int target) {
--	if ( (size_array[reference]/size_array[target] == 1) &&
-+	if ( size_array[target] &&
-+			(size_array[reference]/size_array[target] == 1) &&
- 			((size_array[reference] * 2 - size_array[target])/ size_array[target] == 1) &&
- 			((size_array[reference]%size_array[target] * 3) < size_array[reference]) ) {
- 		/* We have a dual DVD with two feature films - now let's see if they have the same amount of chapters*/
-@@ -1264,7 +1265,7 @@
- 
- 	/* Seek to title of first track, which is at (track_no * 32768) + 40 */
- 
--	if ( 32808 != lseek(filehandle, 32808, SEEK_SET) ) {
-+	if ( 32768 != lseek(filehandle, 32768, SEEK_SET) ) {
- 		close(filehandle);
- 		fprintf(stderr, _("Cannot seek DVD device %s - check your DVD device\n"), device);
- 		return(1);
-@@ -1272,10 +1273,16 @@
- 
- 	/* Read the DVD-Video title */
- 
--	if ( 32 != read(filehandle, title, 32)) {
--		close(filehandle);
--		fprintf(stderr, _("Cannot read title from DVD device %s\n"), device);
--		return(1);
-+#define DVD_SEC_SIZ 2048
-+	{
-+		char tempBuf[ DVD_SEC_SIZ ];
-+
-+		if (DVD_SEC_SIZ != read(filehandle, tempBuf, DVD_SEC_SIZ)) {
-+			close(filehandle);
-+			fprintf(stderr, _("Cannot read title from DVD device %s\n"), device);
-+			return(1);
-+		}
-+      	snprintf( title, 32, "%s", tempBuf + 40 );
- 	}
- 
- 	/* Terminate the title string */
diff --git a/sysutils/dvdbackup/files/patch-src__dvdbackup.c b/sysutils/dvdbackup/files/patch-src__dvdbackup.c
new file mode 100644
index 000000000000..cc414effd320
--- /dev/null
+++ b/sysutils/dvdbackup/files/patch-src__dvdbackup.c
@@ -0,0 +1,18 @@
+--- ./src/dvdbackup.c.orig	2012-06-24 03:10:29.000000000 +0200
++++ ./src/dvdbackup.c	2012-07-28 13:57:54.000000000 +0200
+@@ -1546,7 +1546,6 @@
+ 
+ 	title_set_info = DVDGetFileSet(_dvd);
+ 	if (!title_set_info) {
+-		DVDClose(_dvd);
+ 		return(1);
+ 	}
+ 
+@@ -1573,7 +1572,6 @@
+ 	title_set_info = DVDGetFileSet(_dvd);
+ 
+ 	if (!title_set_info) {
+-		DVDClose(_dvd);
+ 		return(1);
+ 	}
+ 
diff --git a/sysutils/dvdbackup/pkg-plist b/sysutils/dvdbackup/pkg-plist
index 9acf9caf4729..1ef64ae03fc3 100644
--- a/sysutils/dvdbackup/pkg-plist
+++ b/sysutils/dvdbackup/pkg-plist
@@ -1,14 +1,20 @@
 bin/dvdbackup
+%%NLS%%share/locale/da/LC_MESSAGES/dvdbackup.mo
 %%NLS%%share/locale/de/LC_MESSAGES/dvdbackup.mo
-%%NLS%%share/locale/en@quot/LC_MESSAGES/dvdbackup.mo
-%%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en@quot
 %%NLS%%share/locale/en@boldquot/LC_MESSAGES/dvdbackup.mo
-%%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en@boldquot
+%%NLS%%share/locale/en@quot/LC_MESSAGES/dvdbackup.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/dvdbackup.mo
 %%NLS%%share/locale/es/LC_MESSAGES/dvdbackup.mo
+%%NLS%%share/locale/et/LC_MESSAGES/dvdbackup.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/dvdbackup.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/dvdbackup.mo
 %%NLS%%share/locale/it/LC_MESSAGES/dvdbackup.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/dvdbackup.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/dvdbackup.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/dvdbackup.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/dvdbackup.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/dvdbackup.mo
+%%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en@quot
+%%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en@boldquot