Index: head/misc/free42/Makefile =================================================================== --- head/misc/free42/Makefile (revision 569221) +++ head/misc/free42/Makefile (revision 569222) @@ -1,60 +1,54 @@ # $FreeBSD$ PORTNAME= free42 DISTVERSION= 3.0.1 CATEGORIES= misc MASTER_SITES= http://thomasokken.com/free42/upstream/ DISTNAME= ${PORTNAME}-nologo-${DISTVERSION} MAINTAINER= yuri@FreeBSD.org COMMENT= Simulation of the HP-42S scientific calculator and HP-82240 printer LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_aarch64= fails to link: c++: error: no such file or directory: 'gcc111libbid.a' -BROKEN_armv6= fails to link: c++: error: no such file or directory: 'gcc111libbid.a' -BROKEN_mips64= fails to link: c++: error: no such file or directory: 'gcc111libbid.a' -BROKEN_powerpc64= fails to link: c++: error: no such file or directory: 'gcc111libbid.a' -BROKEN_riscv64= fails to link: c++: error: no such file or directory: 'gcc111libbid.a' - LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 USES= compiler dos2unix gmake gnome localbase pkgconfig tar:tgz xorg USE_GNOME= atk cairo gdkpixbuf2 gtk30 pango USE_XORG= x11 xmu -DOS2UNIX_FILES= gtk/IntelRDFPMathLib20U1/LIBRARY/float128/op_system.h gtk/IntelRDFPMathLib20U1/LIBRARY/float128/architecture.h +DOS2UNIX_FILES= gtk/IntelRDFPMathLib20U1/LIBRARY/float128/op_system.h gtk/IntelRDFPMathLib20U1/LIBRARY/float128/architecture.h gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h common/bid_functions.h gtk/IntelRDFPMathLib20U1/TESTS/test_bid_functions.h CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_clang= -Wno-c++11-narrowing -Wno-constant-conversion # to accommodate some code breaking with clang-50 BUILD_WRKSRC= ${WRKSRC}/gtk VARIANTS= bin dec .for v in ${VARIANTS} PLIST_FILES+= bin/${PORTNAME}${v} .endfor post-extract: @cd ${BUILD_WRKSRC} && tar xvfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz post-patch: @${REINPLACE_CMD} -e 's|(free42dirname)|("${DATADIR}/skins")|' \ ${BUILD_WRKSRC}/shell_skin.cc do-build: .for v in ${VARIANTS} @${CP} -r ${BUILD_WRKSRC} ${BUILD_WRKSRC}-${v} @cd ${BUILD_WRKSRC}-${v} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} cleaner && \ ${SETENV} ${MAKE_ENV} ${v:S/dec/BCD_MATH=1/:S/bin//} ${MAKE_CMD} .endfor do-install: .for v in ${VARIANTS} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}-${v}/free42${v} ${STAGEDIR}${PREFIX}/bin/ .endfor .include Index: head/misc/free42/files/patch-common_bid__functions.h =================================================================== --- head/misc/free42/files/patch-common_bid__functions.h (nonexistent) +++ head/misc/free42/files/patch-common_bid__functions.h (revision 569222) @@ -0,0 +1,14 @@ +--- common/bid_functions.h.orig 2021-03-25 17:43:15 UTC ++++ common/bid_functions.h +@@ -159,11 +159,7 @@ typedef unsigned long fexcept_t; + typedef unsigned bid__int64 fexcept_t; + #endif + #else +-#ifdef __QNX__ + #include +-#else +-typedef unsigned short int fexcept_t; +-#endif + #endif + #endif + Property changes on: head/misc/free42/files/patch-common_bid__functions.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/free42/files/patch-common_core__commands6.cc =================================================================== --- head/misc/free42/files/patch-common_core__commands6.cc (nonexistent) +++ head/misc/free42/files/patch-common_core__commands6.cc (revision 569222) @@ -0,0 +1,13 @@ +--- common/core_commands6.cc.orig 2021-03-17 00:38:17 UTC ++++ common/core_commands6.cc +@@ -1096,8 +1096,8 @@ int docmd_stoflag(arg_struct *arg) { + p <<= 1; + } + +- char new_g = !flags.f.rad && flags.f.grad; +- char new_rad = flags.f.rad || flags.f.grad; ++ signed char new_g = !flags.f.rad && flags.f.grad; ++ signed char new_rad = flags.f.rad || flags.f.grad; + if (new_g == old_g) + new_g = -1; + if (new_rad == old_rad) Property changes on: head/misc/free42/files/patch-common_core__commands6.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h =================================================================== --- head/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h (nonexistent) +++ head/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h (revision 569222) @@ -0,0 +1,14 @@ +--- gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h.orig 2021-03-25 17:43:14 UTC ++++ gtk/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h +@@ -159,11 +159,7 @@ typedef unsigned long fexcept_t; + typedef unsigned bid__int64 fexcept_t; + #endif + #else +-#ifdef __QNX__ + #include +-#else +-typedef unsigned short int fexcept_t; +-#endif + #endif + #endif + Property changes on: head/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_TESTS_test__bid__functions.h =================================================================== --- head/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_TESTS_test__bid__functions.h (nonexistent) +++ head/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_TESTS_test__bid__functions.h (revision 569222) @@ -0,0 +1,14 @@ +--- gtk/IntelRDFPMathLib20U1/TESTS/test_bid_functions.h.orig 2021-03-25 17:58:53 UTC ++++ gtk/IntelRDFPMathLib20U1/TESTS/test_bid_functions.h +@@ -165,11 +165,7 @@ typedef unsigned long fexcept_t; + typedef unsigned bid__int64 fexcept_t; + #endif + #else +-#ifdef __QNX__ + #include +-#else +-typedef unsigned short int fexcept_t; +-#endif + #endif + #endif + Property changes on: head/misc/free42/files/patch-gtk_IntelRDFPMathLib20U1_TESTS_test__bid__functions.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/free42/files/patch-gtk_build-intel-lib.sh =================================================================== --- head/misc/free42/files/patch-gtk_build-intel-lib.sh (nonexistent) +++ head/misc/free42/files/patch-gtk_build-intel-lib.sh (revision 569222) @@ -0,0 +1,26 @@ +--- gtk/build-intel-lib.sh.orig 2021-03-05 01:52:42 UTC ++++ gtk/build-intel-lib.sh +@@ -43,6 +43,8 @@ fi + + tar xvfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz + cd IntelRDFPMathLib20U1 ++sed -i '' -e 's/\r//g' LIBRARY/src/bid_functions.h ++patch -p0 <../intel-lib-freebsd.patch + patch -p0 <../intel-lib-linux.patch + + # When building for architectures other than x86 or x86_64, I remove the +@@ -55,11 +58,11 @@ patch -p0 <../intel-lib-linux.patch + # it to x86_64 works when targeting arm64, a 64-bit platform. + # Of course, proceed with caution. Your mileage may vary. + +-case `uname -m` in +- armv7|armv7l|ppc) ++case `uname -p` in ++ armv6|armv7|armv7l|ppc|powerpc|powerpcspe|mips) + patch -p0 <../intel-lib-unknown-32bit.patch + ;; +- aarch64|arm64|i86pc) ++ aarch64|arm64|i86pc|powerpc64|powerpc64le|mips64|riscv64) + patch -p0 <../intel-lib-unknown-64bit.patch + ;; + esac Property changes on: head/misc/free42/files/patch-gtk_build-intel-lib.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/misc/free42/files/patch-gtk_intel-lib-freebsd.patch =================================================================== --- head/misc/free42/files/patch-gtk_intel-lib-freebsd.patch (nonexistent) +++ head/misc/free42/files/patch-gtk_intel-lib-freebsd.patch (revision 569222) @@ -0,0 +1,17 @@ +--- gtk/intel-lib-freebsd.patch.orig 2021-03-25 18:27:04 UTC ++++ gtk/intel-lib-freebsd.patch +@@ -0,0 +1,14 @@ ++--- LIBRARY/src/bid_functions.h.orig 2021-03-25 17:43:14 UTC +++++ LIBRARY/src/bid_functions.h ++@@ -159,11 +159,7 @@ typedef unsigned long fexcept_t; ++ typedef unsigned bid__int64 fexcept_t; ++ #endif ++ #else ++-#ifdef __QNX__ ++ #include ++-#else ++-typedef unsigned short int fexcept_t; ++-#endif ++ #endif ++ #endif ++ Property changes on: head/misc/free42/files/patch-gtk_intel-lib-freebsd.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property