Index: head/multimedia/lsdvd/Makefile =================================================================== --- head/multimedia/lsdvd/Makefile (revision 371470) +++ head/multimedia/lsdvd/Makefile (revision 371471) @@ -1,36 +1,37 @@ # Created by: michael johnson # $FreeBSD$ PORTNAME= lsdvd -PORTVERSION= 0.16 -PORTREVISION= 8 +PORTVERSION= 0.17 CATEGORIES= multimedia -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20-%20I%20hate%20James%20Blunt +MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Print information about the contents and structure of a DVD LICENSE= GPLv2 LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread +USES= pkgconfig GNU_CONFIGURE= yes + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= bin/lsdvd \ man/man1/lsdvd.1.gz WITH_DVD_DEVICE?=/dev/acd0 pre-everything:: @${ECHO_MSG} "===> The default DVD device is ${WITH_DVD_DEVICE}" @${ECHO_MSG} "===> Define WITH_DVD_DEVICE if you want to change the default" @${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'" @${ECHO_MSG} "===>" post-patch: @${REINPLACE_CMD} -e 's|/dev/dvd|${WITH_DVD_DEVICE}|' \ ${WRKSRC}/lsdvd.c .include Index: head/multimedia/lsdvd/distinfo =================================================================== --- head/multimedia/lsdvd/distinfo (revision 371470) +++ head/multimedia/lsdvd/distinfo (revision 371471) @@ -1,2 +1,2 @@ -SHA256 (lsdvd-0.16.tar.gz) = 04ae3e2d823ed427e31d57f3677d28ec36bdf3bf984d35f7bdfab030d89b20f1 -SIZE (lsdvd-0.16.tar.gz) = 100495 +SHA256 (lsdvd-0.17.tar.gz) = 7d2c5bd964acd266b99a61d9054ea64e01204e8e3e1a107abe41b1274969e488 +SIZE (lsdvd-0.17.tar.gz) = 99250 Index: head/multimedia/lsdvd/files/patch-ohuman.c =================================================================== --- head/multimedia/lsdvd/files/patch-ohuman.c (revision 371470) +++ head/multimedia/lsdvd/files/patch-ohuman.c (nonexistent) @@ -1,13 +0,0 @@ ---- ohuman.c.orig Sun Feb 27 11:08:01 2005 -+++ ohuman.c Fri Nov 11 09:58:37 2005 -@@ -3,9 +3,9 @@ - - void ohuman_print(struct dvd_info *dvd_info) { - -+ int i, j; - printf("Disc Title: %s\n", dvd_info->discinfo.disc_title); - -- int i, j; - for (j=0; j < dvd_info->title_count; j++) - { - if ( opt_t == j+1 || opt_t == 0 ) { Property changes on: head/multimedia/lsdvd/files/patch-ohuman.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/lsdvd/files/patch-lsdvd.c =================================================================== --- head/multimedia/lsdvd/files/patch-lsdvd.c (revision 371470) +++ head/multimedia/lsdvd/files/patch-lsdvd.c (revision 371471) @@ -1,67 +1,31 @@ --- lsdvd.c.orig Wed Apr 13 23:34:34 2005 +++ lsdvd.c Fri Nov 11 11:41:05 2005 @@ -124,19 +124,26 @@ return -1; } - if ( fseek(filehandle, 32808, SEEK_SET )) { + if ( fseek(filehandle, 32768, SEEK_SET )) { fclose(filehandle); fprintf(stderr, "Couldn't seek in %s for title\n", dvd_device); strcpy(title, "unknown"); return -1; } - if ( 32 != (i = fread(title, 1, 32, filehandle)) ) { + { + #define DVD_SEC_SIZ 2048 + char tempBuf[ DVD_SEC_SIZ ]; + + if ( DVD_SEC_SIZ != fread(tempBuf, 1, DVD_SEC_SIZ, filehandle) ) { fclose(filehandle); fprintf(stderr, "Couldn't read enough bytes for title.\n"); strcpy(title, "unknown"); return -1; } + snprintf( title, 32, "%s", tempBuf + 40 ); + i=32; + } fclose (filehandle); -@@ -193,6 +200,7 @@ - int has_title = 0, ret = 0; - int max_length = 0, max_track = 0; - struct stat dvd_stat; -+ struct dvd_info dvd_info; - - program_name = argv[0]; - -@@ -263,8 +271,6 @@ - - vmgi_mat = ifo_zero->vmgi_mat; - -- struct dvd_info dvd_info; -- - dvd_info.discinfo.device = dvd_device; - dvd_info.discinfo.disc_title = has_title ? "unknown" : title; - dvd_info.discinfo.vmg_id = vmgi_mat->vmg_identifier; -@@ -363,14 +369,16 @@ - - cell = 0; - if (opt_c) { -+ int ms; -+ - dvd_info.titles[j].chapter_count = pgc->nr_of_programs; - dvd_info.titles[j].chapters = calloc(dvd_info.titles[j].chapter_count, sizeof(*dvd_info.titles[j].chapters)); - -- int ms; - for (i=0; inr_of_programs; i++) - { -+ int next; - ms=0; -- int next = pgc->program_map[i+1]; -+ next = pgc->program_map[i+1]; - if (i == pgc->nr_of_programs - 1) next = pgc->nr_of_cells + 1; - - while (cell < next - 1) Index: head/multimedia/lsdvd/pkg-descr =================================================================== --- head/multimedia/lsdvd/pkg-descr (revision 371470) +++ head/multimedia/lsdvd/pkg-descr (revision 371471) @@ -1,3 +1,3 @@ Print information about the contents and structure of a DVD. -WWW: http://untrepid.com/acidrip/lsdvd.html +WWW: http://sourceforge.net/projects/lsdvd/