Skip site navigation (1)Skip section navigation (2)
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>

index | next in thread | previous in thread | raw e-mail

[-- Attachment #1 --]
On Fri, Sep 22, 2023 at 6:10 AM Dima Panov <fluffy@freebsd.org> wrote:

> The branch main has been updated by fluffy:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=d444560271bb19f11c57d14ac8098cb906c9444d
>
> 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.

===>  Patching for libproxy-0.4.18
===>  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
===>  FAILED Applying FreeBSD patch-bindings_perl_t_CMakeLists.txt
===> Cleanly applied FreeBSD patch(es)  patch-CMakeLists.txt
patch-bindings_CMakeLists.txt patch-bindings_perl_src_CMakeLists.txt
===> 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 += libpcapnav
>      SUBDIR += libpfctl
>      SUBDIR += libproxy
> +    SUBDIR += libproxy-duktape
>      SUBDIR += libproxy-gnome3
>      SUBDIR += libproxy-kde
>      SUBDIR += libproxy-pacrunner
> diff --git a/net/libproxy-duktape/Makefile b/net/libproxy-duktape/Makefile
> new file mode 100644
> index 000000000000..28f0570f8069
> --- /dev/null
> +++ b/net/libproxy-duktape/Makefile
> @@ -0,0 +1,12 @@
> +PORTREVISION=  0
> +CATEGORIES=    net devel
> +PKGNAMESUFFIX= -${LIBPROXY_SLAVE}
> +
> +COMMENT=       Duktape JavaScript plug-in for libproxy
> +
> +LIB_DEPENDS+=  libduktape.so:lang/duktape-lib
> +
> +LIBPROXY_SLAVE=        duktape
> +MASTERDIR=     ${.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/Makefile
> index f630fea894e1..6cc1bc2c6b51 100644
> --- a/net/libproxy-webkit3/Makefile
> +++ b/net/libproxy-webkit3/Makefile
> @@ -4,7 +4,7 @@ PKGNAMESUFFIX=  -${LIBPROXY_SLAVE}
>
>  COMMENT=       WebKit JavaScript plug-in for libproxy
>
> -LIB_DEPENDS=   libjavascriptcoregtk-4.0.so:www/webkit2-gtk3
> +LIB_DEPENDS+=  libjavascriptcoregtk-4.0.so:www/webkit2-gtk3
>
>  USES=          gettext-runtime gnome
>  USE_GNOME=     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=      libproxy
> -DISTVERSION=   0.4.17
> -PORTREVISION?= 1
> +DISTVERSION=   0.4.18
> +PORTREVISION?= 0
>  CATEGORIES?=   net devel
>  MASTER_SITES=
> https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
>
> @@ -19,7 +19,7 @@ CMAKE_ON+=    WITH_VALA
>  CMAKE_OFF+=    BIPR WITH_DOTNET WITH_NATUS WITH_NM WITH_NMold
>
>  # Slave ports.
> -LIBPROXY_SLAVES=       library gnome3 kde mozjs python perl webkit3
> +LIBPROXY_SLAVES=       library duktape gnome3 kde mozjs python perl
> webkit3
>
>  # If nothing is set, we're building the library, i.e. this port.
>  LIBPROXY_SLAVE?=       library
> @@ -49,7 +49,7 @@ LIB_DEPENDS+=  libdbus-1.so:devel/dbus
>  CMAKE_ON=      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+=  libproxy-pacrunner>=${DISTVERSION}:net/libproxy-pacrunner
>  .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 = 1642408064
> -SHA256 (libproxy-0.4.17.tar.xz) =
> bc89f842f654ee1985a31c0ba56dc7e2ce8044a0264ddca84e650f46cd7f8b05
> -SIZE (libproxy-0.4.17.tar.xz) = 80136
> +TIMESTAMP = 1690222352
> +SHA256 (libproxy-0.4.18.tar.xz) =
> 69b5856e9ea42c38ac77e6b8c92ffc86a71d341fef74e77bef85f9cc6c47a4b1
> +SIZE (libproxy-0.4.18.tar.xz) = 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()
>
>

[-- Attachment #2 --]
<div dir="ltr"><div dir="ltr">On Fri, Sep 22, 2023 at 6:10 AM Dima Panov &lt;<a href="mailto:fluffy@freebsd.org" target="_blank">fluffy@freebsd.org</a>&gt; wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by fluffy:<br>
<br>
URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=d444560271bb19f11c57d14ac8098cb906c9444d" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=d444560271bb19f11c57d14ac8098cb906c9444d</a><br>;
<br>
commit d444560271bb19f11c57d14ac8098cb906c9444d<br>
Author:     Dima Panov &lt;fluffy@FreeBSD.org&gt;<br>
AuthorDate: 2023-09-21 22:05:53 +0000<br>
Commit:     Dima Panov &lt;fluffy@FreeBSD.org&gt;<br>
CommitDate: 2023-09-21 22:05:53 +0000<br>
<br>
    net/libproxy: update to 0.4.18 release (+)<br>
<br>
    Add new duktape plugin to the build<br>
<br>
    Changelog:      <a href="https://github.com/libproxy/libproxy/releases/tag/0.4.18" rel="noreferrer" target="_blank">https://github.com/libproxy/libproxy/releases/tag/0.4.18</a></blockquote><div><br></div><div>Hello,</div><div><br></div><div>It&#39;s broken now.</div><div><br></div>===&gt;  Patching for libproxy-0.4.18<br>===&gt;  Applying FreeBSD patches for libproxy-0.4.18 from /usr/ports/net/libproxy/files<br>1 out of 1 hunks failed--saving rejects to bindings/perl/t/CMakeLists.txt.rej<br>===&gt;  FAILED Applying FreeBSD patch-bindings_perl_t_CMakeLists.txt<br>===&gt; Cleanly applied FreeBSD patch(es)  patch-CMakeLists.txt patch-bindings_CMakeLists.txt patch-bindings_perl_src_CMakeLists.txt<br>===&gt; FAILED to apply cleanly FreeBSD patch(es)  patch-bindings_perl_t_CMakeLists.txt<br><div>*** Error code 1</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
---<br>
 net/Makefile                                                 |  1 +<br>
 net/libproxy-duktape/Makefile                                | 12 ++++++++++++<br>
 net/libproxy-duktape/pkg-descr                               |  5 +++++<br>
 net/libproxy-duktape/pkg-plist                               |  1 +<br>
 net/libproxy-webkit3/Makefile                                |  2 +-<br>
 net/libproxy/Makefile                                        |  8 ++++----<br>
 net/libproxy/distinfo                                        |  6 +++---<br>
 net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt    |  8 ++++----<br>
 net/libproxy/files/patch-libproxy_cmake_modules.cmk          |  4 ++--<br>
 .../patch-libproxy_cmake_modules_pacrunner__duktape.cmk      | 10 ++++++++++<br>
 10 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>
     SUBDIR += libpcapnav<br>
     SUBDIR += libpfctl<br>
     SUBDIR += libproxy<br>
+    SUBDIR += libproxy-duktape<br>
     SUBDIR += libproxy-gnome3<br>
     SUBDIR += libproxy-kde<br>
     SUBDIR += 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=  0<br>
+CATEGORIES=    net devel<br>
+PKGNAMESUFFIX= -${LIBPROXY_SLAVE}<br>
+<br>
+COMMENT=       Duktape JavaScript plug-in for libproxy<br>
+<br>
+LIB_DEPENDS+=  libduktape.so:lang/duktape-lib<br>
+<br>
+LIBPROXY_SLAVE=        duktape<br>
+MASTERDIR=     ${.CURDIR}/../libproxy<br>
+<br>
+.include &quot;${MASTERDIR}/Makefile&quot;<br>
diff --git a/net/libproxy-duktape/pkg-descr b/net/libproxy-duktape/pkg-descr<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?  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-plist<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=  -${LIBPROXY_SLAVE}<br>
<br>
 COMMENT=       WebKit JavaScript plug-in for libproxy<br>
<br>
-LIB_DEPENDS=   libjavascriptcoregtk-4.0.so:www/webkit2-gtk3<br>
+LIB_DEPENDS+=  libjavascriptcoregtk-4.0.so:www/webkit2-gtk3<br>
<br>
 USES=          gettext-runtime gnome<br>
 USE_GNOME=     glib20<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>
 PORTNAME=      libproxy<br>
-DISTVERSION=   0.4.17<br>
-PORTREVISION?= 1<br>
+DISTVERSION=   0.4.18<br>
+PORTREVISION?= 0<br>
 CATEGORIES?=   net devel<br>
 MASTER_SITES=  <a href="https://github.com/$%7BPORTNAME%7D/$%7BPORTNAME%7D/releases/download/$%7BDISTVERSION%7D/" rel="noreferrer" target="_blank">https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/</a><br>;
<br>
@@ -19,7 +19,7 @@ CMAKE_ON+=    WITH_VALA<br>
 CMAKE_OFF+=    BIPR WITH_DOTNET WITH_NATUS WITH_NM WITH_NMold<br>
<br>
 # Slave ports.<br>
-LIBPROXY_SLAVES=       library gnome3 kde mozjs python perl webkit3<br>
+LIBPROXY_SLAVES=       library duktape gnome3 kde mozjs python perl webkit3<br>
<br>
 # If nothing is set, we&#39;re building the library, i.e. this port.<br>
 LIBPROXY_SLAVE?=       library<br>
@@ -49,7 +49,7 @@ LIB_DEPENDS+=  libdbus-1.so:devel/dbus<br>
 CMAKE_ON=      BUILD_CONFIG_PACRUNNER<br>
 .endif<br>
<br>
-.if ${LIBPROXY_SLAVE:Mkde} || ${LIBPROXY_SLAVE:Mwebkit3}<br>
+.if  ${LIBPROXY_SLAVE:Mkde} || ${LIBPROXY_SLAVE:Mduktape} || ${LIBPROXY_SLAVE:Mmozjs} || ${LIBPROXY_SLAVE:Mwebkit3}<br>
 RUN_DEPENDS+=  libproxy-pacrunner&gt;=${DISTVERSION}:net/libproxy-pacrunner<br>
 .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 = 1642408064<br>
-SHA256 (libproxy-0.4.17.tar.xz) = bc89f842f654ee1985a31c0ba56dc7e2ce8044a0264ddca84e650f46cd7f8b05<br>
-SIZE (libproxy-0.4.17.tar.xz) = 80136<br>
+TIMESTAMP = 1690222352<br>
+SHA256 (libproxy-0.4.18.tar.xz) = 69b5856e9ea42c38ac77e6b8c92ffc86a71d341fef74e77bef85f9cc6c47a4b1<br>
+SIZE (libproxy-0.4.18.tar.xz) = 82020<br>
diff --git a/net/libproxy/files/patch-bindings_perl_src_CMakeLists.txt b/net/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 therfore missing in the<br>
 build directory for the slave ports, find it via pkg-config and link against it,<br>
 when building a slave.<br>
<br>
---- bindings/perl/src/CMakeLists.txt.orig      2018-06-03 17:39:41 UTC<br>
+--- bindings/perl/src/CMakeLists.txt.orig      2022-06-20 14:06:50 UTC<br>
 +++ 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>
  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c<br>
                     COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/<a href="http://doxsubpp.pl" rel="noreferrer" target="_blank">doxsubpp.pl</a><br>
                             ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.xs ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c<br>
@@ -13,8 +13,8 @@ when building a slave.<br>
                     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})<br>
<br>
  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>
  add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})<br>
