From nobody Fri Jul 11 16:53:30 2025 X-Original-To: dev-commits-ports-main@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 4bdyTT0CPvz61Yd6; Fri, 11 Jul 2025 16:53:33 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdyTS5PKRz3LKG; Fri, 11 Jul 2025 16:53:32 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752252812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3fBsLmz0wyl9fEE65bPVZwS4e+7yjvLGlWzP7wuS36M=; b=SqUv8MiiVPyD8ifEjZRO2wa9QmpRnQ3C858PESKnzDtwRq2RXSG3VhuwJeOHoQRFJFbadQ SGW5n0C2U97QngTJNYAXGCVYScYNq0tW1goRw8QIxnflsLnM57seNYpHPmiw/yeWmaoh4S LpE2BALqquqYExz79ZsQUlr5PGoBTOIY2YeQagpt9IWy78LrzAY0VQb3uxDmLAFHKVmiMV 4AdX1/l8ANftIdvmI5HOCBre0dJOnD7V1YKpMgV2x3gxSTjS16JqR5l+rTd6Ub1r2/08jV iq5eidWjdws4ltdNCZD/VlqYFy7r/d3gN2YFWn8ByCxqKGnmXy+8gQsp7J8EKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752252812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3fBsLmz0wyl9fEE65bPVZwS4e+7yjvLGlWzP7wuS36M=; b=RC4OJLZM2zZTYoBJ9vY1o8egKmcjFHt15Z+xzTQosgThghBd83RWDwODh8PyequJGua13n aUQJJRbSRVlfHhuymqFSD1e0nUkhSqDwt3HEtn9Wav+wiLBSP2TaBV1l6DBHFEN0V4dyBv bBwP9YLKwsR8eZsBC4igZzH/dsQYL9XWAee+0s8yMVf0ps3x4z4vFvgtap07RxGd5Pb+W8 uG/n9IJJCM9ghEB/NJRMDri4IA3CB5OhY0U24/xaBBtYz/FgaKosQuzBvlyi7jIR3ebBeJ 5IB+1RoA+IN9au9yCw83+zYp7Z/6Mv6xMkqKs/hUltzffOANh0Zw6VR2LNQjng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752252812; a=rsa-sha256; cv=none; b=mURj6pwteirEXnBtEgXHkPY7YmleILrvuaRpjhlLeOq8fqZMfmhT/DJb/zlWFPFjF7SOOy esidL2MDVa9FiG/2BoD88kBzpIHuPFofV2gVYqpouBNlm7JUeEkjvlTnqIPYNONnABPLNf S8/m3xzo99seJSUsK4LgIAOxaACcIxiHcuzRqBsSL1Zmw5NBToEuNGIwdVSYvuod88OGHU L3+xuws3ORBnH4kDq3SKj1RugnMfnR9K7jfXlND5Hpm33050YX3koUDoT1j0gBca72hQh6 rnvxtj9iyVxQ6HEquxxP/IkiGlhFcnZmwte7nk9nd5uvWbbQ/L6uU2bTDMr6uQ== Received: from [192.168.1.16] (217-209-194-237-no600.tbcn.telia.com [217.209.194.237]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: diizzy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4bdyTS1K6tz8MN; Fri, 11 Jul 2025 16:53:32 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Content-Type: multipart/alternative; boundary="------------8IuqMSlsllX6vbJu0ug05gXt" Message-ID: <18da36cc-e3c9-4bf2-8900-379774c6809a@FreeBSD.org> Date: Fri, 11 Jul 2025 18:53:30 +0200 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Betterbird (Windows) Subject: Re: git: e02b2ca451b0 - main - textproc/libxml2: Fix cmake file To: Zsolt Udvari , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202507101108.56AB8lfm004321@gitrepo.freebsd.org> Content-Language: en-US From: Daniel Engberg In-Reply-To: <202507101108.56AB8lfm004321@gitrepo.freebsd.org> This is a multi-part message in MIME format. --------------8IuqMSlsllX6vbJu0ug05gXt Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2025-07-10 13:08, Zsolt Udvari wrote: > The branch main has been updated by uzsolt: > > URL:https://cgit.FreeBSD.org/ports/commit/?id=e02b2ca451b050db7a63fb19ccf0decc6c7d04a1 > > commit e02b2ca451b050db7a63fb19ccf0decc6c7d04a1 > Author: Zsolt Udvari > AuthorDate: 2025-07-10 11:03:37 +0000 > Commit: Zsolt Udvari > CommitDate: 2025-07-10 11:08:15 +0000 > > textproc/libxml2: Fix cmake file > > The port's cmake file is wrong because there is an unclosed > if-statement. > Can check with 'cmake -P test-libxml2.cmake' where the content of > test-libxml2.cmake is: > include("/usr/local/lib/cmake/libxml2/libxml2-config.cmake") > > The test's result is: > CMake Error at /usr/local/lib/cmake/libxml2/libxml2-config.cmake:53 (if): > Flow control statements are not properly nested. > Call Stack (most recent call first): > test-libxml2.cmake:1 (include) > > Approved by: portmgr (blanket, trivial runtime fix) > --- > textproc/libxml2/Makefile | 2 +- > textproc/libxml2/files/patch-libxml2-config.cmake.in | 10 ++++++++++ > 2 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile > index 7f2922589d85..af933570190a 100644 > --- a/textproc/libxml2/Makefile > +++ b/textproc/libxml2/Makefile > @@ -1,6 +1,6 @@ > PORTNAME?= libxml2 > DISTVERSION= 2.14.4 > -PORTREVISION?= 0 > +PORTREVISION?= 1 > CATEGORIES?= textproc gnome > MASTER_SITES= GNOME > DISTNAME= libxml2-${DISTVERSION} > diff --git a/textproc/libxml2/files/patch-libxml2-config.cmake.in b/textproc/libxml2/files/patch-libxml2-config.cmake.in > new file mode 100644 > index 000000000000..581142a44aaf > --- /dev/null > +++ b/textproc/libxml2/files/patch-libxml2-config.cmake.in > @@ -0,0 +1,10 @@ > +--- libxml2-config.cmake.in.orig 2025-07-10 08:31:10 UTC > ++++ libxml2-config.cmake.in > +@@ -119,6 +119,7 @@ if(NOT LIBXML2_SHARED) > + if(LIBXML2_WITH_HTTP) > + list(APPEND LIBXML2_LIBRARIES ws2_32) > + list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") > ++ endif() > + endif() > + endif() > + Hi, For more context, this is upstream commit d3e33dc214276498e73b61188be02b2863c9670a which was committed the first time but removed the second time around... https://gitlab.gnome.org/GNOME/libxml2/-/commit/d3e33dc214276498e73b61188be02b2863c9670a Best regards, Daniel --------------8IuqMSlsllX6vbJu0ug05gXt Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit
On 2025-07-10 13:08, Zsolt Udvari wrote:
The branch main has been updated by uzsolt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e02b2ca451b050db7a63fb19ccf0decc6c7d04a1

commit e02b2ca451b050db7a63fb19ccf0decc6c7d04a1
Author:     Zsolt Udvari <uzsolt@FreeBSD.org>
AuthorDate: 2025-07-10 11:03:37 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2025-07-10 11:08:15 +0000

    textproc/libxml2: Fix cmake file
    
    The port's cmake file is wrong because there is an unclosed
    if-statement.
    Can check with 'cmake -P test-libxml2.cmake' where the content of
    test-libxml2.cmake is:
    include("/usr/local/lib/cmake/libxml2/libxml2-config.cmake")
    
    The test's result is:
    CMake Error at /usr/local/lib/cmake/libxml2/libxml2-config.cmake:53 (if):
      Flow control statements are not properly nested.
    Call Stack (most recent call first):
      test-libxml2.cmake:1 (include)
    
    Approved by:    portmgr (blanket, trivial runtime fix)
---
 textproc/libxml2/Makefile                            |  2 +-
 textproc/libxml2/files/patch-libxml2-config.cmake.in | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 7f2922589d85..af933570190a 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME?=	libxml2
 DISTVERSION=	2.14.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	GNOME
 DISTNAME=	libxml2-${DISTVERSION}
diff --git a/textproc/libxml2/files/patch-libxml2-config.cmake.in b/textproc/libxml2/files/patch-libxml2-config.cmake.in
new file mode 100644
index 000000000000..581142a44aaf
--- /dev/null
+++ b/textproc/libxml2/files/patch-libxml2-config.cmake.in
@@ -0,0 +1,10 @@
+--- libxml2-config.cmake.in.orig	2025-07-10 08:31:10 UTC
++++ libxml2-config.cmake.in
+@@ -119,6 +119,7 @@ if(NOT LIBXML2_SHARED)
+         if(LIBXML2_WITH_HTTP)
+             list(APPEND LIBXML2_LIBRARIES ws2_32)
+             list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ws2_32>")
++        endif()
+     endif()
+ endif()
+

Hi,

For more context, this is upstream commit d3e33dc214276498e73b61188be02b2863c9670a which was committed the first time but removed the second time around... 

https://gitlab.gnome.org/GNOME/libxml2/-/commit/d3e33dc214276498e73b61188be02b2863c9670a

Best regards, Daniel

--------------8IuqMSlsllX6vbJu0ug05gXt--