Attachment #251472 for bug #279745




PORTNAME=	libxml++
DISTVERSION=	2.42.3
PORTREVISION?=	2
PORTEPOCH=	1
CATEGORIES=	textproc
MASTER_SITES=	GNOME \
		https://github.com/libxmlplusplus/libxmlplusplus/releases/download/${DISTVERSION}/

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	XML API for C++
WWW=		https://libxmlplusplus.github.io/libxmlplusplus/

LICENSE=	LGPL21
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		compiler:c++11-lang meson gnome pkgconfig tar:xz

.if !defined(REFERENCE_PORT)

USES+=		gmake libtool pathfix pkgconfig gnome
USE_GNOME=	glibmm libxml2
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-static --disable-documentation
INSTALL_TARGET=	install-strip
BINARY_WRAPPERS=	gm4

MESON_ARGS=	-Ddefault_library=both \
		-Dbuild-examples=false \
		-Dbuild-manual=false
	@${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>

Lines 1-3 Link Here

(-)b/textproc/libxml++26/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1569960450	1	TIMESTAMP = 1718304896
2	SHA256 (libxml++-2.40.1.tar.xz) = 4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9	2	SHA256 (libxml++-2.42.3.tar.xz) = 74b95302e24dbebc56e97048e86ad0a4121fc82a43e58d381fbe1d380e8eba04
3	SIZE (libxml++-2.40.1.tar.xz) = 955220	3	SIZE (libxml++-2.42.3.tar.xz) = 922400

Added Link Here

(-)b/textproc/libxml++26/files/patch-libxml++-2.6.pc.in (+8 lines)
1	--- libxml++-2.6.pc.in.orig 2024-06-15 10:06:38 UTC
2	+++ libxml++-2.6.pc.in
3	@@ -16,4 +16,4 @@ Libs: -L${libdir} -lxml++@MSVC_TOOLSET_VER@-@LIBXMLXX_
4	URL: https://libxmlplusplus.github.io/libxmlplusplus/
5	Requires: @LIBXMLXX_MODULES@
6	Libs: -L${libdir} -lxml++@MSVC_TOOLSET_VER@-@LIBXMLXX_API_VERSION@ @LIBXML2_LIB_NO_PKGCONFIG@
7	-Cflags: -I${includedir}/@LIBXMLXX_MODULE_NAME@ -I${libdir}/@LIBXMLXX_MODULE_NAME@/include
8	+Cflags: -I${includedir}/@LIBXMLXX_MODULE_NAME@ -I${includedir}/@LIBXMLXX_MODULE_NAME@/include




--- 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',

Return to bug 279745

Lines 1-37 Link Here

(-)b/textproc/libxml++26/Makefile (-24 / +13 lines)
1	PORTNAME= libxml++	1	PORTNAME= libxml++
2	PORTVERSION= 2.40.1	2	DISTVERSION= 2.42.3
3	PORTREVISION?= 2
4	PORTEPOCH= 1	3	PORTEPOCH= 1
5	CATEGORIES= textproc	4	CATEGORIES= textproc
6	MASTER_SITES= GNOME	5	MASTER_SITES= GNOME \
		6	https://github.com/libxmlplusplus/libxmlplusplus/releases/download/${DISTVERSION}/
7		7
8	MAINTAINER= gnome@FreeBSD.org	8	MAINTAINER= gnome@FreeBSD.org
9	COMMENT= XML API for C++	9	COMMENT= XML API for C++
10	WWW= https://libxmlplusplus.sourceforge.net/	10	WWW= https://libxmlplusplus.github.io/libxmlplusplus/
11		11
12	USES+= tar:xz compiler:c++11-lang	12	LICENSE= LGPL21
13	USE_CXXSTD= c++11	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	PLIST_SUB= VERSION="2.6" API_VERSION="2.6"	15	USES= compiler:c++11-lang meson gnome pkgconfig tar:xz
16
17	.if !defined(REFERENCE_PORT)
18
19	USES+= gmake libtool pathfix pkgconfig gnome
20	USE_GNOME= glibmm libxml2	16	USE_GNOME= glibmm libxml2
21	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
22	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --enable-static --disable-documentation
24	INSTALL_TARGET= install-strip
25	BINARY_WRAPPERS= gm4
26		18
27	post-patch:	19	MESON_ARGS= -Ddefault_library=both \
28	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \	20	-Dbuild-examples=false \
29	${WRKSRC}/Makefile.in	21	-Dbuild-manual=false
30	@${REINPLACE_CMD} -e '/^library_configdir =/s/libdir/includedir/' \
31	${WRKSRC}/Makefile.in
32	@${REINPLACE_CMD} -e '/^Cflags:/s/libdir/includedir/' \
33	${WRKSRC}/libxml++-2.6.pc.in
34		22
35	.include <bsd.port.mk>	23	PLIST_SUB= VERSION="2.6" \
		24	API_VERSION="2.6"
36		25
37	.endif	26	.include <bsd.port.mk>

Added Link Here

(-)b/textproc/libxml++26/files/patch-meson.build (+20 lines)
1	--- meson.build.orig 2024-01-11 09:36:21 UTC
2	+++ meson.build
3	@@ -101,7 +101,7 @@ install_datadir = get_option('datadir')
4	install_includedir = get_option('includedir')
5	install_libdir = get_option('libdir')
6	install_datadir = get_option('datadir')
7	-install_pkgconfigdir = install_libdir / 'pkgconfig'
8	+install_pkgconfigdir = join_paths('libdata', 'pkgconfig')
9
10	# Dependencies.
11	# xmlxx_build_dep: Dependencies when building the libxml++ library.
12	@@ -396,7 +396,7 @@ xmlxxconfig_h_meson = files('libxml++config.h.meson')
13	)
14
15	xmlxxconfig_h_meson = files('libxml++config.h.meson')
16	-install_includeconfigdir = install_libdir / xmlxx_pcname / 'include'
17	+install_includeconfigdir = install_includedir / xmlxx_pcname / 'include'
18	configure_file(
19	input: xmlxxconfig_h_meson,
20	output: 'libxml++config.h',