5 files changed, 7 insertions, 55 deletions

diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index dd20ed032954..e9666304cb77 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -2,10 +2,9 @@
 # $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
@@ -14,7 +13,9 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
 
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/multimedia/lsdvd/distinfo b/multimedia/lsdvd/distinfo
index ffe20f882ac0..5e53576d983b 100644
--- a/multimedia/lsdvd/distinfo
+++ b/multimedia/lsdvd/distinfo
@@ -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
diff --git a/multimedia/lsdvd/files/patch-lsdvd.c b/multimedia/lsdvd/files/patch-lsdvd.c
index 4784bf78224b..f03788e197a5 100644
--- a/multimedia/lsdvd/files/patch-lsdvd.c
+++ b/multimedia/lsdvd/files/patch-lsdvd.c
@@ -29,39 +29,3 @@
  
  	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; 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
deleted file mode 100644
index 0216214d1989..000000000000
--- a/multimedia/lsdvd/files/patch-ohuman.c
+++ /dev/null
@@ -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 ) {
diff --git a/multimedia/lsdvd/pkg-descr b/multimedia/lsdvd/pkg-descr
index 5a546526f4c7..a3fb0bb6a702 100644
--- a/multimedia/lsdvd/pkg-descr
+++ b/multimedia/lsdvd/pkg-descr
@@ -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/