- Update multimedia/vdr to 1.7.22 .

- Add startup script that the rc.d script invokes to wait for
  /dev/dvb nodes to appear, can be disabled by setting vdr_waitdvb="NO"
  in rc.conf(5).  (This turned out to be necessary in some situations
  because devd starts webcamd only later in the boot process.)
- One more fix for changing OSD language when using UTF-8.
- Update multimedia/vdr-plugin-femon to 1.7.11 .
- Update multimedia/vdr-plugin-ttxtsubs to 0.2.4 .
- Bump PORTREVISION for all other plugins.
- Update www/vdradmin-am to 3.6.9 .

5 files changed, 9 insertions, 31 deletions

diff --git a/multimedia/vdr-plugin-ttxtsubs/Makefile b/multimedia/vdr-plugin-ttxtsubs/Makefile
index 1999f13bfdb3..b57eec84f2db 100644
--- a/multimedia/vdr-plugin-ttxtsubs/Makefile
+++ b/multimedia/vdr-plugin-ttxtsubs/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	vdr-plugin-ttxtsubs
-PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTVERSION=	0.2.4
 CATEGORIES=	multimedia
-MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/309/
+MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/725/
 DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	nox@FreeBSD.org
@@ -17,7 +16,7 @@ COMMENT=	Video Disk Recorder - teletext subtitle plugin
 
 PATCH_STRIP=	-p1
 HAVE_CONFIGURE=	yes
-PORTDOCS=	COPYING README
+PORTDOCS=	COPYING README HISTORY
 MAKE_JOBS_SAFE=	yes
 WRKSRC=		${WRKDIR}/${PLUGIN}-${DISTVERSION}
 
diff --git a/multimedia/vdr-plugin-ttxtsubs/distinfo b/multimedia/vdr-plugin-ttxtsubs/distinfo
index ba764e028e83..3d2c9ae90d7c 100644
--- a/multimedia/vdr-plugin-ttxtsubs/distinfo
+++ b/multimedia/vdr-plugin-ttxtsubs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vdr/vdr-ttxtsubs-0.2.2.tar.gz) = 2e685d177bf547385de62fa043272976566dd46e7504de4a5352bb36949ec724
-SIZE (vdr/vdr-ttxtsubs-0.2.2.tar.gz) = 60833
+SHA256 (vdr/vdr-ttxtsubs-0.2.4.tar.gz) = 6d038f9f48ca6bb844934e15ab47d0aca8cbf650d24c5b31930802d0ac57f4ef
+SIZE (vdr/vdr-ttxtsubs-0.2.4.tar.gz) = 60378
diff --git a/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile b/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile
index 9ebcf7e86480..f8839ad70cfb 100644
--- a/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile
+++ b/multimedia/vdr-plugin-ttxtsubs/files/patch-Makefile
@@ -3,16 +3,16 @@
 @@ -101,7 +101,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)
-@@ -114,3 +118,6 @@ dist: clean
+@@ -114,3 +118,6 @@ dist: $(I18Npo) clean
  clean:
  	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
  	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/multimedia/vdr-plugin-ttxtsubs/files/patch-ttxtsubs.c b/multimedia/vdr-plugin-ttxtsubs/files/patch-ttxtsubs.c
deleted file mode 100644
index f622abc6255b..000000000000
--- a/multimedia/vdr-plugin-ttxtsubs/files/patch-ttxtsubs.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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/pkg-plist b/multimedia/vdr-plugin-ttxtsubs/pkg-plist
index bc2ec4d2473a..e9c7ba5779ec 100644
--- a/multimedia/vdr-plugin-ttxtsubs/pkg-plist
+++ b/multimedia/vdr-plugin-ttxtsubs/pkg-plist
@@ -1,4 +1,4 @@
-lib/vdr/libvdr-ttxtsubs.so.1.7.19
+lib/vdr/libvdr-ttxtsubs.so.1.7.22
 %%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