git: d7169b7b3cdc - main - textproc/libxml++30: remove incorrect patch and adjust plist
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 11 Jan 2025 04:13:08 UTC
The branch main has been updated by vishwin:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d7169b7b3cdcdeff0327dca0b4e87f5eca7eb112
commit d7169b7b3cdcdeff0327dca0b4e87f5eca7eb112
Author: Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2025-01-11 04:09:10 +0000
Commit: Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2025-01-11 04:09:10 +0000
textproc/libxml++30: remove incorrect patch and adjust plist
libxml++config.h is always #included as <libxml++config.h>, and its
expected location is lib/libxml++3.0/include. Consumers fail to
build otherwise as other headers in this port include <libxml++config.h>.
---
textproc/libxml++30/Makefile | 3 ++-
textproc/libxml++30/files/patch-meson.build | 11 -----------
textproc/libxml++30/pkg-plist | 2 +-
3 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/textproc/libxml++30/Makefile b/textproc/libxml++30/Makefile
index 07ea95706d4d..d86c29d2c0d9 100644
--- a/textproc/libxml++30/Makefile
+++ b/textproc/libxml++30/Makefile
@@ -1,5 +1,6 @@
PORTNAME= libxml++
-PORTVERSION= 3.2.5
+DISTVERSION= 3.2.5
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= GNOME
PKGNAMESUFFIX= 30
diff --git a/textproc/libxml++30/files/patch-meson.build b/textproc/libxml++30/files/patch-meson.build
deleted file mode 100644
index b91b9255e9b3..000000000000
--- a/textproc/libxml++30/files/patch-meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build.orig 2024-01-11 10:03:52 UTC
-+++ meson.build
-@@ -393,7 +393,7 @@
- )
-
- 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',
diff --git a/textproc/libxml++30/pkg-plist b/textproc/libxml++30/pkg-plist
index 99e71381e4e7..ea61726557cb 100644
--- a/textproc/libxml++30/pkg-plist
+++ b/textproc/libxml++30/pkg-plist
@@ -1,4 +1,3 @@
-include/libxml++-%%API_VERSION%%/include/libxml++config.h
include/libxml++-%%API_VERSION%%/libxml++/attribute.h
include/libxml++-%%API_VERSION%%/libxml++/attributedeclaration.h
include/libxml++-%%API_VERSION%%/libxml++/attributenode.h
@@ -43,4 +42,5 @@ lib/libxml++-%%VERSION%%.a
lib/libxml++-%%VERSION%%.so
lib/libxml++-%%VERSION%%.so.1
lib/libxml++-%%VERSION%%.so.1.0.0
+lib/libxml++-%%API_VERSION%%/include/libxml++config.h
libdata/pkgconfig/libxml++-%%API_VERSION%%.pc