- Update to 0.15

- Take maintainership

4 files changed, 90 insertions, 44 deletions

diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index 2814af527523..72147b4e847a 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	lsdvd
-PORTVERSION=	0.10
-PORTREVISION=	1
+PORTVERSION=	0.15
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	acidrip
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Print information about the contents and structure of a DVD
 
 LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 USE_REINPLACE=	yes
 PLIST_FILES=	bin/lsdvd
 
@@ -38,13 +39,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${WITH_DVD_DEVICE}|' \
 		${WRKSRC}/lsdvd.c
 
-do-build:
-	cd ${WRKSRC} && \
-	${CC} ${CFLAGS} -DPACKAGE=\"${PORTNAME}\" -DVERSION=\"${PORTVERSION}\" \
-	-DHAVE_LIBDVDREAD=1 -I. -I${LOCALBASE}/include -L${LOCALBASE}/lib \
-	-ldvdread lsdvd.c -o lsdvd
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lsdvd ${PREFIX}/bin
-
 .include <bsd.port.post.mk>
diff --git a/multimedia/lsdvd/distinfo b/multimedia/lsdvd/distinfo
index 2c60fd5f6069..731dbeea25df 100644
--- a/multimedia/lsdvd/distinfo
+++ b/multimedia/lsdvd/distinfo
@@ -1,3 +1,3 @@
-MD5 (lsdvd-0.10.tar.gz) = 7fd659f8e26fd790ecc4903d7961985a
-SHA256 (lsdvd-0.10.tar.gz) = 79ce57dc82e66585550f1a8618b3ea03a8e45f6351b599dbd6e4efafdbfc4d59
-SIZE (lsdvd-0.10.tar.gz) = 36206
+MD5 (lsdvd-0.15.tar.gz) = 5ea6a942804cfc7911e7a0efe4819c7a
+SHA256 (lsdvd-0.15.tar.gz) = e98eee0386000dd2e5ef59d5ff3aa55c611e299924b0d6ad304b67e6f58074d5
+SIZE (lsdvd-0.15.tar.gz) = 40101
diff --git a/multimedia/lsdvd/files/patch-lsdvd.c b/multimedia/lsdvd/files/patch-lsdvd.c
index 2176ccf4c41f..bf66b33eabfc 100644
--- a/multimedia/lsdvd/files/patch-lsdvd.c
+++ b/multimedia/lsdvd/files/patch-lsdvd.c
@@ -1,31 +1,72 @@
---- lsdvd.c.orig	Mon Sep 29 17:01:00 2003
-+++ lsdvd.c	Sun Dec 12 20:58:36 2004
-@@ -137,19 +137,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 ];
+--- lsdvd.c.orig	Wed Apr 13 23:34:34 2005
++++ lsdvd.c	Fri Nov 11 09:55:57 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);
++	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);
+ 
+@@ -189,10 +196,11 @@
+ 	pgc_t *pgc;
+ 	int i, j, c, titles, cell, vts_ttn, title_set_nr;
+  	char lang_code[3];
+-	char *dvd_device = "/dev/dvd";
++	char *dvd_device = "/dev/acd0";
+ 	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; i<pgc->nr_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)
diff --git a/multimedia/lsdvd/files/patch-ohuman.c b/multimedia/lsdvd/files/patch-ohuman.c
new file mode 100644
index 000000000000..0216214d1989
--- /dev/null
+++ b/multimedia/lsdvd/files/patch-ohuman.c
@@ -0,0 +1,13 @@
+--- 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 ) {