svn commit: r526328 - in head/devel/electron6: . files

[Luca Pizzamiglio]

Author: pizzamig
Date: Sun Feb 16 21:43:18 2020
New Revision: 526328
URL: https://svnweb.freebsd.org/changeset/ports/526328

Log:
  devel/electron6: small cleanup
  
  no functional changes, only small clean-up
  
  Submitted by:	maintainer (via github)

Added:
  head/devel/electron6/files/patch-third__party_snappy_src_snappy.h
     - copied unchanged from r526327, head/devel/electron6/files/patch-third__part_snappy_src_snappy.h
Deleted:
  head/devel/electron6/Makefile.tests
  head/devel/electron6/files/patch-third__part_snappy_src_snappy.h
Modified:
  head/devel/electron6/Makefile
  head/devel/electron6/Makefile.version
  head/devel/electron6/pkg-plist

Modified: head/devel/electron6/Makefile
==============================================================================
--- head/devel/electron6/Makefile	Sun Feb 16 21:32:55 2020	(r526327)
+++ head/devel/electron6/Makefile	Sun Feb 16 21:43:18 2020	(r526328)
@@ -165,7 +165,7 @@ POST_BUILD_DIST_TARGETS=	electron_dist_zip electron_ch
 YARN_TIMESTAMP=	1576819964
 
 PLIST_SUB=	ELECTRON_VER=${ELECTRON_VER} \
-		PKGNAMESUFFIX=${PKGNAMESUFFIX}
+		ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
 
 .include "Makefile.version"
 .include <bsd.port.pre.mk>

Modified: head/devel/electron6/Makefile.version
==============================================================================
--- head/devel/electron6/Makefile.version	Sun Feb 16 21:32:55 2020	(r526327)
+++ head/devel/electron6/Makefile.version	Sun Feb 16 21:43:18 2020	(r526328)
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
 ELECTRON_VER=	6.1.7
-ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/^([0-9]+)\..+$$/\1/}
+ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}

Copied: head/devel/electron6/files/patch-third__party_snappy_src_snappy.h (from r526327, head/devel/electron6/files/patch-third__part_snappy_src_snappy.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/electron6/files/patch-third__party_snappy_src_snappy.h	Sun Feb 16 21:43:18 2020	(r526328, copy of r526327, head/devel/electron6/files/patch-third__part_snappy_src_snappy.h)
@@ -0,0 +1,20 @@
+--- third_party/snappy/src/snappy.h.orig	2020-01-22 18:43:16 UTC
++++ third_party/snappy/src/snappy.h
+@@ -73,7 +73,7 @@ namespace snappy {
+   // Original contents of *output are lost.
+   //
+   // REQUIRES: "input[]" is not an alias of "*output".
+-  size_t Compress(const char* input, size_t input_length, string* output);
++  size_t Compress(const char* input, size_t input_length, std::string* output);
+ 
+   // Decompresses "compressed[0,compressed_length-1]" to "*uncompressed".
+   // Original contents of "*uncompressed" are lost.
+@@ -82,7 +82,7 @@ namespace snappy {
+   //
+   // returns false if the message is corrupted and could not be decompressed
+   bool Uncompress(const char* compressed, size_t compressed_length,
+-                  string* uncompressed);
++                  std::string* uncompressed);
+ 
+   // Decompresses "compressed" to "*uncompressed".
+   //

Modified: head/devel/electron6/pkg-plist
==============================================================================
--- head/devel/electron6/pkg-plist	Sun Feb 16 21:32:55 2020	(r526327)
+++ head/devel/electron6/pkg-plist	Sun Feb 16 21:43:18 2020	(r526328)
@@ -1,4 +1,4 @@
-bin/electron%%PKGNAMESUFFIX%%
+bin/electron%%ELECTRON_VER_MAJOR%%
 %%DATADIR%%/LICENSE
 %%DATADIR%%/LICENSES.chromium.html
 %%DATADIR%%/chrome_100_percent.pak