<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d25f140b0e34e001f753211acac9e45ee4803069">https://github.com/macports/macports-ports/commit/d25f140b0e34e001f753211acac9e45ee4803069</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d25f140b0e34e001f753211acac9e45ee4803069
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jun 21 02:39:25 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> edbrowse: Update to 3.8.2.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63982
</span>---
www/edbrowse/Portfile | 108 +++++++++++++++++++------
www/edbrowse/files/build-quickjs.patch | 15 ++++
www/edbrowse/files/docdir.patch | 12 +++
www/edbrowse/files/org.macports.edbrowse.plist | 18 +++++
www/edbrowse/files/patch-makefile.diff | 37 ---------
www/edbrowse/files/use-CFLAGS.patch | 21 +++++
6 files changed, 148 insertions(+), 63 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/edbrowse/Portfile b/www/edbrowse/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ecbf66e3d9..7d8a197a012 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/edbrowse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/edbrowse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,32 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup CMB edbrowse 3.8.2.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set quickjs_version 2021-03-27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set main_distfile ${distfiles}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set quickjs_distname quickjs-${quickjs_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set quickjs_distfile ${quickjs_distname}.tar.xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${main_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b9d224a50bf084b4ec5dd05ae7b3a822e0e6147e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a9c1d1fd0665796b81f18b0556f80237c13594033062f9312a49aa9159086e7a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 909574 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${quickjs_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 0d59b21acc50db254d1087baed8c625e6390c113 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a45bface4c3379538dea8533878d694e289330488ea7028b105f72572fe7fe1a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 753556
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name edbrowse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span> categories www
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# edbrowse: GPL-2; quickjs: MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2 MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description A combination editor, browser, and mail client that is \
100% text based.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> long_description Edbrowse is a combination editor, browser, and mail client \
that is 100% text based. The interface is similar to \
/bin/ed, though there are many more features, such as \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,40 +40,79 @@ long_description Edbrowse is a combination editor, browser, and mail client \
</span> into databases through odbc.
homepage http://edbrowse.org/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set quickjs_homepage https://bellard.org/quickjs/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${github.master_sites}:main \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${quickjs_homepage}:quickjs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.only ${main_distfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${main_distfile}:main \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${quickjs_distfile}:quickjs
</span>
platforms darwin freebsd
installs_libs no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:pcre \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:spidermonkey185 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:readline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_zip yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}-1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_extract-append port:xz
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 42503f7f851b987f10a21d068b0f324d1fcac738 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 58089879c31b571792f76fc53c41374fcbe8386ea82fe451737ae72e8a78e826
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append path:bin/pkg-config:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/src/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tidy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:unixODBC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set quickjs_worksrcpath ${workpath}/${quickjs_distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set docdir ${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "xz -dc [shellescape ${distpath}/${quickjs_distfile}] | ${portutil::autoconf::tar_command} -xf -"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${distname} ${workpath}/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${quickjs_distname} ${workpath}/quickjs
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.dir ${workpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles build-quickjs.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ docdir.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use-CFLAGS.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@DOCDIR@|${docdir}|g" ${worksrcpath}/doc/man-${name}-freebsd.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -I${prefix}/include/mozjs185
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append "CC=${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPPFLAGS=${configure.cppflags} -DSYSBSD -DXP_UNIX -DX86_LINUX"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env QUICKJS_DIR=${quickjs_worksrcpath}
</span> build.args STRIP=''
destroot {
xinstall ${worksrcpath}/src/${name} ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0444 ${worksrcpath}/doc/man-${name}-freebsd.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/man/man1/${name}.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/doc ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete {*}[glob ${destroot}${docdir}/man-${name}-*.1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHANGES \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COPYING \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${docdir}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {(3.[0-9].[0-9]+)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Create a launchd plist that creates the temporary directory with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# secure permissions. See README. This only needs to happen at load so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set startupitem.executable (to a dummy value) to avoid creating the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# unnecessary wrapper script and overwrite the plist MacPorts creates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# with our own to avoid the unnecessary use of daemondo.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.autostart yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.executable /bin/true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${startupitem.type} eq "launchd"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${filespath}/${startupitem.uniquename}.plist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${startupitem.location}/${startupitem.uniquename}/${startupitem.plist}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The startup item only creates a secure temporary directory for\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+${subport}; it does not start ${subport}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/edbrowse/files/build-quickjs.patch b/www/edbrowse/files/build-quickjs.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..45b462ed540
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/edbrowse/files/build-quickjs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Build quickjs first.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- edbrowse/makefile.orig 2022-03-12 23:41:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ edbrowse/makefile 2022-06-21 02:22:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Simple makefile to move to the src directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This only works if you are making the default target.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QUICKJS_DIR ?= ../quickjs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tools/quickjobfixup $(QUICKJS_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(MAKE) -C $(QUICKJS_DIR) libquickjs.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd src ; make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean :
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/edbrowse/files/docdir.patch b/www/edbrowse/files/docdir.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f79855eff41
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/edbrowse/files/docdir.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add a placeholder for the Portfile to patch in the real path.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- edbrowse/doc/man-edbrowse-freebsd.1.orig 2022-03-12 23:41:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ edbrowse/doc/man-edbrowse-freebsd.1 2022-06-21 02:28:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,7 +129,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .Em userguide.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,type:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .Pp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.Dl edbrowse /usr/local/share/doc/edbrowse/usersguide.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.Dl edbrowse @DOCDIR@/usersguide.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .Sh AUTHORS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .Nm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ was primarily written by Karl Dahlke <eklhad@comcast.net>.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/edbrowse/files/org.macports.edbrowse.plist b/www/edbrowse/files/org.macports.edbrowse.plist
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..31f1ce11c40
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/edbrowse/files/org.macports.edbrowse.plist
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<plist version="1.0">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>Label</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>org.macports.edbrowse</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>ProgramArguments</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <array>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>/bin/sh</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>-c</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>mkdir -p /tmp/.edbrowse && chmod 1777 /tmp/.edbrowse</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </array>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>Disabled</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <true/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>RunAtLoad</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <true/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+</dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+</plist>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/edbrowse/files/patch-makefile.diff b/www/edbrowse/files/patch-makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7179f36efad..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/edbrowse/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/makefile.orig 2012-12-29 09:22:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/makefile 2013-05-31 10:54:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is the makefile for edbrowse.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--prefix = /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+prefix = @@PREFIX@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bindir = $(prefix)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Flags for gcc compilation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # C preprocessor flags. CPPFLAGS is used in the %.o: %.c implicit rule,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # available in GNU make.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CPPFLAGS = $(JS_CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#CPPFLAGS = $(JS_CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # By default, we strip the executables.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Override this behavior on the command line, by setting STRIP to the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # You probably need to be root to do this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -Dm755 edbrowse $(DESTDIR)$(bindir)/edbrowse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -m755 edbrowse $(DESTDIR)$(bindir)/edbrowse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If you had to build the javascript library yourself,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # link it into /usr/lib.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -102,7 +102,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATICLIBS = -lodbc -lpcre -lm -ljs -lcurl -lssl -lc -lcrypto -lpthread -lm -ldl -lrt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- edbrowse.static: $(EBOBJS) tcp.o dbops.o dbodbc.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cc --static $(LFLAGS) -o edbrowse.static $(EBOBJS) tcp.o dbops.o dbodbc.o $(STATICLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) --static $(LFLAGS) -o edbrowse.static $(EBOBJS) tcp.o dbops.o dbodbc.o $(STATICLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clean:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f *.o edbrowse edbrowseinf edbrowseodbc edbrowse.static
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/edbrowse/files/use-CFLAGS.patch b/www/edbrowse/files/use-CFLAGS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4b07b2bee1b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/edbrowse/files/use-CFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't override MacPorts CFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- quickjs/Makefile.orig 2021-03-27 05:00:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ quickjs/Makefile 2022-06-20 23:10:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef CONFIG_CLANG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HOST_CC=clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=$(CROSS_PREFIX)clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS += -g -Wall -MMD -MF $(OBJDIR)/$(@F).d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wextra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wno-sign-compare
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wno-missing-field-initializers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,7 +87,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HOST_CC=gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=$(CROSS_PREFIX)gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS += -g -Wall -MMD -MF $(OBJDIR)/$(@F).d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wno-array-bounds -Wno-format-truncation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef CONFIG_LTO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AR=$(CROSS_PREFIX)gcc-ar
</span></pre><pre style='margin:0'>
</pre>