git: b1421c879e91 - main - textproc/libxml++26: Update to 2.42.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 04 Jul 2024 18:28:29 UTC
The branch main has been updated by diizzy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b1421c879e9188791dc18b40233fa7a30d948754
commit b1421c879e9188791dc18b40233fa7a30d948754
Author: Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-07-04 18:00:10 +0000
Commit: Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2024-07-04 18:28:23 +0000
textproc/libxml++26: Update to 2.42.3
* Switch to Meson
* Remove REFERENCE_PORT section
* Rework port Makefile for readbility and more closely follow
Porters Handbook
PR: 279745
Approved by: portmgr (maintainer timeout, 2+ weeks)
---
textproc/libxml++26/Makefile | 37 ++++++++--------------
textproc/libxml++26/distinfo | 6 ++--
textproc/libxml++26/files/patch-libxml++-2.6.pc.in | 8 +++++
textproc/libxml++26/files/patch-meson.build | 20 ++++++++++++
4 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index c14188fa7892..802aa7711329 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -1,37 +1,26 @@
PORTNAME= libxml++
-PORTVERSION= 2.40.1
-PORTREVISION?= 2
+DISTVERSION= 2.42.3
PORTEPOCH= 1
CATEGORIES= textproc
-MASTER_SITES= GNOME
+MASTER_SITES= GNOME \
+ https://github.com/libxmlplusplus/libxmlplusplus/releases/download/${DISTVERSION}/
MAINTAINER= gnome@FreeBSD.org
COMMENT= XML API for C++
-WWW= https://libxmlplusplus.sourceforge.net/
+WWW= https://libxmlplusplus.github.io/libxmlplusplus/
-USES+= tar:xz compiler:c++11-lang
-USE_CXXSTD= c++11
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING
-PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
-
-.if !defined(REFERENCE_PORT)
-
-USES+= gmake libtool pathfix pkgconfig gnome
+USES= compiler:c++11-lang meson gnome pkgconfig tar:xz
USE_GNOME= glibmm libxml2
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-static --disable-documentation
-INSTALL_TARGET= install-strip
-BINARY_WRAPPERS= gm4
-post-patch:
- @${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
- ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e '/^library_configdir =/s/libdir/includedir/' \
- ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e '/^Cflags:/s/libdir/includedir/' \
- ${WRKSRC}/libxml++-2.6.pc.in
+PLIST_SUB= VERSION="2.6" \
+ API_VERSION="2.6"
-.include <bsd.port.mk>
+MESON_ARGS= -Ddefault_library=both \
+ -Dbuild-examples=false \
+ -Dbuild-manual=false
-.endif
+.include <bsd.port.mk>
diff --git a/textproc/libxml++26/distinfo b/textproc/libxml++26/distinfo
index c9fc71f95559..6b9dfeea8b0c 100644
--- a/textproc/libxml++26/distinfo
+++ b/textproc/libxml++26/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569960450
-SHA256 (libxml++-2.40.1.tar.xz) = 4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9
-SIZE (libxml++-2.40.1.tar.xz) = 955220
+TIMESTAMP = 1718304896
+SHA256 (libxml++-2.42.3.tar.xz) = 74b95302e24dbebc56e97048e86ad0a4121fc82a43e58d381fbe1d380e8eba04
+SIZE (libxml++-2.42.3.tar.xz) = 922400
diff --git a/textproc/libxml++26/files/patch-libxml++-2.6.pc.in b/textproc/libxml++26/files/patch-libxml++-2.6.pc.in
new file mode 100644
index 000000000000..4b5f8a980fe9
--- /dev/null
+++ b/textproc/libxml++26/files/patch-libxml++-2.6.pc.in
@@ -0,0 +1,8 @@
+--- libxml++-2.6.pc.in.orig 2024-06-15 10:06:38 UTC
++++ libxml++-2.6.pc.in
+@@ -16,4 +16,4 @@ Libs: -L${libdir} -lxml++@MSVC_TOOLSET_VER@-@LIBXMLXX_
+ URL: https://libxmlplusplus.github.io/libxmlplusplus/
+ Requires: @LIBXMLXX_MODULES@
+ Libs: -L${libdir} -lxml++@MSVC_TOOLSET_VER@-@LIBXMLXX_API_VERSION@ @LIBXML2_LIB_NO_PKGCONFIG@
+-Cflags: -I${includedir}/@LIBXMLXX_MODULE_NAME@ -I${libdir}/@LIBXMLXX_MODULE_NAME@/include
++Cflags: -I${includedir}/@LIBXMLXX_MODULE_NAME@ -I${includedir}/@LIBXMLXX_MODULE_NAME@/include
diff --git a/textproc/libxml++26/files/patch-meson.build b/textproc/libxml++26/files/patch-meson.build
new file mode 100644
index 000000000000..671e9e0a5698
--- /dev/null
+++ b/textproc/libxml++26/files/patch-meson.build
@@ -0,0 +1,20 @@
+--- meson.build.orig 2024-01-11 09:36:21 UTC
++++ meson.build
+@@ -101,7 +101,7 @@ install_datadir = get_option('datadir')
+ install_includedir = get_option('includedir')
+ install_libdir = get_option('libdir')
+ install_datadir = get_option('datadir')
+-install_pkgconfigdir = install_libdir / 'pkgconfig'
++install_pkgconfigdir = join_paths('libdata', 'pkgconfig')
+
+ # Dependencies.
+ # xmlxx_build_dep: Dependencies when building the libxml++ library.
+@@ -396,7 +396,7 @@ xmlxxconfig_h_meson = files('libxml++config.h.meson')
+ )
+
+ xmlxxconfig_h_meson = files('libxml++config.h.meson')
+-install_includeconfigdir = install_libdir / xmlxx_pcname / 'include'
++install_includeconfigdir = install_includedir / xmlxx_pcname / 'include'
+ configure_file(
+ input: xmlxxconfig_h_meson,
+ output: 'libxml++config.h',