MythTV: Update port group to version 32

PR:	263311

audio/mythplugin-mythmusic/Makefile

@@ -1,27 +1,27 @@
 PORTNAME=	mythmusic
 DISTVERSIONPREFIX=	v
-DISTVERSION=	31.0
+DISTVERSION=	32.0-60
+DISTVERSIONSUFFIX=	-ge5c974e402
 CATEGORIES=	audio
 PKGNAMEPREFIX=	mythplugin-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER?=	ahicks@p-o.co.uk
 COMMENT=	Music playing plugin for MythTV
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libmp3lame.so:audio/lame \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
-		libmyth-31.so:multimedia/mythtv
+		libmyth-32.so:multimedia/mythtv
 
 USES=		gmake qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
 GH_PROJECT=	mythtv
 USE_LDCONFIG=	yes
-USE_QT=		buildtools_build core gui qmake_build sql xml
+USE_QT=		buildtools_build core gui qmake_build sql widgets xml
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" \

audio/mythplugin-mythmusic/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1607876879
-SHA256 (MythTV-mythtv-v31.0_GH0.tar.gz) = 907d1747950ec6ef1ec965069c75500b4538b781333f60e16d62d519b221a86d
-SIZE (MythTV-mythtv-v31.0_GH0.tar.gz) = 102552136
+TIMESTAMP = 1662209393
+SHA256 (MythTV-mythtv-v32.0-60-ge5c974e402_GH0.tar.gz) = fe4f06933a855969f05766946372e19af6527cdc47a58b4c36e426d737b4412e
+SIZE (MythTV-mythtv-v32.0-60-ge5c974e402_GH0.tar.gz) = 115969769

audio/mythplugin-mythmusic/files/patch-configure

