Changes 0.1.7:

* new VBI data descriptor support (0x45)
* NIT support
* TOT/TDT support
* new DVB Satellite Delivery systems descriptor support (0x43)
* new DVB Local time offset descriptor support (0x58)
* new Terrestrial Delivery systems descriptor support (0x5a)

5 files changed, 47 insertions, 23 deletions

diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
index 69369164b71..b027e5bf3f4 100644
--- a/multimedia/libdvbpsi/Makefile
+++ b/multimedia/libdvbpsi/Makefile
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.8 2009/02/27 22:38:16 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/11/04 19:43:32 adam Exp $
 
-DISTNAME=	libdvbpsi5-0.1.6
-PKGNAME=	${DISTNAME:S/5-/-/}
+DISTNAME=	libdvbpsi-0.1.7
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.videolan.org/pub/libdvbpsi/0.1.6/
+MASTER_SITES=	http://www.videolan.org/pub/libdvbpsi/${PKGVERSION_NOREV}/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	wulf@NetBSD.org
 HOMEPAGE=	http://www.videolan.org/
 COMMENT=	PSI decoder and generator library for MPEG2 and DVB streams
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_LIBTOOL=	yes
+USE_TOOLS+=		gmake
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+PKGCONFIG_OVERRIDE=	libdvbpsi.pc.in
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvbpsi/PLIST b/multimedia/libdvbpsi/PLIST
index 2c63b03deac..b21dc4b2dad 100644
--- a/multimedia/libdvbpsi/PLIST
+++ b/multimedia/libdvbpsi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:08:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/11/04 19:43:32 adam Exp $
 include/dvbpsi/cat.h
 include/dvbpsi/demux.h
 include/dvbpsi/descriptor.h
@@ -18,6 +18,8 @@ include/dvbpsi/dr_0d.h
 include/dvbpsi/dr_0e.h
 include/dvbpsi/dr_0f.h
 include/dvbpsi/dr_42.h
+include/dvbpsi/dr_43.h
+include/dvbpsi/dr_45.h
 include/dvbpsi/dr_47.h
 include/dvbpsi/dr_48.h
 include/dvbpsi/dr_4d.h
@@ -25,12 +27,17 @@ include/dvbpsi/dr_4e.h
 include/dvbpsi/dr_52.h
 include/dvbpsi/dr_55.h
 include/dvbpsi/dr_56.h
+include/dvbpsi/dr_58.h
 include/dvbpsi/dr_59.h
+include/dvbpsi/dr_5a.h
 include/dvbpsi/dr_69.h
 include/dvbpsi/dvbpsi.h
 include/dvbpsi/eit.h
+include/dvbpsi/nit.h
 include/dvbpsi/pat.h
 include/dvbpsi/pmt.h
 include/dvbpsi/psi.h
 include/dvbpsi/sdt.h
+include/dvbpsi/tot.h
 lib/libdvbpsi.la
+lib/pkgconfig/libdvbpsi.pc
diff --git a/multimedia/libdvbpsi/distinfo b/multimedia/libdvbpsi/distinfo
index 7260dee6439..f334dde3cb4 100644
--- a/multimedia/libdvbpsi/distinfo
+++ b/multimedia/libdvbpsi/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/02/27 22:38:16 wiz Exp $
+$NetBSD: distinfo,v 1.4 2010/11/04 19:43:32 adam Exp $
 
-SHA1 (libdvbpsi5-0.1.6.tar.gz) = 29300cf234f7daecb783335d1e2688231521a58e
-RMD160 (libdvbpsi5-0.1.6.tar.gz) = 3e602cea00bb38fa6881b1cd58efe1e235a4e7f7
-Size (libdvbpsi5-0.1.6.tar.gz) = 409072 bytes
-SHA1 (patch-aa) = f8d7f18f5967da00edb8df957cf5dce37d459dcc
+SHA1 (libdvbpsi-0.1.7.tar.bz2) = 4fc21425068a42daf6b261b413e0107cc67fb37c
+RMD160 (libdvbpsi-0.1.7.tar.bz2) = 0ce91c22e8a6abf01f75c719951b524bd31c87ff
+Size (libdvbpsi-0.1.7.tar.bz2) = 308173 bytes
+SHA1 (patch-aa) = 50ac67f20b06b8c9ebeef0140e279085df9164af
+SHA1 (patch-ab) = 462d926b4f78a20502f4bb6fb70302e85556ecc6
diff --git a/multimedia/libdvbpsi/patches/patch-aa b/multimedia/libdvbpsi/patches/patch-aa
index c1fd3aa0fee..4394c9a6831 100644
--- a/multimedia/libdvbpsi/patches/patch-aa
+++ b/multimedia/libdvbpsi/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2009/02/27 22:38:16 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2010/11/04 19:43:33 adam Exp $
 
---- examples/connect.c.orig	2007-01-18 14:57:08.000000000 +0000
+--- examples/connect.c.orig	2008-09-17 09:39:35.000000000 +0000
 +++ examples/connect.c
-@@ -38,7 +38,6 @@
- #   include <netinet/if_ether.h>

- #endif

- #include <netdb.h>

--#include <netinet/ip.h>

- #include <netinet/udp.h>

- #include <arpa/inet.h>

- 

+@@ -38,7 +38,7 @@
+ #   include <netinet/if_ether.h>
+ #endif
+ #include <netdb.h>
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ #    include <netinet/ip.h>
+ #endif
+ #include <netinet/udp.h>
diff --git a/multimedia/libdvbpsi/patches/patch-ab b/multimedia/libdvbpsi/patches/patch-ab
new file mode 100644
index 00000000000..c374d7d34e6
--- /dev/null
+++ b/multimedia/libdvbpsi/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2010/11/04 19:43:33 adam Exp $
+
+--- configure.orig	2010-11-04 09:06:29.000000000 +0000
++++ configure
+@@ -11226,8 +11226,6 @@ fi
+ if test "$release" = "true"
+ then
+   CFLAGS="${CFLAGS} -O6"
+-else
+-  CFLAGS="${CFLAGS} -O2"
+ fi
+ 
+