diff options
| author | Luca Pizzamiglio <pizzamig@FreeBSD.org> | 2020-02-17 00:19:28 +0000 |
|---|---|---|
| committer | Luca Pizzamiglio <pizzamig@FreeBSD.org> | 2020-02-17 00:19:28 +0000 |
| commit | 17a9a2bc96b9bf3e9b8338a89e3eb693367241b6 (patch) | |
| tree | bee52b34cb14d6fbfd85e98b3e2668166f6c1bae | |
| parent | databases/foundationdb & -devel: use mono only during build (diff) | |
devel/electron4: minor cleanup
No functional change, only clean-up.
Submitted by: maintainer (via github)
| -rw-r--r-- | devel/electron4/Makefile | 5 | ||||
| -rw-r--r-- | devel/electron4/Makefile.version | 1 | ||||
| -rw-r--r-- | devel/electron4/pkg-plist | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/devel/electron4/Makefile b/devel/electron4/Makefile index e271c95c0d2a..d72f8ddd4a9c 100644 --- a/devel/electron4/Makefile +++ b/devel/electron4/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v4. 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:8bc5d171a0873c0ba49f9433798bc8b67399788c:node # 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_chromedriver_zip electron_mk NPM_TIMESTAMP= 1573298347 PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \ - PKGNAMESUFFIX=${PKGNAMESUFFIX} + ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR} .include "Makefile.version" .include "Makefile.tests" diff --git a/devel/electron4/Makefile.version b/devel/electron4/Makefile.version index f336df93404d..71adc1e98875 100644 --- a/devel/electron4/Makefile.version +++ b/devel/electron4/Makefile.version @@ -1,3 +1,4 @@ # $FreeBSD$ ELECTRON_VER= 4.2.12 +ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron4/pkg-plist b/devel/electron4/pkg-plist index 1257c7484a5b..48ff3d8f1952 100644 --- a/devel/electron4/pkg-plist +++ b/devel/electron4/pkg-plist @@ -1,4 +1,4 @@ -bin/electron%%PKGNAMESUFFIX%% +bin/electron%%ELECTRON_VER_MAJOR%% %%DATADIR%%/LICENSE %%DATADIR%%/LICENSES.chromium.html %%DATADIR%%/chrome_100_percent.pak |