7 files changed, 29 insertions, 38 deletions

diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index 7f7a617becf7..be49819428ed 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vdr
-PORTVERSION=	1.7.28
+PORTVERSION=	1.7.29
 PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.tvdr.de/vdr/Developer/
diff --git a/multimedia/vdr/Makefile.plugins b/multimedia/vdr/Makefile.plugins
index 9e01ae143789..d8f594473392 100644
--- a/multimedia/vdr/Makefile.plugins
+++ b/multimedia/vdr/Makefile.plugins
@@ -1,13 +1,13 @@
 # this is to be included by vdr plugin ports
 #
-# $FreeBSD: /tmp/pcvs/ports/multimedia/vdr/Makefile.plugins,v 1.4 2012-06-19 18:42:07 nox Exp $
+# $FreeBSD$
 
 BUILD_DEPENDS+=  ${LOCALBASE}/include/linux/dvb/frontend.h:${PORTSDIR}/multimedia/v4l_compat
 
 BUILD_DEPENDS+=	vdr:${PORTSDIR}/multimedia/vdr
 RUN_DEPENDS+=	vdr:${PORTSDIR}/multimedia/vdr
 
-APIVERSION=	1.7.28
+APIVERSION=	1.7.29
 DIST_SUBDIR=	vdr
 PATCH_SUBDIR=	vdr
 USE_GMAKE=	yes
diff --git a/multimedia/vdr/distinfo b/multimedia/vdr/distinfo
index f8d93b6ae8af..f7361dad3130 100644
--- a/multimedia/vdr/distinfo
+++ b/multimedia/vdr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vdr/vdr-1.7.28.tar.bz2) = c932df0468e9a256d35c7339247ec212b48d911f88ec8ea3c367e22816d9484f
-SIZE (vdr/vdr-1.7.28.tar.bz2) = 782861
+SHA256 (vdr/vdr-1.7.29.tar.bz2) = f734fe8f21d54944f7d8d9269de7d6e6577839ed235180f0d96eed6fe8d8212d
+SIZE (vdr/vdr-1.7.29.tar.bz2) = 784665
diff --git a/multimedia/vdr/files/patch-oldgcc b/multimedia/vdr/files/patch-oldgcc
deleted file mode 100644
index b393001b89c0..000000000000
--- a/multimedia/vdr/files/patch-oldgcc
+++ /dev/null
@@ -1,11 +0,0 @@
---- timers.c.orig
-+++ timers.c
-@@ -843,7 +843,7 @@ static int CompareTimers(const void *a, 
- }
- 
- cSortedTimers::cSortedTimers(void)
--:cVector(Timers.Count())
-+:cVector<const cTimer *>(Timers.Count())
- {
-   for (const cTimer *Timer = Timers.First(); Timer; Timer = Timers.Next(Timer))
-       Append(Timer);
diff --git a/multimedia/vdr/files/patch-vdr-1.7.28-devicebonding.diff b/multimedia/vdr/files/patch-vdr-1.7.28-devicebonding.diff
deleted file mode 100644
index 4261a9b9f81b..000000000000
--- a/multimedia/vdr/files/patch-vdr-1.7.28-devicebonding.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- device.c	2012/06/09 14:37:24	2.61
-+++ device.c	2012/06/10 13:13:18
-@@ -334,7 +334,7 @@
-          if (d->ProvidesTransponder(Channel)) {
-             if (d->MaySwitchTransponder(Channel))
-                Device = d; // this device may switch to the transponder without disturbing any receiver or live view
--            else if (!d->Occupied()) {
-+            else if (!d->Occupied() && d->MaySwitchTransponder(Channel)) { // MaySwitchTransponder() implicitly calls Occupied()
-                if (d->Priority() < Priority && (!Device || d->Priority() < Device->Priority()))
-                   Device = d; // use this one only if no other with less impact can be found
-                }
diff --git a/multimedia/vdr/files/patch-vdr-1.7.29-sortrectopmenu.diff b/multimedia/vdr/files/patch-vdr-1.7.29-sortrectopmenu.diff
new file mode 100644
index 000000000000..8b7a485ff532
--- /dev/null
+++ b/multimedia/vdr/files/patch-vdr-1.7.29-sortrectopmenu.diff
@@ -0,0 +1,13 @@
+--- recording.c	2012/06/09 13:57:30	2.57
++++ recording.c	2012/07/15 10:47:58
+@@ -831,8 +831,8 @@
+ {
+   char **sb = (RecordingsSortMode == rsmName) ? &sortBufferName : &sortBufferTime;
+   if (!*sb) {
+-     char *s = (RecordingsSortMode == rsmName) ? strdup(FileName() + strlen(VideoDirectory) + 1)
+-                                              : StripEpisodeName(strdup(FileName() + strlen(VideoDirectory) + 1));
++     char *s = (RecordingsSortMode == rsmName) ? strdup(FileName() + strlen(VideoDirectory))
++                                              : StripEpisodeName(strdup(FileName() + strlen(VideoDirectory)));
+      strreplace(s, '/', 'a'); // some locales ignore '/' when sorting
+      int l = strxfrm(NULL, s, 0) + 1;
+      *sb = MALLOC(char, l);
diff --git a/multimedia/vdr/pkg-plist b/multimedia/vdr/pkg-plist
index 7fee53c526d7..ef179bc13529 100644
--- a/multimedia/vdr/pkg-plist
+++ b/multimedia/vdr/pkg-plist
@@ -1,17 +1,17 @@
 bin/svdrpsend
 bin/vdr
 bin/vdr-waitdvb
-lib/vdr/libvdr-dvbsddevice.so.1.7.28
-lib/vdr/libvdr-svcsvr.so.1.7.28
-lib/vdr/libvdr-svccli.so.1.7.28
-lib/vdr/libvdr-status.so.1.7.28
-lib/vdr/libvdr-skincurses.so.1.7.28
-lib/vdr/libvdr-pictures.so.1.7.28
-lib/vdr/libvdr-osddemo.so.1.7.28
-lib/vdr/libvdr-hello.so.1.7.28
-lib/vdr/libvdr-svdrpdemo.so.1.7.28
-lib/vdr/libvdr-epgtableid0.so.1.7.28
-lib/vdr/libvdr-rcu.so.1.7.28
+lib/vdr/libvdr-dvbsddevice.so.1.7.29
+lib/vdr/libvdr-svcsvr.so.1.7.29
+lib/vdr/libvdr-svccli.so.1.7.29
+lib/vdr/libvdr-status.so.1.7.29
+lib/vdr/libvdr-skincurses.so.1.7.29
+lib/vdr/libvdr-pictures.so.1.7.29
+lib/vdr/libvdr-osddemo.so.1.7.29
+lib/vdr/libvdr-hello.so.1.7.29
+lib/vdr/libvdr-svdrpdemo.so.1.7.29
+lib/vdr/libvdr-epgtableid0.so.1.7.29
+lib/vdr/libvdr-rcu.so.1.7.29
 libdata/pkgconfig/vdr.pc
 %%NLS%%share/locale/ar/LC_MESSAGES/vdr.mo
 %%NLS%%share/locale/es_ES/LC_MESSAGES/vdr.mo