From nobody Thu Jul 04 18:28:29 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WFQBk195gz5P7tp; Thu, 04 Jul 2024 18:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WFQBk0fMsz44bw; Thu, 4 Jul 2024 18:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720117710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fJOGzzFScc0aTrKYd/PKq+D7356nfl2gur1OY0l+8AY=; b=t4tAMVz7lsu5r4nNGvEdYZuafKs1Q1Dus9+NUGTR3fPOlkW8pLs+g3vP7pwZ+ag1GEsTCE 7pyPO7eiVigYnv0argDFGYYqKPi8GMzrx1Wxb0bjYH/X8IFvb+Mv1G3BBXUWq5Xb2YdNgY Mhy/zDocWOKxPRf8ckD57nmNfltnTGoO75njh1qVnp2eawGyY10xVEW8dfj7z/N17AXySu aR/rM3LGYYUykWwQZxFzlKpDGNXuH5PSnziRsx6JeGK/nSHxXwPsJtO/JeRS1lnClvyY4t KLS4p0LpGw6h6QHhusOn+qWjoNHLz1Uwu3PwLx+hXM9raZdPB6nVSYKW1l967Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720117710; a=rsa-sha256; cv=none; b=ThC9PmiJ0PJcc1ubVLY4Rb+R5YcfyRDtnpe3OgTygbsOHw9Rsyl26sw/6dFF7SY+YHPwIS MLhKKzhj0d3VDq5jLqHA0NeXnmuHwxjtJ4YEP/l40/QmeuNwVqd1BUIJ/+ZC3ZuKUVfbzs iOv1qC3yOBB4YPHL0COgTj5k3v9sOx9NUJ15CreTF6Yc/ap4SF8B6155wPenyjzvgqRSHE VxU+RGD2R7xJGkXIbXDp4oYC5pqsQ2JvNvkJq0XNcdgZcA+odYvfFjjeLf6K43mO7/9Cjt ewNvs30g0Rcp/cfRxaQlFvw44QbI/wB4++xNhKU4SaG+gKBMHofVPG2soQ+wkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720117710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fJOGzzFScc0aTrKYd/PKq+D7356nfl2gur1OY0l+8AY=; b=Orl8oX58pYmKaB23cDTmR+TRDD8EGm1XD9VBQD7zXcwnSqlS5kT3I2ZMYJR48EgikBYwwg 03NYGG0pN4gh90DkGVFCUFlzTmr1umuu5qWU6bTQd4kT4zo0F+N4ALVYzkgOZ5KG3ZmzYR MtGmkEe97h96CxW3Ju3/b/ZW2Z1UTIJKQhd7jS3EmX9klizNRvl3nRz3y2eDwMSOpSfM04 bHf0KVKFq7DJpiQgEI8Ybl/338YkhWEeHO/nLXT5CGCufvXqcJfk+xsRA6tKaKzyCQKTj9 nkVb0lMamP9jn1ZlCvKjiVvVFZXWKxIGSzE+ebXmfXR1hSjlasLrQBkWYHz7Zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WFQBk09X8zPPQ; Thu, 4 Jul 2024 18:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 464ISTAF087730; Thu, 4 Jul 2024 18:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 464IST2C087727; Thu, 4 Jul 2024 18:28:29 GMT (envelope-from git) Date: Thu, 4 Jul 2024 18:28:29 GMT Message-Id: <202407041828.464IST2C087727@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: b1421c879e91 - main - textproc/libxml++26: Update to 2.42.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1421c879e9188791dc18b40233fa7a30d948754 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1421c879e9188791dc18b40233fa7a30d948754 commit b1421c879e9188791dc18b40233fa7a30d948754 Author: Daniel Engberg AuthorDate: 2024-07-04 18:00:10 +0000 Commit: Daniel Engberg 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 +MESON_ARGS= -Ddefault_library=both \ + -Dbuild-examples=false \ + -Dbuild-manual=false -.endif +.include 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',