From owner-svn-ports-all@freebsd.org Sat Jun 11 16:06:42 2016 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 778D6AF0F8C; Sat, 11 Jun 2016 16:06:42 +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 mx1.freebsd.org (Postfix) with ESMTPS id 50DB227BC; Sat, 11 Jun 2016 16:06:42 +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 u5BG6fOB008988; Sat, 11 Jun 2016 16:06:41 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5BG6fZC008986; Sat, 11 Jun 2016 16:06:41 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201606111606.u5BG6fZC008986@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sat, 11 Jun 2016 16:06:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416725 - head/multimedia/plexmediaserver X-SVN-Group: ports-head 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.22 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: Sat, 11 Jun 2016 16:06:42 -0000 Author: feld Date: Sat Jun 11 16:06:41 2016 New Revision: 416725 URL: https://svnweb.freebsd.org/changeset/ports/416725 Log: multimedia/plexmediaserver: Improve installation The installation has been changed to be more amenable to the master/slave setup between this port and the -plexpass version. The newest plexpass release has some new files and removed others which was conflicting with the shared do-install. Instead we will have a simpler do-install and handle any additional needs in the pkg-plist. This is not getting a PORTREVISION bump as it is a no-op. The same files get installed and this version runs just fine. There are two binaries that aren't getting stripped that were previously stripped in the last version of this package, but this is of no concern. These files are being removed in the next major Plex release anyway. Modified: head/multimedia/plexmediaserver/Makefile head/multimedia/plexmediaserver/pkg-plist Modified: head/multimedia/plexmediaserver/Makefile ============================================================================== --- head/multimedia/plexmediaserver/Makefile Sat Jun 11 15:54:19 2016 (r416724) +++ head/multimedia/plexmediaserver/Makefile Sat Jun 11 16:06:41 2016 (r416725) @@ -42,22 +42,13 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/compat/li post-patch: # binaries don't come pre-stripped - ${FIND} ${WRKSRC}/Resources -name '*.so' -exec ${STRIP_CMD} {} \; - ${STRIP_CMD} ${WRKSRC}/Resources/rsync ${WRKSRC}/Resources/Python/bin/python + ${FIND} ${WRKSRC}/Resources -name '*.so' -exec ${STRIP_CMD} {} \+ + ${STRIP_CMD} ${WRKSRC}/lib* ${WRKSRC}/Resources/Plex* + ${RM} ${WRKSRC}/start.sh do-install: - @(cd ${WRKSRC} && ${COPYTREE_SHARE} Resources ${STAGEDIR}/${DATADIR}) - ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ DLNA\ Server ${STAGEDIR}/${DATADIR} - ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ Media\ Scanner ${STAGEDIR}/${DATADIR} - ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ Media\ Server ${STAGEDIR}/${DATADIR} - ${INSTALL_LIB} ${WRKSRC}/lib* ${STAGEDIR}/${DATADIR} - # Fix permissions to programs and db - @${CHMOD} a+x ${STAGEDIR}/${DATADIR}/Resources/rsync - @${CHMOD} a+x ${STAGEDIR}/${DATADIR}/Resources/Plex\ New\ Transcoder - @${CHMOD} a+x ${STAGEDIR}/${DATADIR}/Resources/Plex\ Transcoder - @${CHMOD} a+x ${STAGEDIR}/${DATADIR}/Resources/Python/bin/python - @${CHMOD} u+w ${STAGEDIR}/${DATADIR}/Resources/com.plexapp.plugins.library.db - # Python fix + (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}) + # Python fix for older releases of Plex @${LN} -s ${DATADIR}/libpython2.7.so.1 ${STAGEDIR}/${DATADIR}/libpython2.7.so # Workaround for space in binary name @${LN} -s ${DATADIR}/Plex\ Media\ Server ${STAGEDIR}${DATADIR}/Plex_Media_Server Modified: head/multimedia/plexmediaserver/pkg-plist ============================================================================== --- head/multimedia/plexmediaserver/pkg-plist Sat Jun 11 15:54:19 2016 (r416724) +++ head/multimedia/plexmediaserver/pkg-plist Sat Jun 11 16:06:41 2016 (r416725) @@ -1,6 +1,8 @@ +@mode 555 %%DATADIR%%/Plex DLNA Server %%DATADIR%%/Plex Media Scanner %%DATADIR%%/Plex Media Server +@mode %%DATADIR%%/Plex_Media_Server %%DATADIR%%/Resources/Fonts/DejaVuSans-Bold.ttf %%DATADIR%%/Resources/Fonts/DejaVuSans-Regular.ttf @@ -60,9 +62,11 @@ %%DATADIR%%/Resources/Graphics/show.png %%DATADIR%%/Resources/Graphics/video.png %%DATADIR%%/Resources/LICENSE +@mode 555 %%DATADIR%%/Resources/Plex New Transcoder %%DATADIR%%/Resources/Plex Relay %%DATADIR%%/Resources/Plex Transcoder +@mode %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Fanart-TV.bundle/Contents/Code/__init__.py %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Fanart-TV.bundle/Contents/DefaultPrefs.json %%DATADIR%%/Resources/Plug-ins-%%PLEX_BUILD%%/Fanart-TV.bundle/Contents/Info.plist @@ -1916,7 +1920,9 @@ %%DATADIR%%/Resources/Profiles/iOS-iPod-4,1.xml %%DATADIR%%/Resources/Profiles/iOS.xml %%DATADIR%%/Resources/Profiles/tvOS.xml +@mode 555 %%DATADIR%%/Resources/Python/bin/python +@mode %%DATADIR%%/Resources/Python/include/python2.7/pyconfig.h %%DATADIR%%/Resources/Python/lib/python2.7/BaseHTTPServer.py %%DATADIR%%/Resources/Python/lib/python2.7/Bastion.py @@ -2772,7 +2778,9 @@ %%DATADIR%%/Resources/plexmusic-combiner-albums.xml %%DATADIR%%/Resources/plexmusic-combiner-artists.xml %%DATADIR%%/Resources/rootCA.pem +@mode 555 %%DATADIR%%/Resources/rsync +@mode %%DATADIR%%/Resources/server.crt %%DATADIR%%/Resources/server.key %%DATADIR%%/Resources/themoviedb-combiner-movies.xml