From 66b22f147f72ffaf0ccf307c7d3bd5af1514681e Mon Sep 17 00:00:00 2001 From: Xavier Beaudouin Date: Fri, 13 Jun 2025 11:10:43 +0200 Subject: [PATCH] Removed pushed ports. Added libxml2 --- net/akhq/Makefile | 36 ---- net/akhq/distinfo | 3 - net/akhq/files/akhq.in | 40 ---- net/akhq/files/application.yml | 9 - net/akhq/pkg-descr | 2 - net/cloud-init/Makefile | 65 ------- net/cloud-init/distinfo | 5 - .../files/extra-cloudinit_distros_freebsd.py | 11 -- .../files/patch-cloudinit_settings.py | 20 -- .../patch-config_cloud.cfg.d_99__freebsd.cfg | 5 - net/cloud-init/files/patch-setup.py | 11 -- net/cloud-init/pkg-descr | 4 - net/cloud-init/pkg-message | 11 -- net/jose/Makefile | 26 --- net/jose/distinfo | 3 - net/jose/files/patch-lib_meson.build | 11 -- net/jose/pkg-descr | 3 - net/jose/pkg-plist | 37 ---- textproc/libxml2/Makefile | 66 +++++++ textproc/libxml2/distinfo | 3 + textproc/libxml2/files/patch-CMakeLists.txt | 33 ++++ textproc/libxml2/files/patch-uri.c | 25 +++ textproc/libxml2/pkg-descr | 4 + textproc/libxml2/pkg-plist | 182 ++++++++++++++++++ 24 files changed, 313 insertions(+), 302 deletions(-) delete mode 100644 net/akhq/Makefile delete mode 100644 net/akhq/distinfo delete mode 100644 net/akhq/files/akhq.in delete mode 100644 net/akhq/files/application.yml delete mode 100644 net/akhq/pkg-descr delete mode 100644 net/cloud-init/Makefile delete mode 100644 net/cloud-init/distinfo delete mode 100644 net/cloud-init/files/extra-cloudinit_distros_freebsd.py delete mode 100644 net/cloud-init/files/patch-cloudinit_settings.py delete mode 100644 net/cloud-init/files/patch-config_cloud.cfg.d_99__freebsd.cfg delete mode 100644 net/cloud-init/files/patch-setup.py delete mode 100644 net/cloud-init/pkg-descr delete mode 100644 net/cloud-init/pkg-message delete mode 100644 net/jose/Makefile delete mode 100644 net/jose/distinfo delete mode 100644 net/jose/files/patch-lib_meson.build delete mode 100644 net/jose/pkg-descr delete mode 100644 net/jose/pkg-plist create mode 100644 textproc/libxml2/Makefile create mode 100644 textproc/libxml2/distinfo create mode 100644 textproc/libxml2/files/patch-CMakeLists.txt create mode 100644 textproc/libxml2/files/patch-uri.c create mode 100644 textproc/libxml2/pkg-descr create mode 100644 textproc/libxml2/pkg-plist diff --git a/net/akhq/Makefile b/net/akhq/Makefile deleted file mode 100644 index 6ee54f3..0000000 --- a/net/akhq/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -PORTNAME= akhq -DISTVERSION= 0.25.1 -DISTVERSIONSUFFIX= -all -PORTREVISION= 2 -CATEGORIES= net java -MASTER_SITES= https://github.com/tchiotludo/akhq/releases/download/${PORTVERSION}/ -EXTRACT_SUFX= .jar - -MAINTAINER= freebsd@hackacad.net -COMMENT= Kafka Gui for Apache Kafka -WWW= https://github.com/tchiotludo/akhq - -LICENSE= APACHE20 - -USES= java -JAVA_VERSION= 17+ -USE_RC_SUBR= akhq - -NO_ARCH= yes -NO_BUILD= yes -SUB_FILES= akhq -SUB_LIST= WWWOWN=${WWWOWN} - -NO_WRKSUBDIR= yes - -PLIST_FILES= "@sample ${ETCDIR}/application.yml.sample" \ - ${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar -PLIST_SUB+= ${SUB_LIST} - -do-install: - ${MKDIR} ${STAGEDIR}${ETCDIR} - ${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME} - ${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar - ${INSTALL_DATA} ${FILESDIR}/application.yml ${STAGEDIR}${ETCDIR}/application.yml.sample - -.include diff --git a/net/akhq/distinfo b/net/akhq/distinfo deleted file mode 100644 index 1fa3cd3..0000000 --- a/net/akhq/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1734718291 -SHA256 (akhq-0.25.1-all.jar) = 5aec420df890e388ade89c6995e6ed45a37d3cb1ff22f5d9837b1156ff4eaf72 -SIZE (akhq-0.25.1-all.jar) = 191995582 diff --git a/net/akhq/files/akhq.in b/net/akhq/files/akhq.in deleted file mode 100644 index ff9680d..0000000 --- a/net/akhq/files/akhq.in +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -# PROVIDE: akhq -# REQUIRE: LOGIN -# KEYWORD: shutdown - -. /etc/rc.subr - -name=akhq -rcvar=akhq_enable - -load_rc_config $name - -: ${akhq_enable:=NO} -: ${akhq_config:=%%PREFIX%%/etc/akhq/application.yml} -: ${akhq_jar:=%%PREFIX%%/share/java/akhq/akhq.jar} -: ${akhq_java:=%%PREFIX%%/bin/java} -: ${akhq_user:=%%WWWOWN%%} -: ${akhq_pidfile:=/var/run/${name}.pid} - -command="/usr/sbin/daemon" -command_args="-P ${akhq_pidfile} -r -f ${akhq_java} -Dmicronaut.config.files=${akhq_config} -jar ${akhq_jar}" - -start_precmd=akhq_startprecmd - -akhq_startprecmd() -{ - # Ensure the directory for the PID file exists - if [ ! -d $(dirname ${akhq_pidfile}) ]; then - install -d -o ${akhq_user} -m 0750 $(dirname ${akhq_pidfile}) - fi - - # Ensure the PID file exists with the right permissions - if [ ! -e "${akhq_pidfile}" ]; then - install -m 0600 -o ${akhq_user} /dev/null ${akhq_pidfile} - fi -} - -run_rc_command "$1" - diff --git a/net/akhq/files/application.yml b/net/akhq/files/application.yml deleted file mode 100644 index be61195..0000000 --- a/net/akhq/files/application.yml +++ /dev/null @@ -1,9 +0,0 @@ -akhq: - connections: - local: - properties: - bootstrap.servers: "localhost:9092" -micronaut: - server: - port: 8080 - host: "127.0.0.1" diff --git a/net/akhq/pkg-descr b/net/akhq/pkg-descr deleted file mode 100644 index 71e2a94..0000000 --- a/net/akhq/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -Kafka GUI for Apache Kafka to manage topics, topics data, -consumers group, schema registry, connect and more... diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile deleted file mode 100644 index 78eaaca..0000000 --- a/net/cloud-init/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -PORTNAME= cloud-init -DISTVERSION= 24.1.4 -PORTREVISION= 3 -CATEGORIES= net python -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= andrey@bsdnir.info -COMMENT= Init scripts for use on cloud images -WWW= https://cloud-init.io/ - -LICENSE= APACHE20 GPLv3 -LICENSE_COMB= dual -LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-Apache2.0 -LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE-GPLv3 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \ - sudo:security/sudo@sssd - -USES= python shebangfix -USE_GITHUB= yes -GH_ACCOUNT= canonical -USE_PYTHON= autoplist distutils -PYDISTUTILS_INSTALLARGS+= "--init-system=sysvinit_freebsd" - -SHEBANG_FILES= tools/hook-hotplug tools/read-dependencies tools/read-version \ - tools/validate-yaml.py - -# Conflicts -CONFLICTS_INSTALL= cloud-init-devel - -# Standard bsd.port.mk variables -ETCDIR= ${PREFIX}/etc/cloud - -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000 -EXTRA_PATCHES= ${PATCHDIR}/extra-cloudinit_distros_freebsd.py -.endif - -NO_ARCH= yes - -post-patch: - ${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/setup.py - ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cloudinit/settings.py - ${REINPLACE_CMD} -e 's|@@PACKAGED_VERSION@@|${DISTVERSION}${DISTVERSIONSUFFIX}|g' ${WRKSRC}/cloudinit/version.py - ${RM} ${WRKSRC}/config/cloud.cfg.d/99_freebsd.cfg.orig - -post-install: - ${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.sample - ${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg.sample - ${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg.sample - ${REINPLACE_CMD} -e 's|^.*\.cfg$$|@sample &.sample|' \ - -e 's|${ETCDIR}/clean.d|@dir ${ETCDIR}/clean.d|' \ - ${_PYTHONPKGLIST} - -.include diff --git a/net/cloud-init/distinfo b/net/cloud-init/distinfo deleted file mode 100644 index c7e39f0..0000000 --- a/net/cloud-init/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1712351569 -SHA256 (canonical-cloud-init-24.1.4_GH0.tar.gz) = 3c70effcea02be47b6cd751a1d164583df674ff8d6e4eaa6599eb1499e3b3f28 -SIZE (canonical-cloud-init-24.1.4_GH0.tar.gz) = 1734414 -SHA256 (a6e09d9bfd3ef0770bc4d9452d978ba93dbe1245.patch) = e90e4df05691b64abf2f3a0fc02ff7c450260e53ca236583f7fc3fd315a2b114 -SIZE (a6e09d9bfd3ef0770bc4d9452d978ba93dbe1245.patch) = 18418 diff --git a/net/cloud-init/files/extra-cloudinit_distros_freebsd.py b/net/cloud-init/files/extra-cloudinit_distros_freebsd.py deleted file mode 100644 index eb4d375..0000000 --- a/net/cloud-init/files/extra-cloudinit_distros_freebsd.py +++ /dev/null @@ -1,11 +0,0 @@ ---- cloudinit/distros/freebsd.py.orig 2024-10-25 15:58:28 UTC -+++ cloudinit/distros/freebsd.py -@@ -35,7 +35,7 @@ class Distro(cloudinit.distros.bsd.BSD): - pkg_cmd_update_prefix = ["pkg", "update"] - pkg_cmd_upgrade_prefix = ["pkg", "upgrade"] - prefer_fqdn = True # See rc.conf(5) in FreeBSD -- home_dir = "/usr/home" -+ home_dir = "/home" - # FreeBSD has the following dhclient lease path: - # /var/db/dhclient.leases. - dhclient_lease_directory = "/var/db" diff --git a/net/cloud-init/files/patch-cloudinit_settings.py b/net/cloud-init/files/patch-cloudinit_settings.py deleted file mode 100644 index d7ca2bd..0000000 --- a/net/cloud-init/files/patch-cloudinit_settings.py +++ /dev/null @@ -1,20 +0,0 @@ ---- cloudinit/settings.py.orig 2021-03-17 15:43:42 UTC -+++ cloudinit/settings.py -@@ -12,7 +12,7 @@ - CFG_ENV_NAME = "CLOUD_CFG" - - # This is expected to be a yaml formatted file --CLOUD_CONFIG = "/etc/cloud/cloud.cfg" -+CLOUD_CONFIG = "%%PREFIX%%/etc/cloud/cloud.cfg" - - RUN_CLOUD_CONFIG = "/run/cloud-init/cloud.cfg" - -@@ -50,7 +50,7 @@ CFG_BUILTIN = { - "system_info": { - "paths": { - "cloud_dir": "/var/lib/cloud", -- "templates_dir": "/etc/cloud/templates/", -+ "templates_dir": "%%PREFIX%%/etc/cloud/templates/", - }, - "distro": "ubuntu", - "network": {"renderers": None}, diff --git a/net/cloud-init/files/patch-config_cloud.cfg.d_99__freebsd.cfg b/net/cloud-init/files/patch-config_cloud.cfg.d_99__freebsd.cfg deleted file mode 100644 index 54430cf..0000000 --- a/net/cloud-init/files/patch-config_cloud.cfg.d_99__freebsd.cfg +++ /dev/null @@ -1,5 +0,0 @@ ---- config/cloud.cfg.d/99_freebsd.cfg.orig 2021-12-13 06:41:51 UTC -+++ config/cloud.cfg.d/99_freebsd.cfg -@@ -0,0 +1,2 @@ -+no_ssh_fingerprints: true -+disable_network_activation: true diff --git a/net/cloud-init/files/patch-setup.py b/net/cloud-init/files/patch-setup.py deleted file mode 100644 index c94715d..0000000 --- a/net/cloud-init/files/patch-setup.py +++ /dev/null @@ -1,11 +0,0 @@ ---- setup.py.orig 2021-03-17 15:40:30 UTC -+++ setup.py -@@ -153,7 +153,7 @@ INITSYS_TYPES = sorted([f.partition(".")[0] for f in I - # Install everything in the right location and take care of Linux (default) and - # FreeBSD systems. - USR = "usr" --ETC = "etc" -+ETC = "%%PREFIX%%/etc" - USR_LIB_EXEC = "usr/lib" - LIB = "lib" - if os.uname()[0] in ["FreeBSD", "DragonFly"]: diff --git a/net/cloud-init/pkg-descr b/net/cloud-init/pkg-descr deleted file mode 100644 index 3f4d22b..0000000 --- a/net/cloud-init/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Cloud-init is the industry standard multi-distribution method for cross-platform -cloud instance initialization. It is supported across all major public cloud -providers, provisioning systems for private cloud infrastructure, and bare-metal -installations. diff --git a/net/cloud-init/pkg-message b/net/cloud-init/pkg-message deleted file mode 100644 index f82dd34..0000000 --- a/net/cloud-init/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ -[ -{ type: install - message: < diff --git a/net/jose/distinfo b/net/jose/distinfo deleted file mode 100644 index df29adb..0000000 --- a/net/jose/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1719954796 -SHA256 (jose-14.tar.xz) = cee329ef9fce97c4c025604a8d237092f619aaa9f6d35fdf9d8c9052bc1ff95b -SIZE (jose-14.tar.xz) = 764940 diff --git a/net/jose/files/patch-lib_meson.build b/net/jose/files/patch-lib_meson.build deleted file mode 100644 index 26e763f..0000000 --- a/net/jose/files/patch-lib_meson.build +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/meson.build.orig 2025-03-24 16:00:40 UTC -+++ lib/meson.build -@@ -4,7 +4,7 @@ if host_machine.system() == 'freebsd' - - if host_machine.system() == 'freebsd' - if not cc.links(code, args: flags + ',--undefined-version' , name: '-Wl,--version-script=...') -- flags = [ '-export-symbols-regex=^jose_.*' ] -+ # flags = [ '-export-symbols-regex=^jose_.*' ] - endif - else - if not cc.links(code, args: flags, name: '-Wl,--version-script=...') diff --git a/net/jose/pkg-descr b/net/jose/pkg-descr deleted file mode 100644 index 495bbea..0000000 --- a/net/jose/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Jose is a command line utility for performing various tasks on JSON -Object Signing and Encryption (JOSE) objects. Jose provides a full -crypto stack including key generation, signing and encryption. diff --git a/net/jose/pkg-plist b/net/jose/pkg-plist deleted file mode 100644 index e7b4a21..0000000 --- a/net/jose/pkg-plist +++ /dev/null @@ -1,37 +0,0 @@ -bin/jose -include/jose/b64.h -include/jose/cfg.h -include/jose/io.h -include/jose/jose.h -include/jose/jwe.h -include/jose/jwk.h -include/jose/jws.h -include/jose/openssl.h -lib/libjose.so -lib/libjose.so.0 -lib/libjose.so.0.0.0 -libdata/pkgconfig/jose.pc -%%MANPAGES%%share/man/man1/jose-alg.1.gz -%%MANPAGES%%share/man/man1/jose-b64-dec.1.gz -%%MANPAGES%%share/man/man1/jose-b64-enc.1.gz -%%MANPAGES%%share/man/man1/jose-fmt.1.gz -%%MANPAGES%%share/man/man1/jose-jwe-dec.1.gz -%%MANPAGES%%share/man/man1/jose-jwe-enc.1.gz -%%MANPAGES%%share/man/man1/jose-jwe-fmt.1.gz -%%MANPAGES%%share/man/man1/jose-jwk-eql.1.gz -%%MANPAGES%%share/man/man1/jose-jwk-exc.1.gz -%%MANPAGES%%share/man/man1/jose-jwk-gen.1.gz -%%MANPAGES%%share/man/man1/jose-jwk-pub.1.gz -%%MANPAGES%%share/man/man1/jose-jwk-thp.1.gz -%%MANPAGES%%share/man/man1/jose-jwk-use.1.gz -%%MANPAGES%%share/man/man1/jose-jws-fmt.1.gz -%%MANPAGES%%share/man/man1/jose-jws-sig.1.gz -%%MANPAGES%%share/man/man1/jose-jws-ver.1.gz -%%MANPAGES%%share/man/man1/jose.1.gz -share/man/man3/jose_b64.3.gz -share/man/man3/jose_cfg.3.gz -share/man/man3/jose_io.3.gz -share/man/man3/jose_io_t.3.gz -share/man/man3/jose_jwe.3.gz -share/man/man3/jose_jwk.3.gz -share/man/man3/jose_jws.3.gz diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile new file mode 100644 index 0000000..251af28 --- /dev/null +++ b/textproc/libxml2/Makefile @@ -0,0 +1,66 @@ +PORTNAME= libxml2 +DISTVERSION= 2.11.9 +PORTREVISION?= 0 +CATEGORIES?= textproc gnome +MASTER_SITES= GNOME +DIST_SUBDIR= gnome + +MAINTAINER= desktop@FreeBSD.org +COMMENT?= XML parser library for GNOME +WWW= http://xmlsoft.org/ + +LICENSE= MIT + +USES+= cmake:testing cpe iconv localbase:ldflags pathfix \ + pkgconfig tar:xz +CPE_VENDOR= xmlsoft +USE_LDCONFIG= yes +# Don't build with Python support unless requested +CMAKE_${LIBXML2_SLAVE:DON:UOFF}=LIBXML2_WITH_PYTHON + +# Many symbols in the linker version script libxml2.syms are only defined when +# --with-xptr-locs is enabled at configure time. Suppress errors with lld >= 17 +# due to these undefined symbols. +LDFLAGS+= -Wl,--undefined-version + +CMAKE_TESTING_ON= LIBXML2_WITH_TESTS + +CMAKE_ARGS= -DCMAKE_INSTALL_SYSCONFDIR=share +CMAKE_OFF+= LIBXML2_WITH_TESTS + +PLIST_SUB+= LIBVERSION=${DISTVERSION} + +OPTIONS_DEFINE= DOCS ICU MEM_DEBUG READLINE THREAD_ALLOC +OPTIONS_DEFAULT= READLINE +OPTIONS_SUB= yes + +MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!) +READLINE_DESC= History for xmllint +THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!) + +ICU_LIB_DEPENDS= libicudata.so:devel/icu +ICU_CMAKE_BOOL= LIBXML2_WITH_ICU +MEM_DEBUG_CONFIGURE_WITH= LIBXML2_WITH_MEM_DEBUG +READLINE_LIB_DEPENDS= libreadline.so:devel/readline +READLINE_CMAKE_OFF= -DHAVE_LIBHISTORY=false \ + -DHAVE_LIBREADLINE=false +THREAD_ALLOC_CMAKE_BOOL= LIBXML2_WITH_THREAD_ALLOC + +post-patch: + @${REINPLACE_CMD} -e \ + 's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \ + s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \ + ${WRKSRC}/doc/xmllint.1 + +post-install: +.if defined(LIBXML2_SLAVE) + ${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/site-packages/libxml2mod.so + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +.endif + +.include diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo new file mode 100644 index 0000000..4ea4340 --- /dev/null +++ b/textproc/libxml2/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1725749707 +SHA256 (gnome/libxml2-2.11.9.tar.xz) = 780157a1efdb57188ec474dca87acaee67a3a839c2525b2214d318228451809f +SIZE (gnome/libxml2-2.11.9.tar.xz) = 2627500 diff --git a/textproc/libxml2/files/patch-CMakeLists.txt b/textproc/libxml2/files/patch-CMakeLists.txt new file mode 100644 index 0000000..6926e72 --- /dev/null +++ b/textproc/libxml2/files/patch-CMakeLists.txt @@ -0,0 +1,33 @@ +--- CMakeLists.txt.orig 2023-08-11 18:59:11 UTC ++++ CMakeLists.txt +@@ -395,13 +395,17 @@ if(LIBXML2_WITH_ICU) + if(WIN32) + set(ICU_LIBS "-licudt -licuin -licuuc") + else() +- set(ICU_LIBS "-licudata -licui18n -licuuc") ++ set(ICU_LIBS_DIR "${ICU_INCLUDE_DIRS}") ++ STRING(REGEX REPLACE "include" "lib" ICU_LIBS_DIR ${ICU_LIBS_DIR}) ++ set(ICU_LIBS "-L${ICU_LIBS_DIR} -licudata -licui18n -licuuc") + endif() + endif() + + if(LIBXML2_WITH_LZMA) + target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA) +- set(LZMA_LIBS "-llzma") ++ set(LZMA_LIBS_DIR "${LIBLZMA_INCLUDE_DIRS}") ++ STRING(REGEX REPLACE "include" "lib" LZMA_LIBS_DIR ${LZMA_LIBS_DIR}) ++ set(LZMA_LIBS "-L${LZMA_LIBS_DIR} -llzma") + endif() + + if(LIBXML2_WITH_THREADS) +@@ -411,7 +415,9 @@ endif() + + if(LIBXML2_WITH_ZLIB) + target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB) +- set(Z_LIBS "-lz") ++ set(Z_LIBS_DIR "${ZLIB_INCLUDE_DIRS}") ++ STRING(REGEX REPLACE "include" "lib" Z_LIBS_DIR ${Z_LIBS_DIR}) ++ set(Z_LIBS "-L${Z_LIBS_DIR} -lz") + endif() + + set_target_properties( diff --git a/textproc/libxml2/files/patch-uri.c b/textproc/libxml2/files/patch-uri.c new file mode 100644 index 0000000..82b0658 --- /dev/null +++ b/textproc/libxml2/files/patch-uri.c @@ -0,0 +1,25 @@ +Revert the following commit, it makes the freebsd doc chain fail. + +From 8eb55d782a2b9afacc7938694891cc6fad7b42a5 Mon Sep 17 00:00:00 2001 +From: Dennis Filder +Date: Fri, 13 Jun 2014 14:56:14 +0800 +Subject: xmlSaveUri() incorrectly recomposes URIs with rootless paths + +For https://bugzilla.gnome.org/show_bug.cgi?id=731063 + +xmlSaveUri() of libxml2 (snapshot 2014-05-31 and earlier) returns +bogus values when called with URIs that have rootless paths +(e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be +correct) + +--- uri.c.orig 2019-10-22 18:46:01 UTC ++++ uri.c +@@ -1201,6 +1201,8 @@ xmlSaveUri(xmlURIPtr uri) { + if (temp == NULL) goto mem_error; + ret = temp; + } ++ ret[len++] = '/'; ++ ret[len++] = '/'; + } + if (uri->path != NULL) { + p = uri->path; diff --git a/textproc/libxml2/pkg-descr b/textproc/libxml2/pkg-descr new file mode 100644 index 0000000..1c027bb --- /dev/null +++ b/textproc/libxml2/pkg-descr @@ -0,0 +1,4 @@ +Libxml2 is the XML C parser and toolkit developed for the Gnome project (but +usable outside of the Gnome platform). XML itself is a metalanguage to design +markup languages, i.e. text language where semantic and structure are added to +the content using extra "markup" information enclosed between angle brackets. diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist new file mode 100644 index 0000000..8d53acb --- /dev/null +++ b/textproc/libxml2/pkg-plist @@ -0,0 +1,182 @@ +bin/xml2-config +bin/xmlcatalog +bin/xmllint +include/libxml2/libxml/HTMLparser.h +include/libxml2/libxml/HTMLtree.h +include/libxml2/libxml/SAX.h +include/libxml2/libxml/SAX2.h +include/libxml2/libxml/c14n.h +include/libxml2/libxml/catalog.h +include/libxml2/libxml/chvalid.h +include/libxml2/libxml/debugXML.h +include/libxml2/libxml/dict.h +include/libxml2/libxml/encoding.h +include/libxml2/libxml/entities.h +include/libxml2/libxml/globals.h +include/libxml2/libxml/hash.h +include/libxml2/libxml/list.h +include/libxml2/libxml/nanoftp.h +include/libxml2/libxml/nanohttp.h +include/libxml2/libxml/parser.h +include/libxml2/libxml/parserInternals.h +include/libxml2/libxml/pattern.h +include/libxml2/libxml/relaxng.h +include/libxml2/libxml/schemasInternals.h +include/libxml2/libxml/schematron.h +include/libxml2/libxml/threads.h +include/libxml2/libxml/tree.h +include/libxml2/libxml/uri.h +include/libxml2/libxml/valid.h +include/libxml2/libxml/xinclude.h +include/libxml2/libxml/xlink.h +include/libxml2/libxml/xmlIO.h +include/libxml2/libxml/xmlautomata.h +include/libxml2/libxml/xmlerror.h +include/libxml2/libxml/xmlexports.h +include/libxml2/libxml/xmlmemory.h +include/libxml2/libxml/xmlmodule.h +include/libxml2/libxml/xmlreader.h +include/libxml2/libxml/xmlregexp.h +include/libxml2/libxml/xmlsave.h +include/libxml2/libxml/xmlschemas.h +include/libxml2/libxml/xmlschemastypes.h +include/libxml2/libxml/xmlstring.h +include/libxml2/libxml/xmlunicode.h +include/libxml2/libxml/xmlversion.h +include/libxml2/libxml/xmlwriter.h +include/libxml2/libxml/xpath.h +include/libxml2/libxml/xpathInternals.h +include/libxml2/libxml/xpointer.h +lib/cmake/libxml2-%%LIBVERSION%%/libxml2-config-version.cmake +lib/cmake/libxml2-%%LIBVERSION%%/libxml2-config.cmake +lib/cmake/libxml2-%%LIBVERSION%%/libxml2-export-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/libxml2-%%LIBVERSION%%/libxml2-export.cmake +lib/libxml2.so +lib/libxml2.so.2 +lib/libxml2.so.%%LIBVERSION%% +libdata/pkgconfig/libxml-2.0.pc +share/man/man1/xml2-config.1.gz +share/man/man1/xmlcatalog.1.gz +share/man/man1/xmllint.1.gz +share/aclocal/libxml.m4 +%%PORTDOCS%%%%DOCSDIR%%/devhelp/general.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/home.png +%%PORTDOCS%%%%DOCSDIR%%/devhelp/index.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/left.png +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-HTMLparser.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-HTMLtree.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-SAX.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-SAX2.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-c14n.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-catalog.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-chvalid.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-debugXML.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-dict.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-encoding.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-entities.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-globals.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-hash.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-list.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-nanoftp.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-nanohttp.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-parser.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-parserInternals.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-pattern.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-relaxng.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-schemasInternals.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-schematron.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-threads.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-tree.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-uri.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-valid.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xinclude.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xlink.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlIO.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlautomata.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlerror.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlexports.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlmemory.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlmodule.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlreader.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlregexp.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlsave.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlschemas.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlschemastypes.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlstring.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlunicode.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlversion.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xmlwriter.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xpath.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xpathInternals.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2-xpointer.html +%%PORTDOCS%%%%DOCSDIR%%/devhelp/libxml2.devhelp2 +%%PORTDOCS%%%%DOCSDIR%%/devhelp/right.png +%%PORTDOCS%%%%DOCSDIR%%/devhelp/style.css +%%PORTDOCS%%%%DOCSDIR%%/devhelp/up.png +%%PORTDOCS%%%%DOCSDIR%%/examples/index.html +%%PORTDOCS%%%%DOCSDIR%%/examples/io1.c +%%PORTDOCS%%%%DOCSDIR%%/examples/io2.c +%%PORTDOCS%%%%DOCSDIR%%/examples/parse1.c +%%PORTDOCS%%%%DOCSDIR%%/examples/parse2.c +%%PORTDOCS%%%%DOCSDIR%%/examples/parse3.c +%%PORTDOCS%%%%DOCSDIR%%/examples/parse4.c +%%PORTDOCS%%%%DOCSDIR%%/examples/reader1.c +%%PORTDOCS%%%%DOCSDIR%%/examples/reader2.c +%%PORTDOCS%%%%DOCSDIR%%/examples/reader3.c +%%PORTDOCS%%%%DOCSDIR%%/examples/reader4.c +%%PORTDOCS%%%%DOCSDIR%%/examples/testWriter.c +%%PORTDOCS%%%%DOCSDIR%%/examples/tree1.c +%%PORTDOCS%%%%DOCSDIR%%/examples/tree2.c +%%PORTDOCS%%%%DOCSDIR%%/examples/xpath1.c +%%PORTDOCS%%%%DOCSDIR%%/examples/xpath2.c +%%PORTDOCS%%%%DOCSDIR%%/tutorial/apa.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/apb.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/apc.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/apd.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/ape.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/apf.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/apg.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/aph.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/api.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s02.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s03.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s04.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s05.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s06.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s07.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s08.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s09.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/blank.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/1.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/10.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/2.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/3.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/4.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/5.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/6.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/7.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/8.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/9.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/caution.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/draft.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/home.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/important.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/next.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/note.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/prev.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/tip.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-blank.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-minus.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-plus.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/up.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/warning.png +%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeaddattribute.c +%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeaddkeyword.c +%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeconvert.c +%%PORTDOCS%%%%DOCSDIR%%/tutorial/includegetattribute.c +%%PORTDOCS%%%%DOCSDIR%%/tutorial/includekeyword.c +%%PORTDOCS%%%%DOCSDIR%%/tutorial/includexpath.c +%%PORTDOCS%%%%DOCSDIR%%/tutorial/index.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial/ix01.html +%%PORTDOCS%%%%DOCSDIR%%/xmlcatalog.html +%%PORTDOCS%%%%DOCSDIR%%/xmllint.html