From 18c2097b116a809709a1bea6de4bc7174b901e82 Mon Sep 17 00:00:00 2001 From: klausz65 <61782506+klausz65@users.noreply.github.com> Date: Thu, 5 Dec 2024 21:38:40 +0100 Subject: [PATCH] apr-util: change include path and fix dependencies for new postgress packages --- components/library/apr-util/Makefile | 3 +- components/library/apr-util/apr-util.p5m | 70 +++++++++---------- .../library/apr-util/manifests/sample-manifest.p5m | 81 ++++++++++++---------- components/library/apr-util/pkg5 | 6 +- 4 files changed, 85 insertions(+), 75 deletions(-) diff --git a/components/library/apr-util/Makefile b/components/library/apr-util/Makefile index cf96e64f99..8cdd213a6b 100644 --- a/components/library/apr-util/Makefile +++ b/components/library/apr-util/Makefile @@ -27,7 +27,7 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= apr-util COMPONENT_VERSION= 1.6.3 -COMPONENT_REVISION= 2 +COMPONENT_REVISION= 3 COMPONENT_PROJECT_URL= https://apr.apache.org/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz @@ -57,6 +57,7 @@ CONFIGURE_OPTIONS += --without-odbc CONFIGURE_OPTIONS += --enable-layout=OpenSolaris-$(MACH64) CONFIGURE_OPTIONS += --with-apr=/usr/apr/bin/apr-1-config CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_PREFIX)/bin +CONFIGURE_OPTIONS += --includedir=$(USRINCDIR)/$(COMPONENT_NAME) CONFIGURE_OPTIONS += PGSQL_CONFIG=$(PG_CONFIG.64) COMPONENT_TEST_TARGETS= test diff --git a/components/library/apr-util/apr-util.p5m b/components/library/apr-util/apr-util.p5m index 75f9351873..ee5fcb5e95 100644 --- a/components/library/apr-util/apr-util.p5m +++ b/components/library/apr-util/apr-util.p5m @@ -47,41 +47,41 @@ dir path=usr/apr-util/lib/$(MACH64) dir path=usr/apr-util/lib/$(MACH64)/pkgconfig dir path=usr/apr-util/lib/$(MACH64)/apr-util-1 -file path=usr/apr-util/include/apr_buckets.h -file path=usr/apr-util/include/apr_uuid.h -file path=usr/apr-util/include/apr_dbd.h -file path=usr/apr-util/include/apr_thread_pool.h -file path=usr/apr-util/include/apu_version.h -file path=usr/apr-util/include/apr_rmm.h -file path=usr/apr-util/include/apr_uri.h -file path=usr/apr-util/include/apr_sha1.h -file path=usr/apr-util/include/apr_siphash.h -file path=usr/apr-util/include/apr_ldap.h -file path=usr/apr-util/include/apr_xlate.h -file path=usr/apr-util/include/apr_ldap_option.h -file path=usr/apr-util/include/apr_base64.h -file path=usr/apr-util/include/apu_errno.h -file path=usr/apr-util/include/apr_dbm.h -file path=usr/apr-util/include/apr_ldap_rebind.h -file path=usr/apr-util/include/apr_queue.h -file path=usr/apr-util/include/apr_redis.h -file path=usr/apr-util/include/apr_crypto.h -file path=usr/apr-util/include/apr_date.h -file path=usr/apr-util/include/apr_ldap_init.h -file path=usr/apr-util/include/apr_memcache.h -file path=usr/apr-util/include/apr_hooks.h -file path=usr/apr-util/include/apr_ldap_url.h -file path=usr/apr-util/include/apu_want.h -file path=usr/apr-util/include/apr_sdbm.h -file path=usr/apr-util/include/apr_anylock.h -file path=usr/apr-util/include/apr_xml.h -file path=usr/apr-util/include/apr_optional.h -file path=usr/apr-util/include/apu.h -file path=usr/apr-util/include/apr_md5.h -file path=usr/apr-util/include/apr_reslist.h -file path=usr/apr-util/include/apr_optional_hooks.h -file path=usr/apr-util/include/apr_md4.h -file path=usr/apr-util/include/apr_strmatch.h +file path=usr/include/apr-util/apr_buckets.h +file path=usr/include/apr-util/apr_uuid.h +file path=usr/include/apr-util/apr_dbd.h +file path=usr/include/apr-util/apr_thread_pool.h +file path=usr/include/apr-util/apu_version.h +file path=usr/include/apr-util/apr_rmm.h +file path=usr/include/apr-util/apr_uri.h +file path=usr/include/apr-util/apr_sha1.h +file path=usr/include/apr-util/apr_siphash.h +file path=usr/include/apr-util/apr_ldap.h +file path=usr/include/apr-util/apr_xlate.h +file path=usr/include/apr-util/apr_ldap_option.h +file path=usr/include/apr-util/apr_base64.h +file path=usr/include/apr-util/apu_errno.h +file path=usr/include/apr-util/apr_dbm.h +file path=usr/include/apr-util/apr_ldap_rebind.h +file path=usr/include/apr-util/apr_queue.h +file path=usr/include/apr-util/apr_redis.h +file path=usr/include/apr-util/apr_crypto.h +file path=usr/include/apr-util/apr_date.h +file path=usr/include/apr-util/apr_ldap_init.h +file path=usr/include/apr-util/apr_memcache.h +file path=usr/include/apr-util/apr_hooks.h +file path=usr/include/apr-util/apr_ldap_url.h +file path=usr/include/apr-util/apu_want.h +file path=usr/include/apr-util/apr_sdbm.h +file path=usr/include/apr-util/apr_anylock.h +file path=usr/include/apr-util/apr_xml.h +file path=usr/include/apr-util/apr_optional.h +file path=usr/include/apr-util/apu.h +file path=usr/include/apr-util/apr_md5.h +file path=usr/include/apr-util/apr_reslist.h +file path=usr/include/apr-util/apr_optional_hooks.h +file path=usr/include/apr-util/apr_md4.h +file path=usr/include/apr-util/apr_strmatch.h file usr/apr-util/lib/$(MACH64)/aprutil.exp path=usr/apr-util/lib/$(MACH64)/aprutil.exp file usr/apr-util/lib/$(MACH64)/libaprutil-1.so.0.6.3 path=usr/apr-util/lib/$(MACH64)/libaprutil-1.so.0.6.3 file usr/apr-util/lib/$(MACH64)/pkgconfig/apr-util-1.pc path=usr/apr-util/lib/$(MACH64)/pkgconfig/apr-util-1.pc diff --git a/components/library/apr-util/manifests/sample-manifest.p5m b/components/library/apr-util/manifests/sample-manifest.p5m index 440688f889..98a74bb04a 100644 --- a/components/library/apr-util/manifests/sample-manifest.p5m +++ b/components/library/apr-util/manifests/sample-manifest.p5m @@ -10,7 +10,7 @@ # # -# Copyright 2023 +# Copyright 2024 # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -24,41 +24,6 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' file path=usr/apr-util/bin/apu-1-config -file path=usr/apr-util/include/apr_anylock.h -file path=usr/apr-util/include/apr_base64.h -file path=usr/apr-util/include/apr_buckets.h -file path=usr/apr-util/include/apr_crypto.h -file path=usr/apr-util/include/apr_date.h -file path=usr/apr-util/include/apr_dbd.h -file path=usr/apr-util/include/apr_dbm.h -file path=usr/apr-util/include/apr_hooks.h -file path=usr/apr-util/include/apr_ldap.h -file path=usr/apr-util/include/apr_ldap_init.h -file path=usr/apr-util/include/apr_ldap_option.h -file path=usr/apr-util/include/apr_ldap_rebind.h -file path=usr/apr-util/include/apr_ldap_url.h -file path=usr/apr-util/include/apr_md4.h -file path=usr/apr-util/include/apr_md5.h -file path=usr/apr-util/include/apr_memcache.h -file path=usr/apr-util/include/apr_optional.h -file path=usr/apr-util/include/apr_optional_hooks.h -file path=usr/apr-util/include/apr_queue.h -file path=usr/apr-util/include/apr_redis.h -file path=usr/apr-util/include/apr_reslist.h -file path=usr/apr-util/include/apr_rmm.h -file path=usr/apr-util/include/apr_sdbm.h -file path=usr/apr-util/include/apr_sha1.h -file path=usr/apr-util/include/apr_siphash.h -file path=usr/apr-util/include/apr_strmatch.h -file path=usr/apr-util/include/apr_thread_pool.h -file path=usr/apr-util/include/apr_uri.h -file path=usr/apr-util/include/apr_uuid.h -file path=usr/apr-util/include/apr_xlate.h -file path=usr/apr-util/include/apr_xml.h -file path=usr/apr-util/include/apu.h -file path=usr/apr-util/include/apu_errno.h -file path=usr/apr-util/include/apu_version.h -file path=usr/apr-util/include/apu_want.h file path=usr/apr-util/lib/$(MACH64)/apr-util-1/apr_dbd_mysql-1.so link path=usr/apr-util/lib/$(MACH64)/apr-util-1/apr_dbd_mysql.so \ target=apr_dbd_mysql-1.so @@ -160,6 +125,7 @@ file path=usr/apr-util/manual/bc_s.png file path=usr/apr-util/manual/bc_sd.png file path=usr/apr-util/manual/bug.html file path=usr/apr-util/manual/classes.html +file path=usr/apr-util/manual/clipboard.js file path=usr/apr-util/manual/closed.png file path=usr/apr-util/manual/crypt__blowfish_8h_source.html file path=usr/apr-util/manual/dir_13e138d54eb8818da29c3992edef070a.html @@ -172,6 +138,7 @@ file path=usr/apr-util/manual/doc.svg file path=usr/apr-util/manual/docd.svg file path=usr/apr-util/manual/doxygen.css file path=usr/apr-util/manual/doxygen.svg +file path=usr/apr-util/manual/doxygen_crawl.html file path=usr/apr-util/manual/dynsections.js file path=usr/apr-util/manual/files.html file path=usr/apr-util/manual/folderclosed.svg @@ -265,6 +232,8 @@ file path=usr/apr-util/manual/index.html file path=usr/apr-util/manual/jquery.js file path=usr/apr-util/manual/menu.js file path=usr/apr-util/manual/menudata.js +file path=usr/apr-util/manual/minus.svg +file path=usr/apr-util/manual/minusd.svg file path=usr/apr-util/manual/modules.html file path=usr/apr-util/manual/namespace_apache.html file path=usr/apr-util/manual/namespaces.html @@ -273,8 +242,12 @@ file path=usr/apr-util/manual/nav_fd.png file path=usr/apr-util/manual/nav_g.png file path=usr/apr-util/manual/nav_h.png file path=usr/apr-util/manual/nav_hd.png +file path=usr/apr-util/manual/navtree.css file path=usr/apr-util/manual/open.png file path=usr/apr-util/manual/pages.html +file path=usr/apr-util/manual/plus.svg +file path=usr/apr-util/manual/plusd.svg +file path=usr/apr-util/manual/resize.js file path=usr/apr-util/manual/sdbm__pair_8h_source.html file path=usr/apr-util/manual/sdbm__private_8h_source.html file path=usr/apr-util/manual/sdbm__tune_8h_source.html @@ -331,5 +304,41 @@ file path=usr/apr-util/manual/tab_sd.png file path=usr/apr-util/manual/tabs.css file path=usr/apr-util/manual/test__apu_8h_source.html file path=usr/apr-util/manual/testutil_8h_source.html +file path=usr/apr-util/manual/topics.html file path=usr/apr-util/manual/unionapr__anylock__t_1_1apr__anylock__u__t.html file path=usr/apr-util/manual/unionapr__bucket__structs.html +file path=usr/include/apr-util/apr_anylock.h +file path=usr/include/apr-util/apr_base64.h +file path=usr/include/apr-util/apr_buckets.h +file path=usr/include/apr-util/apr_crypto.h +file path=usr/include/apr-util/apr_date.h +file path=usr/include/apr-util/apr_dbd.h +file path=usr/include/apr-util/apr_dbm.h +file path=usr/include/apr-util/apr_hooks.h +file path=usr/include/apr-util/apr_ldap.h +file path=usr/include/apr-util/apr_ldap_init.h +file path=usr/include/apr-util/apr_ldap_option.h +file path=usr/include/apr-util/apr_ldap_rebind.h +file path=usr/include/apr-util/apr_ldap_url.h +file path=usr/include/apr-util/apr_md4.h +file path=usr/include/apr-util/apr_md5.h +file path=usr/include/apr-util/apr_memcache.h +file path=usr/include/apr-util/apr_optional.h +file path=usr/include/apr-util/apr_optional_hooks.h +file path=usr/include/apr-util/apr_queue.h +file path=usr/include/apr-util/apr_redis.h +file path=usr/include/apr-util/apr_reslist.h +file path=usr/include/apr-util/apr_rmm.h +file path=usr/include/apr-util/apr_sdbm.h +file path=usr/include/apr-util/apr_sha1.h +file path=usr/include/apr-util/apr_siphash.h +file path=usr/include/apr-util/apr_strmatch.h +file path=usr/include/apr-util/apr_thread_pool.h +file path=usr/include/apr-util/apr_uri.h +file path=usr/include/apr-util/apr_uuid.h +file path=usr/include/apr-util/apr_xlate.h +file path=usr/include/apr-util/apr_xml.h +file path=usr/include/apr-util/apu.h +file path=usr/include/apr-util/apu_errno.h +file path=usr/include/apr-util/apu_version.h +file path=usr/include/apr-util/apu_want.h diff --git a/components/library/apr-util/pkg5 b/components/library/apr-util/pkg5 index cb90f2ba3e..68fb1b4f2e 100644 --- a/components/library/apr-util/pkg5 +++ b/components/library/apr-util/pkg5 @@ -2,8 +2,8 @@ "dependencies": [ "database/mariadb-106/client", "database/mariadb-106/library", - "database/postgres-14/developer", - "database/postgres-14/library", + "database/postgres-16/developer", + "database/postgres-16/library", "database/sqlite-3", "developer/documentation-tool/doxygen", "library/apr", @@ -22,4 +22,4 @@ "library/apr-util/documentation" ], "name": "apr-util" -} \ No newline at end of file +} -- 2.11.4.GIT