From nobody Fri Sep 22 03:36:59 2023 X-Original-To: dev-commits-ports-main@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 4RsHyn4WQ8z4vQZy for ; Fri, 22 Sep 2023 03:37:37 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsHyn449Zz3Xsg for ; Fri, 22 Sep 2023 03:37:37 +0000 (UTC) (envelope-from sunpoet@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695353857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mD7ID8ys8nf4jFOqqj7jJv2YplsuQQVwPdCZUUdhs14=; b=ySkR51li+bthsZtqDK14hEwhWYKLe5rl/2jt4n/hL9i0El6aPNUJsZV3raLclPcyhPUAsL Fi9Sru485CPanI6bqXd1uJpA8dEopdY1HCGUaEiCJ1CMVHJSUs7LXGEJOOnm+Qhr4SG8rJ QeRGJbZBRH9z7XLM8kX6deALfTkHHXZNGoGniolkaL3+u+WkgMN1vbfmsm2+gI5iPo05jA 1hPNHg+cWKq/U6TvJbJsHT7j+ub2AOTbj/2jVTZqOCXzZohZz8COj8Ud+mFcjihVr01tZO W32Iz54xNmqBTy6WqhlzfuiX6FcRp/erhwPZMrLpuNVZ+/l9ZoNOWkpi8yEHSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695353857; a=rsa-sha256; cv=none; b=uofYUOdaDCe/onOWdtLZy1W5kR4rwgSQYQULWgMNPkWO54+n7qj6sHvw+mUydNd3w8s4km XiIClKI7BfB91z4Fx0viJFL3kEeHObThcW+RvkSyVGo1BNBhpXSeIBvoqJpV48QMPb7THW 5ayTkwb3rOnVhJAtodyDDAdP74//v9YLKQIOQlISvjuay6yOmGrLoTyLeelOwqbUDdZPBr Ur0tgv4qUVHmSYO4wQUMJo87G/2Gw8Lz0MXj3YbBi/N/rzZvIU2hk0U0BGjCe1SAJ9lrLV lHi5ncU4sWIx5tYIkkk0YLgiyXbjj0yDmJhKltlb3rNHKy5d45/+CPUxlsy4lA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695353857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mD7ID8ys8nf4jFOqqj7jJv2YplsuQQVwPdCZUUdhs14=; b=CNAWF0lXX/itwFKtO7eUACuwvMlU06L7F9iQUB66Qi22GWDn1czRMi8bVaa09t50TWZRbF 1EvMwClfi6cuhqh/5oKgElQx8YdlSBvP3qux1Bg8uiVjyNXPPlxJFGSTBJVdpEJ0VlGbyf fMS7tVH6HVUHQBJrM+TbB4DmJ036TILTYd8tGZL9sP1kjjunSzSRlZn3S+VaalTfNpFrX1 i/5axUAh1CEOZdcnsl41AnRqCgEN8q5Yt552r5VbEBRyjW51M111TmVyNQlPOfVKLMsSEt 6/Qr1vhcR7LBmE6heF4SXvJkYXKph0xLvr01Cdf70t166sFmkx0gCni/0260xw== Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: sunpoet) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RsHyn2TFMz8Tq for ; Fri, 22 Sep 2023 03:37:37 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-533352059fdso1850531a12.0 for ; Thu, 21 Sep 2023 20:37:37 -0700 (PDT) X-Gm-Message-State: AOJu0Yymz29vziA3eclEIsGlETzIKUhXGZOb2Glt14JoanQo3JlZzw6+ XX8QRYzZluCsZL7laqQivNPCRkJEfvhh6o2qT7kWbw== X-Google-Smtp-Source: AGHT+IHk6uQSRAoAelBTHm3Nrdq2/yxo79lIEucMMHm9MjOMvQR3s+bKABLE5jfdUvZLsf8EGSSoDHa12e5hVN5bCbg= X-Received: by 2002:a05:6402:174f:b0:533:4c67:c911 with SMTP id v15-20020a056402174f00b005334c67c911mr2528308edx.19.1695353855840; Thu, 21 Sep 2023 20:37:35 -0700 (PDT) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 References: <202309212210.38LMAbJS067795@gitrepo.freebsd.org> In-Reply-To: <202309212210.38LMAbJS067795@gitrepo.freebsd.org> From: Po-Chuan Hsieh Date: Fri, 22 Sep 2023 11:36:59 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: d444560271bb - main - net/libproxy: update to 0.4.18 release (+) To: Dima Panov Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000058a8aa0605ea5439" --00000000000058a8aa0605ea5439 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Sep 22, 2023 at 6:10=E2=80=AFAM Dima Panov wro= te: > The branch main has been updated by fluffy: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3Dd444560271bb19f11c57d14ac8098= cb906c9444d > > commit d444560271bb19f11c57d14ac8098cb906c9444d > Author: Dima Panov > AuthorDate: 2023-09-21 22:05:53 +0000 > Commit: Dima Panov > CommitDate: 2023-09-21 22:05:53 +0000 > > net/libproxy: update to 0.4.18 release (+) > > Add new duktape plugin to the build > > Changelog: > https://github.com/libproxy/libproxy/releases/tag/0.4.18 Hello, It's broken now. =3D=3D=3D> Patching for libproxy-0.4.18 =3D=3D=3D> Applying FreeBSD patches for libproxy-0.4.18 from /usr/ports/net/libproxy/files 1 out of 1 hunks failed--saving rejects to bindings/perl/t/CMakeLists.txt.rej =3D=3D=3D> FAILED Applying FreeBSD patch-bindings_perl_t_CMakeLists.txt =3D=3D=3D> Cleanly applied FreeBSD patch(es) patch-CMakeLists.txt patch-bindings_CMakeLists.txt patch-bindings_perl_src_CMakeLists.txt =3D=3D=3D> FAILED to apply cleanly FreeBSD patch(es) patch-bindings_perl_t_CMakeLists.txt *** Error code 1 > > --- > net/Makefile | 1 + > net/libproxy-duktape/Makefile | 12 > ++++++++++++ > net/libproxy-duktape/pkg-descr | 5 +++++ > net/libproxy-duktape/pkg-plist | 1 + > net/libproxy-webkit3/Makefile | 2 +- > net/libproxy/Makefile | 8 ++++--= -- > net/libproxy/distinfo | 6 +++--- > net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt | 8 ++++--= -- > net/libproxy/files/patch-libproxy_cmake_modules.cmk | 4 ++-- > .../patch-libproxy_cmake_modules_pacrunner__duktape.cmk | 10 > ++++++++++ > 10 files changed, 43 insertions(+), 14 deletions(-) > > diff --git a/net/Makefile b/net/Makefile > index 73841997c6d0..a0822b6214ba 100644 > --- a/net/Makefile > +++ b/net/Makefile > @@ -414,6 +414,7 @@ > SUBDIR +=3D libpcapnav > SUBDIR +=3D libpfctl > SUBDIR +=3D libproxy > + SUBDIR +=3D libproxy-duktape > SUBDIR +=3D libproxy-gnome3 > SUBDIR +=3D libproxy-kde > SUBDIR +=3D libproxy-pacrunner > diff --git a/net/libproxy-duktape/Makefile b/net/libproxy-duktape/Makefil= e > new file mode 100644 > index 000000000000..28f0570f8069 > --- /dev/null > +++ b/net/libproxy-duktape/Makefile > @@ -0,0 +1,12 @@ > +PORTREVISION=3D 0 > +CATEGORIES=3D net devel > +PKGNAMESUFFIX=3D -${LIBPROXY_SLAVE} > + > +COMMENT=3D Duktape JavaScript plug-in for libproxy > + > +LIB_DEPENDS+=3D libduktape.so:lang/duktape-lib > + > +LIBPROXY_SLAVE=3D duktape > +MASTERDIR=3D ${.CURDIR}/../libproxy > + > +.include "${MASTERDIR}/Makefile" > diff --git a/net/libproxy-duktape/pkg-descr > b/net/libproxy-duktape/pkg-descr > new file mode 100644 > index 000000000000..39c82a099848 > --- /dev/null > +++ b/net/libproxy-duktape/pkg-descr > @@ -0,0 +1,5 @@ > +Libproxy exists to answer the question: Given a network resource, how do= I > +reach it? It handles all the details, enabling you to get back to > +programming. > + > +This plug-in allows the Duktape JS engine to make use of libproxy. > diff --git a/net/libproxy-duktape/pkg-plist > b/net/libproxy-duktape/pkg-plist > new file mode 100644 > index 000000000000..d9414aaebb90 > --- /dev/null > +++ b/net/libproxy-duktape/pkg-plist > @@ -0,0 +1 @@ > +lib/libproxy/%%VERSION%%/modules/pacrunner_duktape.so > diff --git a/net/libproxy-webkit3/Makefile b/net/libproxy-webkit3/Makefil= e > index f630fea894e1..6cc1bc2c6b51 100644 > --- a/net/libproxy-webkit3/Makefile > +++ b/net/libproxy-webkit3/Makefile > @@ -4,7 +4,7 @@ PKGNAMESUFFIX=3D -${LIBPROXY_SLAVE} > > COMMENT=3D WebKit JavaScript plug-in for libproxy > > -LIB_DEPENDS=3D libjavascriptcoregtk-4.0.so:www/webkit2-gtk3 > +LIB_DEPENDS+=3D libjavascriptcoregtk-4.0.so:www/webkit2-gtk3 > > USES=3D gettext-runtime gnome > USE_GNOME=3D glib20 > diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile > index 881f5be95934..dd7fab4fbdf5 100644 > --- a/net/libproxy/Makefile > +++ b/net/libproxy/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D libproxy > -DISTVERSION=3D 0.4.17 > -PORTREVISION?=3D 1 > +DISTVERSION=3D 0.4.18 > +PORTREVISION?=3D 0 > CATEGORIES?=3D net devel > MASTER_SITES=3D > https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSIO= N}/ > > @@ -19,7 +19,7 @@ CMAKE_ON+=3D WITH_VALA > CMAKE_OFF+=3D BIPR WITH_DOTNET WITH_NATUS WITH_NM WITH_NMold > > # Slave ports. > -LIBPROXY_SLAVES=3D library gnome3 kde mozjs python perl webkit3 > +LIBPROXY_SLAVES=3D library duktape gnome3 kde mozjs python perl > webkit3 > > # If nothing is set, we're building the library, i.e. this port. > LIBPROXY_SLAVE?=3D library > @@ -49,7 +49,7 @@ LIB_DEPENDS+=3D libdbus-1.so:devel/dbus > CMAKE_ON=3D BUILD_CONFIG_PACRUNNER > .endif > > -.if ${LIBPROXY_SLAVE:Mkde} || ${LIBPROXY_SLAVE:Mwebkit3} > +.if ${LIBPROXY_SLAVE:Mkde} || ${LIBPROXY_SLAVE:Mduktape} || > ${LIBPROXY_SLAVE:Mmozjs} || ${LIBPROXY_SLAVE:Mwebkit3} > RUN_DEPENDS+=3D libproxy-pacrunner>=3D${DISTVERSION}:net/libproxy-pacru= nner > .endif > > diff --git a/net/libproxy/distinfo b/net/libproxy/distinfo > index b51e5c7ec3d6..cad62a8f6f24 100644 > --- a/net/libproxy/distinfo > +++ b/net/libproxy/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP =3D 1642408064 > -SHA256 (libproxy-0.4.17.tar.xz) =3D > bc89f842f654ee1985a31c0ba56dc7e2ce8044a0264ddca84e650f46cd7f8b05 > -SIZE (libproxy-0.4.17.tar.xz) =3D 80136 > +TIMESTAMP =3D 1690222352 > +SHA256 (libproxy-0.4.18.tar.xz) =3D > 69b5856e9ea42c38ac77e6b8c92ffc86a71d341fef74e77bef85f9cc6c47a4b1 > +SIZE (libproxy-0.4.18.tar.xz) =3D 82020 > diff --git a/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt > b/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt > index b35c965d6e74..db18ae1f7da1 100644 > --- a/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt > +++ b/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt > @@ -2,9 +2,9 @@ As the library is only built in the master port, and > therfore missing in the > build directory for the slave ports, find it via pkg-config and link > against it, > when building a slave. > > ---- bindings/perl/src/CMakeLists.txt.orig 2018-06-03 17:39:41 UTC > +--- bindings/perl/src/CMakeLists.txt.orig 2022-06-20 14:06:50 UTC > +++ bindings/perl/src/CMakeLists.txt > -@@ -4,7 +4,7 @@ include_directories( ${PERL_INCLUDE_PATH} ${CMAKE_SOUR > +@@ -4,7 +4,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ > add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c > COMMAND ${PERL_EXECUTABLE} ARGS > ${CMAKE_CURRENT_SOURCE_DIR}/doxsubpp.pl > ${PERL_EXECUTABLE} > ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.xs > ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c > @@ -13,8 +13,8 @@ when building a slave. > WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) > > set(Libproxy_LIB_SRCS Libproxy.c) > -@@ -12,7 +12,7 @@ set(Libproxy_LIB_SRCS Libproxy.c) > - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net) > +@@ -12,7 +12,7 @@ add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS}) > + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/auto/Net/Libproxy) > add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS}) > > -set(PLlibproxy_LIB_DEPENDENCIES libproxy pthread) > diff --git a/net/libproxy/files/patch-libproxy_cmake_modules.cmk > b/net/libproxy/files/patch-libproxy_cmake_modules.cmk > index afe898372415..081eda9955d7 100644 > --- a/net/libproxy/files/patch-libproxy_cmake_modules.cmk > +++ b/net/libproxy/files/patch-libproxy_cmake_modules.cmk > @@ -1,6 +1,6 @@ > ---- libproxy/cmake/modules.cmk.orig 2021-02-26 18:24:03 UTC > +--- libproxy/cmake/modules.cmk.orig 2022-06-20 13:54:49 UTC > +++ libproxy/cmake/modules.cmk > -@@ -29,7 +29,9 @@ endif() > +@@ -32,7 +32,9 @@ message("MODULES TO BUILD:") > ## Module definition > # > message("MODULES TO BUILD:") > diff --git > a/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__duktape.cmk > b/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__duktape.cmk > new file mode 100644 > index 000000000000..06c3322d95c5 > --- /dev/null > +++ > b/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__duktape.cmk > @@ -0,0 +1,10 @@ > +--- libproxy/cmake/modules/pacrunner_duktape.cmk.orig 2022-06-20 > 13:54:49 UTC > ++++ libproxy/cmake/modules/pacrunner_duktape.cmk > +@@ -17,5 +17,7 @@ else() > + link_directories(${DUKTAPE_LIBRARIES}) > + link_libraries(duktape) > + endif() > ++ else() > ++ set(DUKTAPE_FOUND 0) > + endif() > + endif() > > --00000000000058a8aa0605ea5439 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Fri, Sep 22, 2023 at 6:10=E2=80=AFAM D= ima Panov <fluff= y@freebsd.org> wrote:
The branch main has been updated by= fluffy:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3Dd444560271bb19f11c57d14ac8098cb906c9444d

commit d444560271bb19f11c57d14ac8098cb906c9444d
Author:=C2=A0 =C2=A0 =C2=A0Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2023-09-21 22:05:53 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2023-09-21 22:05:53 +0000

=C2=A0 =C2=A0 net/libproxy: update to 0.4.18 release (+)

=C2=A0 =C2=A0 Add new duktape plugin to the build

=C2=A0 =C2=A0 Changelog:=C2=A0 =C2=A0 =C2=A0 https://github.com/libproxy/libproxy/releases/tag/0.4.18<= div>
Hello,

It's broken now.

=3D=3D=3D> =C2=A0Patching for libproxy-0.4.18
=3D=3D= =3D> =C2=A0Applying FreeBSD patches for libproxy-0.4.18 from /usr/ports/= net/libproxy/files
1 out of 1 hunks failed--saving rejects to bindings/p= erl/t/CMakeLists.txt.rej
=3D=3D=3D> =C2=A0FAILED Applying FreeBSD pat= ch-bindings_perl_t_CMakeLists.txt
=3D=3D=3D> Cleanly applied FreeBSD = patch(es) =C2=A0patch-CMakeLists.txt patch-bindings_CMakeLists.txt patch-bi= ndings_perl_src_CMakeLists.txt
=3D=3D=3D> FAILED to apply cleanly Fre= eBSD patch(es) =C2=A0patch-bindings_perl_t_CMakeLists.txt
*** Error= code 1
=C2=A0

---
=C2=A0net/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 1 +
=C2=A0net/libproxy-duktape/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |= 12 ++++++++++++
=C2=A0net/libproxy-duktape/pkg-descr=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|= =C2=A0 5 +++++
=C2=A0net/libproxy-duktape/pkg-plist=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|= =C2=A0 1 +
=C2=A0net/libproxy-webkit3/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |= =C2=A0 2 +-
=C2=A0net/libproxy/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 |=C2=A0 8 ++++----
=C2=A0net/libproxy/distinfo=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 |=C2=A0 6 +++---
=C2=A0net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt=C2=A0 =C2= =A0 |=C2=A0 8 ++++----
=C2=A0net/libproxy/files/patch-libproxy_cmake_modules.cmk=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 |=C2=A0 4 ++--
=C2=A0.../patch-libproxy_cmake_modules_pacrunner__duktape.cmk=C2=A0 =C2=A0 = =C2=A0 | 10 ++++++++++
=C2=A010 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/net/Makefile b/net/Makefile
index 73841997c6d0..a0822b6214ba 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -414,6 +414,7 @@
=C2=A0 =C2=A0 =C2=A0SUBDIR +=3D libpcapnav
=C2=A0 =C2=A0 =C2=A0SUBDIR +=3D libpfctl
=C2=A0 =C2=A0 =C2=A0SUBDIR +=3D libproxy
+=C2=A0 =C2=A0 SUBDIR +=3D libproxy-duktape
=C2=A0 =C2=A0 =C2=A0SUBDIR +=3D libproxy-gnome3
=C2=A0 =C2=A0 =C2=A0SUBDIR +=3D libproxy-kde
=C2=A0 =C2=A0 =C2=A0SUBDIR +=3D libproxy-pacrunner
diff --git a/net/libproxy-duktape/Makefile b/net/libproxy-duktape/Makefile<= br> new file mode 100644
index 000000000000..28f0570f8069
--- /dev/null
+++ b/net/libproxy-duktape/Makefile
@@ -0,0 +1,12 @@
+PORTREVISION=3D=C2=A0 0
+CATEGORIES=3D=C2=A0 =C2=A0 net devel
+PKGNAMESUFFIX=3D -${LIBPROXY_SLAVE}
+
+COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0Duktape JavaScript plug-in for libpro= xy
+
+LIB_DEPENDS+=3D=C2=A0 libduktape.so:lang/duktape-lib
+
+LIBPROXY_SLAVE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 duktape
+MASTERDIR=3D=C2=A0 =C2=A0 =C2=A0${.CURDIR}/../libproxy
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/libproxy-duktape/pkg-descr b/net/libproxy-duktape/pkg-desc= r
new file mode 100644
index 000000000000..39c82a099848
--- /dev/null
+++ b/net/libproxy-duktape/pkg-descr
@@ -0,0 +1,5 @@
+Libproxy exists to answer the question: Given a network resource, how do I=
+reach it?=C2=A0 It handles all the details, enabling you to get back to +programming.
+
+This plug-in allows the Duktape JS engine to make use of libproxy.
diff --git a/net/libproxy-duktape/pkg-plist b/net/libproxy-duktape/pkg-plis= t
new file mode 100644
index 000000000000..d9414aaebb90
--- /dev/null
+++ b/net/libproxy-duktape/pkg-plist
@@ -0,0 +1 @@
+lib/libproxy/%%VERSION%%/modules/pacrunner_duktape.so
diff --git a/net/libproxy-webkit3/Makefile b/net/libproxy-webkit3/Makefile<= br> index f630fea894e1..6cc1bc2c6b51 100644
--- a/net/libproxy-webkit3/Makefile
+++ b/net/libproxy-webkit3/Makefile
@@ -4,7 +4,7 @@ PKGNAMESUFFIX=3D=C2=A0 -${LIBPROXY_SLAVE}

=C2=A0COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0WebKit JavaScript plug-in for li= bproxy

-LIB_DEPENDS=3D=C2=A0 =C2=A0libjavascriptcoregtk-4.0.so:www/webkit2-gtk3 +LIB_DEPENDS+=3D=C2=A0 libjavascriptcoregtk-4.0.so:www/webkit2-gtk3

=C2=A0USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 gettext-runtime gnome
=C2=A0USE_GNOME=3D=C2=A0 =C2=A0 =C2=A0glib20
diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
index 881f5be95934..dd7fab4fbdf5 100644
--- a/net/libproxy/Makefile
+++ b/net/libproxy/Makefile
@@ -1,6 +1,6 @@
=C2=A0PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 libproxy
-DISTVERSION=3D=C2=A0 =C2=A00.4.17
-PORTREVISION?=3D 1
+DISTVERSION=3D=C2=A0 =C2=A00.4.18
+PORTREVISION?=3D 0
=C2=A0CATEGORIES?=3D=C2=A0 =C2=A0net devel
=C2=A0MASTER_SITES=3D=C2=A0 https://github.com/${PORTNAME}/${PORTNAME}/releases/downloa= d/${DISTVERSION}/

@@ -19,7 +19,7 @@ CMAKE_ON+=3D=C2=A0 =C2=A0 WITH_VALA
=C2=A0CMAKE_OFF+=3D=C2=A0 =C2=A0 BIPR WITH_DOTNET WITH_NATUS WITH_NM WITH_N= Mold

=C2=A0# Slave ports.
-LIBPROXY_SLAVES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0library gnome3 kde mozjs pyth= on perl webkit3
+LIBPROXY_SLAVES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0library duktape gnome3 kde mo= zjs python perl webkit3

=C2=A0# If nothing is set, we're building the library, i.e. this port.<= br> =C2=A0LIBPROXY_SLAVE?=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0library
@@ -49,7 +49,7 @@ LIB_DEPENDS+=3D=C2=A0 libdbus-1.so:devel/dbus
=C2=A0CMAKE_ON=3D=C2=A0 =C2=A0 =C2=A0 BUILD_CONFIG_PACRUNNER
=C2=A0.endif

-.if ${LIBPROXY_SLAVE:Mkde} || ${LIBPROXY_SLAVE:Mwebkit3}
+.if=C2=A0 ${LIBPROXY_SLAVE:Mkde} || ${LIBPROXY_SLAVE:Mduktape} || ${LIBPRO= XY_SLAVE:Mmozjs} || ${LIBPROXY_SLAVE:Mwebkit3}
=C2=A0RUN_DEPENDS+=3D=C2=A0 libproxy-pacrunner>=3D${DISTVERSION}:net/lib= proxy-pacrunner
=C2=A0.endif

diff --git a/net/libproxy/distinfo b/net/libproxy/distinfo
index b51e5c7ec3d6..cad62a8f6f24 100644
--- a/net/libproxy/distinfo
+++ b/net/libproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP =3D 1642408064
-SHA256 (libproxy-0.4.17.tar.xz) =3D bc89f842f654ee1985a31c0ba56dc7e2ce8044= a0264ddca84e650f46cd7f8b05
-SIZE (libproxy-0.4.17.tar.xz) =3D 80136
+TIMESTAMP =3D 1690222352
+SHA256 (libproxy-0.4.18.tar.xz) =3D 69b5856e9ea42c38ac77e6b8c92ffc86a71d34= 1fef74e77bef85f9cc6c47a4b1
+SIZE (libproxy-0.4.18.tar.xz) =3D 82020
diff --git a/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt b/ne= t/libproxy/files/patch-bindings_perl_src_CMakeLists.txt
index b35c965d6e74..db18ae1f7da1 100644
--- a/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt
+++ b/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt
@@ -2,9 +2,9 @@ As the library is only built in the master port, and therfo= re missing in the
=C2=A0build directory for the slave ports, find it via pkg-config and link = against it,
=C2=A0when building a slave.

---- bindings/perl/src/CMakeLists.txt.orig=C2=A0 =C2=A0 =C2=A0 2018-06-03 1= 7:39:41 UTC
+--- bindings/perl/src/CMakeLists.txt.orig=C2=A0 =C2=A0 =C2=A0 2022-06-20 1= 4:06:50 UTC
=C2=A0+++ bindings/perl/src/CMakeLists.txt
-@@ -4,7 +4,7 @@ include_directories( ${PERL_INCLUDE_PATH} ${CMAKE_SOUR
+@@ -4,7 +4,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/
=C2=A0 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/doxsubpp.pl
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DI= R}/Libproxy.xs ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c
@@ -13,8 +13,8 @@ when building a slave.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

=C2=A0 set(Libproxy_LIB_SRCS Libproxy.c)
-@@ -12,7 +12,7 @@ set(Libproxy_LIB_SRCS Libproxy.c)
- set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net)
+@@ -12,7 +12,7 @@ add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})
+ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/auto/Net/Libproxy)
=C2=A0 add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})

