Date: Mon, 27 Jan 2014 21:50:45 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341460 - in head: devel/cxxtools devel/cxxtools/files www/tntnet www/tntnet/files www/vdr-plugin-live www/vdr-plugin-live/files Message-ID: <201401272150.s0RLoj5M021866@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Mon Jan 27 21:50:45 2014 New Revision: 341460 URL: http://svnweb.freebsd.org/changeset/ports/341460 QAT: https://qat.redports.org/buildarchive/r341460/ Log: - Update devel/cxxtools and www/tntnet to 2.2.1 and stagify them. - Update www/vdr-plugin-live to 0.3.0 with patches merged from the git 0.3.0 branch. (stagifying the vdr ports left for later.) - Use new LIB_DEPENDS syntax. - Rewrite NOPORTDOCS. Added: head/devel/cxxtools/files/patch-clang (contents, props changed) head/www/vdr-plugin-live/files/patch-042724e30d5690ab67a6c04aea48a16b9a3b085b (contents, props changed) head/www/vdr-plugin-live/files/patch-1a1f2e0754b02c5597debbe82f27b759f23cd6fe (contents, props changed) head/www/vdr-plugin-live/files/patch-69f84f95fa875c6f562294b1a6a1ea6f584d3f6c (contents, props changed) Deleted: head/www/tntnet/files/patch-libcxx head/www/vdr-plugin-live/files/patch-tasks.cpp Modified: head/devel/cxxtools/Makefile head/devel/cxxtools/distinfo head/devel/cxxtools/pkg-plist head/www/tntnet/Makefile head/www/tntnet/distinfo head/www/tntnet/files/patch-etc head/www/tntnet/pkg-plist head/www/vdr-plugin-live/Makefile head/www/vdr-plugin-live/distinfo head/www/vdr-plugin-live/files/gen_version_suffix.h head/www/vdr-plugin-live/files/patch-live.cpp head/www/vdr-plugin-live/pkg-plist Modified: head/devel/cxxtools/Makefile ============================================================================== --- head/devel/cxxtools/Makefile Mon Jan 27 21:46:48 2014 (r341459) +++ head/devel/cxxtools/Makefile Mon Jan 27 21:50:45 2014 (r341460) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cxxtools -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.1 CATEGORIES= devel MASTER_SITES= http://www.tntnet.org/download/ @@ -10,7 +10,7 @@ MAINTAINER= nox@FreeBSD.org COMMENT= Collection of general-purpose C++ classes PATCH_STRIP= -p1 -USES= iconv +USES= iconv pathfix USE_CSTD= gnu89 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include Modified: head/devel/cxxtools/distinfo ============================================================================== --- head/devel/cxxtools/distinfo Mon Jan 27 21:46:48 2014 (r341459) +++ head/devel/cxxtools/distinfo Mon Jan 27 21:50:45 2014 (r341460) @@ -1,2 +1,2 @@ -SHA256 (cxxtools-2.1.1.tar.gz) = 8de01001ab72226444e641c020582d8bd0c7df0966f37073273fee9a66e6054a -SIZE (cxxtools-2.1.1.tar.gz) = 801199 +SHA256 (cxxtools-2.2.1.tar.gz) = 8cebb6d6cda7c93cc4f7c0d552a68d50dd5530b699cf87916bb3b708fdc4e342 +SIZE (cxxtools-2.2.1.tar.gz) = 821324 Added: head/devel/cxxtools/files/patch-clang ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cxxtools/files/patch-clang Mon Jan 27 21:50:45 2014 (r341460) @@ -0,0 +1,32 @@ +Obtained from: + + https://github.com/maekitalo/cxxtools/commit/645dedf575da32198ac815655e5c6e5cd5cc4461 + +--- a/include/cxxtools/char.h ++++ b/include/cxxtools/char.h +@@ -72,23 +72,8 @@ namespace cxxtools + : _value(0) + {} + +- //! Constructs a character using the given char as base for the character value. +- Char(char ch) +- : _value(value_type(static_cast<unsigned char>(ch))) +- {} +- +- //! Constructs a character using the given char as base for the character value. +- Char(unsigned char ch) +- : _value( value_type(ch) ) +- {} +- +- //! Constructs a character using the given char as base for the character value. +- Char(wchar_t ch) +- : _value( value_type(static_cast<uint16_t>(ch)) ) +- {} +- +- //! Constructs a character using the given unsigned 32-bit as base for the character value. +- explicit Char(value_type ch) ++ //! Constructs a character using the given value as base for the character value. ++ Char(value_type ch) + : _value(ch) + {} + Modified: head/devel/cxxtools/pkg-plist ============================================================================== --- head/devel/cxxtools/pkg-plist Mon Jan 27 21:46:48 2014 (r341459) +++ head/devel/cxxtools/pkg-plist Mon Jan 27 21:50:45 2014 (r341460) @@ -2,31 +2,27 @@ bin/cxxtools-config lib/libcxxtools-bin.a lib/libcxxtools-bin.la lib/libcxxtools-bin.so -lib/libcxxtools-bin.so.8 +lib/libcxxtools-bin.so.9 lib/libcxxtools-http.a lib/libcxxtools-http.la lib/libcxxtools-http.so -lib/libcxxtools-http.so.8 +lib/libcxxtools-http.so.9 lib/libcxxtools-json.a lib/libcxxtools-json.la lib/libcxxtools-json.so -lib/libcxxtools-json.so.8 +lib/libcxxtools-json.so.9 lib/libcxxtools-unit.a lib/libcxxtools-unit.la lib/libcxxtools-unit.so -lib/libcxxtools-unit.so.8 -lib/libcxxtools-xml.a -lib/libcxxtools-xml.la -lib/libcxxtools-xml.so -lib/libcxxtools-xml.so.8 +lib/libcxxtools-unit.so.9 lib/libcxxtools-xmlrpc.a lib/libcxxtools-xmlrpc.la lib/libcxxtools-xmlrpc.so -lib/libcxxtools-xmlrpc.so.8 +lib/libcxxtools-xmlrpc.so.9 lib/libcxxtools.a lib/libcxxtools.la lib/libcxxtools.so -lib/libcxxtools.so.8 +lib/libcxxtools.so.9 include/cxxtools/allocator.h include/cxxtools/api.h include/cxxtools/application.h @@ -81,6 +77,7 @@ include/cxxtools/eventsource.h include/cxxtools/facets.h include/cxxtools/fdstream.h include/cxxtools/file.h +include/cxxtools/filedevice.h include/cxxtools/fileinfo.h include/cxxtools/formatter.h include/cxxtools/function.h @@ -118,8 +115,7 @@ include/cxxtools/jsonserializer.h include/cxxtools/library.h include/cxxtools/log.h include/cxxtools/log/cxxtools.h -include/cxxtools/log/cxxtools_init.h -include/cxxtools/loginit.h +include/cxxtools/lrucache.h include/cxxtools/main.h include/cxxtools/md5.h include/cxxtools/md5stream.h @@ -150,6 +146,7 @@ include/cxxtools/posix/fork.h include/cxxtools/posix/pipe.h include/cxxtools/posix/pipestream.h include/cxxtools/properties.h +include/cxxtools/propertiesdeserializer.h include/cxxtools/query_params.h include/cxxtools/queue.h include/cxxtools/quotedprintablestream.h @@ -234,6 +231,12 @@ include/cxxtools/xmlrpc/responder.h include/cxxtools/xmlrpc/scanner.h include/cxxtools/xmlrpc/service.h include/cxxtools/xmltag.h +libdata/pkgconfig/cxxtools-bin.pc +libdata/pkgconfig/cxxtools-http.pc +libdata/pkgconfig/cxxtools-json.pc +libdata/pkgconfig/cxxtools-unit.pc +libdata/pkgconfig/cxxtools-xmlrpc.pc +libdata/pkgconfig/cxxtools.pc @dirrm include/cxxtools/xmlrpc @dirrm include/cxxtools/xml @dirrm include/cxxtools/unit Modified: head/www/tntnet/Makefile ============================================================================== --- head/www/tntnet/Makefile Mon Jan 27 21:46:48 2014 (r341459) +++ head/www/tntnet/Makefile Mon Jan 27 21:50:45 2014 (r341460) @@ -2,18 +2,17 @@ # $FreeBSD$ PORTNAME= tntnet -PORTVERSION= 2.1 -PORTREVISION= 1 +PORTVERSION= 2.2.1 CATEGORIES= www devel MASTER_SITES= http://www.tntnet.org/download/ MAINTAINER= nox@FreeBSD.org COMMENT= Webapplicationserver for C++ -LIB_DEPENDS= cxxtools:${PORTSDIR}/devel/cxxtools +LIB_DEPENDS= libcxxtools.so:${PORTSDIR}/devel/cxxtools BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip -USES= iconv +USES= iconv pkgconfig pathfix USE_CSTD= gnu89 PATCH_STRIP= -p1 GNU_CONFIGURE= yes @@ -29,26 +28,10 @@ LIB_DEPENDS+= gnutls:${PORTSDIR}/securit CONFIGURE_ARGS+= --with-ssl=openssl .endif -MAN1= ecppc.1 ecppl.1 ecppll.1 tntnet-config.1 -MAN7= ecpp.7 tntnet.conf.7 tntnet.properties.7 -MAN8= tntnet.8 - USERS= www GROUPS= www -NO_STAGE= yes post-configure: ${REINPLACE_CMD} 's/^\(#define[[:space:]]*HAVE_SENDFILE[[:space:]]*\).*/\1\0/' ${WRKSRC}/framework/common/config.h -post-install: - @if [ ! -f ${ETCDIR}/tntnet.conf ]; then \ - ${CP} -p ${ETCDIR}/tntnet.conf.sample ${ETCDIR}/tntnet.conf ; \ - fi - @if [ ! -f ${ETCDIR}/mime.conf ]; then \ - ${CP} -p ${ETCDIR}/mime.conf.sample ${ETCDIR}/mime.conf ; \ - fi - @if [ ! -f ${ETCDIR}/tntnet.properties ]; then \ - ${CP} -p ${ETCDIR}/tntnet.properties.sample ${ETCDIR}/tntnet.properties ; \ - fi - .include <bsd.port.mk> Modified: head/www/tntnet/distinfo ============================================================================== --- head/www/tntnet/distinfo Mon Jan 27 21:46:48 2014 (r341459) +++ head/www/tntnet/distinfo Mon Jan 27 21:50:45 2014 (r341460) @@ -1,2 +1,2 @@ -SHA256 (tntnet-2.1.tar.gz) = 8623275f78e532a16f73a8b49b79a84fbf5eea314c22e8a7f7b8d50b3d081ab6 -SIZE (tntnet-2.1.tar.gz) = 1705181 +SHA256 (tntnet-2.2.1.tar.gz) = c83170d08ef04c5868051e1c28c74b9562fe71e9e8263828e755ad5bd3547521 +SIZE (tntnet-2.2.1.tar.gz) = 1127500 Modified: head/www/tntnet/files/patch-etc ============================================================================== --- head/www/tntnet/files/patch-etc Mon Jan 27 21:46:48 2014 (r341459) +++ head/www/tntnet/files/patch-etc Mon Jan 27 21:50:45 2014 (r341460) @@ -1,37 +1,22 @@ --- a/etc/Makefile.am +++ b/etc/Makefile.am -@@ -1,31 +1,36 @@ - nobase_dist_noinst_DATA = \ - tntnet/tntnet.conf.in \ -- init.d/tntnet.in -+ init.d/tntnet.in \ -+ tntnet/mime.conf +@@ -3,19 +3,20 @@ nobase_dist_noinst_DATA = \ + init.d/tntnet.in nobase_sysconf_DATA = \ -- tntnet/tntnet.conf \ +- tntnet/tntnet.xml \ - init.d/tntnet -+ tntnet/tntnet.conf.sample \ ++ tntnet/tntnet.xml.sample \ + tntnet/tntnet - nobase_dist_sysconf_DATA = \ -- tntnet/mime.conf -+ tntnet/mime.conf.sample - - nobase_nodist_sysconf_DATA = \ -- tntnet/tntnet.properties -+ tntnet/tntnet.properties.sample -+ -+tntnet/mime.conf.sample: tntnet/mime.conf -+ cp tntnet/mime.conf $@ - --tntnet/tntnet.conf: tntnet/tntnet.conf.in -+tntnet/tntnet.conf.sample: tntnet/tntnet.conf.in +-tntnet/tntnet.xml: tntnet/tntnet.xml.in ++tntnet/tntnet.xml.sample: tntnet/tntnet.xml.in sed -e 's,@libdir\@,@libdir@,g;' \ -e 's,@pkglibdir\@,@pkglibdir@,g;' \ -e 's,@sysconfdir\@,@sysconfdir@,g;' \ -e 's,@localstatedir\@,@localstatedir@,g;' \ -- -e 's,@datadir\@,@datadir@,g;' <tntnet/tntnet.conf.in >tntnet/tntnet.conf -+ -e 's,@datadir\@,@datadir@,g;' <tntnet/tntnet.conf.in >tntnet/tntnet.conf.sample +- -e 's,@datadir\@,@datadir@,g;' <tntnet/tntnet.xml.in >tntnet/tntnet.xml ++ -e 's,@datadir\@,@datadir@,g;' <tntnet/tntnet.xml.in >tntnet/tntnet.xml.sample -init.d/tntnet: init.d/tntnet.in +tntnet/tntnet: init.d/tntnet.in @@ -42,52 +27,31 @@ - -e 's,@datadir\@,@datadir@,g;' <init.d/tntnet.in >init.d/tntnet + -e 's/^function //;' \ + -e 's,@datadir\@,@datadir@,g;' <init.d/tntnet.in >tntnet/tntnet - --tntnet/tntnet.properties: -+tntnet/tntnet.properties.sample: - ../tntnet-config --properties tntnet | \ - sed -e 's,^#file=tntnet.log,file=@localstatedir@/log/tntnet/tntnet.log,' >$@ --- a/etc/Makefile.in +++ b/etc/Makefile.in -@@ -206,17 +206,18 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - nobase_dist_noinst_DATA = \ - tntnet/tntnet.conf.in \ -- init.d/tntnet.in -+ init.d/tntnet.in \ -+ tntnet/mime.conf +@@ -246,8 +246,8 @@ nobase_dist_noinst_DATA = \ + init.d/tntnet.in nobase_sysconf_DATA = \ -- tntnet/tntnet.conf \ +- tntnet/tntnet.xml \ - init.d/tntnet -+ tntnet/tntnet.conf.sample \ ++ tntnet/tntnet.xml.sample \ + tntnet/tntnet - nobase_dist_sysconf_DATA = \ -- tntnet/mime.conf -+ tntnet/mime.conf.sample - - nobase_nodist_sysconf_DATA = \ -- tntnet/tntnet.properties -+ tntnet/tntnet.properties.sample - all: all-am -@@ -483,21 +484,25 @@ uninstall-am: uninstall-nobase_dist_sysc +@@ -470,19 +470,20 @@ uninstall-am: uninstall-nobase_sysconfDA uninstall-nobase_sysconfDATA --tntnet/tntnet.conf: tntnet/tntnet.conf.in -+tntnet/mime.conf.sample: tntnet/mime.conf -+ cp tntnet/mime.conf $@ -+ -+tntnet/tntnet.conf.sample: tntnet/tntnet.conf.in +-tntnet/tntnet.xml: tntnet/tntnet.xml.in ++tntnet/tntnet.xml.sample: tntnet/tntnet.xml.in sed -e 's,@libdir\@,@libdir@,g;' \ -e 's,@pkglibdir\@,@pkglibdir@,g;' \ -e 's,@sysconfdir\@,@sysconfdir@,g;' \ -e 's,@localstatedir\@,@localstatedir@,g;' \ -- -e 's,@datadir\@,@datadir@,g;' <tntnet/tntnet.conf.in >tntnet/tntnet.conf -+ -e 's,@datadir\@,@datadir@,g;' <tntnet/tntnet.conf.in >tntnet/tntnet.conf.sample +- -e 's,@datadir\@,@datadir@,g;' <tntnet/tntnet.xml.in >tntnet/tntnet.xml ++ -e 's,@datadir\@,@datadir@,g;' <tntnet/tntnet.xml.in >tntnet/tntnet.xml.sample -init.d/tntnet: init.d/tntnet.in +tntnet/tntnet: init.d/tntnet.in @@ -99,29 +63,25 @@ + -e 's/^function //;' \ + -e 's,@datadir\@,@datadir@,g;' <init.d/tntnet.in >tntnet/tntnet --tntnet/tntnet.properties: -+tntnet/tntnet.properties.sample: - ../tntnet-config --properties tntnet | \ - sed -e 's,^#file=tntnet.log,file=@localstatedir@/log/tntnet/tntnet.log,' >$@ - ---- a/etc/tntnet/tntnet.conf.in -+++ b/etc/tntnet/tntnet.conf.in -@@ -2,12 +2,15 @@ - # - - PropertyFile @sysconfdir@/tntnet/tntnet.properties --Listen 0.0.0.0 80 -+#Listen 0.0.0.0 80 -+Listen 127.1 80 - #SslListen 0.0.0.0 443 @sysconfdir@/tntnet/tntnet.pem - - Daemon 1 --User www-data --Group www-data -+#User www-data -+#Group www-data -+User www -+Group www - CompPath @libdir@/tntnet - - # set some limit to prevent DoS-attacks + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +--- a/etc/tntnet/tntnet.xml.in ++++ b/etc/tntnet/tntnet.xml.in +@@ -47,14 +47,14 @@ + + <listeners> + <listener> +- <ip></ip> ++ <ip>127.0.0.1</ip> + <port>80</port> + </listener> + </listeners> + + <daemon>1</daemon> +- <user>www-data</user> +- <group>www-data</group> ++ <user>www</user> ++ <group>www</group> + <pidFile>@localstatedir@/run/tntnet.pid</pidFile> + <documentRoot>/var/www</documentRoot> + <compPath> Modified: head/www/tntnet/pkg-plist ============================================================================== --- head/www/tntnet/pkg-plist Mon Jan 27 21:46:48 2014 (r341459) +++ head/www/tntnet/pkg-plist Mon Jan 27 21:50:45 2014 (r341460) @@ -4,15 +4,9 @@ bin/ecppll bin/tntnet bin/tntnet-config %%ETCDIR%%/tntnet -@unexec if cmp -s %D/etc/tntnet/mime.conf.sample %D/etc/tntnet/mime.conf; then rm -f %D/etc/tntnet/mime.conf; fi -%%ETCDIR%%/mime.conf.sample -@exec if [ ! -f %D/etc/tntnet/mime.conf ] ; then cp -p %D/%F %B/mime.conf; fi -@unexec if cmp -s %D/etc/tntnet/tntnet.conf.sample %D/etc/tntnet/tntnet.conf; then rm -f %D/etc/tntnet/tntnet.conf; fi -%%ETCDIR%%/tntnet.conf.sample -@exec if [ ! -f %D/etc/tntnet/tntnet.conf ] ; then cp -p %D/%F %B/tntnet.conf; fi -@unexec if cmp -s %D/etc/tntnet/tntnet.properties.sample %D/etc/tntnet/tntnet.properties; then rm -f %D/etc/tntnet/tntnet.properties; fi -%%ETCDIR%%/tntnet.properties.sample -@exec if [ ! -f %D/etc/tntnet/tntnet.properties ] ; then cp -p %D/%F %B/tntnet.properties; fi +@unexec if cmp -s %D/%%ETCDIR%%/tntnet.xml.sample %D/%%ETCDIR%%/tntnet.xml; then rm -f %D/%%ETCDIR%%/tntnet.xml; fi +%%ETCDIR%%/tntnet.xml.sample +@exec if [ ! -f %D/%%ETCDIR%%/tntnet.xml ] ; then cp -p %D/%F %B/tntnet.xml; fi include/tnt/applicationunlocker.h include/tnt/backgroundworker.h include/tnt/cmd.h @@ -69,14 +63,10 @@ include/tnt/worker.h include/tnt/zdata.h lib/libtntnet.la lib/libtntnet.so -lib/libtntnet.so.10 -lib/libtntnet_cgi.a -lib/libtntnet_cgi.la -lib/libtntnet_cgi.so -lib/libtntnet_cgi.so.10 +lib/libtntnet.so.12 lib/libtntnet_sdk.la lib/libtntnet_sdk.so -lib/libtntnet_sdk.so.10 +lib/libtntnet_sdk.so.12 lib/tntnet/alldemos.la lib/tntnet/alldemos.so lib/tntnet/alldemos.so.0 @@ -134,10 +124,20 @@ lib/tntnet/strings.so lib/tntnet/strings.so.0 lib/tntnet/tntnet.la lib/tntnet/tntnet.so -lib/tntnet/tntnet.so.10 +lib/tntnet/tntnet.so.12 lib/tntnet/upload.la lib/tntnet/upload.so lib/tntnet/upload.so.0 +man/man1/ecppc.1.gz +man/man1/ecppl.1.gz +man/man1/ecppll.1.gz +man/man1/tntnet-config.1.gz +man/man7/ecpp.7.gz +man/man7/tntnet.properties.7.gz +man/man7/tntnet.xml.7.gz +man/man8/tntnet.8.gz +%%DATADIR%%/tntnet-conf2xml.pl +@dirrm %%DATADIR%% @dirrm lib/tntnet @dirrm include/tnt -@dirrm %%ETCDIR%% +@dirrmtry %%ETCDIR%% Modified: head/www/vdr-plugin-live/Makefile ============================================================================== --- head/www/vdr-plugin-live/Makefile Mon Jan 27 21:46:48 2014 (r341459) +++ head/www/vdr-plugin-live/Makefile Mon Jan 27 21:50:45 2014 (r341460) @@ -2,24 +2,22 @@ # $FreeBSD$ PORTNAME= vdr-plugin-live -PORTVERSION= 0.2.0s20120325 -PORTREVISION= 2 +PORTVERSION= 0.3.0 CATEGORIES= www multimedia MASTER_SITES= http://live.vdr-developer.org/downloads/:release \ LOCAL/nox/:snapshot DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:snapshot +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:release MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - live web plugin -LIB_DEPENDS+= tntnet:${PORTSDIR}/www/tntnet \ - pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= libtntnet.so:${PORTSDIR}/www/tntnet \ + libpcre.so:${PORTSDIR}/devel/pcre -USE_BZIP2= yes PATCH_STRIP= -p1 PORTDOCS= COPYING README HISTORY -WRKSRC= ${WRKDIR}/vdr-plugin-${PLUGIN} +WRKSRC= ${WRKDIR}/${PLUGIN}-${PORTVERSION} VDR_PLUGIN_MAKEFILES= ${WRKSRC}/httpd/Makefile ${WRKSRC}/pages/Makefile MAKE_ARGS+= INCLUDES="-I$(LOCALBASE)/include -I${WRKSRC}" MAKE_ARGS+= PREFIX="${PREFIX}" @@ -46,7 +44,7 @@ post-install: post-install-pluginlocales (cd ${WRKSRC}/${PLUGIN} && \ ${COPYTREE_SHARE} \* ${PREFIX}/etc/vdr/plugins/${PLUGIN} ) ${CHOWN} -R ${VDR_USER}:${VDR_GROUP} ${PREFIX}/etc/vdr/plugins/${PLUGIN} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) .endif Modified: head/www/vdr-plugin-live/distinfo ============================================================================== --- head/www/vdr-plugin-live/distinfo Mon Jan 27 21:46:48 2014 (r341459) +++ head/www/vdr-plugin-live/distinfo Mon Jan 27 21:50:45 2014 (r341460) @@ -1,2 +1,2 @@ -SHA256 (vdr/vdr-live-0.2.0s20120325.tar.bz2) = 1c6d226a87930832cd836635214e1fecc6527ddbfd67d5d0ec1c974b12da2733 -SIZE (vdr/vdr-live-0.2.0s20120325.tar.bz2) = 2010190 +SHA256 (vdr/vdr-live-0.3.0.tar.gz) = c200042e51393c247be97e7f4667a1f3f06319d5c8e538adca32fdfac8d178da +SIZE (vdr/vdr-live-0.3.0.tar.gz) = 786859 Modified: head/www/vdr-plugin-live/files/gen_version_suffix.h ============================================================================== --- head/www/vdr-plugin-live/files/gen_version_suffix.h Mon Jan 27 21:46:48 2014 (r341459) +++ head/www/vdr-plugin-live/files/gen_version_suffix.h Mon Jan 27 21:50:45 2014 (r341460) @@ -3,5 +3,5 @@ */ #ifndef GEN_VERSION_SUFFIX_H #define GEN_VERSION_SUFFIX_H -#define VERSION_SUFFIX "_git_master_94a0a21_20120325164212+0200" +#define VERSION_SUFFIX "_git_release/0.3.x+0200" #endif Added: head/www/vdr-plugin-live/files/patch-042724e30d5690ab67a6c04aea48a16b9a3b085b ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/vdr-plugin-live/files/patch-042724e30d5690ab67a6c04aea48a16b9a3b085b Mon Jan 27 21:50:45 2014 (r341460) @@ -0,0 +1,292 @@ +From 042724e30d5690ab67a6c04aea48a16b9a3b085b Mon Sep 17 00:00:00 2001 +From: Dieter Hametner +Date: Thu, 02 May 2013 23:37:41 +0000 +Subject: Make LIVE compile and work with Tntnet and cxxtools version 2.2. + +Thanks to Tommi Mäkitalo for his help on resolving the issues. +This problem was reported by Martin Gansser and by the user 'varas' in +the bugtracker as bug #1351. This commit fixes that bug. +--- +diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp +index 51018bb..80f145b 100644 +--- a/pages/recordings.ecpp ++++ b/pages/recordings.ecpp +@@ -205,7 +205,11 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) { + <& rec_item_dir name=(recItem->Name()) level=(level) &> + <%cpp> + #if TNT_HAS_QUERYPARAMS ++#if TNT_QUERYPARAMS_NO_BOOL ++ tnt::QueryParams recItemParams(qparam); ++#else + tnt::QueryParams recItemParams(qparam, false); ++#endif + #else + cxxtools::QueryParams recItemParams(qparam, false); + #endif +diff --git a/tntconfig.cpp b/tntconfig.cpp +index 3a1fd14..3325776 100644 +--- a/tntconfig.cpp ++++ b/tntconfig.cpp +@@ -3,7 +3,13 @@ + #include <fstream> + #include <sstream> + #include <stdexcept> ++#include "tntfeatures.h" ++#if TNT_LOG_SERINFO ++#include <cxxtools/log.h> ++#include <cxxtools/xml/xmldeserializer.h> ++#else + #include <cxxtools/loginit.h> ++#endif + #include <tnt/sessionscope.h> + #include <tnt/httpreply.h> + #include <vdr/config.h> +@@ -181,19 +187,67 @@ namespace vdrlive { + #endif + + #if TNT_CONFIG_INTERNAL ++ namespace { ++ std::string GetResourcePath() ++ { ++#if APIVERSNUM > 10729 ++ string resourceDir(Plugin::GetResourceDirectory()); ++ return resourceDir; ++#else ++ string configDir(Plugin::GetConfigDirectory()); ++ return configDir; ++#endif ++ } ++ ++ void MapUrl(tnt::Tntnet & app, const char *rule, const char * component, std::string const & instPath, const char * pathInfo, const char * mime_type) ++ { ++#if TNT_MAPURL_NAMED_ARGS ++ tnt::Mapping::args_type argMap; ++ argMap.insert(std::make_pair("mime-type", mime_type)); ++#endif ++ app.mapUrl(rule, component) ++ .setPathInfo(instPath + pathInfo) ++#if TNT_MAPURL_NAMED_ARGS ++ .setArgs(argMap); ++#else ++ .pushArg(mime_type); ++#endif ++ } ++ } ++ + void TntConfig::Configure(tnt::Tntnet& app) const + { + string const configDir(Plugin::GetConfigDirectory()); +-#if APIVERSNUM > 10729 +- string const resourceDir(Plugin::GetResourceDirectory()); +-#endif + ++#if TNT_LOG_SERINFO ++ cxxtools::SerializationInfo si; ++ std::istringstream logXmlConf( ++ "<logging>\n" ++ " <rootlogger>" + LiveSetup().GetTntnetLogLevel() + "</rootlogger>\n" ++ " <loggers>\n" ++ " <logger>\n" ++ " <category>cxxtools</category>\n" ++ " <level>" + LiveSetup().GetTntnetLogLevel() + "</level>\n" ++ " </logger>\n" ++ " <logger>\n" ++ " <category>tntnet</category>\n" ++ " <level>" + LiveSetup().GetTntnetLogLevel() + "</level>\n" ++ " </logger>\n" ++ " </loggers>\n" ++ "</logging>\n" ++ ); ++ cxxtools::xml::XmlDeserializer d(logXmlConf); ++ d.deserialize(si); ++ log_init(si); ++#else + std::istringstream logConf( + "rootLogger=" + LiveSetup().GetTntnetLogLevel() + "\n" + "logger.tntnet=" + LiveSetup().GetTntnetLogLevel() + "\n" + "logger.cxxtools=" + LiveSetup().GetTntnetLogLevel() + "\n" + ); ++ + log_init(logConf); ++#endif + + // +++ CAUTION +++ CAUTION +++ CAUTION +++ CAUTION +++ CAUTION +++ + // ------------------------------------------------------------------------ +@@ -229,13 +283,12 @@ namespace vdrlive { + + // the following selects the theme specific 'theme.css' file + // inserted by 'tadi' -- verified with above, but not counterchecked yet! +- app.mapUrl("^/themes/([^/]*)/css.*/(.+\\.css)", "content") +-#if APIVERSNUM > 10729 +- .setPathInfo(resourceDir + "/themes/$1/css/$2") +-#else +- .setPathInfo(configDir + "/themes/$1/css/$2") +-#endif +- .pushArg("text/css"); ++ MapUrl(app, ++ "^/themes/([^/]*)/css.*/(.+\\.css)", ++ "content", ++ GetResourcePath(), ++ "/themes/$1/css/$2", ++ "text/css"); + + // the following rules provide a search scheme for images. The first + // rule where a image is found, terminates the search. +@@ -243,79 +296,82 @@ namespace vdrlive { + // 2. /img/<imgname>.<ext> + // deprecated: 3. <imgname>.<ext> (builtin images) + // inserted by 'tadi' -- verified with above, but not counterchecked yet! +- app.mapUrl("^/themes/([^/]*)/img.*/(.+)\\.(.+)", "content") +-#if APIVERSNUM > 10729 +- .setPathInfo(resourceDir + "/themes/$1/img/$2.$3") +-#else +- .setPathInfo(configDir + "/themes/$1/img/$2.$3") +-#endif +- .pushArg("image/$3"); +- app.mapUrl("^/themes/([^/]*)/img.*/(.+)\\.(.+)", "content") +-#if APIVERSNUM > 10729 +- .setPathInfo(resourceDir + "/img/$2.$3") +-#else +- .setPathInfo(configDir + "/img/$2.$3") +-#endif +- .pushArg("image/$3"); ++ MapUrl(app, ++ "^/themes/([^/]*)/img.*/(.+)\\.(.+)", ++ "content", ++ GetResourcePath(), ++ "/themes/$1/img/$2.$3", ++ "image/$3"); ++ ++ MapUrl(app, ++ "^/themes/([^/]*)/img.*/(.+)\\.(.+)", ++ "content", ++ GetResourcePath(), ++ "/img/$2.$3", ++ "image/$3"); + // deprecated: file << "MapUrl ^/themes/([^/]*)/img.*/(.+)\\.(.+) $2@" << endl; + + // Epg images + string const epgImgPath(LiveSetup().GetEpgImageDir()); + if (!epgImgPath.empty()) { + // inserted by 'tadi' -- verified with above, but not counterchecked yet! +- app.mapUrl("^/epgimages/([^/]*)\\.([^./]+)", "content") +- .setPathInfo(epgImgPath + "/$1.$2") +- .pushArg("image/$2"); ++ MapUrl(app, ++ "^/epgimages/([^/]*)\\.([^./]+)", ++ "content", ++ epgImgPath, ++ "/$1.$2", ++ "image/$2"); + } + + // select additional (not build in) javascript. + // WARNING: no path components with '.' in the name are allowed. Only + // the basename may contain dots and must end with '.js' + // inserted by 'tadi' -- verified with above, but not counterchecked yet! +- app.mapUrl("^/js(/[^.]*)([^/]*\\.js)", "content") +-#if APIVERSNUM > 10729 +- .setPathInfo(resourceDir + "/js$1$2") +-#else +- .setPathInfo(configDir + "/js$1$2") +-#endif +- .pushArg("text/javascript"); ++ MapUrl(app, ++ "^/js(/[^.]*)([^/]*\\.js)", ++ "content", ++ GetResourcePath(), ++ "/js$1$2", ++ "text/javascript"); + + // map to 'css/basename(uri)' + // inserted by 'tadi' -- verified with above, but not counterchecked yet! +- app.mapUrl("^/css.*/(.+)", "content") +-#if APIVERSNUM > 10729 +- .setPathInfo(resourceDir + "/css/$1") +-#else +- .setPathInfo(configDir + "/css/$1") +-#endif +- .pushArg("text/css"); ++ MapUrl(app, ++ "^/css.*/(.+)", ++ "content", ++ GetResourcePath(), ++ "/css/$1", ++ "text/css"); + + // map to 'img/basename(uri)' + // inserted by 'tadi' -- verified with above, but not counterchecked yet! +- app.mapUrl("^/img.*/(.+)\\.([^.]+)", "content") +-#if APIVERSNUM > 10729 +- .setPathInfo(resourceDir + "/img/$1.$2") +-#else +- .setPathInfo(configDir + "/img/$1.$2") +-#endif +- .pushArg("image/$2"); ++ MapUrl(app, ++ "^/img.*/(.+)\\.([^.]+)", ++ "content", ++ GetResourcePath(), ++ "/img/$1.$2", ++ "image/$2"); + + // Map favicon.ico into img directory +- app.mapUrl("^/favicon.ico$", "content") +-#if APIVERSNUM > 10729 +- .setPathInfo(resourceDir + "/img/favicon.ico") +-#else +- .setPathInfo(configDir + "/img/favicon.ico") +-#endif +- .pushArg("image/x-icon"); ++ MapUrl(app, ++ "^/favicon.ico$", ++ "content", ++ GetResourcePath(), ++ "/img/favicon.ico", ++ "image/x-icon"); + + // takes first path components without 'extension' when it does not + // contain '.' + // modified by 'tadi' -- verified with above, but not counterchecked yet! + app.mapUrl("^/([^./]+)(.*)?", "$1"); + ++#if TNT_GLOBAL_TNTCONFIG ++ tnt::TntConfig::it().sessionTimeout = 86400; ++ tnt::TntConfig::it().defaultContentType = string("text/html; charset=") + LiveI18n().CharacterEncoding(); ++#else + tnt::Sessionscope::setDefaultTimeout(86400); + tnt::HttpReply::setDefaultContentType(string("text/html; charset=") + LiveI18n().CharacterEncoding()); ++#endif + + Setup::IpList const& ips = LiveSetup().GetServerIps(); + int port = LiveSetup().GetServerPort(); +diff --git a/tntfeatures.h b/tntfeatures.h +index 6de1f88..76d3757 100644 +--- a/tntfeatures.h ++++ b/tntfeatures.h +@@ -17,6 +17,9 @@ + // Query params are now in tntnet and not in cxxtools + #define TNT_HAS_QUERYPARAMS (TNTVERSION >= 16060) + ++// Query params without boolean parameter ++#define TNT_QUERYPARAMS_NO_BOOL (TNTVERSION >= 22000) ++ + // One can request the host part of the request url + #define TNT_HAS_GETHOST (TNTVERSION >= 16060) + +@@ -26,4 +29,13 @@ + // version of TNTNET that binds ipv6 addresses with IPV6_V6ONLY flag set to true + #define TNT_IPV6_V6ONLY (CXXTOOLVER >= 21000) + ++// version of TNTNET with properties deserializer for logger configuration args. ++#define TNT_LOG_SERINFO (CXXTOOLVER >= 22000) ++ ++// version of TNTNET wich expects name, value mappings for Url-Mapper arguments. ++#define TNT_MAPURL_NAMED_ARGS (TNTVERSION >= 22000) ++ ++// version of TNTNET where configuration is global ++#define TNT_GLOBAL_TNTCONFIG (TNTVERSION >= 22000) ++ + #endif // VDR_LIVE_TNTFEATURES_H +-- +cgit v0.9.0.2-40-g7c79 Added: head/www/vdr-plugin-live/files/patch-1a1f2e0754b02c5597debbe82f27b759f23cd6fe ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/vdr-plugin-live/files/patch-1a1f2e0754b02c5597debbe82f27b759f23cd6fe Mon Jan 27 21:50:45 2014 (r341460) @@ -0,0 +1,66 @@ +From 1a1f2e0754b02c5597debbe82f27b759f23cd6fe Mon Sep 17 00:00:00 2001 +From: Dieter Hametner +Date: Fri, 12 Apr 2013 23:02:02 +0000 +Subject: Fixed status toggle of timers, via the edit_timer dialog. + +This bug was reported by user 'mhanu' in bug #1332. +--- +diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp +index 299f35a..0fe253c 100644 +--- a/pages/edit_timer.ecpp ++++ b/pages/edit_timer.ecpp +@@ -26,7 +26,7 @@ using namespace vdrlive; + string async; + // form parameters + tChannelID channel; +- bool active = true; ++ int active = 1; + string title = ""; + string date = ""; + bool wday_mon = false; +@@ -44,7 +44,7 @@ using namespace vdrlive; + int priority = 0; + int lifetime = 0; + string aux = ""; +- string directory = ""; ++ string directory = ""; + </%args> + <%session scope="global"> + bool logged_in(false); +@@ -141,7 +141,7 @@ cTimer* timer; + title = title.substr(directory.size()+1); + } + } +- // TRANSLATORS: only adjust the ordering and separators, don't translate the m's, d's and y's ++ // TRANSLATORS: only adjust the ordering and separators, don't translate the m's, d's and y's + date = timer->Day() ? DatePickerToC(timer->Day(), tr("mm/dd/yyyy")) : ""; + wday_mon = timer->WeekDays() & 0x01; + wday_tue = timer->WeekDays() & 0x02; +@@ -226,7 +226,7 @@ cTimer* timer; + for (RecordingDirs::iterator rdir = recordingdirs.begin(); rdir != recordingdirs.end(); ++rdir) { + std::string dir = *rdir; + </%cpp> +- <option value="<$ dir $>" ++ <option value="<$ dir $>" + % if (*rdir == directory) { + selected="selected" + % } +diff --git a/pages/timers.ecpp b/pages/timers.ecpp +index 2a9ee4c..66b5235 100644 +--- a/pages/timers.ecpp ++++ b/pages/timers.ecpp +@@ -49,10 +49,12 @@ static const size_t maximumDescriptionLength = 300; + throw HtmlError( tr("Sorry, no permission. Please contact your administrator!") ); + LiveTimerManager().DelTimer(timer); + timerNotifier.SetTimerModification(); ++ return reply.redirect("timers.html"); + } + if (action == "toggle") { + LiveTimerManager().ToggleTimerActive(timer); + timerNotifier.SetTimerModification(); ++ return reply.redirect("timers.html"); + } + } + +-- +cgit v0.9.0.2-40-g7c79 Added: head/www/vdr-plugin-live/files/patch-69f84f95fa875c6f562294b1a6a1ea6f584d3f6c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/vdr-plugin-live/files/patch-69f84f95fa875c6f562294b1a6a1ea6f584d3f6c Mon Jan 27 21:50:45 2014 (r341460) @@ -0,0 +1,27 @@ +From 69f84f95fa875c6f562294b1a6a1ea6f584d3f6c Mon Sep 17 00:00:00 2001 +From: Dieter Hametner +Date: Sat, 04 May 2013 20:27:09 +0000 +Subject: With tntnet v2.2 use also the request.getArg(<name>) function. + +In the previous commit support for tntnet 2.2 was added. The URL +mapping changed in that version and allows now named arguments. This +change makes uses of this feature now. +--- +diff --git a/pages/content.ecpp b/pages/content.ecpp +index 27d827c..cde092f 100644 +--- a/pages/content.ecpp ++++ b/pages/content.ecpp +@@ -17,7 +17,11 @@ bool logged_in(false); + + string mime("image/png"); + if (request.getArgsCount() > 0) { ++#if TNT_MAPURL_NAMED_ARGS ++ mime = request.getArg("mime-type"); ++#else + mime = request.getArg(0); ++#endif + // dsyslog("vdrlive::content found mime arg (%s)", mime.c_str()); + } + reply.setContentType(mime); +-- +cgit v0.9.0.2-40-g7c79 Modified: head/www/vdr-plugin-live/files/patch-live.cpp ============================================================================== --- head/www/vdr-plugin-live/files/patch-live.cpp Mon Jan 27 21:46:48 2014 (r341459) +++ head/www/vdr-plugin-live/files/patch-live.cpp Mon Jan 27 21:50:45 2014 (r341460) @@ -1,15 +1,22 @@ --- a/live.cpp +++ b/live.cpp -@@ -42,7 +42,13 @@ bool Plugin::ProcessArgs(int argc, char +@@ -46,10 +46,19 @@ bool Plugin::ProcessArgs(int argc, char bool Plugin::Start(void) { +- m_configDirectory = canonicalize_file_name(cPlugin::ConfigDirectory( PLUGIN_NAME_I18N )); +#ifdef __FreeBSD__ + char buf[PATH_MAX]; + + m_configDirectory = realpath(cPlugin::ConfigDirectory( PLUGIN_NAME_I18N ), buf); ++#if APIVERSNUM > 10729 ++ m_resourceDirectory = realpath(cPlugin::ResourceDirectory( PLUGIN_NAME_I18N )); ++#endif +#else - m_configDirectory = canonicalize_file_name(cPlugin::ConfigDirectory( PLUGIN_NAME_I18N )); ++ m_configDirectory = canonicalize_file_name(cPlugin::ConfigDirectory( PLUGIN_NAME_I18N )); + #if APIVERSNUM > 10729 + m_resourceDirectory = canonicalize_file_name(cPlugin::ResourceDirectory( PLUGIN_NAME_I18N )); + #endif +#endif #if VDRVERSNUM < 10507 Modified: head/www/vdr-plugin-live/pkg-plist ============================================================================== --- head/www/vdr-plugin-live/pkg-plist Mon Jan 27 21:46:48 2014 (r341459) +++ head/www/vdr-plugin-live/pkg-plist Mon Jan 27 21:50:45 2014 (r341460) @@ -43,8 +43,8 @@ etc/vdr/plugins/live/img/logo_login.png etc/vdr/plugins/live/img/menu_line_bg.png etc/vdr/plugins/live/img/minus.png etc/vdr/plugins/live/img/movie.png -etc/vdr/plugins/live/img/on_dvd.png etc/vdr/plugins/live/img/msgbar_line_bg.png +etc/vdr/plugins/live/img/on_dvd.png etc/vdr/plugins/live/img/one_downarrow.png etc/vdr/plugins/live/img/one_uparrow.png etc/vdr/plugins/live/img/pause.png @@ -150,45 +150,45 @@ etc/vdr/plugins/live/themes/veltliner/im etc/vdr/plugins/live/themes/veltliner/img/logo_login.png etc/vdr/plugins/live/themes/veltliner/img/menu_line_bg.png etc/vdr/plugins/live/themes/veltliner/img/zap.png +@dirrm etc/vdr/plugins/live/css +@dirrm etc/vdr/plugins/live/img +@dirrm etc/vdr/plugins/live/js/live +@dirrm etc/vdr/plugins/live/js/mootools +@dirrm etc/vdr/plugins/live/js @dirrm etc/vdr/plugins/live/themes/marine/css @dirrm etc/vdr/plugins/live/themes/marine/img @dirrm etc/vdr/plugins/live/themes/marine +@dirrm etc/vdr/plugins/live/themes/veltliner/css +@dirrm etc/vdr/plugins/live/themes/veltliner/img +@dirrm etc/vdr/plugins/live/themes/veltliner @dirrm etc/vdr/plugins/live/themes/orange-blue/css @dirrm etc/vdr/plugins/live/themes/orange-blue/img @dirrm etc/vdr/plugins/live/themes/orange-blue @dirrm etc/vdr/plugins/live/themes/redwine/css @dirrm etc/vdr/plugins/live/themes/redwine/img @dirrm etc/vdr/plugins/live/themes/redwine -@dirrm etc/vdr/plugins/live/themes/veltliner/css -@dirrm etc/vdr/plugins/live/themes/veltliner/img -@dirrm etc/vdr/plugins/live/themes/veltliner @dirrm etc/vdr/plugins/live/themes -@dirrm etc/vdr/plugins/live/js/mootools -@dirrm etc/vdr/plugins/live/js/live -@dirrm etc/vdr/plugins/live/js -@dirrm etc/vdr/plugins/live/img -@dirrm etc/vdr/plugins/live/css @dirrmtry etc/vdr/plugins/live -%%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/cs_CZ/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/da_DK/LC_MESSAGES/vdr-live.mo %%NLS%%share/locale/de_DE/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/sl_SI/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/ru_RU/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/hr_HR/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/nl_NL/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/sk_SK/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/fr_FR/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/lt_LT/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/tr_TR/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/sv_SE/LC_MESSAGES/vdr-live.mo %%NLS%%share/locale/el_GR/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/nn_NO/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/it_IT/LC_MESSAGES/vdr-live.mo %%NLS%%share/locale/es_ES/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/et_EE/LC_MESSAGES/vdr-live.mo %%NLS%%share/locale/fi_FI/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/fr_FR/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/hr_HR/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/da_DK/LC_MESSAGES/vdr-live.mo %%NLS%%share/locale/hu_HU/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/it_IT/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/lt_LT/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/nl_NL/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/nn_NO/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/pl_PL/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/pt_PT/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/cs_CZ/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/ca_ES/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/et_EE/LC_MESSAGES/vdr-live.mo %%NLS%%share/locale/ro_RO/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/ru_RU/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/sk_SK/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/sl_SI/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/sv_SE/LC_MESSAGES/vdr-live.mo -%%NLS%%share/locale/tr_TR/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/pt_PT/LC_MESSAGES/vdr-live.mo +%%NLS%%share/locale/pl_PL/LC_MESSAGES/vdr-live.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401272150.s0RLoj5M021866>