svn commit: r452551 - in head/multimedia: plexmediaserver plexmediaserver-plexpass

[Mark Felder]

Author: feld
Date: Fri Oct 20 18:45:55 2017
New Revision: 452551
URL: https://svnweb.freebsd.org/changeset/ports/452551

Log:
  multimedia/plexmediaserver{-plexpass}: Change to using DISTVERSIONSUFFIX
  
  This is a more standard way of handling this situation.

Modified:
  head/multimedia/plexmediaserver-plexpass/Makefile
  head/multimedia/plexmediaserver/Makefile

Modified: head/multimedia/plexmediaserver-plexpass/Makefile
==============================================================================
--- head/multimedia/plexmediaserver-plexpass/Makefile	Fri Oct 20 18:40:51 2017	(r452550)
+++ head/multimedia/plexmediaserver-plexpass/Makefile	Fri Oct 20 18:45:55 2017	(r452551)
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTVERSION=	1.9.5.4339
+DISTVERSIONSUFFIX=46276db8d
 PORTREVISION=	0
 PKGNAMESUFFIX=	-plexpass
 
 MAINTAINER=	feld at FreeBSD.org
 
-PLEX_BUILD=	46276db8d
-
 USE_RC_SUBR=	${PORTNAME}_plexpass
 
 MASTERDIR=${.CURDIR}/../plexmediaserver
@@ -19,6 +18,6 @@ FILESDIR=	${.CURDIR}/files
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 
 SUB_LIST=	PORTNAME=${PORTNAME}_plexpass DATADIR=${DATADIR} USERS=${USERS} GROUPS=${GROUPS}
-PLIST_SUB+=	PLEX_BUILD=${PLEX_BUILD}
+PLIST_SUB+=	PLEX_BUILD=${DISTVERSIONSUFFIX}
 
 .include "${MASTERDIR}/Makefile"

Modified: head/multimedia/plexmediaserver/Makefile
==============================================================================
--- head/multimedia/plexmediaserver/Makefile	Fri Oct 20 18:40:51 2017	(r452550)
+++ head/multimedia/plexmediaserver/Makefile	Fri Oct 20 18:45:55 2017	(r452551)
@@ -3,18 +3,18 @@
 
 PORTNAME=	plexmediaserver
 PORTVERSION?=	1.9.4.4325
+DISTVERSIONSUFFIX?=1bf240a65
 PORTREVISION?=	0
 CATEGORIES=	multimedia
-MASTER_SITES=	https://downloads.plex.tv/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/
-DISTNAME=	PlexMediaServer-${PORTVERSION}-${PLEX_BUILD}-freebsd-${ARCH}
+MASTER_SITES=	https://downloads.plex.tv/plex-media-server/${DISTVERSION}/
+DISTNAME=	PlexMediaServer-${DISTVERSION}-${DISTVERSIONSUFFIX}-freebsd-${ARCH}
 
 MAINTAINER?=	feld at FreeBSD.org
 COMMENT=	Plex Media Server component
 
 USES=		cpe tar:bzip2
-PLEX_BUILD?=	1bf240a65
 NO_BUILD=	yes
-WRKSRC=	${WRKDIR}/PlexMediaServer-${PORTVERSION}-${PLEX_BUILD}
+WRKSRC=	${WRKDIR}/PlexMediaServer-${PORTVERSION}-${DISTVERSIONSUFFIX}
 
 CPE_VENDOR=	plex
 CPE_PRODUCT=	plex_media_server
@@ -24,7 +24,7 @@ USE_RC_SUBR?=	${PORTNAME}
 
 SUB_FILES=	pkg-message
 SUB_LIST?=	PORTNAME=${PORTNAME} DATADIR=${DATADIR} USERS=${USERS} GROUPS=${GROUPS}
-PLIST_SUB+=	PLEX_BUILD=${PLEX_BUILD}
+PLIST_SUB+=	PLEX_BUILD=${DISTVERSIONSUFFIX}
 
 USERS=	plex
 GROUPS=	${USERS}