From owner-svn-ports-all@freebsd.org Wed Jan 17 22:17:28 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97BF9EBB927; Wed, 17 Jan 2018 22:17:28 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6F3721732; Wed, 17 Jan 2018 22:17:28 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7E7C215689; Wed, 17 Jan 2018 22:17:27 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0HMHREI010190; Wed, 17 Jan 2018 22:17:27 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0HMHRlp010188; Wed, 17 Jan 2018 22:17:27 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201801172217.w0HMHRlp010188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 17 Jan 2018 22:17:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459290 - in head/multimedia: plexmediaserver plexmediaserver-plexpass X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in head/multimedia: plexmediaserver plexmediaserver-plexpass X-SVN-Commit-Revision: 459290 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jan 2018 22:17:28 -0000 Author: feld Date: Wed Jan 17 22:17:27 2018 New Revision: 459290 URL: https://svnweb.freebsd.org/changeset/ports/459290 Log: multimedia/plexmediaserver{-plexpass}: Auto generate pkg-plist Life is too short to not automate the plist for these ports Package contents are not changing. No PORTREVISION bump. Deleted: head/multimedia/plexmediaserver-plexpass/pkg-plist head/multimedia/plexmediaserver/pkg-plist Modified: head/multimedia/plexmediaserver-plexpass/Makefile head/multimedia/plexmediaserver/Makefile Modified: head/multimedia/plexmediaserver-plexpass/Makefile ============================================================================== --- head/multimedia/plexmediaserver-plexpass/Makefile Wed Jan 17 20:59:05 2018 (r459289) +++ head/multimedia/plexmediaserver-plexpass/Makefile Wed Jan 17 22:17:27 2018 (r459290) @@ -13,11 +13,9 @@ USE_RC_SUBR= ${PORTNAME}_plexpass MASTERDIR=${.CURDIR}/../plexmediaserver DISTINFO_FILE= ${.CURDIR}/distinfo -PLIST= ${.CURDIR}/pkg-plist FILESDIR= ${.CURDIR}/files DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} SUB_LIST= PORTNAME=${PORTNAME}_plexpass DATADIR=${DATADIR} USERS=${USERS} GROUPS=${GROUPS} -PLIST_SUB+= PLEX_BUILD=${DISTVERSIONSUFFIX} .include "${MASTERDIR}/Makefile" Modified: head/multimedia/plexmediaserver/Makefile ============================================================================== --- head/multimedia/plexmediaserver/Makefile Wed Jan 17 20:59:05 2018 (r459289) +++ head/multimedia/plexmediaserver/Makefile Wed Jan 17 22:17:27 2018 (r459290) @@ -24,7 +24,6 @@ USE_RC_SUBR?= ${PORTNAME} SUB_FILES= pkg-message SUB_LIST?= PORTNAME=${PORTNAME} DATADIR=${DATADIR} USERS=${USERS} GROUPS=${GROUPS} -PLIST_SUB+= PLEX_BUILD=${DISTVERSIONSUFFIX} USERS= plex GROUPS= ${USERS} @@ -51,16 +50,24 @@ post-patch: ${FIND} ${WRKSRC}/Resources -name '*.so' -exec ${STRIP_CMD} {} \+ ${FIND} ${WRKSRC} ${WRKSRC}/Resources -name 'Plex*' -depth 1 -exec ${STRIP_CMD} {} \+ ${FIND} ${WRKSRC} -depth 1 -name 'lib*' -exec ${STRIP_CMD} {} \+ - ${RM} ${WRKSRC}/start.sh + ${RM} ${WRKSRC}/start.sh ${WRKSRC}/Resources/start.sh # Older verisons of Plex we have to create a symlink # Newer versions of Plex ship a duplicate file; we'll just symlink ${RM} ${WRKSRC}/libpython2.7.so +.if ! ${PORT_OPTIONS:MRELAY} + ${RM} ${WRKSRC}/Plex\ Relay +.endif do-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}) # Python fix for older releases of Plex - (cd ${STAGEDIR}/${DATADIR} && ${LN} -s libpython2.7.so.1 libpython2.7.so) + ${INSTALL} -lrs ${STAGEDIR}/${DATADIR}/libpython2.7.so.1 ${STAGEDIR}/${DATADIR}/libpython2.7.so # Workaround for space in binary name - (cd ${STAGEDIR}${DATADIR} && ${LN} -s Plex\ Media\ Server Plex_Media_Server) + ${INSTALL} -lrs ${STAGEDIR}/${DATADIR}/Plex\ Media\ Server ${STAGEDIR}/${DATADIR}/Plex_Media_Server + +post-install: + @${CHMOD} 555 ${STAGEDIR}/${DATADIR}/CrashUploader ${STAGEDIR}/${DATADIR}/Plex* + @${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \ + ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} .include