git: 869944c765a3 - main - www/edbrowse: Update to 3.8.5

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=869944c765a38918004b0611c13dcb09714cb459

commit 869944c765a38918004b0611c13dcb09714cb459
Author:     Alfonso S. Siciliano <asiciliano@FreeBSD.org>
AuthorDate: 2022-10-04 06:25:27 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-10-04 16:08:20 +0000

    www/edbrowse: Update to 3.8.5
    
    ChangeLog: https://github.com/CMB/edbrowse/blob/master/CHANGES
    
    PR:             266805
    Reported by:    asiciliano@FreeBSD.org
---
 www/edbrowse/Makefile                 | 18 ++++++++++--------
 www/edbrowse/distinfo                 |  6 +++---
 www/edbrowse/files/patch-makefile     | 11 +++++++++++
 www/edbrowse/files/patch-src_makefile | 20 ++++++++++++++++++++
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/www/edbrowse/Makefile b/www/edbrowse/Makefile
index 7935f86d7b3a..e37a9f06b152 100644
--- a/www/edbrowse/Makefile
+++ b/www/edbrowse/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	edbrowse
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.7.7
-PORTREVISION=	1
+DISTVERSION=	3.8.5
 CATEGORIES=	www editors
 
 MAINTAINER=	alfix86@gmail.com
@@ -10,15 +9,18 @@ WWW=		https://edbrowse.org/
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpcre.so:devel/pcre \
-		libcurl.so:ftp/curl \
-		libtidy5.so:www/tidy-html5 \
-		libduktape.so:lang/duktape-lib
+BUILD_DEPENDS=	${LOCALBASE}/include/quickjs/quickjs.h:lang/quickjs \
+		${LOCALBASE}/lib/quickjs/libquickjs.a:lang/quickjs
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libodbc.so:databases/unixODBC \
+		libpcre2-8.so:devel/pcre2
 
-USES=		cmake:insource compiler:c11 perl5 readline
+USES=		compiler:c11 gmake perl5 pkgconfig readline
 USE_PERL5=	build
 USE_GITHUB=	yes
 
+MAKEFILE=	makefile
+
 GH_ACCOUNT=	CMB
 
 PLIST_FILES=	bin/${PORTNAME} \
@@ -30,7 +32,7 @@ OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man-edbrowse-freebsd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
-	${INSTALL_PROGRAM} ${WRKSRC}/edbrowse ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/edbrowse ${STAGEDIR}${PREFIX}/bin
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/www/edbrowse/distinfo b/www/edbrowse/distinfo
index 562936aefaf1..aa4325ebf2b1 100644
--- a/www/edbrowse/distinfo
+++ b/www/edbrowse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604765984
-SHA256 (CMB-edbrowse-v3.7.7_GH0.tar.gz) = bc015decc022d90f482a7f1028e9a56aa84f17406879f9aa1060e1dc175ed00f
-SIZE (CMB-edbrowse-v3.7.7_GH0.tar.gz) = 835830
+TIMESTAMP = 1664835405
+SHA256 (CMB-edbrowse-v3.8.5_GH0.tar.gz) = 4fb6ce7962560552b370c55467dc65f6d751de06ba373ac7c4678625daed37b4
+SIZE (CMB-edbrowse-v3.8.5_GH0.tar.gz) = 928505
diff --git a/www/edbrowse/files/patch-makefile b/www/edbrowse/files/patch-makefile
new file mode 100644
index 000000000000..cd06747a0a9f
--- /dev/null
+++ b/www/edbrowse/files/patch-makefile
@@ -0,0 +1,11 @@
+--- makefile.orig	2022-10-04 00:20:51 UTC
++++ makefile
+@@ -2,7 +2,7 @@ all :
+ #  This only works if you are making the default target.
+ 
+ all :
+-	cd src ; make
++	cd src && $(MAKE)
+ 
+ clean :
+ 	cd src ; make clean
diff --git a/www/edbrowse/files/patch-src_makefile b/www/edbrowse/files/patch-src_makefile
new file mode 100644
index 000000000000..d891514900c6
--- /dev/null
+++ b/www/edbrowse/files/patch-src_makefile
@@ -0,0 +1,20 @@
+--- src/makefile.orig	2022-10-03 21:56:00 UTC
++++ src/makefile
+@@ -1,7 +1,7 @@ PERL ?= perl
+ #  compiler and flags
+ CC ?=		cc
+ PERL ?= perl
+-QUICKJS_DIR ?= ../../quickjs
++QUICKJS_DIR ?= /usr/local/include/quickjs
+ CFLAGS +=	-Wall -Wno-unused -D_FILE_OFFSET_BITS=64
+ ifeq ($(shell uname),Linux)
+ 	PLATFORM_CFLAGS = -DEDBROWSE_ON_LINUX
+@@ -34,7 +34,7 @@ LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm
+ LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm
+ 
+ # LDFLAGS for quickjs loading.
+-QUICKJS_LDFLAGS = $(QUICKJS_DIR)/libquickjs.a -ldl
++QUICKJS_LDFLAGS = /usr/local/lib/quickjs/libquickjs.a -ldl
+ ifeq ($(shell uname),Linux)
+ 	QUICKJS_LDFLAGS += -latomic
+ endif