<br>
 -set(PLlibproxy_LIB_DEPENDENCIES libproxy pthread)<br>
diff --git a/net/libproxy/files/patch-libproxy_cmake_modules.cmk b/net/libproxy/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    2021-02-26 18:24:03 UTC<br>
+--- libproxy/cmake/modules.cmk.orig    2022-06-20 13:54:49 UTC<br>
 +++ libproxy/cmake/modules.cmk<br>
-@@ -29,7 +29,9 @@ endif()<br>
+@@ -32,7 +32,9 @@ message(&quot;MODULES TO BUILD:&quot;)<br>
  ## Module definition<br>
  #<br>
  message(&quot;MODULES TO BUILD:&quot;)<br>
diff --git a/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__duktape.cmk b/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__duktape.cmk<br>
new file mode 100644<br>
index 000000000000..06c3322d95c5<br>
--- /dev/null<br>
+++ b/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner__duktape.cmk<br>
@@ -0,0 +1,10 @@<br>
+--- libproxy/cmake/modules/pacrunner_duktape.cmk.orig  2022-06-20 13:54:49 UTC<br>
++++ libproxy/cmake/modules/pacrunner_duktape.cmk<br>
+@@ -17,5 +17,7 @@ else()<br>
+       link_directories(${DUKTAPE_LIBRARIES})<br>
+       link_libraries(duktape)<br>
+     endif()<br>
++  else()<br>
++    set(DUKTAPE_FOUND 0)<br>
+   endif()<br>
+ endif()<br>
<br>
</blockquote></div></div>
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58TbcTeYNtGeErHQFhHDfRMX0C_dztdrYOLFpBv-0TncqA>