From owner-freebsd-ports Fri Oct 8 16:40: 9 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 91F0E14FA1 for ; Fri, 8 Oct 1999 16:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id QAA38684; Fri, 8 Oct 1999 16:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from anaconda.lovett.com (anaconda.lovett.com [216.60.121.168]) by hub.freebsd.org (Postfix) with ESMTP id A115814CBE for ; Fri, 8 Oct 1999 16:39:53 -0700 (PDT) (envelope-from ade@lovett.com) Received: from ade by anaconda.lovett.com with local (Exim 3.03 #1) id 11Zjc5-000Jpd-00 for FreeBSD-gnats-submit@freebsd.org; Fri, 08 Oct 1999 18:39:49 -0500 Message-Id: Date: Fri, 08 Oct 1999 18:39:49 -0500 From: Ade Lovett Reply-To: ade@lovett.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/14219: Unbreak/upgrade graphics/xfractint Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 14219 >Category: ports >Synopsis: Unbreak/upgrade graphics/xfractint >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 8 16:40:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Ade Lovett >Release: FreeBSD 3.3-STABLE i386 >Organization: Lovett Network Consultancy >Environment: Up to date ports tree >Description: Distfiles portsurvey pointed out failure for graphics/xfractint Author has a new version available at MASTER_SITE >How-To-Repeat: cd graphics/xfractint; make fetch >Fix: Apply following patch. Version: 3.04 -> 3.10 Changes: Makefile files/md5 patches/patch-aa patches/patch-ab pkg/PLIST Adds: patches/patch-ac Removes: NONE cvs diff: Diffing . Index: Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/xfractint/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 1999/08/31 06:45:19 1.6 +++ Makefile 1999/10/08 23:13:18 @@ -1,19 +1,19 @@ # New ports collection makefile for: xfractint -# Version required: 3.04 +# Version required: 3.10 # Date created: 7 Sept 1995 # Whom: cacho@mexicano.gdl.iteso.mx # # $FreeBSD: ports/graphics/xfractint/Makefile,v 1.6 1999/08/31 06:45:19 mharo Exp $ # -DISTNAME= xfrac304 -PKGNAME= xfractint-3.04 +DISTNAME= xfrac310 +PKGNAME= xfractint-3.10 CATEGORIES= graphics MASTER_SITES= ftp://ftp.phoenix.net/pub/USERS/twegner/ -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org +USE_ZIP= yes USE_XLIB= yes NO_WRKSUBDIR= yes MAN1= xfractint.1 cvs diff: Diffing files Index: files/md5 =================================================================== RCS file: /home/ncvs/ports/graphics/xfractint/files/md5,v retrieving revision 1.2 diff -u -r1.2 md5 --- md5 1997/10/07 11:48:32 1.2 +++ md5 1999/10/08 23:14:10 @@ -1 +1 @@ -MD5 (xfrac304.tgz) = 1b92a92abf2ac36eed0bcf320c9a8b1a +MD5 (xfrac310.zip) = 63c10c185de4c4f4c462f20340992389 cvs diff: Diffing patches Index: patches/patch-aa =================================================================== RCS file: /home/ncvs/ports/graphics/xfractint/patches/patch-aa,v retrieving revision 1.2 diff -u -r1.2 patch-aa --- patch-aa 1997/10/07 11:48:35 1.2 +++ patch-aa 1999/10/08 23:20:06 @@ -1,39 +1,30 @@ ---- Makefile.orig Sat May 10 02:20:54 1997 -+++ Makefile Tue Oct 7 13:39:00 1997 -@@ -5,11 +5,11 @@ +--- Makefile.orig Sat Sep 11 20:32:16 1999 ++++ Makefile Fri Oct 8 18:18:25 1999 +@@ -2,11 +2,11 @@ # SRCDIR should be a path to the directory that will hold fractint.hlp # You will have to copy fractint.hlp to SRCDIR and make it world readable. # SRCDIR should also hold the .par, .frm, etc. files --SRCDIR = /usr/local/bin/X11/fractint -+SRCDIR = ${PREFIX}/lib/fractint +-SRCDIR = /usr/src/xfractint ++SRCDIR = ${PREFIX}/lib/fractint # BINDIR is where you put your X11 binaries --BINDIR = /usr/local/bin/X11 +-BINDIR = /usr/X11R6/bin +BINDIR = ${PREFIX}/bin # MANDIR is where you put your chapter 1 man pages --MANDIR = /usr/local/man/man1 +-MANDIR = /usr/X11R6/man/man1 +MANDIR = ${PREFIX}/man/man1 NOBSTRING = HAVESTRI = -@@ -28,7 +28,7 @@ - # prompts2.c to "#else". - # - --#NOBSTRING = -DNOBSTRING -+NOBSTRING = -DNOBSTRING - #HAVESTRI = -DHAVESTRI - #DEBUG adds some sanity checking but will slow xfractint down - #DEBUG = -DEBUG -@@ -53,7 +53,7 @@ +@@ -51,7 +51,7 @@ #For Solaris, use CFLAGS = -I. -I/usr/openwin/include $(DEFINES) -g #CFLAGS = -I. -D_CONST $(DEFINES) --CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX +-CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX +CFLAGS += -I. $(DEFINES) -DBIG_ANSI_C -I${X11BASE}/include # Gcc is often the only compiler that works for this # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE -@@ -70,8 +70,8 @@ +@@ -68,8 +68,8 @@ # For Apollo, change -lX11 to -L/usr/X11/libX11 # For Solaris, add -L/usr/openwin/lib # For Linux, use @@ -44,7 +35,7 @@ #LIBS = -lX11 -lm -lcurses -ltermcap # HPUX fixes thanks to David Allport, Bill Broadley, and R. Lloyd. -@@ -149,6 +149,8 @@ +@@ -166,6 +166,8 @@ .SUFFIXES: .SUFFIXES: .o .c .s .h @@ -53,7 +44,7 @@ xfractint: fractint.hlp .WAIT $(OBJS) $(CC) -o xfractint $(CFLAGS) $(OBJS) $(LIBS) # strip xfractint -@@ -166,6 +168,12 @@ +@@ -183,6 +185,12 @@ cp xfractint $(BINDIR)/xfractint strip $(BINDIR)/xfractint chmod a+x $(BINDIR)/xfractint Index: patches/patch-ab =================================================================== RCS file: /home/ncvs/ports/graphics/xfractint/patches/patch-ab,v retrieving revision 1.2 diff -u -r1.2 patch-ab --- patch-ab 1997/10/07 11:48:36 1.2 +++ patch-ab 1999/10/08 23:20:15 @@ -1,15 +1,15 @@ ---- port.h.orig Fri Feb 28 05:21:13 1997 -+++ port.h Tue Oct 7 13:27:56 1997 -@@ -40,7 +40,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. */ - #if (defined(XFRACT) && !defined(__sun)) +--- port.h.orig Mon Sep 6 10:38:10 1999 ++++ port.h Fri Oct 8 18:19:32 1999 +@@ -45,7 +45,7 @@ + #if defined(sgi) + #include + #else -#include +#include #endif + #endif #ifndef BIG_ENDIAN - #define BIG_ENDIAN 4321 /* to show byte order (taken from gcc) */ -@@ -282,6 +282,9 @@ +@@ -288,6 +288,9 @@ #define DO_NOT_USE_LONG_DOUBLE #endif #ifdef sun cvs diff: Diffing pkg Index: pkg/PLIST =================================================================== RCS file: /home/ncvs/ports/graphics/xfractint/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- PLIST 1998/08/18 17:55:07 1.3 +++ PLIST 1999/10/08 23:31:16 @@ -1,13 +1,117 @@ bin/xfractint +lib/fractint/Carlson1.map +lib/fractint/Digiorg1.map +lib/fractint/Digiorg2.map +lib/fractint/Gallet01.map +lib/fractint/Gallet02.map +lib/fractint/Gallet03.map +lib/fractint/Gallet04.map +lib/fractint/Gallet05.map +lib/fractint/Gallet06.map +lib/fractint/Gallet07.map +lib/fractint/Gallet08.map +lib/fractint/Gallet09.map +lib/fractint/Gallet10.map +lib/fractint/Gallet11.map +lib/fractint/Gallet12.map +lib/fractint/Gallet13.map +lib/fractint/Gallet14.map +lib/fractint/Gallet15.map +lib/fractint/Gallet16.map +lib/fractint/Gallet17.map +lib/fractint/Gallet18.map +lib/fractint/Lindaa01.map +lib/fractint/Lindaa02.map +lib/fractint/Lindaa03.map +lib/fractint/Lindaa04.map +lib/fractint/Lindaa05.map +lib/fractint/Lindaa06.map +lib/fractint/Lindaa07.map +lib/fractint/Lindaa08.map +lib/fractint/Lindaa09.map +lib/fractint/Lindaa10.map +lib/fractint/Lindaa11.map +lib/fractint/Lindaa12.map +lib/fractint/Lindaa14.map +lib/fractint/Lindaa15.map +lib/fractint/Lindaa16.map +lib/fractint/Lindaa17.map +lib/fractint/Morgan1.map +lib/fractint/Morgan2.map +lib/fractint/Morgan3.map +lib/fractint/Morgen3.map +lib/fractint/Skydye01.map +lib/fractint/Skydye02.map +lib/fractint/Skydye03.map +lib/fractint/Skydye04.map +lib/fractint/Skydye05.map +lib/fractint/Skydye06.map +lib/fractint/Skydye07.map +lib/fractint/Skydye08.map +lib/fractint/Skydye09.map +lib/fractint/Skydye10.map +lib/fractint/Skydye11.map +lib/fractint/Skydye12.map +lib/fractint/Wizzl011.map +lib/fractint/Wizzl012.map +lib/fractint/Wizzl013.map +lib/fractint/Wizzl014.map +lib/fractint/Wizzl015.map +lib/fractint/Wizzl016.map +lib/fractint/Wizzl017.map +lib/fractint/Wizzl018.map +lib/fractint/Wizzl019.map +lib/fractint/Wizzl020.map lib/fractint/altern.map lib/fractint/blues.map +lib/fractint/bud2.map +lib/fractint/bud3.map +lib/fractint/bud4.map +lib/fractint/bud5.map +lib/fractint/bud6.map +lib/fractint/bud7.map lib/fractint/cellular.par lib/fractint/chroma.map +lib/fractint/damien1.map +lib/fractint/damien2.map +lib/fractint/damien3.map +lib/fractint/damien4.map +lib/fractint/damien5.map lib/fractint/default.map lib/fractint/demo.par +lib/fractint/droz10.map +lib/fractint/droz11.map +lib/fractint/droz12.map +lib/fractint/droz13.map +lib/fractint/droz14.map +lib/fractint/droz15.map +lib/fractint/droz21.map +lib/fractint/droz22.map +lib/fractint/droz23.map +lib/fractint/droz28.map +lib/fractint/droz31.map +lib/fractint/droz33.map +lib/fractint/droz34.map +lib/fractint/droz35.map +lib/fractint/droz36.map +lib/fractint/droz38.map +lib/fractint/droz39.map +lib/fractint/droz40.map +lib/fractint/droz44.map +lib/fractint/droz46.map +lib/fractint/droz49.map +lib/fractint/droz52.map +lib/fractint/droz54.map +lib/fractint/droz56.map +lib/fractint/droz60.map +lib/fractint/droz62.map +lib/fractint/droz8.map +lib/fractint/drozdis1.map lib/fractint/firestrm.map lib/fractint/fract18.par lib/fractint/fract19.par +lib/fractint/fract200.frm +lib/fractint/fract200.par lib/fractint/fractint.frm lib/fractint/fractint.hlp lib/fractint/fractint.ifs @@ -28,13 +132,32 @@ lib/fractint/headache.map lib/fractint/icons.par lib/fractint/landscap.map +lib/fractint/lkmtch00.map +lib/fractint/lkmtch01.map +lib/fractint/lkmtch02.map +lib/fractint/lkmtch03.map +lib/fractint/lkmtch04.map +lib/fractint/lkmtch05.map +lib/fractint/lkmtch06.map +lib/fractint/lkmtch07.map +lib/fractint/lkmtch08.map +lib/fractint/lkmtch09.map +lib/fractint/lkmtch10.map +lib/fractint/lkmtch11.map +lib/fractint/lkmtch12.map +lib/fractint/lkmtch13.map +lib/fractint/lkmtch14.map +lib/fractint/lkmtch15.map +lib/fractint/lkmtch16.map +lib/fractint/lkmtch17.map +lib/fractint/lkmtch18.map +lib/fractint/lkmtch19.map lib/fractint/lyapunov.map lib/fractint/lyapunov.par lib/fractint/music.par lib/fractint/neon.map lib/fractint/paintjet.map lib/fractint/penrose.l -lib/fractint/phctutor.frm lib/fractint/phoenix.par lib/fractint/royal.map lib/fractint/tiling.l --- /dev/null Fri Oct 8 18:31:31 1999 +++ patches/patch-ac Fri Oct 8 18:29:31 1999 @@ -0,0 +1,58 @@ +--- soi.c.orig Mon Sep 6 10:38:10 1999 ++++ soi.c Fri Oct 8 18:25:33 1999 +@@ -19,7 +19,11 @@ + + #define DBLS LDBL + #define FABS(x) fabsl(x) ++#ifdef __FreeBSD__ ++#define FREXP(x,y) frexp(x,y) ++#else + #define FREXP(x,y) frexpl(x,y) ++#endif + + #define TRUE 1 + #define FALSE 0 +--- unixscr.c.orig Wed Apr 28 23:12:03 1999 ++++ unixscr.c Fri Oct 8 18:24:15 1999 +@@ -241,7 +241,7 @@ + initdacbox(); + + if (!simple_input) { +- signal(SIGINT,(__sighandler_t)goodbye); ++ signal(SIGINT,(sig_t)goodbye); + } + signal(SIGFPE, fpe_handler); + /* +@@ -2068,12 +2068,12 @@ + void + shell_to_dos() + { +- __sighandler_t sigint; ++ sig_t sigint; + char *shell; + char *argv[2]; + int pid, donepid; + +- sigint = (__sighandler_t)signal(SIGINT, SIG_IGN); ++ sigint = signal(SIGINT, SIG_IGN); + shell = getenv("SHELL"); + if (shell==NULL) { + shell = SHELL; +@@ -2121,7 +2121,7 @@ + fcntl(0,F_SETFL,FNDELAY); + } + +- signal(SIGINT, (__sighandler_t)sigint); ++ signal(SIGINT, sigint); + putchar('\n'); + } + +@@ -2146,7 +2146,7 @@ + int soon; + { + if (!fastmode) return; +- signal(SIGALRM, (__sighandler_t)setredrawscreen); ++ signal(SIGALRM, (sig_t)setredrawscreen); + if (soon) { + alarm(1); + } else { >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message