=C2=A0-set(PLlibproxy_LIB_DEPENDENCIES libproxy pthread)
diff --git a/net/libproxy/files/patch-libproxy_cmake_modules.cmk b/net/libp= roxy/files/patch-libproxy_cmake_modules.cmk
index afe898372415..081eda9955d7 100644
--- a/net/libproxy/files/patch-libproxy_cmake_modules.cmk
+++ b/net/libproxy/files/patch-libproxy_cmake_modules.cmk
@@ -1,6 +1,6 @@
---- libproxy/cmake/modules.cmk.orig=C2=A0 =C2=A0 2021-02-26 18:24:03 UTC +--- libproxy/cmake/modules.cmk.orig=C2=A0 =C2=A0 2022-06-20 13:54:49 UTC =C2=A0+++ libproxy/cmake/modules.cmk
-@@ -29,7 +29,9 @@ endif()
+@@ -32,7 +32,9 @@ message("MODULES TO BUILD:")
=C2=A0 ## Module definition
=C2=A0 #
=C2=A0 message("MODULES TO BUILD:")
diff --git a/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__duk= tape.cmk b/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__dukta= pe.cmk
new file mode 100644
index 000000000000..06c3322d95c5
--- /dev/null
+++ b/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__duktape.cm= k
@@ -0,0 +1,10 @@
+--- libproxy/cmake/modules/pacrunner_duktape.cmk.orig=C2=A0 2022-06-20 13:= 54:49 UTC
++++ libproxy/cmake/modules/pacrunner_duktape.cmk
+@@ -17,5 +17,7 @@ else()
+=C2=A0 =C2=A0 =C2=A0 =C2=A0link_directories(${DUKTAPE_LIBRARIES})
+=C2=A0 =C2=A0 =C2=A0 =C2=A0link_libraries(duktape)
+=C2=A0 =C2=A0 =C2=A0endif()
++=C2=A0 else()
++=C2=A0 =C2=A0 set(DUKTAPE_FOUND 0)
+=C2=A0 =C2=A0endif()
+ endif()

--00000000000058a8aa0605ea5439--