Date: Mon, 2 Sep 2024 01:31:19 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 64029c881fbd - main - textproc/xmlf90: change to cmake; use static release tarball; update WWW Message-ID: <202409020131.4821VJNf063715@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=64029c881fbd6c3973df6de5c799698c4892d3c8 commit 64029c881fbd6c3973df6de5c799698c4892d3c8 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2024-09-02 01:28:52 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-09-02 01:31:17 +0000 textproc/xmlf90: change to cmake; use static release tarball; update WWW --- science/abinit/Makefile | 4 +- textproc/xmlf90/Makefile | 16 ++-- textproc/xmlf90/files/patch-CMakeLists.txt | 17 ++++ .../xmlf90/files/patch-config_cmake_CMakeLists.txt | 11 +++ .../xmlf90/files/patch-config_data_xmlf90.mk.in | 10 --- textproc/xmlf90/pkg-plist | 90 +++++++++++----------- 6 files changed, 81 insertions(+), 67 deletions(-) diff --git a/science/abinit/Makefile b/science/abinit/Makefile index bf8fe2fe8d9d..9adc98c11f56 100644 --- a/science/abinit/Makefile +++ b/science/abinit/Makefile @@ -1,6 +1,6 @@ PORTNAME= abinit DISTVERSION= 10.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -45,7 +45,7 @@ CONFIGURE_ENV= H5CC="${LOCALBASE}/bin/h5cc" \ LINALG_FCFLAGS="-I${LOCALBASE}/include/elpa-2019.05.002/modules" \ LINALG_LIBS="${BLASLIB} ${LAPACKLIB} -lelpa" \ NETCDF_FORTRAN_FCFLAGS=-I${LOCALBASE}/include \ - XMLF90_FCFLAGS=-I${LOCALBASE}/include \ + XMLF90_FCFLAGS=-I${LOCALBASE}/include/xmlf90 \ WANNIER90_LIBS="${BLASLIB} ${LAPACKLIB} -lwannier" CONFIGURE_ARGS= --with-fft --with-libxc --with-libxml2 --with-netcdf \ --with-netcdf-fortran --with-wannier90 --with-xmlf90 diff --git a/textproc/xmlf90/Makefile b/textproc/xmlf90/Makefile index ca0384e581fb..c907464ca5e3 100644 --- a/textproc/xmlf90/Makefile +++ b/textproc/xmlf90/Makefile @@ -1,27 +1,21 @@ PORTNAME= xmlf90 DISTVERSION= 1.6.3 +PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= https://gitlab.com/siesta-project/libraries/xmlf90/-/archive/${DISTVERSION}/ +MASTER_SITES= https://gitlab.com/-/project/12146849/uploads/8153db06dece1c0b9c38dcda31918fbf/ MAINTAINER= yuri@FreeBSD.org COMMENT= Suite of light-weight libraries to work with XML in Fortran -WWW= https://launchpad.net/xmlf90 +WWW= https://gitlab.com/siesta-project/libraries/xmlf90 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS_INSTALL= fox-xml # see https://gitlab.com/siesta-project/libraries/xmlf90/-/issues/8 -USES= autoreconf fortran gmake libtool +USES= cmake fortran pathfix USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-static - -INSTALL_TARGET= install-strip - -OPTIONS_DEFINE= DOCS - -PORTDOCS= * +CMAKE_ON= BUILD_SHARED_LIBS .include <bsd.port.mk> diff --git a/textproc/xmlf90/files/patch-CMakeLists.txt b/textproc/xmlf90/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..5f529cdec685 --- /dev/null +++ b/textproc/xmlf90/files/patch-CMakeLists.txt @@ -0,0 +1,17 @@ +--- CMakeLists.txt.orig 2024-09-01 13:21:59 UTC ++++ CMakeLists.txt +@@ -78,12 +78,12 @@ install( + "${CMAKE_CURRENT_BINARY_DIR}/include/" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${module-dir}" + ) +-# Package license files ++#[[ # Package license files + install( + FILES + "COPYING" + DESTINATION "${CMAKE_INSTALL_DATADIR}/licenses/${PROJECT_NAME}" +-) ++) ]] + + # add the testsuite + enable_testing() diff --git a/textproc/xmlf90/files/patch-config_cmake_CMakeLists.txt b/textproc/xmlf90/files/patch-config_cmake_CMakeLists.txt new file mode 100644 index 000000000000..78c7b2d43969 --- /dev/null +++ b/textproc/xmlf90/files/patch-config_cmake_CMakeLists.txt @@ -0,0 +1,11 @@ +--- config/cmake/CMakeLists.txt.orig 2024-09-01 13:00:51 UTC ++++ config/cmake/CMakeLists.txt +@@ -3,7 +3,7 @@ set( + + set( + module-dir +- "${PROJECT_NAME}/${CMAKE_Fortran_COMPILER_ID}-${CMAKE_Fortran_COMPILER_VERSION}" ++ "${PROJECT_NAME}" + ) + set(module-dir "${module-dir}" PARENT_SCOPE) + diff --git a/textproc/xmlf90/files/patch-config_data_xmlf90.mk.in b/textproc/xmlf90/files/patch-config_data_xmlf90.mk.in deleted file mode 100644 index baeefac61245..000000000000 --- a/textproc/xmlf90/files/patch-config_data_xmlf90.mk.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/data/xmlf90.mk.in.orig 2018-09-04 07:46:34 UTC -+++ config/data/xmlf90.mk.in -@@ -18,6 +18,6 @@ XMLF90_H__ = 1 - - XMLF90_ROOT_BUILD = @prefix@ - XMLF90_INCFLAGS = -I$(XMLF90_ROOT_BUILD)/include --XMLF90_LIBS = $(XMLF90_ROOT_BUILD)/lib/libxmlf90.a -+XMLF90_LIBS = $(XMLF90_ROOT_BUILD)/lib/libxmlf90.so - - endif diff --git a/textproc/xmlf90/pkg-plist b/textproc/xmlf90/pkg-plist index 64e4937df2b7..f163dc548a43 100644 --- a/textproc/xmlf90/pkg-plist +++ b/textproc/xmlf90/pkg-plist @@ -1,46 +1,48 @@ -include/m_dom_attribute.mod -include/m_dom_debug.mod -include/m_dom_document.mod -include/m_dom_element.mod -include/m_dom_error.mod -include/m_dom_namednodemap.mod -include/m_dom_node.mod -include/m_dom_nodelist.mod -include/m_dom_parse.mod -include/m_dom_strings.mod -include/m_dom_types.mod -include/m_dom_utils.mod -include/m_sax_buffer.mod -include/m_sax_charset.mod -include/m_sax_converters.mod -include/m_sax_debug.mod -include/m_sax_dictionary.mod -include/m_sax_elstack.mod -include/m_sax_entities.mod -include/m_sax_fsm.mod -include/m_sax_reader.mod -include/m_wcml.mod -include/m_wstml.mod -include/m_wxml_array_str.mod -include/m_wxml_buffer.mod -include/m_wxml_core.mod -include/m_wxml_dictionary.mod -include/m_wxml_elstack.mod -include/m_wxml_error.mod -include/m_wxml_escape.mod -include/m_wxml_overloads.mod -include/m_wxml_text.mod -include/m_xml_error.mod -include/m_xml_parser.mod -include/m_xpath_api.mod -include/xmlf90_cml.mod -include/xmlf90_dom.mod -include/xmlf90_info.mod -include/xmlf90_sax.mod -include/xmlf90_wxml.mod -include/xmlf90_xpath.mod +include/xmlf90/m_dom_attribute.mod +include/xmlf90/m_dom_debug.mod +include/xmlf90/m_dom_document.mod +include/xmlf90/m_dom_element.mod +include/xmlf90/m_dom_error.mod +include/xmlf90/m_dom_namednodemap.mod +include/xmlf90/m_dom_node.mod +include/xmlf90/m_dom_nodelist.mod +include/xmlf90/m_dom_parse.mod +include/xmlf90/m_dom_strings.mod +include/xmlf90/m_dom_types.mod +include/xmlf90/m_dom_utils.mod +include/xmlf90/m_sax_buffer.mod +include/xmlf90/m_sax_charset.mod +include/xmlf90/m_sax_converters.mod +include/xmlf90/m_sax_debug.mod +include/xmlf90/m_sax_dictionary.mod +include/xmlf90/m_sax_elstack.mod +include/xmlf90/m_sax_entities.mod +include/xmlf90/m_sax_fsm.mod +include/xmlf90/m_sax_reader.mod +include/xmlf90/m_wcml.mod +include/xmlf90/m_wstml.mod +include/xmlf90/m_wxml_array_str.mod +include/xmlf90/m_wxml_buffer.mod +include/xmlf90/m_wxml_core.mod +include/xmlf90/m_wxml_dictionary.mod +include/xmlf90/m_wxml_elstack.mod +include/xmlf90/m_wxml_error.mod +include/xmlf90/m_wxml_escape.mod +include/xmlf90/m_wxml_overloads.mod +include/xmlf90/m_wxml_text.mod +include/xmlf90/m_xml_error.mod +include/xmlf90/m_xml_parser.mod +include/xmlf90/m_xpath_api.mod +include/xmlf90/xmlf90_cml.mod +include/xmlf90/xmlf90_dom.mod +include/xmlf90/xmlf90_sax.mod +include/xmlf90/xmlf90_wxml.mod +include/xmlf90/xmlf90_xpath.mod +lib/cmake/xmlf90/xmlf90-config-version.cmake +lib/cmake/xmlf90/xmlf90-config.cmake +lib/cmake/xmlf90/xmlf90-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/xmlf90/xmlf90-targets.cmake lib/libxmlf90.so -lib/libxmlf90.so.0 -lib/libxmlf90.so.0.0.0 +lib/libxmlf90.so.1 +lib/libxmlf90.so.1.6.3 libdata/pkgconfig/xmlf90.pc -share/org.siesta-project/xmlf90.mk
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409020131.4821VJNf063715>