Date: Sun, 11 Mar 2012 02:34:59 GMT From: Pedro Giffuni <giffunip@tutopia.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/165911: update graphics/xfractint to patchlevel 12 Message-ID: <201203110234.q2B2YxVr055632@red.freebsd.org> Resent-Message-ID: <201203110240.q2B2e6o9097038@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 165911 >Category: ports >Synopsis: update graphics/xfractint to patchlevel 12 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Mar 11 02:40:06 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Pedro Giffuni >Release: 9.0-RELEASE >Organization: >Environment: FreeBSD pcbsd-8714 9.0-RELEASE FreeBSD 9.0-RELEASE #3: Tue Dec 27 14:14:29 PST 2011 root@build9x64.pcbsd.org:/usr/obj/builds/amd64/pcbsd-build90/fbsd-source/9.0/sys/GENERIC amd64 >Description: Update this rather popular fractal generator. Unfortunately this program is starting to use long versions of functions that we don't have in FreeBSD (expl, sinhl, coshl) so I had to patch this files to use simple versions for now: common/mpmath_c.c unix/fpu087.c >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN xfractint.orig/Makefile xfractint/Makefile --- xfractint.orig/Makefile 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/Makefile 2012-03-10 16:26:24.000000000 -0500 @@ -6,9 +6,9 @@ # PORTNAME= xfractint -PORTVERSION= 20.04p09 +PORTVERSION= 20.04p12 CATEGORIES= graphics -MASTER_SITES= http://www.fractint.org/ftp/current/linux/ \ +MASTER_SITES= http://www.fractint.org/ftp/current/linux/ \ http://twegner.dyndns.org/fractint/ftp/current/linux/ MAINTAINER= onemda@gmail.com diff -ruN xfractint.orig/distinfo xfractint/distinfo --- xfractint.orig/distinfo 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/distinfo 2012-03-10 16:26:41.000000000 -0500 @@ -1,2 +1,2 @@ -SHA256 (xfractint-20.04p09.tar.gz) = 296e6da82a81210b2d9ccde0eb15059d27f561f23ef1221f39fbefe48ebe5d69 -SIZE (xfractint-20.04p09.tar.gz) = 1333141 +SHA256 (xfractint-20.04p12.tar.gz) = e81affa9d3b3826f14502cedf1fc4a4dd41bcfa71ba32f8e4224748c5b9c69e0 +SIZE (xfractint-20.04p12.tar.gz) = 1335480 diff -ruN xfractint.orig/files/patch-Makefile xfractint/files/patch-Makefile --- xfractint.orig/files/patch-Makefile 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-Makefile 2012-03-10 21:25:02.000000000 -0500 @@ -1,6 +1,15 @@ ---- ./Makefile.orig 2008-09-25 20:55:39.000000000 -0400 -+++ ./Makefile 2010-01-27 13:52:46.000000000 -0500 -@@ -27,8 +27,8 @@ +--- Makefile.orig 2011-05-08 14:39:40.000000000 -0500 ++++ Makefile 2012-03-10 17:22:45.000000000 -0500 +@@ -20,7 +20,7 @@ + + # Use Xft/fontconfig libraries + WITHXFT = -DWITH_XFT +-XFTHFD = /usr/include/freetype2 ++XFTHFD = $(LOCALBASE)/include/freetype2 + # Or not + # WITHXFT = + # XFTHFD = +@@ -34,7 +34,7 @@ # SRCDIR should be a path to the directory that will hold fractint.hlp # SRCDIR should also hold the .par, .frm, etc. files @@ -9,8 +18,7 @@ SHRDIR = $(PREFIX)/share/xfractint # BINDIR is where you put your X11 binaries BINDIR = $(DESTDIR)/bin - # MANDIR is where you put your chapter 1 man pages -@@ -116,22 +116,18 @@ +@@ -123,22 +123,18 @@ #For Solaris, use CFLAGS = -I. -I/usr/openwin/include $(DEFINES) -g #If you have the nasm assembler on your system add -DNASM to CFLAGS @@ -25,7 +33,7 @@ -else -CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -fno-builtin -+CFLAGS += -I$(LOCALBASE)/include -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -fno-builtin ++CFLAGS += -I$(LOCALBASE)/include -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -fno-builtin #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX \ # -march=$(ARCH) -fno-builtin #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -fno-builtin @@ -34,7 +42,7 @@ # Gcc is often the only compiler that works for this # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE -@@ -140,7 +136,6 @@ +@@ -147,7 +143,6 @@ # For Sun Solaris 2.x w/SparcCompilerC (cc), use CC = cc. # For Sun Solaris 2.x w/GNU gcc, use CC = gcc #CC = gcc @@ -42,7 +50,7 @@ # For HPUX, use LIBS = -L/usr/lib/X11R4 -lX11 -lm -lcurses -ltermcap # For AIX or OSF/1, add -lbsd -@@ -152,11 +147,7 @@ +@@ -159,11 +154,7 @@ # LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses # LIBS = -lX11 -lm -lcurses diff -ruN xfractint.orig/files/patch-common__biginit.c xfractint/files/patch-common__biginit.c --- xfractint.orig/files/patch-common__biginit.c 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-common__biginit.c 2012-03-10 17:14:11.000000000 -0500 @@ -1,12 +1,11 @@ ---- ./common/biginit.c.orig 2008-09-18 21:58:09.000000000 -0400 -+++ ./common/biginit.c 2010-01-27 13:52:46.000000000 -0500 -@@ -7,7 +7,9 @@ - */ - +--- common/biginit.c.orig 2011-05-07 15:28:14.000000000 -0500 ++++ common/biginit.c 2012-03-10 17:13:34.000000000 -0500 +@@ -9,7 +9,7 @@ #include <string.h> -+#ifndef BIG_ANSI_C + #ifdef __APPLE__ + #include <malloc/malloc.h> +-#else ++#elif !defined(BIG_ANSI_C) #include <malloc.h> -+#endif + #endif /* see Fractint.c for a description of the "include" hierarchy */ - #include "port.h" - #include "prototyp.h" diff -ruN xfractint.orig/files/patch-common__fractalb.c xfractint/files/patch-common__fractalb.c --- xfractint.orig/files/patch-common__fractalb.c 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-common__fractalb.c 2012-03-10 16:32:07.000000000 -0500 @@ -1,9 +1,9 @@ ---- ./common/fractalb.c.orig 2008-09-17 21:52:35.000000000 -0400 -+++ ./common/fractalb.c 2010-01-27 13:52:46.000000000 -0500 -@@ -10,7 +10,7 @@ - #include <string.h> - #ifdef __TURBOC__ +--- common/fractalb.c.orig 2011-05-07 15:31:02.000000000 -0500 ++++ common/fractalb.c 2012-03-10 16:31:30.000000000 -0500 +@@ -12,7 +12,7 @@ #include <alloc.h> + #elif defined(__APPLE__) + #include <malloc/malloc.h> -#elif !defined(__386BSD__) +#elif !defined(BIG_ANSI_C) #include <malloc.h> diff -ruN xfractint.orig/files/patch-common__fractals.c xfractint/files/patch-common__fractals.c --- xfractint.orig/files/patch-common__fractals.c 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-common__fractals.c 2012-03-10 16:34:16.000000000 -0500 @@ -1,9 +1,9 @@ ---- ./common/fractals.c.orig 2008-09-17 21:52:35.000000000 -0400 -+++ ./common/fractals.c 2010-01-27 13:52:46.000000000 -0500 -@@ -41,7 +41,7 @@ - #include <string.h> - #ifdef __TURBOC__ +--- common/fractals.c.orig 2011-05-08 11:47:58.000000000 -0500 ++++ common/fractals.c 2012-03-10 16:33:40.000000000 -0500 +@@ -43,7 +43,7 @@ #include <alloc.h> + #elif defined(__APPLE__) + #include <malloc/malloc.h> -#elif !defined(__386BSD__) +#elif !defined(BIG_ANSI_C) #include <malloc.h> diff -ruN xfractint.orig/files/patch-common__frasetup.c xfractint/files/patch-common__frasetup.c --- xfractint.orig/files/patch-common__frasetup.c 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-common__frasetup.c 2012-03-10 16:35:57.000000000 -0500 @@ -1,9 +1,9 @@ ---- ./common/frasetup.c.orig 2004-11-23 08:13:37.000000000 -0500 -+++ ./common/frasetup.c 2010-01-27 13:52:46.000000000 -0500 -@@ -2,7 +2,7 @@ - #include <string.h> - #ifdef __TURBOC__ +--- common/frasetup.c.orig 2011-05-07 15:32:06.000000000 -0500 ++++ common/frasetup.c 2012-03-10 16:35:22.000000000 -0500 +@@ -4,7 +4,7 @@ #include <alloc.h> + #elif defined(__APPLE__) + #include <malloc/malloc.h> -#elif !defined(__386BSD__) +#elif !defined(BIG_ANSI_C) #include <malloc.h> diff -ruN xfractint.orig/files/patch-common__lsys.c xfractint/files/patch-common__lsys.c --- xfractint.orig/files/patch-common__lsys.c 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-common__lsys.c 2012-03-10 16:38:13.000000000 -0500 @@ -1,9 +1,9 @@ ---- ./common/lsys.c.orig 2005-12-21 21:15:40.000000000 -0500 -+++ ./common/lsys.c 2010-01-27 13:52:46.000000000 -0500 -@@ -2,7 +2,7 @@ - #include <string.h> - #ifdef __TURBOC__ +--- common/lsys.c.orig 2011-05-07 15:34:46.000000000 -0500 ++++ common/lsys.c 2012-03-10 16:37:40.000000000 -0500 +@@ -4,7 +4,7 @@ #include <alloc.h> + #elif defined(__APPLE__) + #include <malloc/malloc.h> -#else +#elif !defined(BIG_ANSI_C) #include <malloc.h> diff -ruN xfractint.orig/files/patch-common__lsysf.c xfractint/files/patch-common__lsysf.c --- xfractint.orig/files/patch-common__lsysf.c 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-common__lsysf.c 2012-03-10 16:51:04.000000000 -0500 @@ -1,9 +1,9 @@ ---- ./common/lsysf.c.orig 2004-11-23 08:13:37.000000000 -0500 -+++ ./common/lsysf.c 2010-01-27 13:52:46.000000000 -0500 -@@ -1,7 +1,7 @@ - #include <string.h> - #ifdef __TURBOC__ +--- common/lsysf.c.orig 2011-05-07 15:35:02.000000000 -0500 ++++ common/lsysf.c 2012-03-10 16:50:40.000000000 -0500 +@@ -3,7 +3,7 @@ #include <alloc.h> + #elif defined(__APPLE__) + #include <malloc/malloc.h> -#else +#elif !defined(BIG_ANSI_C) #include <malloc.h> diff -ruN xfractint.orig/files/patch-common__memory.c xfractint/files/patch-common__memory.c --- xfractint.orig/files/patch-common__memory.c 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-common__memory.c 2012-03-10 16:57:43.000000000 -0500 @@ -1,9 +1,11 @@ ---- ./common/memory.c.orig 2006-12-17 12:06:05.000000000 -0500 -+++ ./common/memory.c 2010-01-27 13:52:46.000000000 -0500 -@@ -1,6 +1,5 @@ - #include <string.h> +--- common/memory.c.orig 2012-03-10 16:57:05.000000000 -0500 ++++ common/memory.c 2012-03-10 16:57:36.000000000 -0500 +@@ -2,7 +2,7 @@ #include <limits.h> --#include <malloc.h> + #ifdef __APPLE__ + #include <malloc/malloc.h> +-#else ++#elif !defined(BIG_ANSI_C) + #include <malloc.h> + #endif - #if (!defined(XFRACT) && !defined(WINFRACT)) - #include <io.h> diff -ruN xfractint.orig/files/patch-common__miscres.c xfractint/files/patch-common__miscres.c --- xfractint.orig/files/patch-common__miscres.c 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-common__miscres.c 2012-03-10 16:59:28.000000000 -0500 @@ -1,10 +1,11 @@ ---- ./common/miscres.c.orig 2007-05-02 20:32:43.000000000 -0400 -+++ ./common/miscres.c 2010-01-27 13:52:46.000000000 -0500 -@@ -5,7 +5,6 @@ - #include <string.h> - #include <ctype.h> +--- common/miscres.c.orig 2011-05-08 10:19:52.000000000 -0500 ++++ common/miscres.c 2012-03-10 16:58:44.000000000 -0500 +@@ -7,7 +7,7 @@ #include <time.h> --#include <malloc.h> + #ifdef __APPLE__ + #include <malloc/malloc.h> +-#else ++#elif !defined(BIG_ANSI_C) + #include <malloc.h> + #endif - #ifndef XFRACT - #include <io.h> diff -ruN xfractint.orig/files/patch-common__mpmath_c.c xfractint/files/patch-common__mpmath_c.c --- xfractint.orig/files/patch-common__mpmath_c.c 1969-12-31 19:00:00.000000000 -0500 +++ xfractint/files/patch-common__mpmath_c.c 2012-03-10 17:45:13.000000000 -0500 @@ -0,0 +1,11 @@ +--- common/mpmath_c.c.orig 2012-03-10 17:28:37.000000000 -0500 ++++ common/mpmath_c.c 2012-03-10 17:34:32.000000000 -0500 +@@ -220,7 +220,7 @@ + if(t.x < -690) + e2x = 0.0; + else +- e2x = expl(t.x); ++ e2x = exp(t.x); + #ifdef XFRACT + if (isnan(e2x) || isinf(e2x)) + e2x = 1.0; diff -ruN xfractint.orig/files/patch-common__prompts1.c xfractint/files/patch-common__prompts1.c --- xfractint.orig/files/patch-common__prompts1.c 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-common__prompts1.c 2012-03-10 17:02:56.000000000 -0500 @@ -1,9 +1,9 @@ ---- ./common/prompts1.c.orig 2008-08-04 21:44:54.000000000 -0400 -+++ ./common/prompts1.c 2010-01-27 13:52:46.000000000 -0500 -@@ -12,7 +12,7 @@ - #endif - #ifdef __TURBOC__ +--- common/prompts1.c.orig 2011-05-07 15:32:26.000000000 -0500 ++++ common/prompts1.c 2012-03-10 17:02:06.000000000 -0500 +@@ -14,7 +14,7 @@ #include <alloc.h> + #elif defined(__APPLE__) + #include <malloc/malloc.h> -#elif !defined(__386BSD__) +#elif !defined(BIG_ANSI_C) #include <malloc.h> diff -ruN xfractint.orig/files/patch-common__prompts2.c xfractint/files/patch-common__prompts2.c --- xfractint.orig/files/patch-common__prompts2.c 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-common__prompts2.c 2012-03-10 17:05:02.000000000 -0500 @@ -1,5 +1,5 @@ ---- ./common/prompts2.c.orig 2008-02-17 11:10:04.000000000 -0500 -+++ ./common/prompts2.c 2010-01-27 13:52:46.000000000 -0500 +--- common/prompts2.c.orig 2011-05-08 10:20:02.000000000 -0500 ++++ common/prompts2.c 2012-03-10 17:04:43.000000000 -0500 @@ -12,7 +12,7 @@ #ifdef DIRENT @@ -9,10 +9,10 @@ #include <sys/dir.h> #else #include <dirent.h> -@@ -24,7 +24,7 @@ - #endif - #ifdef __TURBOC__ +@@ -26,7 +26,7 @@ #include <alloc.h> + #elif defined(__APPLE__) + #include <malloc/malloc.h> -#elif !defined(__386BSD__) +#elif !defined(BIG_ANSI_C) #include <malloc.h> diff -ruN xfractint.orig/files/patch-common__soi.c xfractint/files/patch-common__soi.c --- xfractint.orig/files/patch-common__soi.c 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-common__soi.c 2012-03-10 17:09:35.000000000 -0500 @@ -1,16 +1,15 @@ ---- ./common/soi.c.orig 2004-11-23 08:13:37.000000000 -0500 -+++ ./common/soi.c 2010-01-27 13:52:46.000000000 -0500 -@@ -13,7 +13,9 @@ - */ - #include <time.h> +--- common/soi.c.orig 2011-05-07 15:36:36.000000000 -0500 ++++ common/soi.c 2012-03-10 17:08:47.000000000 -0500 +@@ -15,7 +15,7 @@ #include <string.h> -+#ifndef BIG_ANSI_C + #ifdef __APPLE__ + #include <malloc/malloc.h> +-#else ++#elif !defined(BIG_ANSI_C) #include <malloc.h> -+#endif + #endif #include "port.h" - #include "prototyp.h" - -@@ -21,7 +23,7 @@ +@@ -25,7 +25,7 @@ #define FABS(x) fabsl(x) /* the following needs to be changed back to frexpl once the portability issue has been addressed JCO */ diff -ruN xfractint.orig/files/patch-common__soi1.c xfractint/files/patch-common__soi1.c --- xfractint.orig/files/patch-common__soi1.c 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/files/patch-common__soi1.c 2012-03-10 17:10:51.000000000 -0500 @@ -1,12 +1,11 @@ ---- ./common/soi1.c.orig 2004-11-23 08:13:37.000000000 -0500 -+++ ./common/soi1.c 2010-01-27 13:52:46.000000000 -0500 -@@ -13,7 +13,9 @@ - */ - #include <time.h> +--- common/soi1.c.orig 2011-05-07 15:36:50.000000000 -0500 ++++ common/soi1.c 2012-03-10 17:10:37.000000000 -0500 +@@ -15,7 +15,7 @@ #include <string.h> -+#ifndef BIG_ANSI_C + #ifdef __APPLE__ + #include <malloc/malloc.h> +-#else ++#elif !defined(BIG_ANSI_C) #include <malloc.h> -+#endif + #endif #include "port.h" - #include "prototyp.h" - diff -ruN xfractint.orig/files/patch-unix__fpu087.c xfractint/files/patch-unix__fpu087.c --- xfractint.orig/files/patch-unix__fpu087.c 1969-12-31 19:00:00.000000000 -0500 +++ xfractint/files/patch-unix__fpu087.c 2012-03-10 17:46:40.000000000 -0500 @@ -0,0 +1,22 @@ +--- unix/fpu087.c.orig 2012-03-10 17:28:49.000000000 -0500 ++++ unix/fpu087.c 2012-03-10 17:36:40.000000000 -0500 +@@ -86,8 +86,8 @@ + *Sinh = 1.0; + *Cosh = 1.0; + } else { +- *Sinh = (double)sinhl(*Angle); +- *Cosh = (double)coshl(*Angle); ++ *Sinh = (double)sinh(*Angle); ++ *Cosh = (double)cosh(*Angle); + } + if (isnan(*Sinh) || isinf(*Sinh)) + *Sinh = 1.0; +@@ -119,7 +119,7 @@ + { + LDBL pwr,y; + y = x->y; +- pwr = expl(x->x); ++ pwr = exp(x->x); + if (isnan(pwr) || isinf(pwr)) + pwr = 1.0; + z->x = (double)(pwr*cosl(y)); diff -ruN xfractint.orig/pkg-descr xfractint/pkg-descr --- xfractint.orig/pkg-descr 2012-03-10 16:20:02.000000000 -0500 +++ xfractint/pkg-descr 2012-03-10 16:21:56.000000000 -0500 @@ -5,4 +5,4 @@ The unix port was done by Ken Shirriff and modified by Scott D. Boyd. -WWW: http://spanky.triumf.ca/www/fractint/xfractint_port.html +WWW: http://www.nahee.com/spanky/www/fractint/ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203110234.q2B2YxVr055632>