Date: Fri, 16 Oct 2015 07:47:47 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399429 - in head/graphics/xfractint: . files Message-ID: <201510160747.t9G7llmd031509@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Oct 16 07:47:47 2015 New Revision: 399429 URL: https://svnweb.freebsd.org/changeset/ports/399429 Log: - Update to version 20.04p14 and unbreak this classic port - Drop workarounds for older math functions and reenable use of sinhl(3), coshl(3), and frexp(3) on FreeBSD versions that have them in libm - Remove useless definite article from COMMENT line - Install manual page with its section suffix (1) instead of "man" - Unmute installation commands, sort pkg-plist, trim pkg-descr while here PR: 203360 Submitted by: pfg Approved by: maintainer timeout (since 2015-09-26) Added: head/graphics/xfractint/files/pre-1000034-libm-patch (contents, props changed) Deleted: head/graphics/xfractint/files/patch-common__mpmath_c.c head/graphics/xfractint/files/patch-unix__fpu087.c Modified: head/graphics/xfractint/Makefile head/graphics/xfractint/distinfo head/graphics/xfractint/files/patch-common__soi.c head/graphics/xfractint/pkg-descr head/graphics/xfractint/pkg-plist Modified: head/graphics/xfractint/Makefile ============================================================================== --- head/graphics/xfractint/Makefile Fri Oct 16 07:44:55 2015 (r399428) +++ head/graphics/xfractint/Makefile Fri Oct 16 07:47:47 2015 (r399429) @@ -2,32 +2,36 @@ # $FreeBSD$ PORTNAME= xfractint -PORTVERSION= 20.04p12 -PORTREVISION= 1 +PORTVERSION= 20.04p14 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 -COMMENT= The Unix port of fractint - -BROKEN= No public distfiles +COMMENT= Unix port of FractInt USES= gmake USE_XORG= x11 xft ALL_TARGET= ${PORTNAME} -DESKTOP_ENTRIES+="Xfracint" "${COMMENT}" "" "${PORTNAME}" "" "false" +DESKTOP_ENTRIES= "Xfracint" "${COMMENT}" "" "${PORTNAME}" "" "false" + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 1000034 +EXTRA_PATCHES= ${FILESDIR}/pre-1000034-libm-patch +.endif 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 + ${INSTALL_MAN} ${WRKSRC}/unix/xfractint.man \ + ${STAGEDIR}${MANPREFIX}/man/man1/xfractint.1 @${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} + cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR} .endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/graphics/xfractint/distinfo ============================================================================== --- head/graphics/xfractint/distinfo Fri Oct 16 07:44:55 2015 (r399428) +++ head/graphics/xfractint/distinfo Fri Oct 16 07:47:47 2015 (r399429) @@ -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 Modified: head/graphics/xfractint/files/patch-common__soi.c ============================================================================== --- head/graphics/xfractint/files/patch-common__soi.c Fri Oct 16 07:44:55 2015 (r399428) +++ head/graphics/xfractint/files/patch-common__soi.c Fri Oct 16 07:47:47 2015 (r399429) @@ -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) Added: head/graphics/xfractint/files/pre-1000034-libm-patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/xfractint/files/pre-1000034-libm-patch Fri Oct 16 07:47:47 2015 (r399429) @@ -0,0 +1,44 @@ +--- 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; +--- common/soi.c.orig 2011-05-07 15:36:36.000000000 -0500 ++++ common/soi.c 2012-03-10 17:08:47.000000000 -0500 +@@ -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) +--- 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 = (LDBL)sinhl(*Angle); +- *Cosh = (LDBL)coshl(*Angle); ++ *Sinh = (LDBL)sinh(*Angle); ++ *Cosh = (LDBL)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)); Modified: head/graphics/xfractint/pkg-descr ============================================================================== --- head/graphics/xfractint/pkg-descr Fri Oct 16 07:44:55 2015 (r399428) +++ head/graphics/xfractint/pkg-descr Fri Oct 16 07:47:47 2015 (r399429) @@ -1,6 +1,4 @@ -Xfractint - The Unix port of fractint. - -Fractint is an IBM PC program to generate fractals, and was written by +FractInt is an IBM PC program to generate fractals, and was written by the Stone Soup Group. The Unix port was done by Ken Shirriff and modified by Scott D. Boyd. Modified: head/graphics/xfractint/pkg-plist ============================================================================== --- head/graphics/xfractint/pkg-plist Fri Oct 16 07:44:55 2015 (r399428) +++ head/graphics/xfractint/pkg-plist Fri Oct 16 07:47:47 2015 (r399429) @@ -1,7 +1,5 @@ bin/xfractint -man/man1/xfractint.man.gz -%%DATADIR%%/fractint.hlp -%%DATADIR%%/sstools.ini +man/man1/xfractint.1.gz %%DATADIR%%/formulas/fract001.frm %%DATADIR%%/formulas/fract002.frm %%DATADIR%%/formulas/fract003.frm @@ -13,6 +11,7 @@ man/man1/xfractint.man.gz %%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 +36,7 @@ man/man1/xfractint.man.gz %%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 +58,4 @@ man/man1/xfractint.man.gz %%DATADIR%%/pars/newphoen.par %%DATADIR%%/pars/orbits.par %%DATADIR%%/pars/phoenix.par +%%DATADIR%%/sstools.ini
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510160747.t9G7llmd031509>