Attachment #251652 for bug #279935




PORTNAME=	mmg
PORTVERSION=	5.7.3
DISTVERSIONPREFIX=	v
DISTVERSION=	5.7.3
CATEGORIES=	science

MAINTAINER=	thierry@FreeBSD.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 perl5 shebangfix
USE_PERL5=	build
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>




--- 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 ()
 

Added Link Here

(-)b/science/mmg/files/patch-git__log__mmg.h (+9 lines)
1	--- git_log_mmg.h.orig 2024-06-23 16:47:08 UTC
2	+++ git_log_mmg.h
3	@@ -0,0 +1,6 @@
4	+#ifndef _GIT_LOG_MMG_H
5	+#define _GIT_LOG_MMG_H
6	+#define MMG_GIT_BRANCH "No git branch found"
7	+#define MMG_GIT_COMMIT "No git commit found"
8	+#define MMG_GIT_DATE "No git commit found"
9	+#endif




PORTNAME=	libxslt
DISTVERSION=	1.1.41
PORTREVISION=	1
CATEGORIES=	textproc gnome
MASTER_SITES=	GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
DIST_SUBDIR=	gnome

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		cmake:testing cpe gnome pathfix pkgconfig tar:xz
# from the choices of that and CMake.
USES=		cpe gmake gnome libtool localbase:ldflags pathfix pkgconfig tar:xz
CPE_VENDOR=	xmlsoft
GNU_CONFIGURE=	yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
USE_GNOME=	libxml2
USE_LDCONFIG=	yes

PLIST_SUB=	DISTVERSION=${DISTVERSION}
PORTDOCS=	*
INSTALL_TARGET=	install-strip
TEST_TARGET=	check

CMAKE_TESTING_ON=	LIBXSLT_WITH_TESTS

CMAKE_OFF=		LIBXSLT_WITH_PYTHON \
			LIBXSLT_WITH_TESTS
OPTIONS_SUB=		yes

CRYPTO_DESC=	Enable crypto support
MEM_DEBUG_DESC=	Enable memory debugging

OPTIONS_DEFINE=		DOCS GCRYPT
OPTIONS_DEFAULT=	GCRYPT
OPTIONS_SUB=		yes

GCRYPT_DESC=		Enable crypto support using GNU crypt

GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
GCRYPT_USES=		localbase:ldflags
GCRYPT_CMAKE_BOOL=	LIBXSLT_WITH_CRYPTO

post-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/libxslt-plugins
		${WRKSRC}/doc/Makefile.in

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/textproc/libxslt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1661816621	1	TIMESTAMP = 1718990200
2	SHA256 (gnome/libxslt-1.1.37.tar.xz) = 3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4	2	SHA256 (gnome/libxslt-1.1.41.tar.xz) = 3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda
3	SIZE (gnome/libxslt-1.1.37.tar.xz) = 1588572	3	SIZE (gnome/libxslt-1.1.41.tar.xz) = 1573868




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





include/libxslt/xsltexports.h
include/libxslt/xsltlocale.h
include/libxslt/xsltutils.h
%%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.22
%%STATIC%%lib/libxslt.a
lib/libxslt.so
lib/libxslt.so.1
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

Return to bug 279935

Lines 1-6 Link Here

(-)b/science/mmg/Makefile (-6 / +4 lines)
1	PORTNAME= mmg	1	PORTNAME= mmg
2	PORTVERSION= 5.7.3
3	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
		3	DISTVERSION= 5.7.3
