6 files changed, 64 insertions, 18 deletions

diff --git a/multimedia/vdr-plugin-osdteletext/Makefile b/multimedia/vdr-plugin-osdteletext/Makefile
index e5bb7f75d8ed..af26b0412cd2 100644
--- a/multimedia/vdr-plugin-osdteletext/Makefile
+++ b/multimedia/vdr-plugin-osdteletext/Makefile
@@ -6,13 +6,16 @@
 #
 
 PORTNAME=	vdr-plugin-osdteletext
-PORTVERSION=	0.9.0
-PORTREVISION=	9
+PORTVERSION=	0.9.2
 CATEGORIES=	multimedia
-MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/416/
+MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/899/
 DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 EXTRACT_SUFX=	.tgz
 
+#PATCH_SITES=	http://projects.vdr-developer.org/attachments/download/901/
+#PATCHFILES=	receiver-fix-2.diff
+#PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Video Disk Recorder - OSD teletext plugin
 
diff --git a/multimedia/vdr-plugin-osdteletext/distinfo b/multimedia/vdr-plugin-osdteletext/distinfo
index a9f0571cb36a..c93c440c17ad 100644
--- a/multimedia/vdr-plugin-osdteletext/distinfo
+++ b/multimedia/vdr-plugin-osdteletext/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vdr/vdr-osdteletext-0.9.0.tgz) = 6ae02a6918e8eababf49a9388a89740d1d56f3f63d2bcc99b4dc7c8108035240
-SIZE (vdr/vdr-osdteletext-0.9.0.tgz) = 60498
+SHA256 (vdr/vdr-osdteletext-0.9.2.tgz) = d6c7eee8dc81d0e9499250b3f6540603d8d290d9a1ecbaa4d19092f606662bac
+SIZE (vdr/vdr-osdteletext-0.9.2.tgz) = 60028
diff --git a/multimedia/vdr-plugin-osdteletext/files/patch-Makefile b/multimedia/vdr-plugin-osdteletext/files/patch-Makefile
index cf8be7f4f332..6aaa8ca6b801 100644
--- a/multimedia/vdr-plugin-osdteletext/files/patch-Makefile
+++ b/multimedia/vdr-plugin-osdteletext/files/patch-Makefile
@@ -1,14 +1,10 @@
 --- osdteletext-0.8.3/Makefile.orig
 +++ osdteletext-0.8.3/Makefile
-@@ -110,8 +114,11 @@ dist: clean
- 
- clean:
- 	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
--	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+@@ -113,5 +113,8 @@ clean:
+ 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
  
  install:
 +	${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION)
-+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
 +
 +install-readme:
  	@install -d ../../man
