From cdbf9bfcec9d571f9e3d96910d3605edc61e328b Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Fri, 22 Mar 2024 18:21:30 +0100
Subject: [PATCH] rebuild libproxy
---
components/library/libproxy/pkg5 | 6 +++---
components/library/libproxy/Makefile | 10 ++++++----
components/library/libproxy/manifests/sample-manifest.p5m | 6 +++---
components/library/libproxy/libproxy.p5m | 4 ++--
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/components/library/libproxy/Makefile b/components/library/libproxy/Makefile
index 334a5c5..e3b5ce6 100644
--- a/components/library/libproxy/Makefile
+++ b/components/library/libproxy/Makefile
@@ -16,13 +16,14 @@
BUILD_BITS= 64_and_32
BUILD_STYLE= cmake
+USE_PARALLEL_BUILD= yes
USE_DEFAULT_TEST_TRANSFORMS= yes
USE_COMMON_TEST_MASTER= false
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= libproxy
COMPONENT_VERSION= 0.4.18
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_SUMMARY= Libproxy is a library that provides automatic proxy configuration management
COMPONENT_PROJECT_URL= https://libproxy.github.io/libproxy/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -36,7 +37,7 @@
include $(WS_MAKE_RULES)/common.mk
-PATH = $(PATH.gnu)
+PATH= $(PATH.gnu)
COMPONENT_PRE_CONFIGURE_ACTION= ( $(CLONEY) $(SOURCE_DIR) $(@D) )
@@ -67,13 +68,14 @@
LDFLAGS += -lsocket -lxnet -lnsl
# Assumes "make" is GNU make, turns into fork bomb if it finds illumos make
-COMPONENT_BUILD_ENV += PATH=$(PATH.gnu)
+COMPONENT_BUILD_ENV += PATH=$(PATH)
COMPONENT_POST_INSTALL_ACTION= \
- [ $(BITS) -eq 64 ] && $(PYTHON) -m py_compile $(PROTO_DIR)/$(PYTHON_LIB)/libproxy.py || truea ;
+ [ $(BITS) -eq 64 ] && $(PYTHON) -m py_compile $(PROTO_DIR)/$(PYTHON_LIB)/libproxy.py || true ;
# Drop 32-bit binaries
COMPONENT_POST_INSTALL_ACTION += $(RM) -r $(PROTOUSRBINDIR32) ;
+
# Move the 'proxy' binary to demos
$(INSTALL_64): COMPONENT_POST_INSTALL_ACTION += $(INSTALL) -d $(PROTOUSRDIR)/demo/jds/bin/ ;
$(INSTALL_64): COMPONENT_POST_INSTALL_ACTION += $(MV) $(PROTOUSRBINDIR)/proxy $(PROTOUSRDIR)/demo/jds/bin/ ;
diff --git a/components/library/libproxy/libproxy.p5m b/components/library/libproxy/libproxy.p5m
index c3f4f19..113cd38 100644
--- a/components/library/libproxy/libproxy.p5m
+++ b/components/library/libproxy/libproxy.p5m
@@ -33,14 +33,14 @@
#file path=usr/lib/$(MACH64)/libproxy/$(HUMAN_VERSION)/modules/config_gnome3.so
#file path=usr/lib/$(MACH64)/libproxy/$(HUMAN_VERSION)/modules/config_pacrunner.so
file path=usr/lib/$(MACH64)/pkgconfig/libproxy-1.0.pc
-file path=usr/lib/$(MACH64)/pxgsettings mode=0555
+file path=usr/libexec/pxgsettings
link path=usr/lib/libproxy.so target=libproxy.so.1
link path=usr/lib/libproxy.so.1 target=libproxy.so.1.0.0
file path=usr/lib/libproxy.so.1.0.0
#file path=usr/lib/libproxy/$(HUMAN_VERSION)/modules/config_gnome3.so
#file path=usr/lib/libproxy/$(HUMAN_VERSION)/modules/config_pacrunner.so
file path=usr/lib/pkgconfig/libproxy-1.0.pc
-file path=usr/lib/pxgsettings mode=0555
+file path=usr/libexec/$(MACH32)/pxgsettings
file path=usr/lib/python$(PYVER)/vendor-packages/libproxy.py
file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Net/Libproxy.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/Libproxy/Libproxy.so
diff --git a/components/library/libproxy/manifests/sample-manifest.p5m b/components/library/libproxy/manifests/sample-manifest.p5m
index d7cc3f7..49b6020 100644
--- a/components/library/libproxy/manifests/sample-manifest.p5m
+++ b/components/library/libproxy/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2023 <contributor>
+# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -31,15 +31,15 @@
file path=usr/lib/$(MACH64)/libproxy/$(HUMAN_VERSION)/modules/config_gnome3.so
file path=usr/lib/$(MACH64)/libproxy/$(HUMAN_VERSION)/modules/config_pacrunner.so
file path=usr/lib/$(MACH64)/pkgconfig/libproxy-1.0.pc
-file path=usr/lib/$(MACH64)/pxgsettings
link path=usr/lib/libproxy.so target=libproxy.so.1
link path=usr/lib/libproxy.so.1 target=libproxy.so.1.0.0
file path=usr/lib/libproxy.so.1.0.0
file path=usr/lib/libproxy/$(HUMAN_VERSION)/modules/config_gnome3.so
file path=usr/lib/libproxy/$(HUMAN_VERSION)/modules/config_pacrunner.so
file path=usr/lib/pkgconfig/libproxy-1.0.pc
-file path=usr/lib/pxgsettings
file path=usr/lib/python$(PYVER)/vendor-packages/libproxy.py
+file path=usr/libexec/$(MACH32)/pxgsettings
+file path=usr/libexec/pxgsettings
file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Net/Libproxy.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Net/Libproxy/Libproxy.so
file path=usr/share/cmake/Modules/Findlibproxy.cmake
diff --git a/components/library/libproxy/pkg5 b/components/library/libproxy/pkg5
index 783bec4..f8f7a34 100644
--- a/components/library/libproxy/pkg5
+++ b/components/library/libproxy/pkg5
@@ -7,8 +7,8 @@
"system/library/gcc-13-runtime"
],
"fmris": [
- "library/libproxy/libproxy-gnome",
- "library/libproxy"
+ "library/libproxy",
+ "library/libproxy/libproxy-gnome"
],
"name": "libproxy"
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3