Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Feb 2020 00:19:28 +0000 (UTC)
From:      Luca Pizzamiglio <pizzamig@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r526331 - head/devel/electron4
Message-ID:  <202002170019.01H0JSjK034832@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pizzamig
Date: Mon Feb 17 00:19:28 2020
New Revision: 526331
URL: https://svnweb.freebsd.org/changeset/ports/526331

Log:
  devel/electron4: minor cleanup
  
  No functional change, only clean-up.
  
  Submitted by:	maintainer (via github)

Modified:
  head/devel/electron4/Makefile
  head/devel/electron4/Makefile.version
  head/devel/electron4/pkg-plist

Modified: head/devel/electron4/Makefile
==============================================================================
--- head/devel/electron4/Makefile	Sun Feb 16 21:50:29 2020	(r526330)
+++ head/devel/electron4/Makefile	Mon Feb 17 00:19:28 2020	(r526331)
@@ -9,7 +9,7 @@ MASTER_SITES=	https://github.com/tagattie/FreeBSD-Elec
 		https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \
 		https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
 		https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
-PKGNAMESUFFIX=	${ELECTRON_VER:C/^([0-9]+)\..+$$/\1/}
+PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
 DISTFILES=	chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
 		chromium-${CHROMIUM_OFFICIAL_VER}${EXTRACT_SUFX}:chromium_official \
 		${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
@@ -64,7 +64,6 @@ GH_TUPLE=	electron:node:8bc5d171a0873c0ba49f9433798bc8
 		# yaml:pyyaml:3.12:pyyaml \
 		# kennethreitz:requests:e4d59bedfd3c7f4f254f4f5d036587bcd8152458:requests
 
-#ELECTRON_VER=	4.2.12
 # Official chromium version containing "gn" which is known to work
 CHROMIUM_OFFICIAL_VER=	76.0.3809.132
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
@@ -156,7 +155,7 @@ POST_BUILD_DIST_TARGETS=	electron_dist_zip electron_ch
 NPM_TIMESTAMP=	1573298347
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
-		PKGNAMESUFFIX=${PKGNAMESUFFIX}
+		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
 
 .include "Makefile.version"
 .include "Makefile.tests"

Modified: head/devel/electron4/Makefile.version
==============================================================================
--- head/devel/electron4/Makefile.version	Sun Feb 16 21:50:29 2020	(r526330)
+++ head/devel/electron4/Makefile.version	Mon Feb 17 00:19:28 2020	(r526331)
@@ -1,3 +1,4 @@
 # $FreeBSD$
 
 ELECTRON_VER=	4.2.12
+ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}

Modified: head/devel/electron4/pkg-plist
==============================================================================
--- head/devel/electron4/pkg-plist	Sun Feb 16 21:50:29 2020	(r526330)
+++ head/devel/electron4/pkg-plist	Mon Feb 17 00:19:28 2020	(r526331)
@@ -1,4 +1,4 @@
-bin/electron%%PKGNAMESUFFIX%%
+bin/electron%%ELECTRON_VER_MAJOR%%
 %%DATADIR%%/LICENSE
 %%DATADIR%%/LICENSES.chromium.html
 %%DATADIR%%/chrome_100_percent.pak



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