Date: Fri, 22 Sep 2023 11:36:59 +0800 From: Po-Chuan Hsieh <sunpoet@freebsd.org> To: Dima Panov <fluffy@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: d444560271bb - main - net/libproxy: update to 0.4.18 release (+) Message-ID: <CAMHz58TbcTeYNtGeErHQFhHDfRMX0C_dztdrYOLFpBv-0TncqA@mail.gmail.com> In-Reply-To: <202309212210.38LMAbJS067795@gitrepo.freebsd.org> References: <202309212210.38LMAbJS067795@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <fluffy@freebsd.org> 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 <fluffy@FreeBSD.org> > AuthorDate: 2023-09-21 22:05:53 +0000 > Commit: Dima Panov <fluffy@FreeBSD.org> > 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 <div dir=3D"ltr"><div dir=3D"ltr">On Fri, Sep 22, 2023 at 6:10=E2=80=AFAM D= ima Panov <<a href=3D"mailto:fluffy@freebsd.org" target=3D"_blank">fluff= y@freebsd.org</a>> wrote:<br></div><div class=3D"gmail_quote"><blockquot= e class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px s= olid rgb(204,204,204);padding-left:1ex">The branch main has been updated by= fluffy:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3Dd444560271bb19f= 11c57d14ac8098cb906c9444d" rel=3D"noreferrer" target=3D"_blank">https://cgi= t.FreeBSD.org/ports/commit/?id=3Dd444560271bb19f11c57d14ac8098cb906c9444d</= a><br> <br> commit d444560271bb19f11c57d14ac8098cb906c9444d<br> Author:=C2=A0 =C2=A0 =C2=A0Dima Panov <fluffy@FreeBSD.org><br> AuthorDate: 2023-09-21 22:05:53 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Dima Panov <fluffy@FreeBSD.org><br> CommitDate: 2023-09-21 22:05:53 +0000<br> <br> =C2=A0 =C2=A0 net/libproxy: update to 0.4.18 release (+)<br> <br> =C2=A0 =C2=A0 Add new duktape plugin to the build<br> <br> =C2=A0 =C2=A0 Changelog:=C2=A0 =C2=A0 =C2=A0 <a href=3D"https://github.com/= libproxy/libproxy/releases/tag/0.4.18" rel=3D"noreferrer" target=3D"_blank"= >https://github.com/libproxy/libproxy/releases/tag/0.4.18</a></blockquote><= div><br></div><div>Hello,</div><div><br></div><div>It's broken now.</di= v><div><br></div>=3D=3D=3D> =C2=A0Patching for libproxy-0.4.18<br>=3D=3D= =3D> =C2=A0Applying FreeBSD patches for libproxy-0.4.18 from /usr/ports/= net/libproxy/files<br>1 out of 1 hunks failed--saving rejects to bindings/p= erl/t/CMakeLists.txt.rej<br>=3D=3D=3D> =C2=A0FAILED Applying FreeBSD pat= ch-bindings_perl_t_CMakeLists.txt<br>=3D=3D=3D> Cleanly applied FreeBSD = patch(es) =C2=A0patch-CMakeLists.txt patch-bindings_CMakeLists.txt patch-bi= ndings_perl_src_CMakeLists.txt<br>=3D=3D=3D> FAILED to apply cleanly Fre= eBSD patch(es) =C2=A0patch-bindings_perl_t_CMakeLists.txt<br><div>*** Error= code 1</div><div>=C2=A0</div><blockquote class=3D"gmail_quote" style=3D"ma= rgin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:= 1ex"><br> ---<br> =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 +<br> =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 ++++++++++++<br> =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 +++++<br> =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 +<br> =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 +-<br> =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 ++++----<br> =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 +++---<br> =C2=A0net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt=C2=A0 =C2= =A0 |=C2=A0 8 ++++----<br> =C2=A0net/libproxy/files/patch-libproxy_cmake_modules.cmk=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 |=C2=A0 4 ++--<br> =C2=A0.../patch-libproxy_cmake_modules_pacrunner__duktape.cmk=C2=A0 =C2=A0 = =C2=A0 | 10 ++++++++++<br> =C2=A010 files changed, 43 insertions(+), 14 deletions(-)<br> <br> diff --git a/net/Makefile b/net/Makefile<br> index 73841997c6d0..a0822b6214ba 100644<br> --- a/net/Makefile<br> +++ b/net/Makefile<br> @@ -414,6 +414,7 @@<br> =C2=A0 =C2=A0 =C2=A0SUBDIR +=3D libpcapnav<br> =C2=A0 =C2=A0 =C2=A0SUBDIR +=3D libpfctl<br> =C2=A0 =C2=A0 =C2=A0SUBDIR +=3D libproxy<br> +=C2=A0 =C2=A0 SUBDIR +=3D libproxy-duktape<br> =C2=A0 =C2=A0 =C2=A0SUBDIR +=3D libproxy-gnome3<br> =C2=A0 =C2=A0 =C2=A0SUBDIR +=3D libproxy-kde<br> =C2=A0 =C2=A0 =C2=A0SUBDIR +=3D libproxy-pacrunner<br> diff --git a/net/libproxy-duktape/Makefile b/net/libproxy-duktape/Makefile<= br> new file mode 100644<br> index 000000000000..28f0570f8069<br> --- /dev/null<br> +++ b/net/libproxy-duktape/Makefile<br> @@ -0,0 +1,12 @@<br> +PORTREVISION=3D=C2=A0 0<br> +CATEGORIES=3D=C2=A0 =C2=A0 net devel<br> +PKGNAMESUFFIX=3D -${LIBPROXY_SLAVE}<br> +<br> +COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0Duktape JavaScript plug-in for libpro= xy<br> +<br> +LIB_DEPENDS+=3D=C2=A0 libduktape.so:lang/duktape-lib<br> +<br> +LIBPROXY_SLAVE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 duktape<br> +MASTERDIR=3D=C2=A0 =C2=A0 =C2=A0${.CURDIR}/../libproxy<br> +<br> +.include "${MASTERDIR}/Makefile"<br> diff --git a/net/libproxy-duktape/pkg-descr b/net/libproxy-duktape/pkg-desc= r<br> new file mode 100644<br> index 000000000000..39c82a099848<br> --- /dev/null<br> +++ b/net/libproxy-duktape/pkg-descr<br> @@ -0,0 +1,5 @@<br> +Libproxy exists to answer the question: Given a network resource, how do I= <br> +reach it?=C2=A0 It handles all the details, enabling you to get back to<br= > +programming.<br> +<br> +This plug-in allows the Duktape JS engine to make use of libproxy.<br> diff --git a/net/libproxy-duktape/pkg-plist b/net/libproxy-duktape/pkg-plis= t<br> new file mode 100644<br> index 000000000000..d9414aaebb90<br> --- /dev/null<br> +++ b/net/libproxy-duktape/pkg-plist<br> @@ -0,0 +1 @@<br> +lib/libproxy/%%VERSION%%/modules/pacrunner_duktape.so<br> diff --git a/net/libproxy-webkit3/Makefile b/net/libproxy-webkit3/Makefile<= br> index f630fea894e1..6cc1bc2c6b51 100644<br> --- a/net/libproxy-webkit3/Makefile<br> +++ b/net/libproxy-webkit3/Makefile<br> @@ -4,7 +4,7 @@ PKGNAMESUFFIX=3D=C2=A0 -${LIBPROXY_SLAVE}<br> <br> =C2=A0COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0WebKit JavaScript plug-in for li= bproxy<br> <br> -LIB_DEPENDS=3D=C2=A0 =C2=A0libjavascriptcoregtk-4.0.so:www/webkit2-gtk3<br= > +LIB_DEPENDS+=3D=C2=A0 libjavascriptcoregtk-4.0.so:www/webkit2-gtk3<br> <br> =C2=A0USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 gettext-runtime gnome<br> =C2=A0USE_GNOME=3D=C2=A0 =C2=A0 =C2=A0glib20<br> diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile<br> index 881f5be95934..dd7fab4fbdf5 100644<br> --- a/net/libproxy/Makefile<br> +++ b/net/libproxy/Makefile<br> @@ -1,6 +1,6 @@<br> =C2=A0PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 libproxy<br> -DISTVERSION=3D=C2=A0 =C2=A00.4.17<br> -PORTREVISION?=3D 1<br> +DISTVERSION=3D=C2=A0 =C2=A00.4.18<br> +PORTREVISION?=3D 0<br> =C2=A0CATEGORIES?=3D=C2=A0 =C2=A0net devel<br> =C2=A0MASTER_SITES=3D=C2=A0 <a href=3D"https://github.com/$%7BPORTNAME%7D/$= %7BPORTNAME%7D/releases/download/$%7BDISTVERSION%7D/" rel=3D"noreferrer" ta= rget=3D"_blank">https://github.com/${PORTNAME}/${PORTNAME}/releases/downloa= d/${DISTVERSION}/</a><br> <br> @@ -19,7 +19,7 @@ CMAKE_ON+=3D=C2=A0 =C2=A0 WITH_VALA<br> =C2=A0CMAKE_OFF+=3D=C2=A0 =C2=A0 BIPR WITH_DOTNET WITH_NATUS WITH_NM WITH_N= Mold<br> <br> =C2=A0# Slave ports.<br> -LIBPROXY_SLAVES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0library gnome3 kde mozjs pyth= on perl webkit3<br> +LIBPROXY_SLAVES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0library duktape gnome3 kde mo= zjs python perl webkit3<br> <br> =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<br> @@ -49,7 +49,7 @@ LIB_DEPENDS+=3D=C2=A0 libdbus-1.so:devel/dbus<br> =C2=A0CMAKE_ON=3D=C2=A0 =C2=A0 =C2=A0 BUILD_CONFIG_PACRUNNER<br> =C2=A0.endif<br> <br> -.if ${LIBPROXY_SLAVE:Mkde} || ${LIBPROXY_SLAVE:Mwebkit3}<br> +.if=C2=A0 ${LIBPROXY_SLAVE:Mkde} || ${LIBPROXY_SLAVE:Mduktape} || ${LIBPRO= XY_SLAVE:Mmozjs} || ${LIBPROXY_SLAVE:Mwebkit3}<br> =C2=A0RUN_DEPENDS+=3D=C2=A0 libproxy-pacrunner>=3D${DISTVERSION}:net/lib= proxy-pacrunner<br> =C2=A0.endif<br> <br> diff --git a/net/libproxy/distinfo b/net/libproxy/distinfo<br> index b51e5c7ec3d6..cad62a8f6f24 100644<br> --- a/net/libproxy/distinfo<br> +++ b/net/libproxy/distinfo<br> @@ -1,3 +1,3 @@<br> -TIMESTAMP =3D 1642408064<br> -SHA256 (libproxy-0.4.17.tar.xz) =3D bc89f842f654ee1985a31c0ba56dc7e2ce8044= a0264ddca84e650f46cd7f8b05<br> -SIZE (libproxy-0.4.17.tar.xz) =3D 80136<br> +TIMESTAMP =3D 1690222352<br> +SHA256 (libproxy-0.4.18.tar.xz) =3D 69b5856e9ea42c38ac77e6b8c92ffc86a71d34= 1fef74e77bef85f9cc6c47a4b1<br> +SIZE (libproxy-0.4.18.tar.xz) =3D 82020<br> diff --git a/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt b/ne= t/libproxy/files/patch-bindings_perl_src_CMakeLists.txt<br> index b35c965d6e74..db18ae1f7da1 100644<br> --- a/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt<br> +++ b/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt<br> @@ -2,9 +2,9 @@ As the library is only built in the master port, and therfo= re missing in the<br> =C2=A0build directory for the slave ports, find it via pkg-config and link = against it,<br> =C2=A0when building a slave.<br> <br> ---- bindings/perl/src/CMakeLists.txt.orig=C2=A0 =C2=A0 =C2=A0 2018-06-03 1= 7:39:41 UTC<br> +--- bindings/perl/src/CMakeLists.txt.orig=C2=A0 =C2=A0 =C2=A0 2022-06-20 1= 4:06:50 UTC<br> =C2=A0+++ bindings/perl/src/CMakeLists.txt<br> -@@ -4,7 +4,7 @@ include_directories( ${PERL_INCLUDE_PATH} ${CMAKE_SOUR<br> +@@ -4,7 +4,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/<br> =C2=A0 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c<br> =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}/<a href=3D"h= ttp://doxsubpp.pl" rel=3D"noreferrer" target=3D"_blank">doxsubpp.pl</a><br> =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<br> @@ -13,8 +13,8 @@ when building a slave.<br> =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})<br> <br> =C2=A0 set(Libproxy_LIB_SRCS Libproxy.c)<br> -@@ -12,7 +12,7 @@ set(Libproxy_LIB_SRCS Libproxy.c)<br> - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net)<br> +@@ -12,7 +12,7 @@ add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})<br> + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/auto/Net/Libproxy)<br> =C2=A0 add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})<br> <br> =C2=A0-set(PLlibproxy_LIB_DEPENDENCIES libproxy pthread)<br> diff --git a/net/libproxy/files/patch-libproxy_cmake_modules.cmk b/net/libp= roxy/files/patch-libproxy_cmake_modules.cmk<br> index afe898372415..081eda9955d7 100644<br> --- a/net/libproxy/files/patch-libproxy_cmake_modules.cmk<br> +++ b/net/libproxy/files/patch-libproxy_cmake_modules.cmk<br> @@ -1,6 +1,6 @@<br> ---- libproxy/cmake/modules.cmk.orig=C2=A0 =C2=A0 2021-02-26 18:24:03 UTC<b= r> +--- libproxy/cmake/modules.cmk.orig=C2=A0 =C2=A0 2022-06-20 13:54:49 UTC<b= r> =C2=A0+++ libproxy/cmake/modules.cmk<br> -@@ -29,7 +29,9 @@ endif()<br> +@@ -32,7 +32,9 @@ message("MODULES TO BUILD:")<br> =C2=A0 ## Module definition<br> =C2=A0 #<br> =C2=A0 message("MODULES TO BUILD:")<br> 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<br> new file mode 100644<br> index 000000000000..06c3322d95c5<br> --- /dev/null<br> +++ b/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__duktape.cm= k<br> @@ -0,0 +1,10 @@<br> +--- libproxy/cmake/modules/pacrunner_duktape.cmk.orig=C2=A0 2022-06-20 13:= 54:49 UTC<br> ++++ libproxy/cmake/modules/pacrunner_duktape.cmk<br> +@@ -17,5 +17,7 @@ else()<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0link_directories(${DUKTAPE_LIBRARIES})<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0link_libraries(duktape)<br> +=C2=A0 =C2=A0 =C2=A0endif()<br> ++=C2=A0 else()<br> ++=C2=A0 =C2=A0 set(DUKTAPE_FOUND 0)<br> +=C2=A0 =C2=A0endif()<br> + endif()<br> <br> </blockquote></div></div> --00000000000058a8aa0605ea5439--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58TbcTeYNtGeErHQFhHDfRMX0C_dztdrYOLFpBv-0TncqA>