From b745526dc08660d4e4f403ac715c8b2e2176d229 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Fri, 5 Mar 2021 23:19:56 +0000 Subject: misc/free42: Update 2.4.2 -> 3.0.1 Reported by: portscout --- misc/free42/Makefile | 4 +-- misc/free42/distinfo | 6 ++-- misc/free42/files/patch-common_free42.h | 11 ------ misc/free42/files/patch-gtk_Makefile | 50 +++----------------------- misc/free42/files/patch-gtk_build-intel-lib.sh | 15 -------- 5 files changed, 9 insertions(+), 77 deletions(-) delete mode 100644 misc/free42/files/patch-common_free42.h delete mode 100644 misc/free42/files/patch-gtk_build-intel-lib.sh (limited to 'misc/free42') diff --git a/misc/free42/Makefile b/misc/free42/Makefile index ce8dcb48932d..883146317176 100644 --- a/misc/free42/Makefile +++ b/misc/free42/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= free42 -DISTVERSION= 2.4.2 +DISTVERSION= 3.0.1 CATEGORIES= misc MASTER_SITES= http://thomasokken.com/free42/upstream/ DISTNAME= ${PORTNAME}-nologo-${DISTVERSION} @@ -22,7 +22,7 @@ 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 glib20 gtk20 pango +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 diff --git a/misc/free42/distinfo b/misc/free42/distinfo index 89e507f10bf9..49f86c9ebd96 100644 --- a/misc/free42/distinfo +++ b/misc/free42/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563338442 -SHA256 (free42-nologo-2.4.2.tgz) = 7d1bec2a67e817856de56675b6ec5758d212e5707f3e050e451b1d0d4215c434 -SIZE (free42-nologo-2.4.2.tgz) = 7403471 +TIMESTAMP = 1614985753 +SHA256 (free42-nologo-3.0.1.tgz) = 8211a76fbdbd0ffdacd96ec36129c998a07ef5859c148f29e620432da8c457bc +SIZE (free42-nologo-3.0.1.tgz) = 7438742 diff --git a/misc/free42/files/patch-common_free42.h b/misc/free42/files/patch-common_free42.h deleted file mode 100644 index dc42eb315ca6..000000000000 --- a/misc/free42/files/patch-common_free42.h +++ /dev/null @@ -1,11 +0,0 @@ ---- common/free42.h.orig 2017-11-20 23:46:32 UTC -+++ common/free42.h -@@ -70,7 +70,7 @@ - * provided by MathLib. - */ - extern "C" void sincos(double x, double *sinx, double *cosx); --//#define NO_SINCOS 1 -+#define NO_SINCOS 1 - - #endif - diff --git a/misc/free42/files/patch-gtk_Makefile b/misc/free42/files/patch-gtk_Makefile index a540fa9645f6..91d0097e2f59 100644 --- a/misc/free42/files/patch-gtk_Makefile +++ b/misc/free42/files/patch-gtk_Makefile @@ -1,50 +1,8 @@ ---- gtk/Makefile.orig 2017-11-20 03:58:50 UTC +--- gtk/Makefile.orig 2021-03-05 01:52:42 UTC +++ gtk/Makefile -@@ -15,12 +15,11 @@ - # along with this program; if not, see http://www.gnu.org/licenses/. - ############################################################################### - --CFLAGS = -MMD \ -+FLAGS_COMMON = \ -+ -MMD \ - -Wall \ - -Wno-parentheses \ - -Wno-write-strings \ -- -g \ -- -I/usr/X11R6/include \ - $(shell pkg-config --cflags gtk+-2.0) \ - -DVERSION="\"$(shell cat ../VERSION)\"" \ - -DDECIMAL_CALL_BY_REFERENCE=1 \ -@@ -29,13 +28,14 @@ CFLAGS = -MMD \ - -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \ - -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 - --CXXFLAGS = $(CFLAGS) \ -+CFLAGS+= $(FLAGS_COMMON) -+ -+CXXFLAGS+= $(FLAGS_COMMON) \ - -fno-exceptions \ - -fno-rtti \ - -D_WCHAR_T_DEFINED - --LDFLAGS = -L/usr/X11R6/lib --LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0) -+LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0) -lX11 - - ifeq "$(shell uname -s)" "Linux" - LDFLAGS += -Wl,--hash-style=both -@@ -118,7 +118,7 @@ clean: FORCE - readtest_lines.cc \ - gcc111libbid.a \ - *.o *.d *.i *.ii *.s symlinks core.* -- rm -rf IntelRDFPMathLib20U1 -+ #rm -rf IntelRDFPMathLib20U1 - - cleaner: FORCE - rm -f `find . -type l` \ -@@ -128,7 +128,7 @@ cleaner: FORCE - readtest_lines.cc \ - gcc111libbid.a \ +@@ -136,7 +136,7 @@ cleaner: FORCE + readtest_lines.cc \ + gcc111libbid.a \ *.o *.d *.i *.ii *.s symlinks core.* - rm -rf IntelRDFPMathLib20U1 + #rm -rf IntelRDFPMathLib20U1 diff --git a/misc/free42/files/patch-gtk_build-intel-lib.sh b/misc/free42/files/patch-gtk_build-intel-lib.sh deleted file mode 100644 index bf1b0eaa9cae..000000000000 --- a/misc/free42/files/patch-gtk_build-intel-lib.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- gtk/build-intel-lib.sh.orig 2017-11-20 03:58:50 UTC -+++ gtk/build-intel-lib.sh -@@ -1,10 +1,10 @@ - #!/bin/sh - if [ -f gcc111libbid.a ]; then exit 0; fi --tar xvfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz -+#tar xvfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz - cd IntelRDFPMathLib20U1 - patch -p0 <../intel-lib-linux.patch - cd LIBRARY --make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 -+gmake CC=cc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 - mv libbid.a ../../gcc111libbid.a - cd ../.. - ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc -- cgit v1.2.3