diff --git a/multimedia/lms/Makefile b/multimedia/lms/Makefile index 9f94167b8bb7..34926d121098 100644 --- a/multimedia/lms/Makefile +++ b/multimedia/lms/Makefile @@ -1,52 +1,51 @@ PORTNAME= lms DISTVERSIONPREFIX= v -DISTVERSION= 3.28.0 -PORTREVISION= 2 +DISTVERSION= 3.32.0 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org COMMENT= Lightweight Music Server WWW= https://github.com/epoupon/lms LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= googletest>0:devel/googletest \ ${LOCALBASE}/include/stb/stb_image.h:devel/stb LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libboost_system.so:devel/boost-libs \ libconfig++.so:devel/libconfig \ libGraphicsMagick.so:graphics/GraphicsMagick \ libtag.so:audio/taglib \ libwthttp.so:www/wt RUN_DEPENDS= ffmpeg:multimedia/ffmpeg USES= cmake compiler:c++17-lang cpe pkgconfig USE_GITHUB= yes GH_ACCOUNT= epoupon USER= nobody GROUP= nobody SUB_LIST= USER=${USER} USE_RC_SUBR= ${PORTNAME} PLIST_SUB= USER="${USER}" GROUP="${GROUP}" post-patch: @${REINPLACE_CMD} -e 's|"/etc/lms.conf"|"${PREFIX}/etc/lms.conf"|' \ ${WRKSRC}/src/lms/main.cpp \ ${WRKSRC}/src/tools/cover/LmsCover.cpp \ ${WRKSRC}/src/tools/recommendation/LmsRecommendation.cpp @${REINPLACE_CMD} -e 's|"/usr/|"${PREFIX}/|; s|"/var/lms/"|"/var/db/lms/"|' \ ${WRKSRC}/conf/lms.conf post-install: # link sample ${RLN} ${STAGEDIR}${DATADIR}/lms.conf ${STAGEDIR}${PREFIX}/etc/lms.conf.sample # create the DB directory ${MKDIR} ${STAGEDIR}/var/db/lms # install the PAM config file # PAM breaks, see https://github.com/epoupon/lms/issues/210 ${RLN} ${STAGEDIR}${DATADIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/pam.d/${PORTNAME} .include diff --git a/multimedia/lms/distinfo b/multimedia/lms/distinfo index 17c976f446c2..9c470c9b33a5 100644 --- a/multimedia/lms/distinfo +++ b/multimedia/lms/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666514002 -SHA256 (epoupon-lms-v3.28.0_GH0.tar.gz) = 7128bbf83be14e1037ed1d6ad678679bcac52cf987be112b9b223c3b672f952c -SIZE (epoupon-lms-v3.28.0_GH0.tar.gz) = 462781 +TIMESTAMP = 1667879966 +SHA256 (epoupon-lms-v3.32.0_GH0.tar.gz) = 655951141d1efda9f10e0a9b8ed4984c712301549e8c81752369e0071c7677a2 +SIZE (epoupon-lms-v3.32.0_GH0.tar.gz) = 356002 diff --git a/multimedia/lms/files/patch-cmake_modules_FindSTB.cmake b/multimedia/lms/files/patch-cmake_modules_FindSTB.cmake deleted file mode 100644 index 5d3a894f91eb..000000000000 --- a/multimedia/lms/files/patch-cmake_modules_FindSTB.cmake +++ /dev/null @@ -1,10 +0,0 @@ -- workaround for https://github.com/epoupon/lms/issues/207 - ---- cmake/modules/FindSTB.cmake.orig 2022-03-10 16:21:18 UTC -+++ cmake/modules/FindSTB.cmake -@@ -1,4 +1,4 @@ --find_path(STB_INCLUDE_DIR stb/stb.h) -+find_path(STB_INCLUDE_DIR stb/stb_image.h) - - include(FindPackageHandleStandardArgs) - diff --git a/multimedia/lms/files/patch-src_libs_services_auth_include_services_auth_IPasswordService.hpp b/multimedia/lms/files/patch-src_libs_services_auth_include_services_auth_IPasswordService.hpp deleted file mode 100644 index b702ad3e1334..000000000000 --- a/multimedia/lms/files/patch-src_libs_services_auth_include_services_auth_IPasswordService.hpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/libs/services/auth/include/services/auth/IPasswordService.hpp -+++ src/libs/services/auth/include/services/auth/IPasswordService.hpp -@@ -20,6 +20,7 @@ - #pragma once - - #include -+#include - - #include - #include diff --git a/multimedia/lms/pkg-plist b/multimedia/lms/pkg-plist index b8cc024e0669..1df9dbf442ea 100644 --- a/multimedia/lms/pkg-plist +++ b/multimedia/lms/pkg-plist @@ -1,63 +1,55 @@ bin/lms bin/lms-metadata bin/lms-recommendation +@sample etc/lms.conf.sample +etc/pam.d/lms lib/liblmsauth.so lib/liblmsav.so lib/liblmsdatabase.so lib/liblmsimage.so lib/liblmsmetadata.so lib/liblmsrecommendation.so lib/liblmsscanner.so lib/liblmsscrobbling.so lib/liblmsservice-cover.so lib/liblmssom.so lib/liblmssubsonic.so lib/liblmsutils.so -@sample etc/lms.conf.sample -etc/pam.d/lms %%DATADIR%%/approot/admin-database.xml %%DATADIR%%/approot/admin-initwizard.xml %%DATADIR%%/approot/admin-scannercontroller.xml %%DATADIR%%/approot/admin-user.xml %%DATADIR%%/approot/admin-users.xml %%DATADIR%%/approot/artist.xml %%DATADIR%%/approot/artists.xml %%DATADIR%%/approot/error.xml %%DATADIR%%/approot/explore.xml %%DATADIR%%/approot/images/unknown-artist.jpg %%DATADIR%%/approot/images/unknown-cover.jpg %%DATADIR%%/approot/login.xml +%%DATADIR%%/approot/main.xml %%DATADIR%%/approot/mediaplayer.xml %%DATADIR%%/approot/messages.xml %%DATADIR%%/approot/messages_fr.xml %%DATADIR%%/approot/messages_it.xml %%DATADIR%%/approot/messages_zh.xml +%%DATADIR%%/approot/misc.xml +%%DATADIR%%/approot/notifications.xml %%DATADIR%%/approot/playqueue.xml %%DATADIR%%/approot/%%CMAKE_BUILD_TYPE%%.xml %%DATADIR%%/approot/%%CMAKE_BUILD_TYPE%%s.xml %%DATADIR%%/approot/search.xml %%DATADIR%%/approot/settings.xml -%%DATADIR%%/approot/templates.xml +%%DATADIR%%/approot/tracklist.xml +%%DATADIR%%/approot/tracklists.xml %%DATADIR%%/approot/tracks.xml %%DATADIR%%/default.service -%%DATADIR%%/docroot/css/S6u8w4BMUTPHjxsAUi-qJCY.woff2 -%%DATADIR%%/docroot/css/S6u8w4BMUTPHjxsAXC-q.woff2 -%%DATADIR%%/docroot/css/S6u9w4BMUTPHh6UVSwaPGR_p.woff2 -%%DATADIR%%/docroot/css/S6u9w4BMUTPHh6UVSwiPGQ.woff2 -%%DATADIR%%/docroot/css/S6uyw4BMUTPHjx4wXg.woff2 -%%DATADIR%%/docroot/css/S6uyw4BMUTPHjxAwXjeu.woff2 -%%DATADIR%%/docroot/css/bootstrap-darkly.min.css -%%DATADIR%%/docroot/css/bootstrap-flatly.min.css -%%DATADIR%%/docroot/css/fonts.css -%%DATADIR%%/docroot/css/lms-darkly.css -%%DATADIR%%/docroot/css/lms-flatly.css +%%DATADIR%%/docroot/css/bootstrap.solar.min.css %%DATADIR%%/docroot/css/lms.css -%%DATADIR%%/docroot/js/bootstrap-notify.js -%%DATADIR%%/docroot/js/bootstrap.min.js -%%DATADIR%%/docroot/js/jquery-1.10.2.min.js +%%DATADIR%%/docroot/js/bootstrap.bundle.min.js %%DATADIR%%/docroot/js/mediaplayer.js %%DATADIR%%/lms %%DATADIR%%/lms.conf @owner %%USER%% @group %%GROUP%% @dir /var/db/lms