diff --git a/math/reduce/Makefile b/math/reduce/Makefile index e598f3d2edac..1dda4866d5f4 100644 --- a/math/reduce/Makefile +++ b/math/reduce/Makefile @@ -1,62 +1,60 @@ PORTNAME= reduce PORTVERSION= ${SFSUBDIR:S/snapshot_//:S/-//g} CATEGORIES= math lang MASTER_SITES= SF/${PORTNAME}-algebra/${SFSUBDIR}/ DISTNAME= Reduce-svn6339-src MAINTAINER= yuri@FreeBSD.org COMMENT= Codemist Standard Lisp REDUCE general-purpose computer system LICENSE= BSD2CLAUSE -BROKEN_armv6= fails to compile: redfront.h:118:12: conflicting types for '__wcwidth' BROKEN_i386= fails to compile: sysv.S:832:1: changed section flags for .eh_frame, expected: 0x2 -BROKEN_powerpc64= fails to compile: arith01.cpp: 'statuc' does not name a type BUILD_DEPENDS= gnuplot:math/gnuplot LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff USES= autoreconf:build libtool gmake ncurses jpeg xorg USE_XORG= x11 xcursor xext xorgproto xft xrandr xrender SFSUBDIR= snapshot_2022-06-17 TARGET_SDIR= ${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL} CPPFLAGS+= -I${NCURSESINC} # Avoid GNU_CONFIGURE as it breaks staging HAS_CONFIGURE= yes ALL_TARGET= MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS= --with-csl CPPFLAGS+= `freetype-config --cflags` LDFLAGS+= `freetype-config --libs` REDUCE_BINS= ${WRKSRC}/cslbuild/${TARGET_SDIR} OPTIONS_DEFINE= DOCS do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${REDUCE_BINS}/csl/reduce.img ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${REDUCE_BINS}/csl/reduce ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${FILESDIR}/runcsl.sh ${STAGEDIR}${PREFIX}/bin/redcsl ${INSTALL_MAN} ${FILESDIR}/redcsl.1 ${STAGEDIR}${MANPREFIX}/man/man1/ ${MKDIR} ${STAGEDIR}${DATADIR}/reduce.doc (cd ${REDUCE_BINS}/csl/reduce.doc && ${COPYTREE_SHARE} . \ ${STAGEDIR}${DATADIR}/reduce.doc) ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR} (cd ${REDUCE_BINS}/csl/reduce.fonts && ${COPYTREE_SHARE} . \ ${STAGEDIR}${DATADIR}/reduce.fonts) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/manual/manual.pdf\ ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/primers/*.pdf \ ${STAGEDIR}${DOCSDIR} .include diff --git a/math/reduce/files/patch-generic_newfront_redfront.h b/math/reduce/files/patch-generic_newfront_redfront.h new file mode 100644 index 000000000000..83ed9bd1f793 --- /dev/null +++ b/math/reduce/files/patch-generic_newfront_redfront.h @@ -0,0 +1,26 @@ +- fix of this failure on arm64: +- +- In file included from /wrkdirs/usr/ports/math/reduce/work/Reduce-svn6339-src/generic/newfront/redchild.c:31: +- /wrkdirs/usr/ports/math/reduce/work/Reduce-svn6339-src/generic/newfront/redfront.h:118:12: error: conflicting types for '__wcwidth' +- extern int wcwidth(wchar_t c); +- ^ +- /usr/include/wchar.h:213:21: note: expanded from macro 'wcwidth' +- #define wcwidth(_c) __wcwidth(_c) +- ^ +- /usr/include/_ctype.h:161:1: note: previous definition is here +- __wcwidth(__ct_rune_t _c) +- ^ +- 1 error generated. + +--- generic/newfront/redfront.h.orig 2021-03-16 10:41:22 UTC ++++ generic/newfront/redfront.h +@@ -115,7 +115,9 @@ typedef void (*sig_t)(int); + */ + #ifndef NATIVE_WINDOWS + #include "sys.h" ++# if !defined(__FreeBSD__) + extern int wcwidth(wchar_t c); ++# endif + #include "chartype.h" + #endif +