Attachment 251652 Details for Bug 279935 – Patch for mmg

[patch] Patch for mmg

mmg-fixup.patch (text/plain), 9.36 KB, created by Daniel Engberg on 2024-06-23 17:27:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-06-23 17:27:18 UTC

Size: 9.36 KB

patch

obsolete

>diff --git a/science/mmg/Makefile b/science/mmg/Makefile
>index 9d7280445d4a..2647abe39e67 100644
>--- a/science/mmg/Makefile
>+++ b/science/mmg/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	mmg
>-PORTVERSION=	5.7.3
> DISTVERSIONPREFIX=	v
>+DISTVERSION=	5.7.3
> CATEGORIES=	science
> 
> MAINTAINER=	thierry@FreeBSD.org
>@@ -10,21 +10,19 @@ WWW=		https://www.mmgtools.org/
> LICENSE=	LGPL3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	git:devel/git	\
>-		bash:shells/bash
> LIB_DEPENDS=	libscotch.so:cad/scotch	\
> 		libElas.so:science/linearelasticity	\
> 		libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R}
> 
>-USES=		cmake:testing perl5 shebangfix
>+USES=		cmake perl5 shebangfix
> USE_PERL5=	build
>-SHEBANG_FILES=	scripts/*.sh
>+SHEBANG_FILES=	scripts/*.pl
>+USE_LDCONFIG=	yes
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	MmgTools
> 
> CMAKE_ON=	BUILD_SHARED_LIBS
>-USE_LDCONFIG=	yes
> 
> .include <../../math/vtk9/Makefile.version>
> .include <bsd.port.mk>
>diff --git a/science/mmg/files/patch-CMakeLists.txt b/science/mmg/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..c7cb99ce1840
>--- /dev/null
>+++ b/science/mmg/files/patch-CMakeLists.txt
>@@ -0,0 +1,14 @@
>+--- CMakeLists.txt.orig	2024-04-25 08:15:24 UTC
>++++ CMakeLists.txt
>+@@ -124,10 +124,7 @@ IF (NOT WIN32 OR MINGW)
>+ IF (NOT WIN32 OR MINGW)
>+ 
>+   ADD_CUSTOM_TARGET(GenerateGitHashMmg
>+-    COMMAND ./git_log_mmg.sh ${PROJECT_SOURCE_DIR} ${MMGCOMMON_BINARY_DIR}
>+-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/scripts/
>+-    COMMENT "Getting git commit hash"
>+-    BYPRODUCTS ${MMGCOMMON_BINARY_DIR}/git_log_mmg.h
>++    COMMAND cp ${PROJECT_SOURCE_DIR}/git_log_mmg.h ${MMGCOMMON_BINARY_DIR}/git_log_mmg.h
>+   )
>+ ENDIF ()
>+ 
>diff --git a/science/mmg/files/patch-git__log__mmg.h b/science/mmg/files/patch-git__log__mmg.h
>new file mode 100644
>index 000000000000..4a8ec0ac0b8a
>--- /dev/null
>+++ b/science/mmg/files/patch-git__log__mmg.h
>@@ -0,0 +1,9 @@
>+--- git_log_mmg.h.orig	2024-06-23 16:47:08 UTC
>++++ git_log_mmg.h
>+@@ -0,0 +1,6 @@
>++#ifndef _GIT_LOG_MMG_H
>++#define _GIT_LOG_MMG_H
>++#define MMG_GIT_BRANCH "No git branch found"
>++#define MMG_GIT_COMMIT "No git commit found"
>++#define MMG_GIT_DATE   "No git commit found"
>++#endif
>diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
>index 858cf3dc9c5d..c866ca8c696c 100644
>--- a/textproc/libxslt/Makefile
>+++ b/textproc/libxslt/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	libxslt
>-DISTVERSION=	1.1.37
>-PORTREVISION=	1
>+DISTVERSION=	1.1.41
> CATEGORIES=	textproc gnome
> MASTER_SITES=	GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
> DIST_SUBDIR=	gnome
>@@ -12,39 +11,30 @@ WWW=		https://gitlab.gnome.org/GNOME/libxslt/
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-# See note in textproc/libxml2 for why this port uses autotools
>-# from the choices of that and CMake.
>-USES=		cpe gmake gnome libtool localbase:ldflags pathfix pkgconfig tar:xz
>+USES=		cmake:testing cpe gnome pathfix pkgconfig tar:xz
> CPE_VENDOR=	xmlsoft
>-GNU_CONFIGURE=	yes
>-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
> USE_GNOME=	libxml2
> USE_LDCONFIG=	yes
> 
>-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
>-		--without-python
>-INSTALL_TARGET=	install-strip
>-TEST_TARGET=	check
>+PLIST_SUB=	DISTVERSION=${DISTVERSION}
>+PORTDOCS=	*
> 
>-PLIST_SUB=	LIBVERSION=${PORTVERSION}
>+CMAKE_TESTING_ON=	LIBXSLT_WITH_TESTS
> 
>-OPTIONS_DEFINE=	CRYPTO MEM_DEBUG STATIC
>-OPTIONS_DEFAULT=	CRYPTO STATIC
>-OPTIONS_SUB=		yes
>-
>-CRYPTO_DESC=	Enable crypto support
>-MEM_DEBUG_DESC=	Enable memory debugging
>+CMAKE_OFF=		LIBXSLT_WITH_PYTHON \
>+			LIBXSLT_WITH_TESTS
> 
>-CRYPTO_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
>-			libgpg-error.so:security/libgpg-error
>-CRYPTO_CONFIGURE_WITH=	crypto
>+OPTIONS_DEFINE=		DOCS GCRYPT
>+OPTIONS_DEFAULT=	GCRYPT
>+OPTIONS_SUB=		yes
> 
>-MEM_DEBUG_CONFIGURE_WITH=	mem-debug
>+GCRYPT_DESC=		Enable crypto support using GNU crypt
> 
>-STATIC_CONFIGURE_ENABLE=	static
>+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
>+GCRYPT_USES=		localbase:ldflags
>+GCRYPT_CMAKE_BOOL=	LIBXSLT_WITH_CRYPTO
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \
>-		${WRKSRC}/doc/Makefile.in
>+post-install:
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/libxslt-plugins
> 
> .include <bsd.port.mk>
>diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
>index c24ab8dafc97..c778dd7de976 100644
>--- a/textproc/libxslt/distinfo
>+++ b/textproc/libxslt/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1661816621
>-SHA256 (gnome/libxslt-1.1.37.tar.xz) = 3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4
>-SIZE (gnome/libxslt-1.1.37.tar.xz) = 1588572
>+TIMESTAMP = 1718990200
>+SHA256 (gnome/libxslt-1.1.41.tar.xz) = 3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda
>+SIZE (gnome/libxslt-1.1.41.tar.xz) = 1573868
>diff --git a/textproc/libxslt/files/patch-01-git-cd923ff30cd305d379526202612e063a6b170efc b/textproc/libxslt/files/patch-01-git-cd923ff30cd305d379526202612e063a6b170efc
>new file mode 100644
>index 000000000000..925b32bdf111
>--- /dev/null
>+++ b/textproc/libxslt/files/patch-01-git-cd923ff30cd305d379526202612e063a6b170efc
>@@ -0,0 +1,47 @@
>+From cd923ff30cd305d379526202612e063a6b170efc Mon Sep 17 00:00:00 2001
>+From: Nick Wellnhofer <wellnhofer@aevum.de>
>+Date: Fri, 21 Jun 2024 22:56:55 +0200
>+Subject: [PATCH] locale: Work around issue with FreeBSD's strxfrm_l
>+
>+newlocale seems to require LC_CTYPE_MASK as well. Better switch to
>+LC_ALL_MASK to avoid similar problems.
>+
>+Fixes #108.
>+---
>+ libxslt/xsltlocale.c | 6 +++---
>+ 1 file changed, 3 insertions(+), 3 deletions(-)
>+
>+diff --git a/libxslt/xsltlocale.c b/libxslt/xsltlocale.c
>+index aa38ccf7..1d7f2535 100644
>+--- libxslt/xsltlocale.c
>++++ libxslt/xsltlocale.c
>+@@ -143,7 +143,7 @@ xsltNewLocale(const xmlChar *languageTag, int lowerFirst ATTRIBUTE_UNUSED) {
>+ 	    return(NULL);
>+ 
>+         memcpy(q, ".UTF-8", 7);
>+-        locale = newlocale(LC_COLLATE_MASK, localeName, NULL);
>++        locale = newlocale(LC_ALL_MASK, localeName, NULL);
>+         if (locale != NULL)
>+             return(locale);
>+ 
>+@@ -155,7 +155,7 @@ xsltNewLocale(const xmlChar *languageTag, int lowerFirst ATTRIBUTE_UNUSED) {
>+     /* Try locale without territory, e.g. for Esperanto (eo) */
>+ 
>+     memcpy(q, ".UTF-8", 7);
>+-    locale = newlocale(LC_COLLATE_MASK, localeName, NULL);
>++    locale = newlocale(LC_ALL_MASK, localeName, NULL);
>+     if (locale != NULL)
>+         return(locale);
>+ 
>+@@ -173,7 +173,7 @@ xsltNewLocale(const xmlChar *languageTag, int lowerFirst ATTRIBUTE_UNUSED) {
>+     *q++ = region[0];
>+     *q++ = region[1];
>+     memcpy(q, ".UTF-8", 7);
>+-    locale = newlocale(LC_COLLATE_MASK, localeName, NULL);
>++    locale = newlocale(LC_ALL_MASK, localeName, NULL);
>+ 
>+     return(locale);
>+ #endif
>+-- 
>+GitLab
>+
>diff --git a/textproc/libxslt/pkg-plist b/textproc/libxslt/pkg-plist
>index 08511d56a75e..393d8a2c43ab 100644
>--- a/textproc/libxslt/pkg-plist
>+++ b/textproc/libxslt/pkg-plist
>@@ -24,59 +24,21 @@ include/libxslt/xsltconfig.h
> include/libxslt/xsltexports.h
> include/libxslt/xsltlocale.h
> include/libxslt/xsltutils.h
>-lib/cmake/libxslt/FindGcrypt.cmake
>-lib/cmake/libxslt/libxslt-config.cmake
>-%%STATIC%%lib/libexslt.a
>+%%GCRYPT%%lib/cmake/libxslt-%%DISTVERSION%%/FindGcrypt.cmake
>+lib/cmake/libxslt-%%DISTVERSION%%/libxslt-config-version.cmake
>+lib/cmake/libxslt-%%DISTVERSION%%/libxslt-config.cmake
>+lib/cmake/libxslt-%%DISTVERSION%%/libxslt-export-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/libxslt-%%DISTVERSION%%/libxslt-export.cmake
> lib/libexslt.so
> lib/libexslt.so.0
>-lib/libexslt.so.0.8.20
>-%%STATIC%%lib/libxslt.a
>+lib/libexslt.so.0.8.22
> lib/libxslt.so
> lib/libxslt.so.1
>-lib/libxslt.so.1.1.37
>+lib/libxslt.so.%%DISTVERSION%%
> lib/xsltConf.sh
> libdata/pkgconfig/libexslt.pc
> libdata/pkgconfig/libxslt.pc
> share/man/man1/xsltproc.1.gz
> share/man/man3/libexslt.3.gz
> share/man/man3/libxslt.3.gz
>-share/aclocal/libxslt.m4
>-share/gtk-doc/html/libexslt/general.html
>-share/gtk-doc/html/libexslt/home.png
>-share/gtk-doc/html/libexslt/index.html
>-share/gtk-doc/html/libexslt/left.png
>-share/gtk-doc/html/libexslt/libexslt-exslt.html
>-share/gtk-doc/html/libexslt/libexslt-exsltexports.html
>-share/gtk-doc/html/libexslt/libexslt.devhelp2
>-share/gtk-doc/html/libexslt/right.png
>-share/gtk-doc/html/libexslt/style.css
>-share/gtk-doc/html/libexslt/up.png
>-share/gtk-doc/html/libxslt/general.html
>-share/gtk-doc/html/libxslt/home.png
>-share/gtk-doc/html/libxslt/index.html
>-share/gtk-doc/html/libxslt/left.png
>-share/gtk-doc/html/libxslt/libxslt-attributes.html
>-share/gtk-doc/html/libxslt/libxslt-documents.html
>-share/gtk-doc/html/libxslt/libxslt-extensions.html
>-share/gtk-doc/html/libxslt/libxslt-extra.html
>-share/gtk-doc/html/libxslt/libxslt-functions.html
>-share/gtk-doc/html/libxslt/libxslt-imports.html
>-share/gtk-doc/html/libxslt/libxslt-keys.html
>-share/gtk-doc/html/libxslt/libxslt-namespaces.html
>-share/gtk-doc/html/libxslt/libxslt-numbersInternals.html
>-share/gtk-doc/html/libxslt/libxslt-pattern.html
>-share/gtk-doc/html/libxslt/libxslt-preproc.html
>-share/gtk-doc/html/libxslt/libxslt-security.html
>-share/gtk-doc/html/libxslt/libxslt-templates.html
>-share/gtk-doc/html/libxslt/libxslt-transform.html
>-share/gtk-doc/html/libxslt/libxslt-variables.html
>-share/gtk-doc/html/libxslt/libxslt-xslt.html
>-share/gtk-doc/html/libxslt/libxslt-xsltInternals.html
>-share/gtk-doc/html/libxslt/libxslt-xsltexports.html
>-share/gtk-doc/html/libxslt/libxslt-xsltlocale.html
>-share/gtk-doc/html/libxslt/libxslt-xsltutils.html
>-share/gtk-doc/html/libxslt/libxslt.devhelp2
>-share/gtk-doc/html/libxslt/right.png
>-share/gtk-doc/html/libxslt/style.css
>-share/gtk-doc/html/libxslt/up.png
> @dir lib/libxslt-plugins

Actions: View | Diff

Attachments on bug 279935: 251652 | 251653