libproxy: fix more problems

[Thomas Klausner <wiz%gatalith.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Mon May 22 00:45:32 2023 +0200
Changeset:	77c8e035afec6df3f6ea4153ee1e52229dd06cbf

Modified Files:
	libproxy/Makefile
	libproxy/buildlink3.mk
	libproxy/distinfo
Added Files:
	libproxy/patches/patch-src_libproxy_proxy.h

Log Message:
libproxy: fix more problems

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=77c8e035afec6df3f6ea4153ee1e52229dd06cbf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libproxy/Makefile                           |  4 ++--
 libproxy/buildlink3.mk                      |  3 +++
 libproxy/distinfo                           |  1 +
 libproxy/patches/patch-src_libproxy_proxy.h | 22 ++++++++++++++++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diffs:
diff --git a/libproxy/Makefile b/libproxy/Makefile
index 7dc3efc40e..a5b7ee30c1 100644
--- a/libproxy/Makefile
+++ b/libproxy/Makefile
@@ -13,8 +13,8 @@ LICENSE=	gnu-lgpl-v2.1
 USE_LANGUAGES=	c99 c++11
 USE_TOOLS+=	bash:build pkg-config
 
-PKGCONFIG_OVERRIDE+=	bindings/csharp/libproxy-sharp-1.0.pc.cmake
-PKGCONFIG_OVERRIDE+=	libproxy/libproxy-1.0.pc.in
+PKGCONFIG_OVERRIDE+=		output/meson-private/libproxy-1.0.pc
+PKGCONFIG_OVERRIDE_STAGE=	post-configure
 
 TEST_TARGET=	test
 
diff --git a/libproxy/buildlink3.mk b/libproxy/buildlink3.mk
index 6b61dae48f..5da12c503d 100644
--- a/libproxy/buildlink3.mk
+++ b/libproxy/buildlink3.mk
@@ -9,6 +9,9 @@ BUILDLINK_API_DEPENDS.libproxy+=	libproxy>=0.2.3
 BUILDLINK_ABI_DEPENDS.libproxy+=	libproxy>=0.4.11
 BUILDLINK_PKGSRCDIR.libproxy?=		../../wip/libproxy
 
+# before version 0.5, the header file was directly in include/proxy.h
+BUILDLINK_FNAME_TRANSFORM.libproxy+=	-e s,include/libproxy,include,
+
 .include "../../devel/glib2/buildlink3.mk"
 .endif # LIBPROXY_BUILDLINK3_MK
 
diff --git a/libproxy/distinfo b/libproxy/distinfo
index aa08d8f38b..2d13e6fd81 100644
--- a/libproxy/distinfo
+++ b/libproxy/distinfo
@@ -4,3 +4,4 @@ BLAKE2s (libproxy-0.5.0.tar.gz) = 4ed621c85760f691a47513b3b00515b370389d0f774a0c
 SHA512 (libproxy-0.5.0.tar.gz) = 699d09d747c3e56247b1d0a8dee0cd7c122199cc4296aa61753a4e52b4346ad5d98d608f953d28a5779e7d49f64be639e22c696ac82d48bbdaa7b743501b18e6
 Size (libproxy-0.5.0.tar.gz) = 58746 bytes
 SHA1 (patch-src_backend_plugins_pacrunner-duktape_pacrunner-duktape.c) = fb9a76af07848e2a3205a872cd7067e94653701b
+SHA1 (patch-src_libproxy_proxy.h) = 6a740b835dcdbc6aaa78d24cd00816eeff10cd0f
diff --git a/libproxy/patches/patch-src_libproxy_proxy.h b/libproxy/patches/patch-src_libproxy_proxy.h
new file mode 100644
index 0000000000..5ee5053121
--- /dev/null
+++ b/libproxy/patches/patch-src_libproxy_proxy.h
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Fix C++ usage of header.
+https://github.com/libproxy/libproxy/issues/226
+
+--- src/libproxy/proxy.h.orig	2023-05-15 13:09:42.000000000 +0000
++++ src/libproxy/proxy.h
+@@ -22,12 +22,12 @@
+ 
+ #pragma once
+ 
++#include <gio/gio.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-#include <gio/gio.h>
+-
+ /**
+  * SECTION:px-proxy
+  * @short_description: A convient helper for using proxy servers