From owner-svn-ports-all@freebsd.org Sat Sep 26 06:56:16 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 856123F5E1A; Sat, 26 Sep 2020 06:56:16 +0000 (UTC) (envelope-from yuri@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bz01X2wBPz4CMM; Sat, 26 Sep 2020 06:56:16 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 47625203E3; Sat, 26 Sep 2020 06:56:16 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08Q6uGLE072058; Sat, 26 Sep 2020 06:56:16 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08Q6uFej072051; Sat, 26 Sep 2020 06:56:15 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202009260656.08Q6uFej072051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 26 Sep 2020 06:56:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550108 - in head/sysutils/libdnf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/sysutils/libdnf: . files X-SVN-Commit-Revision: 550108 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Sep 2020 06:56:16 -0000 Author: yuri Date: Sat Sep 26 06:56:14 2020 New Revision: 550108 URL: https://svnweb.freebsd.org/changeset/ports/550108 Log: sysutils/libdnf: Fix PYTHON option Added: head/sysutils/libdnf/files/patch-python_hawkey_CMakeLists.txt (contents, props changed) head/sysutils/libdnf/files/patch-tests_CMakeLists.txt (contents, props changed) Modified: head/sysutils/libdnf/Makefile head/sysutils/libdnf/files/patch-CMakeLists.txt head/sysutils/libdnf/pkg-plist Modified: head/sysutils/libdnf/Makefile ============================================================================== --- head/sysutils/libdnf/Makefile Sat Sep 26 06:54:52 2020 (r550107) +++ head/sysutils/libdnf/Makefile Sat Sep 26 06:56:14 2020 (r550108) @@ -2,6 +2,7 @@ PORTNAME= libdnf DISTVERSION= 0.48.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org @@ -10,8 +11,7 @@ COMMENT= Dandified YUM, the next-generation version of LICENSE= LGPL21 # no LICENSE tag for Version 2.1 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= check>0:devel/check \ - ${LOCALBASE}/include/libsmartcols/libsmartcols.h:devel/util-linux +BUILD_DEPENDS= check>0:devel/check LIB_DEPENDS= libassuan.so:security/libassuan \ libgpgme.so:security/gpgme \ libgpg-error.so:security/libgpg-error \ @@ -19,26 +19,27 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libmodulemd.so:misc/libmodulemd \ librepo.so:misc/librepo \ librpmio.so:archivers/rpm4 \ + libsmartcols.so:devel/util-linux \ libsolv.so:misc/libsolv USES= cmake compiler:c++11-lang gettext gnome pkgconfig sqlite ssl USE_GNOME= glib20 USE_LDCONFIG= yes +USE_GCC= any # clang fails: https://github.com/rpm-software-management/libdnf/issues/1038 USE_GITHUB= yes GH_ACCOUNT= rpm-software-management -CMAKE_OFF= BUILD_TESTNG WITH_GTKDOC WITH_HTML +CMAKE_OFF= BUILD_TESTNG WITH_GTKDOC WITH_HTML BUILD_TESTING FREEBSD_INSTALL_DOCS -USE_GCC= any # clang fails: https://github.com/rpm-software-management/libdnf/issues/1038 - OPTIONS_DEFINE= PYTHON ZCHUNK +OPTIONS_DEFAULT= PYTHON +OPTIONS_SUB= yes PYTHON_CMAKE_BOOL= WITH_BINDINGS PYTHON_USES= python PYTHON_CMAKE_ON= -DPYTHON_DESIRED=${PYTHON_MAJOR_VER} PYTHON_BUILD_DEPENDS= swig:devel/swig -PYTHON_BROKEN= https://github.com/rpm-software-management/libdnf/issues/1046 ZCHUNK_DESC= With zchunk support ZCHUNK_CMAKE_BOOL= WITH_ZCHUNK Modified: head/sysutils/libdnf/files/patch-CMakeLists.txt ============================================================================== --- head/sysutils/libdnf/files/patch-CMakeLists.txt Sat Sep 26 06:54:52 2020 (r550107) +++ head/sysutils/libdnf/files/patch-CMakeLists.txt Sat Sep 26 06:56:14 2020 (r550108) @@ -1,15 +1,15 @@ --- CMakeLists.txt.orig 2020-06-02 09:41:46 UTC +++ CMakeLists.txt -@@ -65,7 +65,7 @@ pkg_check_modules(REPO REQUIRED librepo>=0.11.0) - include_directories(${REPO_INCLUDE_DIRS}) - link_directories(${REPO_LIBRARY_DIRS}) - pkg_check_modules(RPM REQUIRED rpm>=4.11.0) --pkg_check_modules(SMARTCOLS REQUIRED smartcols) -+#pkg_check_modules(SMARTCOLS REQUIRED smartcols) - pkg_check_modules(SQLite3 REQUIRED sqlite3) +@@ -171,15 +171,19 @@ add_subdirectory(po) - # always enable linking with libdnf utils -@@ -178,8 +178,10 @@ endif() + + # build docs ++if (FREEBSD_INSTALL_DOCS) + add_subdirectory(docs/libdnf) + if(WITH_BINDINGS) + add_subdirectory(docs/hawkey) + endif() ++endif() # build tests Added: head/sysutils/libdnf/files/patch-python_hawkey_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/libdnf/files/patch-python_hawkey_CMakeLists.txt Sat Sep 26 06:56:14 2020 (r550108) @@ -0,0 +1,9 @@ +--- python/hawkey/CMakeLists.txt.orig 2020-09-26 05:11:04 UTC ++++ python/hawkey/CMakeLists.txt +@@ -50,4 +50,6 @@ target_link_libraries(_hawkeymodule ${PYTHON_LIBRARY}) + install(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey) + install(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey) + ++if (BUILD_TESTING) + add_subdirectory(tests) ++endif() Added: head/sysutils/libdnf/files/patch-tests_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/libdnf/files/patch-tests_CMakeLists.txt Sat Sep 26 06:56:14 2020 (r550108) @@ -0,0 +1,12 @@ +--- tests/CMakeLists.txt.orig 2020-09-26 05:07:59 UTC ++++ tests/CMakeLists.txt +@@ -2,7 +2,9 @@ add_subdirectory(libdnf/module/modulemd) + add_subdirectory(libdnf/module) + add_subdirectory(libdnf/repo) + add_subdirectory(libdnf/transaction) ++if (BUILD_TESTING) + add_subdirectory(hawkey) ++endif() + add_subdirectory(libdnf) + + Modified: head/sysutils/libdnf/pkg-plist ============================================================================== --- head/sysutils/libdnf/pkg-plist Sat Sep 26 06:54:52 2020 (r550107) +++ head/sysutils/libdnf/pkg-plist Sat Sep 26 06:56:14 2020 (r550108) @@ -55,6 +55,25 @@ include/libdnf/utils/logger.hpp lib/libdnf.so lib/libdnf.so.2 lib/libdnf/plugins/README +%%PYTHON%%%%PYTHON_SITELIBDIR%%/hawkey/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/hawkey/_hawkey.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_common_types.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_conf.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_error.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_module.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_repo.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_smartcols.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_transaction.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_utils.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/common_types.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/conf.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/error.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/module.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/repo.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/smartcols.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/transaction.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/utils.py libdata/pkgconfig/libdnf.pc share/locale/as/LC_MESSAGES/libdnf.mo share/locale/bg/LC_MESSAGES/libdnf.mo