@@ -1,24 +0,0 @@
---- configure.orig	2018-02-01 11:15:37 UTC
-+++ configure
-@@ -227,6 +227,10 @@ add_cxxflags(){
-     append ECXXFLAGS "$@"
- }
- 
-+add_cppflags(){
-+    append CPPFLAGS "$@"
-+}
-+
- check_cxx(){
-     log check_cxx "$@"
-     cat > $TMPCXX
-@@ -582,6 +586,10 @@ CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=}
- OPENGLV=$(cat mythconfig.mak | grep -e "^CONFIG_OPENGL_VIDEO=yes")
- OPENGLES=$(cat mythconfig.mak | grep -e "^HAVE_GLES2_GL2_H=yes")
- 
-+add_cppflags "-I${prefix}/include"
-+add_cxxflags "-I${prefix}/include"
-+add_ldflags "-L${prefix}/lib"
-+
- EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
- EXTRALIBS=${EXTRALIBS#EXTRALIBS=}
- 

audio/mythplugin-mythmusic/files/patch-settings.pro

@@ -1,12 +0,0 @@
-Prevent linking to unneccessary libraries
-
---- settings.pro.orig	2018-02-25 02:52:28 UTC
-+++ settings.pro
-@@ -34,6 +34,7 @@ QMAKE_CXXFLAGS += $$ARCHFLAGS
- QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
- QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC
- QMAKE_CXXFLAGS += $$ECXXFLAGS
-+QMAKE_LFLAGS +=	-Wl,--as-needed
- 
- profile:!win32:!macx:CONFIG += debug
- 

multimedia/mythtv/Makefile

@@ -1,7 +1,7 @@
 PORTNAME=	mythtv
 DISTVERSIONPREFIX=	v
-DISTVERSION=	31.0
-PORTREVISION=	8
+DISTVERSION=	32.0-60
+DISTVERSIONSUFFIX=	-ge5c974e402
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 
@@ -9,7 +9,6 @@ MAINTAINER?=	ahicks@p-o.co.uk
 COMMENT?=	Homebrew PVR project
 
 LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 .if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
@@ -31,19 +30,27 @@ LIB_DEPENDS=	liblzo2.so:archivers/lzo2 \
 		libxml2.so:textproc/libxml2 \
 		libdav1d.so:multimedia/dav1d \
 		libaom.so:multimedia/aom \
-		libdrm.so:graphics/libdrm
+		libdrm.so:graphics/libdrm \
+		libpulse.so:audio/pulseaudio \
+		libjack.so:audio/jack \
+		libSoundTouch.so:audio/soundtouch \
+		libasound.so:audio/alsa-lib \
+		libsndio.so:audio/sndio \
+		libgnutls.so:security/gnutls \
+		libzip.so:archivers/libzip \
+		libexpat.so:textproc/expat2
 BUILD_DEPENDS=	yasm:devel/yasm \
 		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 
-USES=		compiler:c++11-lang gmake gl iconv libtool pkgconfig pathfix \
+USES=		compiler:c++17-lang gmake gl iconv libtool pkgconfig pathfix \
 		qmake:no_env qt:5 ssl xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
 USE_GL=		gl
 USE_LDCONFIG=	yes
 USE_QT=		buildtools_build core dbus gui imageformats_run \
-		linguist_build network opengl qmake_build script sql \
-		sql-mysql_run webkit widgets xml
+		linguist_build multimedia network opengl qmake_build script \
+		sql sql-mysql_run webkit widgets xml
 USE_XORG=	x11 xv xrandr xxf86vm xinerama xext xcb
 
 HAS_CONFIGURE=	yes
@@ -70,7 +77,6 @@ DESKTOP_ENTRIES="MythTV Frontend" "MythTV is a homebrew PVR project" "" \
 CONFLICTS_INSTALL=	mythtv
 
 CONFIGURE_ARGS+=--disable-dvb --disable-firewire --disable-hdhomerun \
-		--disable-hdpvr --disable-ivtv \
 		--without-bindings=perl,python
 
 EXTRA_PATCHES=	${.CURDIR}/../../multimedia/mythtv/files/extrapatch-programs_programs.pro
@@ -89,12 +95,11 @@ SHEBANG_FILES=	programs/scripts/database/*.pl \
 		programs/scripts/internetcontent/*.pl \
 		programs/scripts/internetcontent/nv_python_libs/*.py \
 		programs/scripts/hardwareprofile/*.py \
-		programs/scripts/metadata/Television/ttvdb.py \
 		programs/scripts/metadata/Movie/tmdb3.py \
 		programs/scripts/metadata/Music/mbutils.py
 
 CONFIGURE_ARGS+=--dvb-path="${WRKSRC}/media_tree/include/uapi" \
-		--enable-ivtv --enable-v4l2
+		--enable-v4l2
 
 USERS=		mythtv
 GROUPS=		mythtv
@@ -134,6 +139,7 @@ BINDINGS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.2.2:databases/py-mys
 			p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \
 			p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined
 BINDINGS_CONFIGURE_ON=	--python="${PYTHON_CMD}" --with-bindings=perl,python
+BINDINGS_CONFIGURE_OFF=	--without-bindings=perl,python
 
 HDHOMERUN_DESC=		Native support for HDHomeRun network tuners
 HDHOMERUN_LIB_DEPENDS=	libhdhomerun.so:multimedia/libhdhomerun
@@ -223,6 +229,12 @@ post-patch:
 		${LINUXDVB}/frontend.h
 .endif
 
+pre-install:
+.if !defined(SLAVEPORT)
+	@${REINPLACE_CMD} -e '/^CPPFLAGS=/ s#$$# -I${LOCALBASE}/include#' \
+		${WRKSRC}/libs/libmythbase/mythconfig.mak
+.endif
+
 post-install:
 .if !defined(SLAVEPORT)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mythtv/database
@@ -232,10 +244,6 @@ post-install:
 		${GREP} -q 'x-executable; charset=binary'" \; -print | ${XARGS} ${STRIP_CMD}
 	@${FIND} ${STAGEDIR}${PREFIX}/lib -type f -name lib\*.so.\* | ${XARGS} ${STRIP_CMD}
 
-post-install-BINDINGS-on:
-	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/MythTV/ttvdb/XSLT/
-	${INSTALL_DATA} ${WRKSRC}/bindings/python/MythTV/ttvdb/XSLT/*.xsl ${STAGEDIR}${PYTHON_SITELIBDIR}/MythTV/ttvdb/XSLT/
-
 # Apply additional substitutions to pkg-plist generated by the 'makeplist' target
 create-plist: stage
 	@(cd ${.CURDIR} && ${MAKE} makeplist > pkg-plist && \

multimedia/mythtv/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1599843409
-SHA256 (MythTV-mythtv-v31.0_GH0.tar.gz) = 907d1747950ec6ef1ec965069c75500b4538b781333f60e16d62d519b221a86d
-SIZE (MythTV-mythtv-v31.0_GH0.tar.gz) = 102552136
+TIMESTAMP = 1660634284
+SHA256 (MythTV-mythtv-v32.0-60-ge5c974e402_GH0.tar.gz) = fe4f06933a855969f05766946372e19af6527cdc47a58b4c36e426d737b4412e
+SIZE (MythTV-mythtv-v32.0-60-ge5c974e402_GH0.tar.gz) = 115969769

multimedia/mythtv/files/extrapatch-programs_programs.pro

@@ -2,8 +2,8 @@ Disable backend components for multimedia/mythtv-frontend
 
 --- programs/programs.pro.orig	2018-01-11 12:39:22 UTC
 +++ programs/programs.pro
-@@ -15,13 +15,4 @@ using_frontend {
-     !mingw:!win32-msvc*: SUBDIRS += mythtranscode/external/replex
+@@ -19,21 +19,6 @@
+     unix:QMAKE_EXTRA_TARGETS += mythfrontend-test
  }
  
 -using_backend {
@@ -13,6 +13,12 @@ Disable backend components for multimedia/mythtv-frontend
 -    !win32-msvc*:SUBDIRS += scripts
 -    !mingw:!win32-msvc*: SUBDIRS += mythfilerecorder
 -    !mingw:!win32-msvc*: SUBDIRS += mythexternrecorder
+-
+-    # unit tests mythbackend
+-    mythbackend-test.depends = sub-mythbackend
+-    mythbackend-test.target = buildtestmythbackend
+-    mythbackend-test.commands = cd mythbackend/test && $(QMAKE) && $(MAKE)
+-    unix:QMAKE_EXTRA_TARGETS += mythbackend-test
 -}
 -
  using_mythtranscode: SUBDIRS += mythtranscode

multimedia/mythtv/files/patch-bindings-python-setup.py

@@ -1,10 +0,0 @@
---- bindings/python/setup.py.orig	2020-03-23 14:32:28 UTC
-+++ bindings/python/setup.py
-@@ -86,7 +86,6 @@ setup(
-                   'MythTV/wikiscripts', 'MythTV/utility',
- 				  'MythTV/services_api'],
-         package_dir={'MythTV/tmdb3':'./tmdb3/tmdb3'},
--        data_files=[('MythTV/ttvdb/XSLT', glob.glob('MythTV/ttvdb/XSLT/*'))],
-         url=['http://www.mythtv.org/'],
-         scripts=SCRIPTS,
-         requires=['MySQLdb','lxml'],

multimedia/mythtv/files/patch-dav1d-1.0

@@ -1,111 +0,0 @@
-https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/5e61fce832f7
-
-libavcodec/libdav1d.c:137:7: error: no member named 'n_tile_threads' in 'struct Dav1dSettings'
-    s.n_tile_threads = dav1d->tile_threads
-    ~ ^
-libavcodec/libdav1d.c:139:52: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS'
-                     : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS);
-                                                   ^
-libavcodec/libdav1d.c:139:52: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS'
-libavcodec/libdav1d.c:140:7: error: no member named 'n_frame_threads' in 'struct Dav1dSettings'
-    s.n_frame_threads = dav1d->frame_threads
-    ~ ^
-libavcodec/libdav1d.c:142:48: error: no member named 'n_tile_threads' in 'struct Dav1dSettings'
-                      : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
-                                             ~ ^
-./libavutil/common.h:96:22: note: expanded from macro 'FFMIN'
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-                     ^
-libavcodec/libdav1d.c:142:65: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'?
-                      : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
-                                                                ^~~~~~~~~~~~~~~~~~~~~~~
-                                                                DAV1D_OBU_FRAME_HDR
-./libavutil/common.h:96:28: note: expanded from macro 'FFMIN'
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-                           ^
-/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here
-    DAV1D_OBU_FRAME_HDR = 3,
-    ^
-libavcodec/libdav1d.c:142:65: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'?
-                      : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
-                                                                ^~~~~~~~~~~~~~~~~~~~~~~
-                                                                DAV1D_OBU_FRAME_HDR
-./libavutil/common.h:96:34: note: expanded from macro 'FFMIN'
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-                                 ^
-/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here
-    DAV1D_OBU_FRAME_HDR = 3,
-    ^
-libavcodec/libdav1d.c:142:48: error: no member named 'n_tile_threads' in 'struct Dav1dSettings'
-                      : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
-                                             ~ ^
-./libavutil/common.h:96:40: note: expanded from macro 'FFMIN'
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-                                       ^
-libavcodec/libdav1d.c:144:14: error: no member named 'n_frame_threads' in 'struct Dav1dSettings'
-           s.n_frame_threads, s.n_tile_threads);
-           ~ ^
-libavcodec/libdav1d.c:144:33: error: no member named 'n_tile_threads' in 'struct Dav1dSettings'
-           s.n_frame_threads, s.n_tile_threads);
-                              ~ ^
-libavcodec/libdav1d.c:378:94: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS'
-    { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD },
-                                                                                             ^
-libavcodec/libdav1d.c:379:97: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'?
-    { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD },
-                                                                                                ^~~~~~~~~~~~~~~~~~~~~~~
-                                                                                                DAV1D_OBU_FRAME_HDR
-/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here
-    DAV1D_OBU_FRAME_HDR = 3,
-    ^
-
---- external/FFmpeg/libavcodec/libdav1d.c.orig	2020-03-23 14:32:28 UTC
-+++ external/FFmpeg/libavcodec/libdav1d.c
-@@ -30,6 +30,9 @@
- #include "decode.h"
- #include "internal.h"
- 
-+#define FF_DAV1D_VERSION_AT_LEAST(x,y) \
-+    (DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y))
-+
- typedef struct Libdav1dContext {
-     AVClass *class;
-     Dav1dContext *c;
-@@ -132,6 +135,15 @@ static av_cold int libdav1d_init(AVCodecContext *c)
-     s.allocator.release_picture_callback = libdav1d_picture_release;
-     s.apply_grain = dav1d->apply_grain;
- 
-+#if FF_DAV1D_VERSION_AT_LEAST(6,0)
-+    if (dav1d->frame_threads || dav1d->tile_threads)
-+        s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads);
-+    else
-+        s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS);
-+    s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : s.n_threads;
-+    av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n",
-+           s.n_threads, s.max_frame_delay);
-+#else
-     s.n_tile_threads = dav1d->tile_threads
-                      ? dav1d->tile_threads
-                      : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS);
-@@ -140,6 +152,7 @@ static av_cold int libdav1d_init(AVCodecContext *c)
-                       : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
-     av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n",
-            s.n_frame_threads, s.n_tile_threads);
-+#endif
- 
-     res = dav1d_open(&dav1d->c, &s);
-     if (res < 0)
-@@ -335,6 +348,13 @@ static av_cold int libdav1d_close(AVCodecContext *c)
- 
-     return 0;
- }
-+
-+#ifndef DAV1D_MAX_FRAME_THREADS
-+#define DAV1D_MAX_FRAME_THREADS DAV1D_MAX_THREADS
-+#endif
-+#ifndef DAV1D_MAX_TILE_THREADS
-+#define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS
-+#endif
- 
- #define OFFSET(x) offsetof(Libdav1dContext, x)
- #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM

multimedia/mythtv/files/patch-external_FFmpeg_libswscale_ppc_swscale__altivec.c

@@ -1,55 +0,0 @@
---- external/FFmpeg/libswscale/ppc/swscale_altivec.c.orig	2019-08-11 20:06:32 UTC
-+++ external/FFmpeg/libswscale/ppc/swscale_altivec.c
-@@ -153,13 +153,13 @@ static void yuv2plane1_float_altivec(const int32_t *sr
-     const int add = (1 << (shift - 1));
-     const int clip = (1 << 16) - 1;
-     const float fmult = 1.0f / 65535.0f;
--    const vector uint32_t vadd = (vector uint32_t) {add, add, add, add};
--    const vector uint32_t vshift = (vector uint32_t) vec_splat_u32(shift);
--    const vector uint32_t vlargest = (vector uint32_t) {clip, clip, clip, clip};
--    const vector float vmul = (vector float) {fmult, fmult, fmult, fmult};
--    const vector float vzero = (vector float) {0, 0, 0, 0};
--    vector uint32_t v;
--    vector float vd;
-+    const vec_u32 vadd = (vec_u32) {add, add, add, add};
-+    const vec_u32 vshift = (vec_u32) vec_splat_u32(shift);
-+    const vec_u32 vlargest = (vec_u32) {clip, clip, clip, clip};
-+    const vec_f vmul = (vec_f) {fmult, fmult, fmult, fmult};
-+    const vec_f vzero = (vec_f) {0, 0, 0, 0};
-+    vec_u32 v;
-+    vec_f vd;
-     int i;
- 
-     yuv2plane1_float_u(src, dest, dst_u, 0);
-@@ -186,14 +186,14 @@ static void yuv2plane1_float_bswap_altivec(const int32
-     const int add = (1 << (shift - 1));
-     const int clip = (1 << 16) - 1;
-     const float fmult = 1.0f / 65535.0f;
--    const vector uint32_t vadd = (vector uint32_t) {add, add, add, add};
--    const vector uint32_t vshift = (vector uint32_t) vec_splat_u32(shift);
--    const vector uint32_t vlargest = (vector uint32_t) {clip, clip, clip, clip};
-+    const vec_u32 vadd = (vec_u32) {add, add, add, add};
-+    const vec_u32 vshift = (vec_u32) vec_splat_u32(shift);
-+    const vec_u32 vlargest = (vec_u32) {clip, clip, clip, clip};
-     const vector float vmul = (vector float) {fmult, fmult, fmult, fmult};
-     const vector float vzero = (vector float) {0, 0, 0, 0};
--    const vector uint32_t vswapbig = (vector uint32_t) {16, 16, 16, 16};
--    const vector uint16_t vswapsmall = vec_splat_u16(8);
--    vector uint32_t v;
-+    const vec_u32 vswapbig = (vec_u32) {16, 16, 16, 16};
-+    const vec_u16 vswapsmall = vec_splat_u16(8);
-+    vec_u32 v;
-     vector float vd;
-     int i;
- 
-@@ -208,8 +208,8 @@ static void yuv2plane1_float_bswap_altivec(const int32
-         vd = vec_ctf(v, 0);
-         vd = vec_madd(vd, vmul, vzero);
- 
--        vd = (vector float) vec_rl((vector uint32_t) vd, vswapbig);
--        vd = (vector float) vec_rl((vector uint16_t) vd, vswapsmall);
-+        vd = (vector float) vec_rl((vec_u32) vd, vswapbig);
-+        vd = (vector float) vec_rl((vec_u16) vd, vswapsmall);
- 
-         vec_st(vd, 0, (float *) &dest[i]);
-     }

multimedia/mythtv/files/patch-libs_libmythui_mythpainter.cpp

@@ -1,10 +0,0 @@
---- libs/libmythui/mythpainter.cpp.orig	2020-05-21 12:31:44 UTC
-+++ libs/libmythui/mythpainter.cpp
-@@ -5,6 +5,7 @@
- // QT headers
- #include <QRect>
- #include <QPainter>
-+#include <QPainterPath>
- 
- // libmythbase headers
- #include "mythlogging.h"

www/mythplugin-mythweb/Makefile

@@ -1,6 +1,8 @@
 PORTNAME=	mythweb
 DISTVERSIONPREFIX=	v
-DISTVERSION=	31.0
+DISTVERSION=	32.0-40
+DISTVERSIONSUFFIX=	-gb05906a6
+
 CATEGORIES=	www
 PKGNAMEPREFIX=	mythplugin-
 

www/mythplugin-mythweb/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1600775958
-SHA256 (MythTV-mythweb-v31.0_GH0.tar.gz) = 064a3417d2e04fc9d85355e8128ea93586fe63e17c26ba27ed758e056bd00afc
-SIZE (MythTV-mythweb-v31.0_GH0.tar.gz) = 1796118
+TIMESTAMP = 1649783999
+SHA256 (MythTV-mythweb-v32.0-40-gb05906a6_GH0.tar.gz) = 41d0fe3390eae082f6b00a3adee19f5619af936f08c1324dff1cab2482abfd7a
+SIZE (MythTV-mythweb-v32.0-40-gb05906a6_GH0.tar.gz) = 1797375

www/mythplugin-mythweb/pkg-plist

@@ -173,18 +173,18 @@
 %%WWWDIR%%/modules/mythtv/tmpl/default/set_settings.php
 %%WWWDIR%%/modules/mythtv/tmpl/lite/set_keys.php
 %%WWWDIR%%/modules/mythtv/tmpl/lite/set_settings.php
-%%WWWDIR%%/modules/mythweb/init.php
-%%WWWDIR%%/modules/mythweb/set_defaults.php
-%%WWWDIR%%/modules/mythweb/set_flvplayer.php
-%%WWWDIR%%/modules/mythweb/set_recommend.php
-%%WWWDIR%%/modules/mythweb/set_session.php
-%%WWWDIR%%/modules/mythweb/tmpl/default/set_defaults.php
-%%WWWDIR%%/modules/mythweb/tmpl/default/set_flvplayer.php
-%%WWWDIR%%/modules/mythweb/tmpl/default/set_recommend.php
-%%WWWDIR%%/modules/mythweb/tmpl/default/set_session.php
-%%WWWDIR%%/modules/mythweb/tmpl/lite/set_defaults.php
-%%WWWDIR%%/modules/mythweb/tmpl/lite/set_flvplayer.php
-%%WWWDIR%%/modules/mythweb/tmpl/lite/set_session.php
+%%WWWDIR%%/modules/%%AP_NAME%%/init.php
+%%WWWDIR%%/modules/%%AP_NAME%%/set_defaults.php
+%%WWWDIR%%/modules/%%AP_NAME%%/set_flvplayer.php
+%%WWWDIR%%/modules/%%AP_NAME%%/set_recommend.php
+%%WWWDIR%%/modules/%%AP_NAME%%/set_session.php
+%%WWWDIR%%/modules/%%AP_NAME%%/tmpl/default/set_defaults.php
+%%WWWDIR%%/modules/%%AP_NAME%%/tmpl/default/set_flvplayer.php
+%%WWWDIR%%/modules/%%AP_NAME%%/tmpl/default/set_recommend.php
+%%WWWDIR%%/modules/%%AP_NAME%%/tmpl/default/set_session.php
+%%WWWDIR%%/modules/%%AP_NAME%%/tmpl/lite/set_defaults.php
+%%WWWDIR%%/modules/%%AP_NAME%%/tmpl/lite/set_flvplayer.php
+%%WWWDIR%%/modules/%%AP_NAME%%/tmpl/lite/set_session.php
 %%WWWDIR%%/modules/remote/do.php
 %%WWWDIR%%/modules/remote/handler.php
 %%WWWDIR%%/modules/remote/init.php
@@ -204,7 +204,7 @@
 %%WWWDIR%%/modules/settings/tmpl/default/welcome.php
 %%WWWDIR%%/modules/settings/tmpl/lite/footer.php
 %%WWWDIR%%/modules/settings/tmpl/lite/header.php
-%%WWWDIR%%/modules/settings/tmpl/lite/mythweb.php
+%%WWWDIR%%/modules/settings/tmpl/lite/%%AP_NAME%%.php
 %%WWWDIR%%/modules/settings/tmpl/lite/welcome.php
 %%WWWDIR%%/modules/stats/handler.php
 %%WWWDIR%%/modules/stats/init.php
@@ -322,11 +322,11 @@
 %%WWWDIR%%/modules/video/tmpl/default/video.php
 %%WWWDIR%%/modules/video/tmpl/default/welcome.php
 %%WWWDIR%%/modules/welcome.php
-%%WWWDIR%%/mythweb.conf.apache
-%%WWWDIR%%/mythweb.conf.lighttpd
-%%WWWDIR%%/mythweb.conf.nginx
-%%WWWDIR%%/mythweb.php
-%%WWWDIR%%/mythweb.pl
+%%WWWDIR%%/%%AP_NAME%%.conf.apache
+%%WWWDIR%%/%%AP_NAME%%.conf.lighttpd
+%%WWWDIR%%/%%AP_NAME%%.conf.nginx
+%%WWWDIR%%/%%AP_NAME%%.php
+%%WWWDIR%%/%%AP_NAME%%.pl
 %%WWWDIR%%/skins/clean_blue/backend_log.css
 %%WWWDIR%%/skins/clean_blue/header.css
 %%WWWDIR%%/skins/clean_blue/img/apple-touch-icons/apple-touch-icon-114x114.png