Upgrade to 3.04.

5 files changed, 105 insertions, 147 deletions

diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile
index 59a2d61a6359..e503268a4eae 100644
--- a/graphics/xfractint/Makefile
+++ b/graphics/xfractint/Makefile
@@ -1,20 +1,19 @@
 # New ports collection makefile for:    xfractint
-# Version required:     3.00
+# Version required:     3.04
 # Date created:         7 Sept 1995
 # Whom:                 cacho@mexicano.gdl.iteso.mx
 #
-# $Id: Makefile,v 1.1.1.1 1995/09/09 04:21:56 asami Exp $
+# $Id: Makefile,v 1.2 1996/11/18 11:29:38 asami Exp $
 #
 
-DISTNAME=       xfract300
-PKGNAME=	xfractint-3.00
+DISTNAME=       xfrac304
+PKGNAME=	xfractint-3.04
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/sprite/
-EXTRACT_SUFX=	.shar.Z
+MASTER_SITES=	ftp://ftp.phoenix.net/pub/USERS/twegner/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	ports@FreeBSD.ORG
 
-EXTRACT_CMD=	zcat
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	|sh
 NO_WRKSUBDIR=	yes
 MAN1=		xfractint.1
 
diff --git a/graphics/xfractint/distinfo b/graphics/xfractint/distinfo
index 1f36da611c69..3b87b2b1758b 100644
--- a/graphics/xfractint/distinfo
+++ b/graphics/xfractint/distinfo
@@ -1 +1 @@
-MD5 (xfract300.shar.Z) = 30090fa5f1a508b2687128ed1c73fcc1
+MD5 (xfrac304.tgz) = 1b92a92abf2ac36eed0bcf320c9a8b1a
diff --git a/graphics/xfractint/files/patch-aa b/graphics/xfractint/files/patch-aa
index c4ff08eb3b28..4fa03cfc7303 100644
--- a/graphics/xfractint/files/patch-aa
+++ b/graphics/xfractint/files/patch-aa
@@ -1,104 +1,68 @@
-*** Makefile.orig	Fri Sep  8 10:19:18 1995
---- Makefile	Fri Sep  8 11:12:39 1995
-***************
-*** 5,15 ****
-  # 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
-  # BINDIR is where you put your X11 binaries
-! BINDIR = /usr/local/bin/X11
-  # MANDIR is where you put your chapter 1 man pages
-! MANDIR = /user/local/man/man1
-  
-  #SRCDIR = /users/shirriff/fractfiles
-  #BINDIR = /users/shirriff/fractfiles
---- 5,15 ----
-  # 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 = ${PREFIX}/lib/fractint
-  # BINDIR is where you put your X11 binaries
-! BINDIR = ${PREFIX}/bin
-  # MANDIR is where you put your chapter 1 man pages
-! MANDIR = ${PREFIX}/man/man1
-  
-  #SRCDIR = /users/shirriff/fractfiles
-  #BINDIR = /users/shirriff/fractfiles
-***************
-*** 32,38 ****
-  #     prompts2.c to "#else".
-  #
-  
-! #NOBSTRING = -DNOBSTRING
-  #HAVESTRI = -DHAVESTRI
-  #DEBUG adds some sanity checking but will slow xfractint down
-  #DEBUG = -DEBUG
---- 32,38 ----
-  #     prompts2.c to "#else".
-  #
-  
-! NOBSTRING = -DNOBSTRING
-  #HAVESTRI = -DHAVESTRI
-  #DEBUG adds some sanity checking but will slow xfractint down
-  #DEBUG = -DEBUG
-***************
-*** 56,62 ****
-  #For Solaris, use CFLAGS = -I. -I/usr/openwin/include $(DEFINES) -g
-  
-  #CFLAGS = -I. -D_CONST $(DEFINES)
-! CFLAGS = -I. $(DEFINES) -g
-  
-  # Gcc is often the only compiler that works for this
-  # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE
---- 56,62 ----
-  #For Solaris, use CFLAGS = -I. -I/usr/openwin/include $(DEFINES) -g
-  
-  #CFLAGS = -I. -D_CONST $(DEFINES)
-! CFLAGS = -I. $(DEFINES) -O2 -m486 -I/usr/X11R6/include
-  
-  # Gcc is often the only compiler that works for this
-  # For HPUX, use CC = cc -Aa -D_HPUX_SOURCE
-***************
-*** 72,78 ****
-  # For 386BSD, add -L/usr/X386/lib to LIBS
-  # For Apollo, change -lX11 to -L/usr/X11/libX11
-  # For Solaris, add -L/usr/openwin/lib
-! LIBS = -lX11 -lm -lcurses -ltermcap
-  
-  # HPUX fixes thanks to David Allport, Bill Broadley, and R. Lloyd.
-  # AIX fixes thanks to David Sanderson & Elliot Jaffe.
---- 72,78 ----
-  # For 386BSD, add -L/usr/X386/lib to LIBS
-  # For Apollo, change -lX11 to -L/usr/X11/libX11
-  # For Solaris, add -L/usr/openwin/lib
-! LIBS = -lX11 -lm -lcurses -ltermcap -L/usr/X11R6/lib
-  
-  # HPUX fixes thanks to David Allport, Bill Broadley, and R. Lloyd.
-  # AIX fixes thanks to David Sanderson & Elliot Jaffe.
-***************
-*** 147,152 ****
---- 147,154 ----
-  .SUFFIXES:
-  .SUFFIXES: .o .c .s .h
-  
-+ all:	xfractint
-+ 
-  xfractint: fractint.hlp .WAIT $(OBJS)
-  	$(CC) -o xfractint $(CFLAGS) $(OBJS) $(LIBS)
-  	strip xfractint
-***************
-*** 164,169 ****
---- 166,177 ----
-  	cp xfractint $(BINDIR)/xfractint
-  	strip $(BINDIR)/xfractint
-  	chmod a+x $(BINDIR)/xfractint
-+ 	if [ ! -d $(SRCDIR) ]; then \
-+ 		echo "Making $(SRCDIR)"; \
-+ 		mkdir $(SRCDIR); \
-+ 		chmod 755 $(SRCDIR); \
-+ 		else true; \
-+ 	fi;
-  	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) $(SRCDIR)
-  	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) )
-  	cp xfractint.man $(MANDIR)/xfractint.1
+--- Makefile.orig	Sat May 10 02:20:54 1997
++++ Makefile	Tue Oct  7 13:39:00 1997
+@@ -5,11 +5,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
+ # BINDIR is where you put your X11 binaries
+-BINDIR = /usr/local/bin/X11
++BINDIR = ${PREFIX}/bin
+ # MANDIR is where you put your chapter 1 man pages
+-MANDIR = /usr/local/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 @@
+ #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) -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 @@
+ # For Apollo, change -lX11 to -L/usr/X11/libX11
+ # For Solaris, add -L/usr/openwin/lib
+ # For Linux, use  
+-LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -ltermcap
+-#LIBS = -L/usr/X11R6/lib -lX11 -lm -lcurses -ltermcap
++#LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses -ltermcap
++LIBS = -L/usr/X11R6/lib -lX11 -lm -lcurses -ltermcap
+ #LIBS = -lX11 -lm -lcurses -ltermcap
+ 
+ # HPUX fixes thanks to David Allport, Bill Broadley, and R. Lloyd.
+@@ -149,6 +149,8 @@
+ .SUFFIXES:
+ .SUFFIXES: .o .c .s .h
+ 
++all:	xfractint
++
+ xfractint: fractint.hlp .WAIT $(OBJS)
+ 	$(CC) -o xfractint $(CFLAGS) $(OBJS) $(LIBS)
+ #	strip xfractint
+@@ -166,6 +168,12 @@
+ 	cp xfractint $(BINDIR)/xfractint
+ 	strip $(BINDIR)/xfractint
+ 	chmod a+x $(BINDIR)/xfractint
++	if [ ! -d $(SRCDIR) ]; then \
++		echo "Making $(SRCDIR)"; \
++		mkdir $(SRCDIR); \
++		chmod 755 $(SRCDIR); \
++		else true; \
++	fi;
+ 	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) $(SRCDIR)
+ 	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) )
+ 	cp xfractint.man $(MANDIR)/xfractint.1
diff --git a/graphics/xfractint/files/patch-ab b/graphics/xfractint/files/patch-ab
index 96ed84ff67d1..22c697d6d2c3 100644
--- a/graphics/xfractint/files/patch-ab
+++ b/graphics/xfractint/files/patch-ab
@@ -1,33 +1,21 @@
-*** port.h.orig	Thu Sep  7 20:55:27 1995
---- port.h	Thu Sep  7 21:27:45 1995
-***************
-*** 150,156 ****
-  #endif
-  
-          /* Keep this defined for Unix, even on a little-endian machine */
-! #define BIG_ENDIAN
-  
-  #define USE_BIGNUM_C_CODE
-  
---- 150,158 ----
-  #endif
-  
-          /* Keep this defined for Unix, even on a little-endian machine */
-! #ifndef BIG_ENDIAN
-! #define BIG_ENDIAN 4321
-! #endif
-  
-  #define USE_BIGNUM_C_CODE
-  
-***************
-*** 202,207 ****
---- 204,212 ----
-  #undef LDBL_DIG
-  #endif
-  #ifdef sun
-+ #undef LDBL_DIG
-+ #endif
-+ #ifdef __FreeBSD__
-  #undef LDBL_DIG
-  #endif
-  
+--- 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))
+-#include <endian.h>
++#include <machine/endian.h>
+ #endif
+ #ifndef BIG_ENDIAN
+ #define BIG_ENDIAN    4321  /* to show byte order (taken from gcc) */
+@@ -282,6 +282,9 @@
+ #define DO_NOT_USE_LONG_DOUBLE
+ #endif
+ #ifdef sun
++#define DO_NOT_USE_LONG_DOUBLE
++#endif
++#ifdef __FreeBSD__
+ #define DO_NOT_USE_LONG_DOUBLE
+ #endif
+ 
diff --git a/graphics/xfractint/pkg-plist b/graphics/xfractint/pkg-plist
index 666f2cf96b88..ddbb74f8465b 100644
--- a/graphics/xfractint/pkg-plist
+++ b/graphics/xfractint/pkg-plist
@@ -4,7 +4,10 @@ lib/fractint/blues.map
 lib/fractint/cellular.par
 lib/fractint/chroma.map
 lib/fractint/default.map
+lib/fractint/demo.par
 lib/fractint/firestrm.map
+lib/fractint/fract18.par
+lib/fractint/fract19.par
 lib/fractint/fractint.frm
 lib/fractint/fractint.hlp
 lib/fractint/fractint.ifs
@@ -26,12 +29,16 @@ lib/fractint/headache.map
 lib/fractint/icons.par
 lib/fractint/landscap.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
 lib/fractint/topo.map
 lib/fractint/volcano.map
 man/man1/xfractint.1.gz
+@dirrm lib/fractint