From nobody Tue Oct 04 16:11:54 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MhjQ23dssz4f9bG; Tue, 4 Oct 2022 16:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MhjQ236v3z41yZ; Tue, 4 Oct 2022 16:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664899914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NriLXKDfP2AHzRg7HjiVyhNZ6bcjZyMZ0UAiSA5qQIM=; b=hrN6jBZJmdTvvcaBmKYxM7hx+Uv4VnI+UlrBO1udMLsmgCKTOpLNJwiC9lu98ZEyYqiT5Y PwrdijZvWNA89fKDrXEKvprErmIanZtChyRowSSyUGRHhvQBgpOfrDIFuxvzxt0TpE02rg H/BwJVLPpMBHOVRKKoh2bsnFCIEKRzYo1gB6N0Cj7xympj3GZcwN7gGYsi9S7sz3thijhI s0Grh6b2gJchMzFdItZu6U+SE1+bNrbVKrWPcC3KEvbzmvWYoZbCfNX8xOqy5pzJ5lC+gG YqfRkdP5p1Cyc5QkDDio2xsKwUpRAL1wJayjo8KCOL6/uLBpFs2rjb5pBdOPoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MhjQ229RNzcZ6; Tue, 4 Oct 2022 16:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 294GBsH7035431; Tue, 4 Oct 2022 16:11:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 294GBsOG035430; Tue, 4 Oct 2022 16:11:54 GMT (envelope-from git) Date: Tue, 4 Oct 2022 16:11:54 GMT Message-Id: <202210041611.294GBsOG035430@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 869944c765a3 - main - www/edbrowse: Update to 3.8.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 869944c765a38918004b0611c13dcb09714cb459 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664899914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NriLXKDfP2AHzRg7HjiVyhNZ6bcjZyMZ0UAiSA5qQIM=; b=uT2g1ARKHHJilCNH5IqEH+MHl2u55/EEGrg61POitFHmzMJ/IqKUScA+spQXlpngQxB6YK rOrl0c2TVwlZoSzhd2pQKD9kS096SfRUFA1kQoXpdvPr1/XbcnwnhQILxeB2tXBDpRKB1T FlBQmmZ+Ul0uJAjyFNMTK8vsfjSQVfwRAab2EY8GxJl2ygpfsdi5uuQsqGxonFv7zNH9Vn iFlY3cNlaD/xRA9gEJM92SkiychRZt1Tg7GWUnvGX7bpElPBc2zt9Hpl5hUKw/WF7RsDRK SpusJeB4uTFrjOGPO/kaAyeNLlX3b2/g7TJik7q6zEDQk11xx/Ywix0iI6yGxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664899914; a=rsa-sha256; cv=none; b=DU5Ye3AOLfHv1ojPIlX76MAsz7VWLdpX8CzJ4DX8jnebHSWFrlC1lV9eCdOO4sq4N8WNG8 FDiSW3+X0GNdM4Z0MbReudV+3gi7trCFmycEIaU8AmAgvRvQei1cqBjeEcQQAkYZp/CCCe dM83nf387MKoUgyZZft6fnSn+IpuKDNh9dfHstwBPTH2CseI35SWAw29DJMnJgXzIgFGJI 3veRpS73Pln+Kw6HYfkBoB58BLj4QitTj8EXZw09+/bMYkpWN1phXw1+8ZZXj31zkmLXOi LBZt+lyz9ekgqWpyGB7EttXGLXwSo1Gv9gmz95kDBg8hTZiPeH+YV2grug1PGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=869944c765a38918004b0611c13dcb09714cb459 commit 869944c765a38918004b0611c13dcb09714cb459 Author: Alfonso S. Siciliano AuthorDate: 2022-10-04 06:25:27 +0000 Commit: Fernando Apesteguía 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