Update makeesparduino to 5.0.2.

ok jca@
This commit is contained in:
tracey 2020-05-18 22:11:43 +00:00
parent bd3f806067
commit c3a6a0be27
5 changed files with 31 additions and 19 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2020/04/23 14:31:06 tracey Exp $
# $OpenBSD: Makefile,v 1.2 2020/05/18 22:11:43 tracey Exp $
COMMENT = makefile for ESP8266 and ESP32 Arduino projects
GH_ACCOUNT = plerup
GH_PROJECT = makeEspArduino
GH_TAGNAME = 4.22.0
GH_TAGNAME = 5.0.2
PKGNAME = makeesparduino-${GH_TAGNAME}
@ -27,5 +27,6 @@ post-patch:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/makeEspArduino
cp -r ${WRKDIST}/*.mk ${PREFIX}/share/makeEspArduino/
cp -r ${WRKDIST}/tools ${PREFIX}/share/makeEspArduino/
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (makeEspArduino-4.22.0.tar.gz) = uqUhHKeLx0rrW+xoXm2A7l6LTfM2Jqegf4g49tnjM7w=
SIZE (makeEspArduino-4.22.0.tar.gz) = 22314
SHA256 (makeEspArduino-5.0.2.tar.gz) = Xm/HwKIToQ2zJxLkSOvSNJh9jUkAf2MQqD0WCGCAdYk=
SIZE (makeEspArduino-5.0.2.tar.gz) = 25007

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-makeEspArduino_mk,v 1.1.1.1 2020/04/23 14:31:06 tracey Exp $
$OpenBSD: patch-makeEspArduino_mk,v 1.2 2020/05/18 22:11:43 tracey Exp $
Index: makeEspArduino.mk
--- makeEspArduino.mk.orig
+++ makeEspArduino.mk
@@ -26,8 +26,13 @@ CHIP ?= esp8266
BOARD ?= $(if $(filter $(CHIP), esp32),esp32,generic)
@@ -26,8 +26,13 @@ __TOOLS_DIR := $(dir $(__THIS_FILE))tools
CHIP ?= esp8266
# Serial flashing parameters
-UPLOAD_PORT ?= $(shell ls -1tr /dev/tty*USB* 2>/dev/null | tail -1)
@ -76,7 +76,7 @@ Index: makeEspArduino.mk
else
# Location defined, assume it is a git clone
ESP_ARDUINO_VERSION = $(call git_description,$(ESP_ROOT))
@@ -213,6 +233,8 @@ LWIP_VARIANT ?= $(shell cat $(ESP_ROOT)/boards.txt | p
@@ -215,6 +235,8 @@ LWIP_VARIANT ?= $(shell $(BOARD_OP) $(BOARD) first_lwi
# Handle possible changed state i.e. make command line parameters or changed git versions
ifeq ($(OS), Darwin)
CMD_LINE := $(shell ps $$PPID -o command | tail -1)
@ -85,8 +85,8 @@ Index: makeEspArduino.mk
else
CMD_LINE := $(shell tr "\0" " " </proc/$$PPID/cmdline)
endif
@@ -496,6 +518,8 @@ DEFAULT_GOAL ?= all
@@ -515,6 +537,8 @@ DEFAULT_GOAL ?= all
# Build threads, default is using all cpus
ifeq ($(OS), Darwin)
BUILD_THREADS ?= $(shell sysctl -n hw.ncpu)
+else ifeq ($(OS), OpenBSD)
@ -94,11 +94,3 @@ Index: makeEspArduino.mk
else
BUILD_THREADS ?= $(shell nproc)
endif
@@ -516,6 +540,7 @@ my $$os = shift;
$$os =~ s/Windows_NT/windows/;
$$os =~ s/Linux/linux/;
$$os =~ s/Darwin/macosx/;
+$$os =~ s/OpenBSD/openbsd/;
my $$lwipvariant = shift;
my %v;

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-tools_parse_arduino_pl,v 1.1 2020/05/18 22:11:43 tracey Exp $
Index: tools/parse_arduino.pl
--- tools/parse_arduino.pl.orig
+++ tools/parse_arduino.pl
@@ -22,6 +22,7 @@ my $os = shift;
$os =~ s/Windows_NT/windows/;
$os =~ s/Linux/linux/;
$os =~ s/Darwin/macosx/;
+$os =~ s/OpenBSD/openbsd/;
my $lwipvariant = shift;
my %vars;

View File

@ -1,3 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2020/04/23 14:31:07 tracey Exp $
@comment $OpenBSD: PLIST,v 1.2 2020/05/18 22:11:43 tracey Exp $
share/makeEspArduino/
share/makeEspArduino/makeEspArduino.mk
share/makeEspArduino/tools/
share/makeEspArduino/tools/board_op.pl
share/makeEspArduino/tools/find_inc.pl
share/makeEspArduino/tools/mem_use.pl
share/makeEspArduino/tools/parse_arduino.pl
share/makeEspArduino/tools/vscode.pl