From nobody Fri Oct 04 12:48:49 2024 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 4XKpJL1WVbz5Xjt7; Fri, 04 Oct 2024 12:48:50 +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 4XKpJL11vnz4lf3; Fri, 4 Oct 2024 12:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728046130; 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=xx5kG4dzd4eppas7yf8pwvVK8vg+X4LzDPNKOi7YkaU=; b=f5wf5JxmQe0nMU+6hci1AIYRYDwVyin/AmP9ohRpIZhZfWpQYeOaxVrWLJl0HdMLWYzAhX jPIM583pexAOFtIWpmOHFJLkdyZ9o7uWGlm4qa7ctnn4ENfFqQkLX5y1FnJ+W1jWJMlnK7 cruCWFErl/SQtCEilbN3uVW3IGxKueUDuJs74I8o3bHdMDLMH3omOJXPXeO/lhXEOE8uod WussFe2xVBbzqQWHWRKCIgy7waZbkHFRuCVkm4MAIHvUtXt66CJshYv9GePem+8qzMMXlu vWrKtinmNPLmPKdc0LSA656UspQZ+C4ztuQOGA1CyeCGWx7cTju6pD2qtYofvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728046130; 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=xx5kG4dzd4eppas7yf8pwvVK8vg+X4LzDPNKOi7YkaU=; b=Hm3wzOgTC9UBf4Rh30h6+DKCkDrhuvvt8jKON/SfbeyUk7h0W0J+llTjjIhIsGkQnykv1P 5l6AWuSvqGSMnFhjjnPLR/c5zZLPT8RaJ71aFJ5qze4PuPVHHWmyvi6dXuh+eAqUJ+oCaJ b12ANSJ8SlEOaXI4M9BzUUn8TAjR/w1dvumldh9nMzQ4zwBepWqBlBBVMwH9GbBe8ibuqZ mkUYizPdZ5tH+BKxbwGRozFA0MhLI54lV66nLuueiYe/K9YMfzhfLxPnWnJa1MK7r2gBwF LGWYxB7TRX2QzAauqLfCx3/D1qwsuoCt7t6DhjaDGSWdCO5fgJSGYOLARMArlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728046130; a=rsa-sha256; cv=none; b=KMnSicu37getYYate1xUpYsqLBt97rVpi7scNMPBQwVZ0D9Gt9a9iUXHq5uy+U9uhZuge0 ABjZVxnKqcNSqilYvsQYv6St9wy95HiQB7J4D80ZrQ1NUsJx1T1jnSQgCBmX/IGg62rTPy 7yddfej+1uwiV1AEuifM2Z0z+jdZ3CTlCE2MGXSOxdUBG27Hx3F4HkNVHn9THXJbxM5hKk CFJIMchaOlBUS+QBvvbT4+BuBkQYTcRzLl5QYy8LMDvD1Ca9pt48+htDjrbF4/YUCbKyiQ wYzfirPcnp+lMcdkGaXxANklsc+xS7lmsWRvf4Ld4o2y2XdWFrP0TiQRIvdhZA== 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 4XKpJL0Vknzb5x; Fri, 4 Oct 2024 12:48:50 +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 494CmnsK026977; Fri, 4 Oct 2024 12:48:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494Cmnd8026974; Fri, 4 Oct 2024 12:48:49 GMT (envelope-from git) Date: Fri, 4 Oct 2024 12:48:49 GMT Message-Id: <202410041248.494Cmnd8026974@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Pietro Cerutti Subject: git: c48bf2b5ca00 - main - sysutils/createrepo_c: fix dependency on libxml2, more cleanups 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c48bf2b5ca004fdf0e797e3089c8545c8c35df6a Auto-Submitted: auto-generated The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=c48bf2b5ca004fdf0e797e3089c8545c8c35df6a commit c48bf2b5ca004fdf0e797e3089c8545c8c35df6a Author: Pietro Cerutti AuthorDate: 2024-10-04 12:44:45 +0000 Commit: Pietro Cerutti CommitDate: 2024-10-04 12:48:46 +0000 sysutils/createrepo_c: fix dependency on libxml2, more cleanups Reported by: diizzy --- sysutils/createrepo_c/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sysutils/createrepo_c/Makefile b/sysutils/createrepo_c/Makefile index 33d962dd8e84..ba3fe4a76c83 100644 --- a/sysutils/createrepo_c/Makefile +++ b/sysutils/createrepo_c/Makefile @@ -12,17 +12,19 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= librpm.so:archivers/rpm4 \ libcurl.so:ftp/curl \ libmodulemd.so:misc/libmodulemd \ + libpopt.so:devel/popt \ libzck.so:archivers/zchunk \ libzstd.so:archivers/zstd TEST_DEPENDS= bash:shells/bash -USES= cmake pkgconfig shebangfix sqlite +USES= cmake:testing gnome pathfix pkgconfig shebangfix sqlite ssl -USE_GNOME= libxml2 +USE_GNOME= glib20 libxml2 USE_GITHUB= yes GH_ACCOUNT= rpm-software-management +CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Doxygen CMAKE_OFF= ENABLE_PYTHON SHEBANG_FILES= tests/run_tests.sh.in @@ -31,16 +33,18 @@ USE_LDCONFIG= yes post-patch: ${REINPLACE_CMD} \ - '/pkg_check_modules/s|REQUIRED|REQUIRED IMPORTED_TARGET|' \ + -e '/pkg_check_modules/s|REQUIRED|REQUIRED IMPORTED_TARGET|' \ + -e 's|EXCLUDE_FROM_ALL||' \ ${WRKSRC}/CMakeLists.txt for m in GLIB2 GIO GTHREAD2 LIBMODULEMD LZMA SQLITE3 RPM ZCK ZSTD; do \ ${REINPLACE_CMD} \ "s/\$${$${m}_LIBRARIES}/PkgConfig::$${m}/" \ - ${WRKSRC}/src/CMakeLists.txt \ + ${WRKSRC}/src/CMakeLists.txt; \ + done + for m in GLIB2; do \ + ${REINPLACE_CMD} \ + "s/\$${$${m}_LIBRARIES}/PkgConfig::$${m}/" \ ${WRKSRC}/tests/CMakeLists.txt; \ done -do-test: - cd ${CONFIGURE_WRKSRC} && ${MAKE_CMD} tests && ${MAKE_CMD} test - .include