4	CATEGORIES= science	4	CATEGORIES= science
5		5
6	MAINTAINER= thierry@FreeBSD.org	6	MAINTAINER= thierry@FreeBSD.org
Lines 10-30 WWW= https://www.mmgtools.org/ Link Here
10	LICENSE= LGPL3	10	LICENSE= LGPL3
11	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
12		12
13	BUILD_DEPENDS= git:devel/git \
14	bash:shells/bash
15	LIB_DEPENDS= libscotch.so:cad/scotch \	13	LIB_DEPENDS= libscotch.so:cad/scotch \
16	libElas.so:science/linearelasticity \	14	libElas.so:science/linearelasticity \
17	libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R}	15	libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R}
18		16
19	USES= cmake:testing perl5 shebangfix	17	USES= cmake perl5 shebangfix
20	USE_PERL5= build	18	USE_PERL5= build
21	SHEBANG_FILES= scripts/*.sh	19	SHEBANG_FILES= scripts/*.pl
		20	USE_LDCONFIG= yes
22		21
23	USE_GITHUB= yes	22	USE_GITHUB= yes
24	GH_ACCOUNT= MmgTools	23	GH_ACCOUNT= MmgTools
25		24
26	CMAKE_ON= BUILD_SHARED_LIBS	25	CMAKE_ON= BUILD_SHARED_LIBS
27	USE_LDCONFIG= yes
28		26
29	.include <../../math/vtk9/Makefile.version>	27	.include <../../math/vtk9/Makefile.version>
30	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Added Link Here

(-)b/science/mmg/files/patch-CMakeLists.txt (+14 lines)
1	--- CMakeLists.txt.orig 2024-04-25 08:15:24 UTC
2	+++ CMakeLists.txt
3	@@ -124,10 +124,7 @@ IF (NOT WIN32 OR MINGW)
4	IF (NOT WIN32 OR MINGW)
5
6	ADD_CUSTOM_TARGET(GenerateGitHashMmg
7	- COMMAND ./git_log_mmg.sh ${PROJECT_SOURCE_DIR} ${MMGCOMMON_BINARY_DIR}
8	- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/scripts/
9	- COMMENT "Getting git commit hash"
10	- BYPRODUCTS ${MMGCOMMON_BINARY_DIR}/git_log_mmg.h
11	+ COMMAND cp ${PROJECT_SOURCE_DIR}/git_log_mmg.h ${MMGCOMMON_BINARY_DIR}/git_log_mmg.h
12	)
13	ENDIF ()
14

Lines 1-6 Link Here

(-)b/textproc/libxslt/Makefile (-26 / +16 lines)
1	PORTNAME= libxslt	1	PORTNAME= libxslt
2	DISTVERSION= 1.1.37	2	DISTVERSION= 1.1.41
3	PORTREVISION= 1
4	CATEGORIES= textproc gnome	3	CATEGORIES= textproc gnome
5	MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/	4	MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
6	DIST_SUBDIR= gnome	5	DIST_SUBDIR= gnome
Lines 12-50 WWW= https://gitlab.gnome.org/GNOME/libxslt/ Link Here
12	LICENSE= MIT	11	LICENSE= MIT
13	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
14		13
15	# See note in textproc/libxml2 for why this port uses autotools	14	USES= cmake:testing cpe gnome pathfix pkgconfig tar:xz
16	# from the choices of that and CMake.
17	USES= cpe gmake gnome libtool localbase:ldflags pathfix pkgconfig tar:xz
18	CPE_VENDOR= xmlsoft	15	CPE_VENDOR= xmlsoft
19	GNU_CONFIGURE= yes
20	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
21	USE_GNOME= libxml2	16	USE_GNOME= libxml2
22	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
23		18
24	CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \	19	PLIST_SUB= DISTVERSION=${DISTVERSION}
25	--without-python	20	PORTDOCS= *
26	INSTALL_TARGET= install-strip
27	TEST_TARGET= check
28		21
29	PLIST_SUB= LIBVERSION=${PORTVERSION}	22	CMAKE_TESTING_ON= LIBXSLT_WITH_TESTS
30		23
31	OPTIONS_DEFINE= CRYPTO MEM_DEBUG STATIC	24	CMAKE_OFF= LIBXSLT_WITH_PYTHON \
32	OPTIONS_DEFAULT= CRYPTO STATIC	25	LIBXSLT_WITH_TESTS
33	OPTIONS_SUB= yes
34
35	CRYPTO_DESC= Enable crypto support
36	MEM_DEBUG_DESC= Enable memory debugging
37		26
38	CRYPTO_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \	27	OPTIONS_DEFINE= DOCS GCRYPT
39	libgpg-error.so:security/libgpg-error	28	OPTIONS_DEFAULT= GCRYPT
40	CRYPTO_CONFIGURE_WITH= crypto	29	OPTIONS_SUB= yes
41		30
42	MEM_DEBUG_CONFIGURE_WITH= mem-debug	31	GCRYPT_DESC= Enable crypto support using GNU crypt
43		32
44	STATIC_CONFIGURE_ENABLE= static	33	GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
		34	GCRYPT_USES= localbase:ldflags
		35	GCRYPT_CMAKE_BOOL= LIBXSLT_WITH_CRYPTO
45		36
46	post-patch:	37	post-install:
47	@${REINPLACE_CMD} -e '/^install-data-am:/ s\|install-data-local\|\|' \	38	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/libxslt-plugins
48	${WRKSRC}/doc/Makefile.in
49		39
50	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Added Link Here

(-)b/textproc/libxslt/files/patch-01-git-cd923ff30cd305d379526202612e063a6b170efc (+47 lines)
1	From cd923ff30cd305d379526202612e063a6b170efc Mon Sep 17 00:00:00 2001
2	From: Nick Wellnhofer <wellnhofer@aevum.de>
3	Date: Fri, 21 Jun 2024 22:56:55 +0200
4	Subject: [PATCH] locale: Work around issue with FreeBSD's strxfrm_l
5
6	newlocale seems to require LC_CTYPE_MASK as well. Better switch to
7	LC_ALL_MASK to avoid similar problems.
8
9	Fixes #108.
10	---
11	libxslt/xsltlocale.c \| 6 +++---
12	1 file changed, 3 insertions(+), 3 deletions(-)
13
14	diff --git a/libxslt/xsltlocale.c b/libxslt/xsltlocale.c
15	index aa38ccf7..1d7f2535 100644
16	--- libxslt/xsltlocale.c
17	+++ libxslt/xsltlocale.c
18	@@ -143,7 +143,7 @@ xsltNewLocale(const xmlChar *languageTag, int lowerFirst ATTRIBUTE_UNUSED) {
19	return(NULL);
20
21	memcpy(q, ".UTF-8", 7);
22	- locale = newlocale(LC_COLLATE_MASK, localeName, NULL);
23	+ locale = newlocale(LC_ALL_MASK, localeName, NULL);
24	if (locale != NULL)
25	return(locale);
26
27	@@ -155,7 +155,7 @@ xsltNewLocale(const xmlChar *languageTag, int lowerFirst ATTRIBUTE_UNUSED) {
28	/* Try locale without territory, e.g. for Esperanto (eo) */
29
30	memcpy(q, ".UTF-8", 7);
31	- locale = newlocale(LC_COLLATE_MASK, localeName, NULL);
32	+ locale = newlocale(LC_ALL_MASK, localeName, NULL);
33	if (locale != NULL)
34	return(locale);
35
36	@@ -173,7 +173,7 @@ xsltNewLocale(const xmlChar *languageTag, int lowerFirst ATTRIBUTE_UNUSED) {
37	*q++ = region[0];
38	*q++ = region[1];
39	memcpy(q, ".UTF-8", 7);
40	- locale = newlocale(LC_COLLATE_MASK, localeName, NULL);
41	+ locale = newlocale(LC_ALL_MASK, localeName, NULL);
42
43	return(locale);
44	#endif
45	--
46	GitLab
47

Lines 24-82 include/libxslt/xsltconfig.h Link Here

(-)b/textproc/libxslt/pkg-plist (-45 / +7 lines)
24	include/libxslt/xsltexports.h	24	include/libxslt/xsltexports.h
25	include/libxslt/xsltlocale.h	25	include/libxslt/xsltlocale.h
26	include/libxslt/xsltutils.h	26	include/libxslt/xsltutils.h
27	lib/cmake/libxslt/FindGcrypt.cmake	27	%%GCRYPT%%lib/cmake/libxslt-%%DISTVERSION%%/FindGcrypt.cmake
28	lib/cmake/libxslt/libxslt-config.cmake	28	lib/cmake/libxslt-%%DISTVERSION%%/libxslt-config-version.cmake
29	%%STATIC%%lib/libexslt.a	29	lib/cmake/libxslt-%%DISTVERSION%%/libxslt-config.cmake
		30	lib/cmake/libxslt-%%DISTVERSION%%/libxslt-export-%%CMAKE_BUILD_TYPE%%.cmake
		31	lib/cmake/libxslt-%%DISTVERSION%%/libxslt-export.cmake
30	lib/libexslt.so	32	lib/libexslt.so
31	lib/libexslt.so.0	33	lib/libexslt.so.0
32	lib/libexslt.so.0.8.20	34	lib/libexslt.so.0.8.22
33	%%STATIC%%lib/libxslt.a
34	lib/libxslt.so	35	lib/libxslt.so
35	lib/libxslt.so.1	36	lib/libxslt.so.1
36	lib/libxslt.so.1.1.37	37	lib/libxslt.so.%%DISTVERSION%%
37	lib/xsltConf.sh	38	lib/xsltConf.sh
38	libdata/pkgconfig/libexslt.pc	39	libdata/pkgconfig/libexslt.pc
39	libdata/pkgconfig/libxslt.pc	40	libdata/pkgconfig/libxslt.pc
40	share/man/man1/xsltproc.1.gz	41	share/man/man1/xsltproc.1.gz
41	share/man/man3/libexslt.3.gz	42	share/man/man3/libexslt.3.gz
42	share/man/man3/libxslt.3.gz	43	share/man/man3/libxslt.3.gz
43	share/aclocal/libxslt.m4
44	share/gtk-doc/html/libexslt/general.html
45	share/gtk-doc/html/libexslt/home.png
46	share/gtk-doc/html/libexslt/index.html
47	share/gtk-doc/html/libexslt/left.png
48	share/gtk-doc/html/libexslt/libexslt-exslt.html
49	share/gtk-doc/html/libexslt/libexslt-exsltexports.html
50	share/gtk-doc/html/libexslt/libexslt.devhelp2
51	share/gtk-doc/html/libexslt/right.png
52	share/gtk-doc/html/libexslt/style.css
53	share/gtk-doc/html/libexslt/up.png
54	share/gtk-doc/html/libxslt/general.html
55	share/gtk-doc/html/libxslt/home.png
56	share/gtk-doc/html/libxslt/index.html
57	share/gtk-doc/html/libxslt/left.png
58	share/gtk-doc/html/libxslt/libxslt-attributes.html
59	share/gtk-doc/html/libxslt/libxslt-documents.html
60	share/gtk-doc/html/libxslt/libxslt-extensions.html
61	share/gtk-doc/html/libxslt/libxslt-extra.html
62	share/gtk-doc/html/libxslt/libxslt-functions.html
63	share/gtk-doc/html/libxslt/libxslt-imports.html
64	share/gtk-doc/html/libxslt/libxslt-keys.html
65	share/gtk-doc/html/libxslt/libxslt-namespaces.html
66	share/gtk-doc/html/libxslt/libxslt-numbersInternals.html
67	share/gtk-doc/html/libxslt/libxslt-pattern.html
68	share/gtk-doc/html/libxslt/libxslt-preproc.html
69	share/gtk-doc/html/libxslt/libxslt-security.html
70	share/gtk-doc/html/libxslt/libxslt-templates.html
71	share/gtk-doc/html/libxslt/libxslt-transform.html
72	share/gtk-doc/html/libxslt/libxslt-variables.html
73	share/gtk-doc/html/libxslt/libxslt-xslt.html
74	share/gtk-doc/html/libxslt/libxslt-xsltInternals.html
75	share/gtk-doc/html/libxslt/libxslt-xsltexports.html
76	share/gtk-doc/html/libxslt/libxslt-xsltlocale.html
77	share/gtk-doc/html/libxslt/libxslt-xsltutils.html
78	share/gtk-doc/html/libxslt/libxslt.devhelp2
79	share/gtk-doc/html/libxslt/right.png
80	share/gtk-doc/html/libxslt/style.css
81	share/gtk-doc/html/libxslt/up.png
82	@dir lib/libxslt-plugins	44	@dir lib/libxslt-plugins