diff --git a/multimedia/vdr-plugin-osdteletext/files/patch-osdteletext-vdr-1.7.27.txt b/multimedia/vdr-plugin-osdteletext/files/patch-osdteletext-vdr-1.7.27.txt
new file mode 100644
index 000000000000..33c6f5889ed9
--- /dev/null
+++ b/multimedia/vdr-plugin-osdteletext/files/patch-osdteletext-vdr-1.7.27.txt
@@ -0,0 +1,47 @@
+diff --git a/txtrecv.c b/txtrecv.c
+index 3dc89f6..3de5c1d 100644
+--- a/txtrecv.c
++++ b/txtrecv.c
+@@ -518,7 +518,7 @@ void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber
+    int TPid = newLiveChannel->Tpid();
+ 
+    if (TPid) {
+-      receiver = new cTxtReceiver(TPid, newLiveChannel->GetChannelID(), storeTopText, storage);
++      receiver = new cTxtReceiver(newLiveChannel, storeTopText, storage);
+       cDevice::ActualDevice()->AttachReceiver(receiver);
+    }
+ 
+@@ -526,10 +526,18 @@ void cTxtStatus::ChannelSwitch(const cDevice *Device, int ChannelNumber
+ }
+ 
+ 
+-cTxtReceiver::cTxtReceiver(int TPid, tChannelID chan, bool storeTopText, Storage* storage)
+- : cReceiver(chan, -1, TPid), cThread("osdteletext-receiver"),
++cTxtReceiver::cTxtReceiver(const cChannel* chan, bool storeTopText, Storage* storage)
++#if APIVERSNUM >= 10712
++ : cReceiver(chan, -1), cThread("osdteletext-receiver"),
++#else
++ : cReceiver(chan, -1, chan->Tpid()), cThread("osdteletext-receiver"),
++#endif
+    TxtPage(0), storeTopText(storeTopText), buffer((188+60)*75), storage(storage)
+ {
++#if APIVERSNUM >= 10712
++   SetPids(NULL);
++   AddPid(chan->Tpid());
++#endif
+    storage->prepareDirectory(ChannelID());
+ 
+    // 10 ms timeout on getting TS frames
+diff --git a/txtrecv.h b/txtrecv.h
+index a111d0d..3468b6e 100644
+--- a/txtrecv.h
++++ b/txtrecv.h
+@@ -165,7 +165,7 @@ protected:
+    virtual void Receive(uchar *Data, int Length);
+    virtual void Action();
+ public:
+-   cTxtReceiver(int TPid, tChannelID chan, bool storeTopText, Storage* storage);
++   cTxtReceiver(const cChannel* chan, bool storeTopText, Storage* storage);
+    virtual ~cTxtReceiver();
+    virtual void Stop();
+ };
diff --git a/multimedia/vdr-plugin-osdteletext/files/patch-vdr-osdteletext-0.8.3 b/multimedia/vdr-plugin-osdteletext/files/patch-vdr-osdteletext-0.9.2
index 2ca093201bf4..8db6a0967a04 100644
--- a/multimedia/vdr-plugin-osdteletext/files/patch-vdr-osdteletext-0.8.3
+++ b/multimedia/vdr-plugin-osdteletext/files/patch-vdr-osdteletext-0.9.2
@@ -1,17 +1,16 @@
-diff -ur orig/osdteletext-0.8.3/Makefile osdteletext-0.8.3/Makefile
---- orig/osdteletext-0.8.3/Makefile	2009-05-25 20:28:59.000000000 +0200
-+++ osdteletext-0.8.3/Makefile	2010-03-16 17:31:20.000000000 +0100
-@@ -94,7 +94,11 @@
+--- Makefile.orig
++++ Makefile
+@@ -98,7 +98,11 @@ all: libvdr-$(PLUGIN).so i18n
  
  libvdr-$(PLUGIN).so: $(OBJS)
- 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 +ifdef FREEBSD
 +	@cp -f $@ $(LIBDIR)/$@.$(APIVERSION)
 +else
  	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 +endif
  
- dist: clean
+ dist: $(I18Npo) clean
  	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 diff -ur orig/osdteletext-0.8.3/txtrecv.c osdteletext-0.8.3/txtrecv.c
 --- orig/osdteletext-0.8.3/txtrecv.c	2009-05-25 20:28:59.000000000 +0200
diff --git a/multimedia/vdr-plugin-osdteletext/pkg-plist b/multimedia/vdr-plugin-osdteletext/pkg-plist
index 9a06e57b1e16..54a501ab0b42 100644
--- a/multimedia/vdr-plugin-osdteletext/pkg-plist
+++ b/multimedia/vdr-plugin-osdteletext/pkg-plist
@@ -1,4 +1,4 @@
-lib/vdr/libvdr-osdteletext.so.1.7.22
+lib/vdr/libvdr-osdteletext.so.%%APIVERSION%%
 @exec /usr/bin/install -o %%VDR_USER%% -g %%VDR_GROUP%% -d /var/cache/vdr/vtx
 %%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr-osdteletext.mo
 %%NLS%%share/locale/de_DE/LC_MESSAGES/vdr-osdteletext.mo
@@ -8,4 +8,5 @@ lib/vdr/libvdr-osdteletext.so.1.7.22
 %%NLS%%share/locale/it_IT/LC_MESSAGES/vdr-osdteletext.mo
 %%NLS%%share/locale/pt_PT/LC_MESSAGES/vdr-osdteletext.mo
 %%NLS%%share/locale/ru_RU/LC_MESSAGES/vdr-osdteletext.mo
+%%NLS%%share/locale/sk_SK/LC_MESSAGES/vdr-osdteletext.mo
 %%NLS%%share/locale/uk_UA/LC_MESSAGES/vdr-osdteletext.mo