Attachment 109423 Details for Bug 150452 – file.diff

[patch] file.diff

file.diff (text/plain), 6.84 KB, created by Ganael Laplanche on 2010-09-09 22:00:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael Laplanche

Created: 2010-09-09 22:00:16 UTC

Size: 6.84 KB

patch

obsolete

>diff -aurN sysutils/dvdbackup.orig/Makefile sysutils/dvdbackup/Makefile
>--- sysutils/dvdbackup.orig/Makefile	2010-09-07 10:37:02.229775082 +0000
>+++ sysutils/dvdbackup/Makefile	2010-09-08 06:27:16.859689988 +0000
>@@ -6,29 +6,38 @@
> #
> 
> PORTNAME=	dvdbackup
>-PORTVERSION=	0.1.1
>-PORTREVISION=	6
>+PORTVERSION=	0.4.1
> CATEGORIES=	sysutils
>-MASTER_SITES=	http://dvd-create.sourceforge.net/ GENTOO/distfiles
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	ehaupt@FreeBSD.org
> COMMENT=	Backup content from DVD to hard disk
> 
> LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}
>-PLIST_FILES=	bin/dvdbackup
>-PORTDOCS=	README
>-
>-do-build:
>-	${CC} -o ${WRKSRC}/dvdbackup ${CFLAGS} -I${LOCALBASE}/include \
>-		-L${LOCALBASE}/lib -ldvdread ${WRKSRC}/src/dvdbackup.c
>-
>-do-install:
>-	@${INSTALL_PROGRAM} ${WRKSRC}/dvdbackup ${PREFIX}/bin
>-.if !defined(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>+GNU_CONFIGURE=	yes
>+USE_GMAKE=	yes
>+
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib
>+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>+
>+PORTDOCS=	NEWS README
>+
>+.if !defined(WITHOUT_NLS)
>+USE_GETTEXT=	yes
>+CONFIGURE_ARGS+=	--enable-nls
>+PLIST_SUB+=	NLS=""
>+.else
>+CONFIGURE_ARGS+=	--disable-nls
>+PLIST_SUB+=	NLS="@comment "
>+.endif
>+
>+MAN1=	dvdbackup.1
>+
>+post-configure:
>+.if defined(NOPORTDOCS)
>+	@${REINPLACE_CMD} 's|^install-data-am: .*|install-data-am: |' ${WRKSRC}/Makefile.in
> .endif
> 
> .include <bsd.port.mk>
>diff -aurN sysutils/dvdbackup.orig/distinfo sysutils/dvdbackup/distinfo
>--- sysutils/dvdbackup.orig/distinfo	2010-09-07 10:37:02.228775164 +0000
>+++ sysutils/dvdbackup/distinfo	2010-09-07 10:50:41.203813263 +0000
>@@ -1,3 +1,3 @@
>-MD5 (dvdbackup-0.1.1.tar.gz) = 53a071d1def5ee49d702a4dd080d25ac
>-SHA256 (dvdbackup-0.1.1.tar.gz) = 39b0ec9c00a6425a18edab52999932e87e3249e38a03da1d7a8e820232819db7
>-SIZE (dvdbackup-0.1.1.tar.gz) = 24806
>+MD5 (dvdbackup-0.4.1.tar.gz) = e23ed1a0d5ab97a81eebc93682c0bfeb
>+SHA256 (dvdbackup-0.4.1.tar.gz) = ac9138b3265ef7f113d139e68130663937ce25322ae00922f74bab55aa63347b
>+SIZE (dvdbackup-0.4.1.tar.gz) = 232885
>diff -aurN sysutils/dvdbackup.orig/files/patch-src::dvdbackup.c sysutils/dvdbackup/files/patch-src::dvdbackup.c
>--- sysutils/dvdbackup.orig/files/patch-src::dvdbackup.c	2010-09-07 10:37:02.226774910 +0000
>+++ sysutils/dvdbackup/files/patch-src::dvdbackup.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,78 +0,0 @@
>---- src/dvdbackup.c.orig	Mon Aug  5 02:08:39 2002
>-+++ src/dvdbackup.c	Tue Mar  1 05:01:19 2005
>-@@ -210,6 +210,7 @@
>- 	fprintf(stderr,"\t-v X\t\twhere X is the amount of verbosity\n");
>- 	fprintf(stderr,"\t-I\t\tfor information about the DVD\n");
>- 	fprintf(stderr,"\t-o directory\twhere directory is your backup target\n");
>-+	fprintf(stderr,"\t-n\t\tuse this as DVD name (if we can't get it)\n");
>- 	fprintf(stderr,"\t-M\t\tbackup the whole DVD\n");
>- 	fprintf(stderr,"\t-F\t\tbackup the main feature of the DVD\n");
>- 	fprintf(stderr,"\t-T X\t\tbackup title set X\n");
>-@@ -219,8 +220,8 @@
>- 	fprintf(stderr,"\t-a 0\t\tto get aspect ratio 4:3 instead of 16:9 if both are present\n");
>- 	fprintf(stderr,"\t-h\t\tprint a brief usage message\n");
>- 	fprintf(stderr,"\t-?\t\tprint a brief usage message\n\n");
>--	fprintf(stderr,"\t-i is manditory\n");
>--	fprintf(stderr,"\t-o is manditory except if you use -I\n");
>-+	fprintf(stderr,"\t-i is mandatory\n");
>-+	fprintf(stderr,"\t-o is mandatory except if you use -I\n");
>- 	fprintf(stderr,"\t-a is option to the -F switch and has no effect on other options\n");
>- 	fprintf(stderr,"\t-s and -e should prefereibly be used together with -t \n\n");
>- 	exit(1);
>-@@ -228,7 +228,8 @@
>- }
>- 
>- 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 lets see if they have the same amount of chapters*/
>-@@ -782,7 +783,7 @@
>- 	 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 ( CheckSizeArray(size_size_array, 0, 1)  == 1 && title_sets >1 ) {
>- 		/* We have a dual DVD with two feature films - now lets see if they have the same amount of chapters*/
>- 
>- 		chapters_1 = 0;
>-@@ -1530,7 +1531,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, "Can't seek DVD device %s - check your DVD device\n", device);
>- 		return(1);
>-@@ -1538,12 +1539,18 @@
>- 
>- 	/* Read the DVD-Video title */
>- 
>--	if ( 32 != read(filehandle, title, 32)) {
>-+#define	DVD_SEC_SIZ	2048
>-+	{
>-+	 char tempBuf[ DVD_SEC_SIZ ];
>-+
>-+	if ( DVD_SEC_SIZ != read(filehandle, tempBuf, DVD_SEC_SIZ)) {
>- 		close(filehandle);
>- 		fprintf(stderr, "Can't read title from DVD device %s\n", device);
>- 		return(1);
>- 	}
>- 
>-+	snprintf( title, 32, "%s", tempBuf + 40 );
>-+	}
>- 	/* Terminate the title string */
>- 
>- 	title[32] = '\0';
>-@@ -2164,7 +2171,7 @@
>- 	DVDGetTitleName(dvd,title_name);
>- 
>- 
>--	fprintf(stdout,"\n\n\nDVD-Video information of the DVD with tile %s\n\n", title_name);
>-+	fprintf(stdout,"\n\n\nDVD-Video information of the DVD with title %s\n\n", title_name);
>- 
>- 	/* Print file structure */
>- 
>diff -aurN sysutils/dvdbackup.orig/pkg-descr sysutils/dvdbackup/pkg-descr
>--- sysutils/dvdbackup.orig/pkg-descr	2010-09-07 10:37:02.227775247 +0000
>+++ sysutils/dvdbackup/pkg-descr	2010-09-08 06:33:11.261560407 +0000
>@@ -1,3 +1,3 @@
> Backup content from DVD to hard disk
> 
>-WWW:	http://dvd-create.sourceforge.net/
>+WWW:	http://dvdbackup.sourceforge.net/
>diff -aurN sysutils/dvdbackup.orig/pkg-plist sysutils/dvdbackup/pkg-plist
>--- sysutils/dvdbackup.orig/pkg-plist	1970-01-01 00:00:00.000000000 +0000
>+++ sysutils/dvdbackup/pkg-plist	2010-09-08 06:07:02.807584692 +0000
>@@ -0,0 +1,14 @@
>+bin/dvdbackup
>+%%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/es/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/ru/LC_MESSAGES/dvdbackup.mo

Actions: View | Diff

Attachments on bug 150452: 109423 | 109424