Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Oct 2018 22:12:17 +0200
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        Steve Wills <swills@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r482373 - head/multimedia/tautulli
Message-ID:  <1539893537.3422544.1546940568.7751C422@webmail.messagingengine.com>
In-Reply-To: <201810181955.w9IJtde2086453@repo.freebsd.org>
References:  <201810181955.w9IJtde2086453@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Oct 18, 2018, at 21:55, Steve Wills wrote:
> Author: swills
> Date: Thu Oct 18 19:55:39 2018
> New Revision: 482373
> URL: https://svnweb.freebsd.org/changeset/ports/482373
> 
> Log:
>   multimedia/tautulli: Update to 2.1.22
>   
>   PR:		232364
>   Submitted by:	Nathan <ndowens@yahoo.com>
> 
> Modified:
>   head/multimedia/tautulli/Makefile   (contents, props changed)
>   head/multimedia/tautulli/distinfo   (contents, props changed)
> 
> Modified: head/multimedia/tautulli/Makefile
> ==============================================================================
> --- head/multimedia/tautulli/Makefile	Thu Oct 18 19:55:37 2018	(r482372)
> +++ head/multimedia/tautulli/Makefile	Thu Oct 18 19:55:39 2018	(r482373)
> @@ -2,9 +2,8 @@
>  # $FreeBSD$
>  
>  PORTNAME=	tautulli
> -PORTVERSION=	2.0.28
> +PORTVERSION=	2.1.22
>  DISTVERSIONPREFIX=v
> -PORTREVISION=	0
>  CATEGORIES=	multimedia python
>  
>  MAINTAINER=	ports@FreeBSD.org
> @@ -17,22 +16,23 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:database
>  		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
>  		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
>  
> -SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
> -
>  USES=		python:2.7 shebangfix
> -SHEBANG_FILES=	Tautulli.py
> -python_OLD_CMD=	/bin/sh
> -

Tautulli.py is a Python script but has a wrong shebang (#!/bin/sh)
so this needs to stay, or it will not be corrected and it cannot
possibly be run from the rc script as is.

https://github.com/Tautulli/Tautulli/blob/v2.1.22/Tautulli.py#L1

>  USE_GITHUB=	yes
> +USE_RC_SUBR=	${PORTNAME}
> +
> +SHEBANG_FILES=	Tautulli.py
> +SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
>  GH_ACCOUNT=	Tautulli
>  GH_PROJECT=	Tautulli
> +
>  NO_BUILD=	yes
>  NO_ARCH=	yes
> +DOCS=		API.md CHANGELOG.md README.md

(Aside: Is it really necessary to invent new variables with no
semantic meaning that are only used in one place?  This could be
put directly into do-install-DOCS-on instead.)

>  
> -USE_RC_SUBR=	${PORTNAME}
> +USERS=		tautulli
> +GROUPS=		tautulli
>  
> -USERS=	tautulli
> -GROUPS=	tautulli
> +OPTIONS_DEFINE=	DOCS
>  
>  post-patch:
>  	${FIND} ${WRKSRC} -name '*.orig' -delete
> @@ -40,14 +40,16 @@ post-patch:
>  do-install:
>  	${MKDIR} ${STAGEDIR}${WWWDIR}/data ${STAGEDIR}${WWWDIR}/lib \
>  		${STAGEDIR}${WWWDIR}/plexpy
> -	cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${WWWDIR}
> -	cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${WWWDIR}
> -	cd ${WRKSRC} && ${COPYTREE_SHARE} plexpy ${STAGEDIR}${WWWDIR}
> +	(cd ${WRKSRC} ; ${COPYTREE_SHARE} data lib plexpy ${STAGEDIR}${WWWDIR})

This copies things to the wrong place due to the way COPYTREE_SHARE
works (i.e. it copies data/ and plexpy/ to lib/, nothing to the
stage directory).  Looks like

cd ${WRKSRC} && ${COPYTREE_SHARE} "data lib plexpy" ${STAGEDIR}${WWWDIR}

was meant here.




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1539893537.3422544.1546940568.7751C422>