8 files changed, 120 insertions, 0 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 53d8b188d957..774a3d6eec60 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -342,6 +342,7 @@
     SUBDIR += vdr-plugin-skinenigmang
     SUBDIR += vdr-plugin-softdevice
     SUBDIR += vdr-plugin-streamdev
+    SUBDIR += vdr-plugin-ttxtsubs
     SUBDIR += vdr-plugin-upnp
     SUBDIR += vdr-plugin-vnsiserver
     SUBDIR += vdr-plugin-wirbelscan
diff --git a/multimedia/vdr-plugin-ttxtsubs/Makefile b/multimedia/vdr-plugin-ttxtsubs/Makefile
new file mode 100644
index 000000000000..efb752e60bba
--- /dev/null
+++ b/multimedia/vdr-plugin-ttxtsubs/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for:	vdr-plugin-ttxtsubs
+# Date created:		Fri May 13 18:13:34 CEST 2011
+# Whom:			Juergen Lock <nox@freebsd.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	vdr-plugin-ttxtsubs
+PORTVERSION=	0.2.2
+CATEGORIES=	multimedia
+MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/309/
+DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
+
+MAINTAINER=	nox@FreeBSD.org
+COMMENT=	Video Disk Recorder - telnet control plugin
+
+PATCH_STRIP=	-p1
+HAVE_CONFIGURE=	yes
+PORTDOCS=	COPYING README
+MAKE_JOBS_SAFE=	yes
+WRKSRC=		${WRKDIR}/${PLUGIN}-${DISTVERSION}
+
+.include	"${.CURDIR}/../vdr/Makefile.plugins"
+
+post-patch: post-patch-plugin
+
+post-install: post-install-pluginlocales
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
+.endif
+
+.include <bsd.port.mk>
diff --git a/multimedia/vdr-plugin-ttxtsubs/distinfo b/multimedia/vdr-plugin-ttxtsubs/distinfo
new file mode 100644
index 000000000000..ba764e028e83
--- /dev/null
+++ b/multimedia/vdr-plugin-ttxtsubs/distinfo
@@ -0,0 +1,2 @@
+SHA256 (vdr/vdr-ttxtsubs-0.2.2.tar.gz) = 2e685d177bf547385de62fa043272976566dd46e7504de4a5352bb36949ec724
+SIZE (vdr/vdr-ttxtsubs-0.2.2.tar.gz) = 60833
diff --git a/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile b/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile
new file mode 100644
index 000000000000..9ebcf7e86480
--- /dev/null
+++ b/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -101,7 +101,11 @@ all: libvdr-$(PLUGIN).so i18n
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ifdef FREEBSD
++	@cp -f $@ $(LIBDIR)/$@.$(APIVERSION)
++else
+ 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
++endif
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+@@ -114,3 +118,6 @@ dist: clean
+ clean:
+ 	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+ 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
++
++install:
++	${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) $(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION)
diff --git a/multimedia/vdr-plugin-ttxtsubs/files/patch-ttxtsubs.c b/multimedia/vdr-plugin-ttxtsubs/files/patch-ttxtsubs.c
new file mode 100644
index 000000000000..f622abc6255b
--- /dev/null
+++ b/multimedia/vdr-plugin-ttxtsubs/files/patch-ttxtsubs.c
@@ -0,0 +1,21 @@
+--- a/ttxtsubs.c
++++ b/ttxtsubs.c
+@@ -119,6 +119,7 @@ class cPluginTtxtsubs : public cPlugin, 
+ public:
+   cPluginTtxtsubs(void);
+   virtual ~cPluginTtxtsubs();
++  void Reload(void) { StopTtxt(); StartTtxtPlay(0x000); }
+ 
+   // -- cPlugin
+   virtual const char *Version(void) { return VERSION; }
+@@ -566,7 +567,9 @@ cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(c
+ 
+ cMenuSetupTtxtsubs::~cMenuSetupTtxtsubs(void)
+ {
+-
++  if(mTtxtsubs) {
++    mTtxtsubs->Reload();
++  }
+   if(mDoStore) {
+     Store();
+     //    Setup.Save(); // Can't get it to write to conf file, menu item disabled.
diff --git a/multimedia/vdr-plugin-ttxtsubs/files/patch-ttxtsubschannelsettings.c b/multimedia/vdr-plugin-ttxtsubs/files/patch-ttxtsubschannelsettings.c
new file mode 100644
index 000000000000..8f590491d631
--- /dev/null
+++ b/multimedia/vdr-plugin-ttxtsubs/files/patch-ttxtsubschannelsettings.c
@@ -0,0 +1,23 @@
+--- a/ttxtsubschannelsettings.c
++++ b/ttxtsubschannelsettings.c
+@@ -34,10 +34,19 @@ cTtxtSubsChannelSetting::cTtxtSubsChanne
+ bool cTtxtSubsChannelSetting::Parse(const char *s)
+ {
+    bool result=false;
++#ifdef __FreeBSD__
++   char *buffer=MALLOC(char, 256);
++#else
+    char *buffer=NULL;
++#endif
+    int PageMode;
+    int PageNumber;
+-   if (3 == sscanf(s, "%a[^,],%d,%d\n", &buffer, &PageMode, &PageNumber)) {
++#ifdef __FreeBSD__
++   if (3 == sscanf(s, "%255[^,],%d,%d\n", buffer, &PageMode, &PageNumber))
++#else
++   if (3 == sscanf(s, "%a[^,],%d,%d\n", &buffer, &PageMode, &PageNumber))
++#endif
++   {
+       tChannelID channelID=tChannelID::FromString(buffer);
+       if (channelID.Valid()) {
+         channelid=channelID;
diff --git a/multimedia/vdr-plugin-ttxtsubs/pkg-descr b/multimedia/vdr-plugin-ttxtsubs/pkg-descr
new file mode 100644
index 000000000000..1c21af7857e5
--- /dev/null
+++ b/multimedia/vdr-plugin-ttxtsubs/pkg-descr
@@ -0,0 +1,8 @@
+http://www.linuxtv.org/vdrwiki/index.php/Ttxtsubs-plugin
+
+vdr-ttxtsubs - a teletext subtitle plugin for the Linux Video Disk Recorder
+
+This plug-in implements displaying, recording and replaying teletext
+based subtitles using the on screen display.
+
+WWW: http://projects.vdr-developer.org/projects/show/plg-ttxtsubs
diff --git a/multimedia/vdr-plugin-ttxtsubs/pkg-plist b/multimedia/vdr-plugin-ttxtsubs/pkg-plist
new file mode 100644
index 000000000000..c24ff0cdeaca
--- /dev/null
+++ b/multimedia/vdr-plugin-ttxtsubs/pkg-plist
@@ -0,0 +1,11 @@
+lib/vdr/libvdr-ttxtsubs.so.1.7.18
+%%NLS%%share/locale/fr_FR/LC_MESSAGES/vdr-ttxtsubs.mo
+%%NLS%%share/locale/ru_RU/LC_MESSAGES/vdr-ttxtsubs.mo
+%%NLS%%share/locale/uk_UA/LC_MESSAGES/vdr-ttxtsubs.mo
+%%NLS%%share/locale/sv_SE/LC_MESSAGES/vdr-ttxtsubs.mo
+%%NLS%%share/locale/it_IT/LC_MESSAGES/vdr-ttxtsubs.mo
+%%NLS%%share/locale/es_ES/LC_MESSAGES/vdr-ttxtsubs.mo
+%%NLS%%share/locale/fi_FI/LC_MESSAGES/vdr-ttxtsubs.mo
+%%NLS%%share/locale/de_DE/LC_MESSAGES/vdr-ttxtsubs.mo
+%%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr-ttxtsubs.mo
+%%NLS%%share/locale/et_EE/LC_MESSAGES/vdr-ttxtsubs.mo