From nobody Fri Mar 10 20:15:53 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PYHP520Q7z3xtDX; Fri, 10 Mar 2023 20:15:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PYHP51XKQz4M2K; Fri, 10 Mar 2023 20:15:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678479353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=obWYXNiM7V3lgluGZWGwnk8O5PTS3fDsWg5pZ2l/UMM=; b=HCR3siiMZPPSJIzs8GCdu5yXWBpbRtd6qvAeRuOrlB1fkhrnENYRxMkoO5uJO67WSwY7Za yKQyfO5IZolB0epXJ+bQXWedrqfwQ8FFDUqYSlBWvEKRJsg1L3VsKqjD2qd4X84YKThHai g3YSiEIqL5b79NJ7RVpb9I1gSMgT8kLUV/ya6m8NUMbgqWhC5SS0lBC5DUOfEs+DxJS54s j+PkNT8zEMzW1PagGLrl3/LHylg2yckSow1qDIqIKlP1FrT11xlUgYoUuW6RaOiaTTAst4 ZfixwqjSFWTQS2PFPRzRvNlHLu0knVJPxCCQC0Gvbdh9WhMgU3amB0CUxECJBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678479353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=obWYXNiM7V3lgluGZWGwnk8O5PTS3fDsWg5pZ2l/UMM=; b=L+aM1jWSwtYfPxs8ny5L4GoBBoHwDLx8ecdnTfCddDh+xZukXbOjE4NvqTFbFM3I/bQUyJ ETQVG7/S9R8flR1M7emkumxFWI2sMEpj6FFyxcy2/UYM2ZxNe4yADFnxX5LbNgA9bqnJ4t 6qXZAictO5oNpzxI7CJtUoFzHP7UDrpZD92defGjty5bNiVvL+hSseA3V3aQiWs8yKGVP5 CZAIcJwqdJBXG1g5eHU78Id0zGai1iOl6IVKh0u5s7M3CtoCSRQ01yWT389Chi/v55gWiv xmIBv3ilRBcNpJW3GsS08l7j38Fk7TMLlyqGtp74sK32KPB1ZJdelHcogb6Pxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678479353; a=rsa-sha256; cv=none; b=G6j/4TDfxnSLILaYS5EI2elxeq3ow/l4Q5grfN9sMEN4FrIFD3fX0edD+N5hKdnfSOVwV2 hDg0YMh9fqU4oBWKjuq4kz9InWDdlr5+6HplK02DMeTKOtJmo5mLnghfCVsoTGXqmUMcYv ogaSXN+gQt0FpLo2JKhxorxBnNWqdETXMeldF/mVF7fu4QkJEtA3Iltn8t2uFJoYdO7O0v ERnhLlj2ZpsQboHIiVa1Ex9JAkBsWR4nQeVqJxbR5PGzYibFJGBIzMoY5DPgZfQK0qwCjA JYpYHTdM18Wj2ckdnFQmxrTqe97wZNbuIBDZokSr18ymcKvwPuAvGUw+Qca4Fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PYHP50cPrz12VV; Fri, 10 Mar 2023 20:15:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32AKFrg5064158; Fri, 10 Mar 2023 20:15:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32AKFriD064156; Fri, 10 Mar 2023 20:15:53 GMT (envelope-from git) Date: Fri, 10 Mar 2023 20:15:53 GMT Message-Id: <202303102015.32AKFriD064156@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dries Michiels Subject: git: deff0c40387c - main - multimedia/emby-server(-devel): deduplicate Makefile List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: driesm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: deff0c40387ce8776344c0ae47121de6fa465912 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=deff0c40387ce8776344c0ae47121de6fa465912 commit deff0c40387ce8776344c0ae47121de6fa465912 Author: Matthew Wener AuthorDate: 2023-03-10 19:37:43 +0000 Commit: Dries Michiels CommitDate: 2023-03-10 20:14:08 +0000 multimedia/emby-server(-devel): deduplicate Makefile While here also automate plist Pull Request: https://github.com/freebsd/freebsd-ports/pull/163 --- multimedia/emby-server-devel/Makefile | 135 +-- .../SQLitePCLRaw.provider.sqlite3.dll.config.in | 3 - multimedia/emby-server-devel/files/emby-server.in | 75 -- multimedia/emby-server-devel/pkg-deinstall | 10 - multimedia/emby-server-devel/pkg-descr | 6 - multimedia/emby-server-devel/pkg-message | 17 - multimedia/emby-server-devel/pkg-plist | 1183 -------------------- multimedia/emby-server/Makefile | 11 +- multimedia/emby-server/pkg-plist | 1177 ------------------- 9 files changed, 12 insertions(+), 2605 deletions(-) diff --git a/multimedia/emby-server-devel/Makefile b/multimedia/emby-server-devel/Makefile index a8d34ea4837a..3c598c1833f7 100644 --- a/multimedia/emby-server-devel/Makefile +++ b/multimedia/emby-server-devel/Makefile @@ -1,138 +1,13 @@ -PORTNAME= emby-server DISTVERSION= 4.8.0.21 -PORTREVISION= 4 -CATEGORIES= multimedia -MASTER_SITES= https://github.com/MediaBrowser/Emby.Releases/releases/download/${DISTVERSION}/ \ - https://mediabrowser.github.io/embytools/ PKGNAMESUFFIX= -devel -DISTNAME= emby-server-freebsd13_${DISTVERSION}_amd64 -DISTFILES= ${DISTNAME}.tar.xz \ - ffdetect-${FFVERSION}-x64_freebsd13.tar.xz \ - ffmpeg-${FFVERSION}.tar.gz \ - license.docx -DIST_SUBDIR= ${PORTNAME}${PKGNAMESUFFIX} -EXTRACT_ONLY= ${DISTNAME}.tar.xz \ - ffdetect-${FFVERSION}-x64_freebsd13.tar.xz \ - ffmpeg-${FFVERSION}.tar.gz -MAINTAINER= driesm@FreeBSD.org -COMMENT= Media server to organize, play & stream audio/video to various devices -WWW= https://emby.media/ - -LICENSE= UNKNOWN -LICENSE_NAME= custom -LICENSE_FILE= ${DISTDIR}/${DIST_SUBDIR}/license.docx -LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept - -ONLY_FOR_ARCHS= amd64 - -BUILD_DEPENDS= nasm:devel/nasm \ - ${LOCALBASE}/include/CL/opencl.h:devel/opencl -LIB_DEPENDS= libaribb24.so:multimedia/aribb24 \ - libass.so:multimedia/libass \ - libchromaprint.so:audio/chromaprint \ - libdav1d.so:multimedia/dav1d \ - libdrm.so:graphics/libdrm \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libfribidi.so:converters/fribidi \ - libgnutls.so:security/gnutls \ - libmfx.so:multimedia/intel-media-sdk \ - libOpenCL.so:devel/ocl-icd \ - libogg.so:audio/libogg \ - libopus.so:audio/opus \ - libpng.so:graphics/png \ - libraw.so:graphics/libraw \ - libtesseract.so:graphics/tesseract \ - libtheora.so:multimedia/libtheora \ - libva.so:multimedia/libva \ - libvorbis.so:audio/libvorbis \ - libvpx.so:multimedia/libvpx \ - libwebp.so:graphics/webp \ - libx264.so:multimedia/libx264 \ - libx265.so:multimedia/x265 \ - libzvbi.so:devel/libzvbi -RUN_DEPENDS= icu>0:devel/icu \ - libinotify>0:devel/libinotify \ - libunwind>0:devel/libunwind +DIST_SUBDIR= ${PORTNAME}${PKGNAMESUFFIX} -USES= compiler:c11 gmake iconv localbase:ldflags pkgconfig sqlite ssl:run -USE_RC_SUBR= ${PORTNAME} - -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --cc="${CC}" \ - --disable-alsa \ - --disable-doc \ - --disable-ffplay \ - --disable-libxcb \ - --disable-outdev=xv \ - --disable-sdl2 \ - --disable-shared \ - --disable-sndio \ - --disable-v4l2-m2m \ - --disable-vdpau \ - --disable-xlib \ - --enable-chromaprint \ - --enable-fontconfig \ - --enable-gnutls \ - --enable-gpl \ - --enable-iconv \ - --enable-libaribb24 \ - --enable-libass \ - --enable-libdav1d \ - --enable-libdrm \ - --enable-libfreetype \ - --enable-libfribidi \ - --enable-libmfx \ - --enable-libopus \ - --enable-libtesseract \ - --enable-libtheora \ - --enable-libvorbis \ - --enable-libvpx \ - --enable-libwebp \ - --enable-libx264 \ - --enable-libx265 \ - --enable-libzvbi \ - --enable-opencl \ - --enable-optimizations \ - --enable-static \ - --enable-vaapi \ - --enable-version3 - -MAKE_ENV= V=1 +MAINTAINER= driesm@FreeBSD.org CONFLICTS_INSTALL= emby-server -NOPRECIOUSMAKEVARS= yes -SUB_FILES= SQLitePCLRaw.provider.sqlite3.dll.config -SUB_LIST= GROUP=${GROUPS} \ - PORTNAME=${PORTNAME} \ - RC_NAME=emby_server \ - USER=${USERS} - -WRKSRC= ${WRKDIR}/ffmpeg-${FFVERSION}_public - -USERS= emby -GROUPS= emby - -OPTIONS_DEFINE= LAME -OPTIONS_DEFAULT= LAME - -LAME_LIB_DEPENDS= libmp3lame.so:audio/lame -LAME_CONFIGURE_ENABLE= libmp3lame - -FFVERSION= 2022_05_07 - -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server/bin - (${INSTALL_PROGRAM} ${WRKDIR}/bin/ffdetect ${STAGEDIR}${PREFIX}/lib/emby-server/bin) - (${INSTALL_PROGRAM} ${WRKSRC}/ffmpeg ${STAGEDIR}${PREFIX}/lib/emby-server/bin) - (${INSTALL_PROGRAM} ${WRKSRC}/ffprobe ${STAGEDIR}${PREFIX}/lib/emby-server/bin) - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server/lib - (cd ${WRKDIR}/lib && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/lib/emby-server/lib) - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server/system - (${INSTALL_DATA} ${WRKDIR}/SQLitePCLRaw.provider.sqlite3.dll.config ${STAGEDIR}${PREFIX}/lib/emby-server/system) - (cd ${WRKDIR}/system && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/emby-server/system "! -name EmbyServer") - (${INSTALL_PROGRAM} ${WRKDIR}/system/EmbyServer ${STAGEDIR}${PREFIX}/lib/emby-server/system) +MASTERDIR= ${.CURDIR}/../emby-server +DISTINFO_FILE= ${.CURDIR}/distinfo -.include +.include "${MASTERDIR}/Makefile" diff --git a/multimedia/emby-server-devel/files/SQLitePCLRaw.provider.sqlite3.dll.config.in b/multimedia/emby-server-devel/files/SQLitePCLRaw.provider.sqlite3.dll.config.in deleted file mode 100644 index 25552988c298..000000000000 --- a/multimedia/emby-server-devel/files/SQLitePCLRaw.provider.sqlite3.dll.config.in +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/multimedia/emby-server-devel/files/emby-server.in b/multimedia/emby-server-devel/files/emby-server.in deleted file mode 100644 index d753175697b4..000000000000 --- a/multimedia/emby-server-devel/files/emby-server.in +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh - -# PROVIDE: %%PORTNAME%% -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# %%RC_NAME%%_enable: Set to yes to enable the %%PORTNAME%% service. -# Default: no -# %%RC_NAME%%_user: The user account used to run the %%PORTNAME%% daemon. -# This is optional, however do not specifically set this to an -# empty string as this will cause the daemon to run as root. -# Default: %%USER%% -# %%RC_NAME%%_group: The group account used to run the %%PORTNAME%% daemon. -# This is optional, however do not specifically set this to an -# empty string as this will cause the daemon to run with group wheel. -# Default: %%GROUP%% -# %%RC_NAME%%_data_dir: Directory where %%PORTNAME%% configuration -# data is stored. -# Default: /var/db/%%PORTNAME%% -# %%RC_NAME%%_ffdetect: Path of the ffdetect binary. -# Default: %%PREFIX%%/lib/emby-server/bin/ffdetect -# %%RC_NAME%%_ffmpeg: Path of the ffmpeg binary. -# Default: %%PREFIX%%/lib/emby-server/bin/ffmpeg -# %%RC_NAME%%_ffprobe: Path of the ffprobe binary. -# Default: %%PREFIX%%/lib/emby-server/bin/ffprobe -# %%RC_NAME%%_pid: Name of the pid file. -# Default: %%PORTNAME%%.pid -# %%RC_NAME%%_pid_dir: Path of the pid file. -# Default: /var/run/emby-server - -. /etc/rc.subr -name=%%RC_NAME%% -rcvar=${name}_enable -load_rc_config ${name} - -: ${%%RC_NAME%%_enable:="no"} -: ${%%RC_NAME%%_user:="%%USER%%"} -: ${%%RC_NAME%%_group:="%%GROUP%%"} -: ${%%RC_NAME%%_data_dir:="/var/db/%%PORTNAME%%"} -: ${%%RC_NAME%%_ffdetect:="%%PREFIX%%/lib/emby-server/bin/ffdetect"} -: ${%%RC_NAME%%_ffmpeg:="%%PREFIX%%/lib/emby-server/bin/ffmpeg"} -: ${%%RC_NAME%%_ffprobe:="%%PREFIX%%/lib/emby-server/bin/ffprobe"} -: ${%%RC_NAME%%_pid:="%%PORTNAME%%.pid"} -: ${%%RC_NAME%%_pid_dir:="/var/run/emby-server"} - -pidfile="${%%RC_NAME%%_pid_dir}/${%%RC_NAME%%_pid}" -command="/usr/sbin/daemon" -command_args="-r -f -P ${pidfile} %%PREFIX%%/lib/emby-server/system/EmbyServer \ - -os freebsd \ - -ffdetect ${%%RC_NAME%%_ffdetect} \ - -ffmpeg ${%%RC_NAME%%_ffmpeg} \ - -ffprobe ${%%RC_NAME%%_ffprobe} \ - -programdata ${%%RC_NAME%%_data_dir}" - -start_precmd=%%RC_NAME%%_start_precmd -%%RC_NAME%%_start_precmd() -{ - [ -d ${%%RC_NAME%%_pid_dir} ] || install -d -g ${%%RC_NAME%%_group} -o ${%%RC_NAME%%_user} ${%%RC_NAME%%_pid_dir} - [ -d ${%%RC_NAME%%_data_dir} ] || install -d -g ${%%RC_NAME%%_group} -o ${%%RC_NAME%%_user} ${%%RC_NAME%%_data_dir} - - # .NET 6+ use dual mode sockets to avoid the separate AF handling. - # disable .NET use of V6 if no ipv6 is configured. - # See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259194#c17 - ifconfig | grep -q inet6 - if [ $? == 1 ]; then - export DOTNET_SYSTEM_NET_DISABLEIPV6=1 - fi - - export LD_LIBRARY_PATH=%%PREFIX%%/lib/emby-server/lib:%%LOCALBASE%%/lib -} - -run_rc_command "$1" diff --git a/multimedia/emby-server-devel/pkg-deinstall b/multimedia/emby-server-devel/pkg-deinstall deleted file mode 100644 index 89c613d6caac..000000000000 --- a/multimedia/emby-server-devel/pkg-deinstall +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -case $2 in - DEINSTALL) - echo "==> If you are uninstalling Emby Server permanently," - echo " and you do *NOT* want to retain the database, logs" - echo " configuration and media metadata, you should" - echo " manually delete directory /var/db/emby-server" - ;; -esac diff --git a/multimedia/emby-server-devel/pkg-descr b/multimedia/emby-server-devel/pkg-descr deleted file mode 100644 index 1a1a6ac9bd83..000000000000 --- a/multimedia/emby-server-devel/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Emby Server is a home media server built on top of other popular open source -technologies such as Service Stack, jQuery, jQuery mobile, and .NET Core. - -It features a REST-based API with built-in documention to facilitate client -development. It also offers client libraries for its API to enable rapid -development. diff --git a/multimedia/emby-server-devel/pkg-message b/multimedia/emby-server-devel/pkg-message deleted file mode 100644 index 6a7b4a48c799..000000000000 --- a/multimedia/emby-server-devel/pkg-message +++ /dev/null @@ -1,17 +0,0 @@ -[ -{ type: install - message: <