diff --git a/misc/free42/Makefile b/misc/free42/Makefile index fb678e912295..cde74075afdd 100644 --- a/misc/free42/Makefile +++ b/misc/free42/Makefile @@ -1,59 +1,58 @@ PORTNAME= free42 -DISTVERSION= 3.1.2 -PORTREVISION= 1 +DISTVERSION= 3.1.3 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 WWW= https://thomasokken.com/free42 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz 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 \ 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 xfz ../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 diff --git a/misc/free42/distinfo b/misc/free42/distinfo index e1fac365acf9..4f228e9b486a 100644 --- a/misc/free42/distinfo +++ b/misc/free42/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1703113442 -SHA256 (free42-nologo-3.1.2.tgz) = b0e81569aa4dae3765a151e03226b9c4f075ba8db2ffde56ee133865d5de1530 -SIZE (free42-nologo-3.1.2.tgz) = 7459860 +TIMESTAMP = 1705552860 +SHA256 (free42-nologo-3.1.3.tgz) = c7b09f00dec14dded782cf9e20bd0e9b297497c08b0e5296fc619f0e412c8c1c +SIZE (free42-nologo-3.1.3.tgz) = 7461009 diff --git a/misc/free42/files/patch-gtk_Makefile b/misc/free42/files/patch-gtk_Makefile index 91d0097e2f59..0207703445ab 100644 --- a/misc/free42/files/patch-gtk_Makefile +++ b/misc/free42/files/patch-gtk_Makefile @@ -1,11 +1,11 @@ ---- gtk/Makefile.orig 2021-03-05 01:52:42 UTC +--- gtk/Makefile.orig 2024-01-17 13:18:38 UTC +++ gtk/Makefile -@@ -136,7 +136,7 @@ cleaner: FORCE - readtest_lines.cc \ +@@ -156,7 +156,7 @@ cleaner: FORCE gcc111libbid.a \ - *.o *.d *.i *.ii *.s symlinks core.* + *.o *.d *.i *.ii *.s symlinks core.* \ + raw2txt txt2raw - rm -rf IntelRDFPMathLib20U1 + #rm -rf IntelRDFPMathLib20U1 FORCE: