Attachment 161408 Details for Bug 203360 – Update and fix xfractint

[patch] Update and fix xfractint

graphics-fractint.diff (text/plain), 15.26 KB, created by Pedro F. Giffuni on 2015-09-26 02:37:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2015-09-26 02:37:16 UTC

Size: 15.26 KB

patch

obsolete

>Index: graphics/xfractint/Makefile
>===================================================================
>--- graphics/xfractint/Makefile	(revision 397791)
>+++ graphics/xfractint/Makefile	(working copy)
>@@ -2,30 +2,27 @@
> # $FreeBSD$
> 
> PORTNAME=	xfractint
>-PORTVERSION=	20.04p12
>-PORTREVISION=	1
>+PORTVERSION=	20.04p14
> CATEGORIES=	graphics
> MASTER_SITES=	http://www.fractint.org/ftp/current/linux/	\
> 		http://twegner.dyndns.org/fractint/ftp/current/linux/
> 
> MAINTAINER=	onemda@gmail.com
>-COMMENT=	The Unix port of fractint
>+COMMENT=	Unix port of fractint
> 
>-BROKEN=		No public distfiles
>-
> USES=		gmake
> USE_XORG=	x11 xft
> 
> ALL_TARGET=	${PORTNAME}
> 
>-DESKTOP_ENTRIES+="Xfracint" "${COMMENT}" "" "${PORTNAME}" "" "false"
>+DESKTOP_ENTRIES+="Xfracint" "${COMMENT}" "" "${PORTNAME}" "" ${FALSE}
> 
> do-install:
>-	@${INSTALL_PROGRAM} ${WRKSRC}/xfractint ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
>-	@${INSTALL_MAN} ${WRKSRC}/unix/xfractint.man ${STAGEDIR}${PREFIX}/man/man1/${MAN1}
>+	${INSTALL_PROGRAM} ${WRKSRC}/xfractint ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
>+	${INSTALL_MAN} ${WRKSRC}/unix/xfractint.man ${STAGEDIR}${PREFIX}/man/man1/${MAN1}
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
>-	@${INSTALL_DATA} ${WRKSRC}/fractint.hlp ${STAGEDIR}${DATADIR}
>-	@${INSTALL_DATA} ${WRKSRC}/sstools.ini ${STAGEDIR}${DATADIR}
>+	${INSTALL_DATA} ${WRKSRC}/fractint.hlp ${STAGEDIR}${DATADIR}
>+	${INSTALL_DATA} ${WRKSRC}/sstools.ini ${STAGEDIR}${DATADIR}
> .for dir in formulas ifs lsystem maps pars
> 	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR}
> .endfor
>Index: graphics/xfractint/distinfo
>===================================================================
>--- graphics/xfractint/distinfo	(revision 397791)
>+++ graphics/xfractint/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (xfractint-20.04p12.tar.gz) = e81affa9d3b3826f14502cedf1fc4a4dd41bcfa71ba32f8e4224748c5b9c69e0
>-SIZE (xfractint-20.04p12.tar.gz) = 1335480
>+SHA256 (xfractint-20.04p14.tar.gz) = 0e2856e596a44f5a8dbd4cb389683ead484776cdba4cce75c6c2a09f86c9b849
>+SIZE (xfractint-20.04p14.tar.gz) = 1336285
>Index: graphics/xfractint/files/patch-Makefile
>===================================================================
>--- graphics/xfractint/files/patch-Makefile	(revision 397791)
>+++ graphics/xfractint/files/patch-Makefile	(working copy)
>@@ -1,6 +1,6 @@
>---- Makefile.orig	2011-05-08 14:39:40.000000000 -0500
>-+++ Makefile	2012-03-10 17:22:45.000000000 -0500
>-@@ -20,7 +20,7 @@
>+--- Makefile.orig	2014-05-03 13:12:33 UTC
>++++ Makefile
>+@@ -20,7 +20,7 @@ NCURSES =
>  
>  # Use Xft/fontconfig libraries
>  WITHXFT = -DWITH_XFT
>@@ -9,7 +9,7 @@
>  # Or not
>  # WITHXFT =
>  # XFTHFD =
>-@@ -34,7 +34,7 @@
>+@@ -34,7 +34,7 @@ endif
>  
>  # SRCDIR should be a path to the directory that will hold fractint.hlp
>  # SRCDIR should also hold the .par, .frm, etc. files
>@@ -18,7 +18,7 @@
>  SHRDIR = $(PREFIX)/share/xfractint
>  # BINDIR is where you put your X11 binaries
>  BINDIR = $(DESTDIR)/bin
>-@@ -123,22 +123,18 @@
>+@@ -123,22 +123,18 @@ AFLAGS = -f elf -w+orphan-labels
>  #For Solaris, use CFLAGS = -I. -I/usr/openwin/include $(DEFINES) -g
>  #If you have the nasm assembler on your system add -DNASM to CFLAGS
>  
>@@ -42,7 +42,7 @@
>  
>  # Gcc is often the only compiler that works for this
>  # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE
>-@@ -147,7 +143,6 @@
>+@@ -147,7 +143,6 @@ endif
>  # For Sun Solaris 2.x w/SparcCompilerC (cc), use CC = cc.
>  # For Sun Solaris 2.x w/GNU gcc, use CC = gcc
>  #CC = gcc
>@@ -50,7 +50,7 @@
>  
>  # For HPUX, use LIBS = -L/usr/lib/X11R4 -lX11 -lm -lcurses -ltermcap
>  # For AIX or OSF/1, add -lbsd
>-@@ -159,11 +154,7 @@
>+@@ -159,11 +154,7 @@ CC = /usr/bin/gcc
>  # LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses
>  # LIBS = -lX11 -lm -lcurses
>  
>Index: graphics/xfractint/files/patch-common__biginit.c
>===================================================================
>--- graphics/xfractint/files/patch-common__biginit.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__biginit.c	(working copy)
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- common/biginit.c.orig	2014-05-03 13:12:35 UTC
>++++ common/biginit.c
>+@@ -9,7 +9,7 @@ is in the allocations of memory for the 
>  #include <string.h>
>  #ifdef __APPLE__
>  #include <malloc/malloc.h>
>Index: graphics/xfractint/files/patch-common__fractalb.c
>===================================================================
>--- graphics/xfractint/files/patch-common__fractalb.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__fractalb.c	(working copy)
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- common/fractalb.c.orig	2014-05-03 13:12:35 UTC
>++++ common/fractalb.c
>+@@ -12,7 +12,7 @@ fractal routines.
>  #include <alloc.h>
>  #elif defined(__APPLE__)
>  #include <malloc/malloc.h>
>Index: graphics/xfractint/files/patch-common__fractals.c
>===================================================================
>--- graphics/xfractint/files/patch-common__fractals.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__fractals.c	(working copy)
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- common/fractals.c.orig	2015-01-19 18:35:16 UTC
>++++ common/fractals.c
>+@@ -43,7 +43,7 @@ an appropriate setup, per_image, per_pix
>  #include <alloc.h>
>  #elif defined(__APPLE__)
>  #include <malloc/malloc.h>
>Index: graphics/xfractint/files/patch-common__frasetup.c
>===================================================================
>--- graphics/xfractint/files/patch-common__frasetup.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__frasetup.c	(working copy)
>@@ -1,5 +1,5 @@
>---- common/frasetup.c.orig	2011-05-07 15:32:06.000000000 -0500
>-+++ common/frasetup.c	2012-03-10 16:35:22.000000000 -0500
>+--- common/frasetup.c.orig	2014-05-03 13:12:35 UTC
>++++ common/frasetup.c
> @@ -4,7 +4,7 @@
>  #include <alloc.h>
>  #elif defined(__APPLE__)
>Index: graphics/xfractint/files/patch-common__lsys.c
>===================================================================
>--- graphics/xfractint/files/patch-common__lsys.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__lsys.c	(working copy)
>@@ -1,5 +1,5 @@
>---- common/lsys.c.orig	2011-05-07 15:34:46.000000000 -0500
>-+++ common/lsys.c	2012-03-10 16:37:40.000000000 -0500
>+--- common/lsys.c.orig	2015-01-19 18:35:16 UTC
>++++ common/lsys.c
> @@ -4,7 +4,7 @@
>  #include <alloc.h>
>  #elif defined(__APPLE__)
>Index: graphics/xfractint/files/patch-common__lsysf.c
>===================================================================
>--- graphics/xfractint/files/patch-common__lsysf.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__lsysf.c	(working copy)
>@@ -1,5 +1,5 @@
>---- common/lsysf.c.orig	2011-05-07 15:35:02.000000000 -0500
>-+++ common/lsysf.c	2012-03-10 16:50:40.000000000 -0500
>+--- common/lsysf.c.orig	2014-05-03 13:12:35 UTC
>++++ common/lsysf.c
> @@ -3,7 +3,7 @@
>  #include <alloc.h>
>  #elif defined(__APPLE__)
>Index: graphics/xfractint/files/patch-common__memory.c
>===================================================================
>--- graphics/xfractint/files/patch-common__memory.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__memory.c	(working copy)
>@@ -1,5 +1,5 @@
>---- common/memory.c.orig	2012-03-10 16:57:05.000000000 -0500
>-+++ common/memory.c	2012-03-10 16:57:36.000000000 -0500
>+--- common/memory.c.orig	2014-05-03 13:12:35 UTC
>++++ common/memory.c
> @@ -2,7 +2,7 @@
>  #include <limits.h>
>  #ifdef __APPLE__
>Index: graphics/xfractint/files/patch-common__miscres.c
>===================================================================
>--- graphics/xfractint/files/patch-common__miscres.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__miscres.c	(working copy)
>@@ -1,5 +1,5 @@
>---- common/miscres.c.orig	2011-05-08 10:19:52.000000000 -0500
>-+++ common/miscres.c	2012-03-10 16:58:44.000000000 -0500
>+--- common/miscres.c.orig	2014-05-03 13:12:35 UTC
>++++ common/miscres.c
> @@ -7,7 +7,7 @@
>  #include <time.h>
>  #ifdef __APPLE__
>Index: graphics/xfractint/files/patch-common__mpmath_c.c
>===================================================================
>--- graphics/xfractint/files/patch-common__mpmath_c.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__mpmath_c.c	(working copy)
>@@ -1,11 +0,0 @@
>---- 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;
>Index: graphics/xfractint/files/patch-common__prompts1.c
>===================================================================
>--- graphics/xfractint/files/patch-common__prompts1.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__prompts1.c	(working copy)
>@@ -1,5 +1,5 @@
>---- common/prompts1.c.orig	2011-05-07 15:32:26.000000000 -0500
>-+++ common/prompts1.c	2012-03-10 17:02:06.000000000 -0500
>+--- common/prompts1.c.orig	2014-05-03 13:12:35 UTC
>++++ common/prompts1.c
> @@ -14,7 +14,7 @@
>  #include <alloc.h>
>  #elif defined(__APPLE__)
>Index: graphics/xfractint/files/patch-common__prompts2.c
>===================================================================
>--- graphics/xfractint/files/patch-common__prompts2.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__prompts2.c	(working copy)
>@@ -1,5 +1,5 @@
>---- common/prompts2.c.orig	2011-05-08 10:20:02.000000000 -0500
>-+++ common/prompts2.c	2012-03-10 17:04:43.000000000 -0500
>+--- common/prompts2.c.orig	2015-08-08 13:22:41 UTC
>++++ common/prompts2.c
> @@ -12,7 +12,7 @@
>  
>  #ifdef DIRENT
>Index: graphics/xfractint/files/patch-common__soi.c
>===================================================================
>--- graphics/xfractint/files/patch-common__soi.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__soi.c	(working copy)
>@@ -1,5 +1,5 @@
>---- common/soi.c.orig	2011-05-07 15:36:36.000000000 -0500
>-+++ common/soi.c	2012-03-10 17:08:47.000000000 -0500
>+--- common/soi.c.orig	2014-05-03 13:12:35 UTC
>++++ common/soi.c
> @@ -15,7 +15,7 @@
>  #include <string.h>
>  #ifdef __APPLE__
>@@ -9,12 +9,3 @@
>  #include <malloc.h>
>  #endif
>  #include "port.h"
>-@@ -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 */
>--#ifndef XFRACT
>-+#ifndef __FreeBSD__
>- #define FREXP(x,y) frexpl(x,y)
>- #else
>- #define FREXP(x,y) frexp(x,y)
>Index: graphics/xfractint/files/patch-common__soi1.c
>===================================================================
>--- graphics/xfractint/files/patch-common__soi1.c	(revision 397791)
>+++ graphics/xfractint/files/patch-common__soi1.c	(working copy)
>@@ -1,5 +1,5 @@
>---- common/soi1.c.orig	2011-05-07 15:36:50.000000000 -0500
>-+++ common/soi1.c	2012-03-10 17:10:37.000000000 -0500
>+--- common/soi1.c.orig	2014-05-03 13:12:35 UTC
>++++ common/soi1.c
> @@ -15,7 +15,7 @@
>  #include <string.h>
>  #ifdef __APPLE__
>Index: graphics/xfractint/files/patch-headers__port.h
>===================================================================
>--- graphics/xfractint/files/patch-headers__port.h	(revision 397791)
>+++ graphics/xfractint/files/patch-headers__port.h	(working copy)
>@@ -1,5 +1,5 @@
>---- ./headers/port.h.orig	2008-02-17 17:26:16.000000000 -0500
>-+++ ./headers/port.h	2010-01-27 13:52:46.000000000 -0500
>+--- headers/port.h.orig	2015-07-04 13:09:32 UTC
>++++ headers/port.h
> @@ -44,7 +44,7 @@
>  /* If endian.h is not present, it can be handled in the code below, */
>  /* but if you have this file, it can make it more fool proof. */
>@@ -7,9 +7,9 @@
> -#if defined(sgi)
> +#if defined(sgi) || defined(__FreeBSD__)
>  #include <sys/endian.h>
>- #else
>- #include <endian.h>
>-@@ -319,7 +319,7 @@
>+ #elif defined(__APPLE__)
>+ #include <machine/endian.h>
>+@@ -333,7 +333,7 @@ extern struct DIR_SEARCH DTA;   /* Disk 
>  /* HP-UX support long doubles and allows them to be read in with  */
>  /*   scanf(), but does not support the functions sinl, cosl, fabsl, etc.  */
>  /* CAE added this 26Jan95 so it would compile (altered by Wes to new macro) */
>Index: graphics/xfractint/files/patch-unix__fpu087.c
>===================================================================
>--- graphics/xfractint/files/patch-unix__fpu087.c	(revision 397791)
>+++ graphics/xfractint/files/patch-unix__fpu087.c	(working copy)
>@@ -1,22 +0,0 @@
>---- 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));
>Index: graphics/xfractint/files/patch-unix__general.c
>===================================================================
>--- graphics/xfractint/files/patch-unix__general.c	(revision 397791)
>+++ graphics/xfractint/files/patch-unix__general.c	(working copy)
>@@ -1,6 +1,6 @@
>---- ./unix/general.c.orig	2008-04-11 10:36:28.000000000 -0400
>-+++ ./unix/general.c	2010-01-27 13:52:46.000000000 -0500
>-@@ -317,7 +317,7 @@
>+--- unix/general.c.orig	2015-06-24 00:31:32 UTC
>++++ unix/general.c
>+@@ -319,7 +319,7 @@ int delaytime;
>      static struct timeval delay;
>      delay.tv_sec = delaytime/1000;
>      delay.tv_usec = (delaytime%1000)*1000;
>Index: graphics/xfractint/files/patch-unix__unixscr.c
>===================================================================
>--- graphics/xfractint/files/patch-unix__unixscr.c	(revision 397791)
>+++ graphics/xfractint/files/patch-unix__unixscr.c	(working copy)
>@@ -1,5 +1,5 @@
>---- ./unix/unixscr.c.orig	2008-05-03 13:52:03.000000000 -0400
>-+++ ./unix/unixscr.c	2010-01-27 13:52:46.000000000 -0500
>+--- unix/unixscr.c.orig	2015-08-09 13:46:52 UTC
>++++ unix/unixscr.c
> @@ -54,7 +54,7 @@
>  #define FNDELAY O_NDELAY
>  #endif
>@@ -9,7 +9,7 @@
>  # include <sys/filio.h>
>  # define FNDELAY O_NONBLOCK
>  #endif
>-@@ -339,7 +339,7 @@
>+@@ -337,7 +337,7 @@ UnixInit()
>      initdacbox();
>  
>      if (!simple_input) {
>Index: graphics/xfractint/pkg-plist
>===================================================================
>--- graphics/xfractint/pkg-plist	(revision 397791)
>+++ graphics/xfractint/pkg-plist	(working copy)
>@@ -1,7 +1,6 @@
> bin/xfractint
> man/man1/xfractint.man.gz
>-%%DATADIR%%/fractint.hlp
>-%%DATADIR%%/sstools.ini
>+share/applications/xfractint.desktop
> %%DATADIR%%/formulas/fract001.frm
> %%DATADIR%%/formulas/fract002.frm
> %%DATADIR%%/formulas/fract003.frm
>@@ -13,6 +12,7 @@
> %%DATADIR%%/formulas/julitile.frm
> %%DATADIR%%/formulas/new_if.frm
> %%DATADIR%%/formulas/newton.frm
>+%%DATADIR%%/fractint.hlp
> %%DATADIR%%/ifs/fract205.ifs
> %%DATADIR%%/ifs/fractint.ifs
> %%DATADIR%%/lsystem/fract205.l
>@@ -37,6 +37,7 @@
> %%DATADIR%%/maps/green.map
> %%DATADIR%%/maps/grey.map
> %%DATADIR%%/maps/grid.map
>+%%DATADIR%%/maps/headach2.map
> %%DATADIR%%/maps/headache.map
> %%DATADIR%%/maps/landscap.map
> %%DATADIR%%/maps/lyapunov.map
>@@ -58,3 +59,4 @@
> %%DATADIR%%/pars/newphoen.par
> %%DATADIR%%/pars/orbits.par
> %%DATADIR%%/pars/phoenix.par
>+%%DATADIR%%/sstools.ini

Actions: View | Diff

Attachments on bug 203360: 161408