Correct versioning scheme; rename stable 20.4.03 to 20.04_p03 and add 20.04_p07 as version bump. Reverting commit for bug 48923, couldn't care less about users adding -funroll-all-loops into global CFLAGS. Fixing bug 203498, manpage installation location. More foo..

(Portage version: 2.1.4_rc11, RepoMan options: --force)

15 files changed, 184 insertions, 1434 deletions

diff --git a/x11-misc/xfractint/ChangeLog b/x11-misc/xfractint/ChangeLog
index 92293c3b94f5..ccd5606bda9e 100644
--- a/x11-misc/xfractint/ChangeLog
+++ b/x11-misc/xfractint/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-misc/xfractint
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.44 2007/07/22 03:21:47 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.45 2007/12/27 20:42:56 drac Exp $
+
+*xfractint-20.04_p07 (27 Dec 2007)
+*xfractint-20.04_p03 (27 Dec 2007)
+
+  27 Dec 2007; Samuli Suominen <drac@gentoo.org>
+  -files/xfractint-20.02p05.patch, -files/xfractint-20.03p00.patch,
+  -files/xfractint-20.03p01-make.patch,
+  +files/xfractint-20.04_p07-Makefile.patch, -xfractint-20.3.01.ebuild,
+  -xfractint-20.3.02.ebuild, +xfractint-20.04_p03.ebuild,
+  +xfractint-20.04_p07.ebuild, -xfractint-20.4.00.ebuild,
+  -xfractint-20.4.03.ebuild:
+  Correct versioning scheme; rename stable 20.4.03 to 20.04_p03 and add
+  20.04_p07 as version bump. Reverting commit for bug 48923, couldn't care
+  less about users adding -funroll-all-loops into global CFLAGS. Fixing bug
+  203498, manpage installation location.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   xfractint-20.3.01.ebuild, xfractint-20.3.02.ebuild,
diff --git a/x11-misc/xfractint/files/digest-xfractint-20.4.03 b/x11-misc/xfractint/files/digest-xfractint-20.04_p03
index f077aa40b360..f077aa40b360 100644
--- a/x11-misc/xfractint/files/digest-xfractint-20.4.03
+++ b/x11-misc/xfractint/files/digest-xfractint-20.04_p03
diff --git a/x11-misc/xfractint/files/digest-xfractint-20.04_p07 b/x11-misc/xfractint/files/digest-xfractint-20.04_p07
new file mode 100644
index 000000000000..88de3046f39e
--- /dev/null
+++ b/x11-misc/xfractint/files/digest-xfractint-20.04_p07
@@ -0,0 +1,3 @@
+MD5 c8ce3f11b8ec40759135f8727da5fd85 xfractint-20.04p07.tar.gz 1322518
+RMD160 1a51654fe43db03c91c03fca6826b299ac1212c6 xfractint-20.04p07.tar.gz 1322518
+SHA256 557118b6ba9f6e14800ca932a2ec2a11528c707aa5bf06b0816fad2820fdf520 xfractint-20.04p07.tar.gz 1322518
diff --git a/x11-misc/xfractint/files/digest-xfractint-20.3.01 b/x11-misc/xfractint/files/digest-xfractint-20.3.01
deleted file mode 100644
index c821875d7270..000000000000
--- a/x11-misc/xfractint/files/digest-xfractint-20.3.01
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fd89b7723110163d2a7d7745da173c15 xfractint-20.03p01.tar.bz2 917145
-RMD160 a2cea5410c982670183836a190ca2f5e56b19239 xfractint-20.03p01.tar.bz2 917145
-SHA256 690197364b20dc00fab989afd067355a0ba4f0c24b026490f1edab7cddacc5f2 xfractint-20.03p01.tar.bz2 917145
diff --git a/x11-misc/xfractint/files/digest-xfractint-20.3.02 b/x11-misc/xfractint/files/digest-xfractint-20.3.02
deleted file mode 100644
index f4b6f633a59b..000000000000
--- a/x11-misc/xfractint/files/digest-xfractint-20.3.02
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3fd35da5ec5dae4c85e02a75df5f794a xfract20.3.02.tar.gz 1053757
-RMD160 10d2a89a2c8fb7cbd912ac30425d81f6c2ea23c7 xfract20.3.02.tar.gz 1053757
-SHA256 bc5c09a4f5417b430f88c90cfed9edfb7b1d98990129811fc9037889a8e52331 xfract20.3.02.tar.gz 1053757
diff --git a/x11-misc/xfractint/files/digest-xfractint-20.4.00 b/x11-misc/xfractint/files/digest-xfractint-20.4.00
deleted file mode 100644
index a5ed0973c724..000000000000
--- a/x11-misc/xfractint/files/digest-xfractint-20.4.00
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0dcdea71cdabd80732b68b5bb1f0b77 xfract20.4.00.tar.gz 1056716
-RMD160 feee363205afaa5bc9e7095fec2214b1c97ee07d xfract20.4.00.tar.gz 1056716
-SHA256 7016050cdb5fa27794bba7c887a2a8f0b1835aca33ead0129b7a454c5e678273 xfract20.4.00.tar.gz 1056716
diff --git a/x11-misc/xfractint/files/xfractint-20.02p05.patch b/x11-misc/xfractint/files/xfractint-20.02p05.patch
deleted file mode 100644
index 4243310690ac..000000000000
--- a/x11-misc/xfractint/files/xfractint-20.02p05.patch
+++ /dev/null
@@ -1,668 +0,0 @@
-diff -Naur xfractint-20.02p05-orig/editpal.c xfractint-20.02p05/editpal.c
---- xfractint-20.02p05-orig/editpal.c	2003-03-25 02:25:40.000000000 +0100
-+++ xfractint-20.02p05/editpal.c	2003-10-25 15:51:01.000000000 +0200
-@@ -114,11 +114,11 @@
- #endif
- 
- #include <string.h>
--#ifndef XFRACT
-+//#ifndef XFRACT
- #include <stdarg.h>
--#else
--#include <varargs.h>
--#endif
-+//#else
-+//#include <varargs.h>
-+//#endif
- 
- #ifdef __TURBOC__
- #   include <mem.h>   /* to get mem...() declarations */
-@@ -410,21 +410,21 @@
-    }
- 
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- static void displayf(int x, int y, int fg, int bg, char *format, ...)
--#else
-+/*#else
- static void displayf(va_alist)
- va_dcl
--#endif
-+#endif*/
-    {
-    char buff[81];
-    int  ctr;
- 
-    va_list arg_list;
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg_list, format);
--#else
-+/*#else
-    int x,y,fg,bg;
-    char *format;
- 
-@@ -434,7 +434,7 @@
-    fg = va_arg(arg_list,int);
-    bg = va_arg(arg_list,int);
-    format = va_arg(arg_list,char *);
--#endif
-+#endif*/
-    vsprintf(buff, format, arg_list);
-    va_end(arg_list);
- 
-diff -Naur xfractint-20.02p05-orig/fracsubr.c xfractint-20.02p05/fracsubr.c
---- xfractint-20.02p05-orig/fracsubr.c	2003-02-13 04:01:23.000000000 +0100
-+++ xfractint-20.02p05/fracsubr.c	2003-10-25 15:52:26.000000000 +0200
-@@ -3,12 +3,12 @@
- FRACTALS.C, i.e. which are non-fractal-specific fractal engine subroutines.
- */
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- #include <stdarg.h>
--#include <sys/timeb.h>
--#else
--#include <varargs.h>
--#endif
-+//#include <sys/timeb.h>
-+//#else
-+//#include <varargs.h>
-+//#endif
- #include <sys/types.h>
- #include <time.h>
-   /* see Fractint.c for a description of the "include"  hierarchy */
-@@ -1058,27 +1058,27 @@
- 
-    */
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- int put_resume(int len, ...)
--#else
-+/*#else
- int put_resume(va_alist)
- va_dcl
--#endif
-+#endif*/
- {
-    va_list arg_marker;  /* variable arg list */
-    BYTE *source_ptr;
--#ifdef XFRACT
-+/*#ifdef XFRACT
-    int len;
--#endif
-+#endif*/
- 
-    if (resume_info == 0)
-       return(-1);
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg_marker,len);
--#else
-+/*#else
-    va_start(arg_marker);
-    len = va_arg(arg_marker,int);
--#endif
-+#endif*/
-    while (len)
-    {
-       source_ptr = (BYTE *)va_arg(arg_marker,char *);
-@@ -1109,27 +1109,27 @@
-    return(0);
- }
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- int get_resume(int len, ...)
--#else
-+/*#else
- int get_resume(va_alist)
- va_dcl
--#endif
-+#endif*/
- {
-    va_list arg_marker;  /* variable arg list */
-    BYTE *dest_ptr;
--#ifdef XFRACT
-+/*#ifdef XFRACT
-    int len;
--#endif
-+#endif*/
- 
-    if (resume_info == 0)
-       return(-1);
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg_marker,len);
--#else
-+/*#else
-    va_start(arg_marker);
-    len = va_arg(arg_marker,int);
--#endif
-+#endif*/
-    while (len)
-    {
-       dest_ptr = (BYTE *)va_arg(arg_marker,char *);
-diff -Naur xfractint-20.02p05-orig/fractint.c xfractint-20.02p05/fractint.c
---- xfractint-20.02p05-orig/fractint.c	2003-03-25 02:25:46.000000000 +0100
-+++ xfractint-20.02p05/fractint.c	2003-10-25 15:55:49.000000000 +0200
-@@ -6,12 +6,12 @@
- #include <string.h>
- #include <time.h>
- #include <signal.h>
--#ifndef XFRACT
--#include <io.h>
-+//#ifndef XFRACT
-+//#include <io.h>
- #include <stdarg.h>
--#else
--#include <varargs.h>
--#endif
-+//#else
-+//#include <varargs.h>
-+//#endif
- #include <ctype.h>
- 
-   /* #include hierarchy for fractint is a follows:
-@@ -555,12 +555,12 @@
-      timer(1,NULL,int width)            decoder
-      timer(2)                           encoder
-   */
--#ifndef XFRACT
-+//#ifndef XFRACT
- int timer(int timertype,int(*subrtn)(),...)
--#else
-+/*#else
- int timer(va_alist)
- va_dcl
--#endif
-+#endif*/
- {
-    va_list arg_marker;  /* variable arg list */
-    char *timestring;
-@@ -570,15 +570,15 @@
-    int i;
-    int do_bench;
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg_marker,subrtn);
--#else
-+/*#else
-    int timertype;
-    int (*subrtn)();
-    va_start(arg_marker);
-    timertype = va_arg(arg_marker, int);
-    subrtn = (int (*)())va_arg(arg_marker, int *);
--#endif
-+#endif*/
- 
-    do_bench = timerflag; /* record time? */
-    if (timertype == 2)   /* encoder, record time only if debug=200 */
-diff -Naur xfractint-20.02p05-orig/framain2.c xfractint-20.02p05/framain2.c
---- xfractint-20.02p05-orig/framain2.c	2003-03-25 02:25:49.000000000 +0100
-+++ xfractint-20.02p05/framain2.c	2003-10-25 15:57:43.000000000 +0200
-@@ -1,11 +1,11 @@
- #include <string.h>
- #include <time.h>
--#ifndef XFRACT
--#include <io.h>
-+//#ifndef XFRACT
-+//#include <io.h>
- #include <stdarg.h>
--#else
--#include <varargs.h>
--#endif
-+//#else
-+//#include <varargs.h>
-+//#endif
- #include <ctype.h>
-   /* see Fractint.c for a description of the "include"  hierarchy */
- #include "port.h"
-diff -Naur xfractint-20.02p05-orig/hc.c xfractint-20.02p05/hc.c
---- xfractint-20.02p05-orig/hc.c	2003-02-13 04:01:23.000000000 +0100
-+++ xfractint-20.02p05/hc.c	2003-10-25 15:49:33.000000000 +0200
-@@ -56,7 +56,7 @@
- #include <io.h>
- #include <stdarg.h>
- #else
--#include <varargs.h>
-+#include <stdarg.h>
- #define strupr strlwr
- #endif
- #include <fcntl.h>
-@@ -301,24 +301,25 @@
-    }
- 
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- void fatal(int diff, char *format, ...)
--#else
--void fatal(va_alist)
--    va_dcl
--#endif
-+//#else
-+//void fatal(va_alist)
-+//    va_dcl
-+//#endif
-    {
-    va_list arg;
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg, format);
--#else
-+/*#else
-    int diff;
-    char *format;
--   va_start(arg);
-+   va_start(arg, format);
-    diff = va_arg(arg,int);
-    format = va_arg(arg,char *);
- #endif
-+*/
- 
-    print_msg("Fatal", srcline-diff, format, arg);
-    va_end(arg);
-@@ -330,24 +331,25 @@
-    }
- 
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- void error(int diff, char *format, ...)
--#else
--void error(va_alist)
--    va_dcl
--#endif
-+//#else
-+//void error(int diff, char *format, ...)
-+//void error(va_alist)
-+//    va_dcl
-+//#endif
-    {
-    va_list arg;
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg, format);
--#else
--   int diff;
-+//#else
-+/*   int diff;
-    char *format;
-    va_start(arg);
-    diff = va_arg(arg,int);
-    format = va_arg(arg,char *);
--#endif
-+#endif*/
-    print_msg("Error", srcline-diff, format, arg);
-    va_end(arg);
- 
-@@ -356,23 +358,23 @@
-    }
- 
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- void warn(int diff, char *format, ...)
--#else
-+/*#else
- void warn(va_alist)
-    va_dcl
--#endif
-+#endif*/
-    {
-    va_list arg;
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg, format);
--#else
-+/*#else
-    int diff;
-    char *format;
-    va_start(arg);
-    diff = va_arg(arg, int);
-    format = va_arg(arg, char *);
--#endif
-+#endif*/
-    print_msg("Warning", srcline-diff, format, arg);
-    va_end(arg);
- 
-@@ -381,47 +383,47 @@
-    }
- 
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- void notice(char *format, ...)
--#else
-+/*#else
- void notice(va_alist)
-     va_dcl
--#endif
-+#endif*/
-    {
-    va_list arg;
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg, format);
--#else
-+/*#else
-    char *format;
- 
-    va_start(arg);
-    format = va_arg(arg,char *);
--#endif
-+#endif*/
-    print_msg("Note", srcline, format, arg);
-    va_end(arg);
-    }
- 
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- void msg(char *format, ...)
--#else
-+/*#else
- void msg(va_alist)
- va_dcl
--#endif
-+#endif*/
-    {
-    va_list arg;
--#ifdef XFRACT
-+/*#ifdef XFRACT
-    char *format;
--#endif
-+#endif*/
- 
-    if (quiet_mode)
-       return;
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg, format);
--#else
-+/*#else
-    va_start(arg);
-    format = va_arg(arg,char *);
--#endif
-+#endif*/
-    print_msg(NULL, 0, format, arg);
-    va_end(arg);
-    }
-diff -Naur xfractint-20.02p05-orig/jiim.c xfractint-20.02p05/jiim.c
---- xfractint-20.02p05-orig/jiim.c	2003-03-25 02:25:49.000000000 +0100
-+++ xfractint-20.02p05/jiim.c	2003-10-25 15:58:07.000000000 +0200
-@@ -40,11 +40,11 @@
- 
- #include <string.h>
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- #include <stdarg.h>
--#else
-+/*#else
- #include <varargs.h>
--#endif
-+#endif*/
- 
- #ifdef __TURBOC__
- #   include <mem.h>   /* to get mem...() declarations */
-diff -Naur xfractint-20.02p05-orig/Makefile xfractint-20.02p05/Makefile
---- xfractint-20.02p05-orig/Makefile	2003-03-29 18:51:27.000000000 +0100
-+++ xfractint-20.02p05/Makefile	2003-10-25 16:30:04.000000000 +0200
-@@ -213,8 +213,11 @@
- 	cp xfractint $(BINDIR)/xfractint
- 	strip $(BINDIR)/xfractint
- 	chmod a+x $(BINDIR)/xfractint
--	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) ./maps/$(MAPFILES) $(SRCDIR)
--	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) )
-+	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(SRCDIR)
-+	mkdir $(SRCDIR)/maps
-+	(cd maps; cp $(MAPFILES) $(SRCDIR)/maps )	
-+	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) )
-+	(cd $(SRCDIR)/maps; chmod a+r $(MAPFILES) )
- 	cp xfractint.man $(MANDIR)/xfractint.1
- 	chmod a+r $(MANDIR)/xfractint.1
- 
-diff -Naur xfractint-20.02p05-orig/memory.c xfractint-20.02p05/memory.c
---- xfractint-20.02p05-orig/memory.c	2003-02-13 04:01:23.000000000 +0100
-+++ xfractint-20.02p05/memory.c	2003-10-25 15:58:30.000000000 +0200
-@@ -1,12 +1,12 @@
- #include <string.h>
- #include <limits.h>
- #include <malloc.h>
--#ifndef XFRACT
--#include <io.h>
-+//#ifndef XFRACT
-+//#include <io.h>
- #include <stdarg.h>
--#else
--#include <varargs.h>
--#endif
-+//#else
-+//#include <varargs.h>
-+//#endif
- #include <ctype.h>
- 
- #include "port.h"
-diff -Naur xfractint-20.02p05-orig/miscovl.c xfractint-20.02p05/miscovl.c
---- xfractint-20.02p05-orig/miscovl.c	2003-03-25 02:51:13.000000000 +0100
-+++ xfractint-20.02p05/miscovl.c	2003-10-25 16:00:05.000000000 +0200
-@@ -5,14 +5,14 @@
- #include <string.h>
- #include <ctype.h>
- #include <time.h>
--#ifndef XFRACT
--#include <malloc.h>
--#include <process.h>
-+//#ifndef XFRACT
-+//#include <malloc.h>
-+//#include <process.h>
- #include <stdarg.h>
--#include <io.h>
--#else
--#include <varargs.h>
--#endif
-+//#include <io.h>
-+//#else
-+//#include <varargs.h>
-+//#endif
-   /* see Fractint.c for a description of the "include"  hierarchy */
- #include "port.h"
- #include "prototyp.h"
-@@ -24,12 +24,12 @@
- static void write_batch_parms(char *colorinf,int colorsonly, int maxcolor,int i, int j);
- static void expand_comments(char far *target, char far *source);
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- static void put_parm(char *parm,...);
--#else
--static void put_parm();
-+//#else
-+//static void put_parm();
- extern  int fake_lut;
--#endif
-+//#endif
- 
- static void put_parm_line(void);
- static int getprec(double,double,double);
-@@ -1200,24 +1200,24 @@
-       }
- }
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- static void put_parm(char *parm,...)
--#else
-+/*#else
- static void put_parm(va_alist)
- va_dcl
--#endif
-+#endif*/
- {
-    char *bufptr;
-    va_list args;
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(args,parm);
--#else
-+/*#else
-    char * parm;
- 
-    va_start(args);
-    parm = va_arg(args,char *);
--#endif
-+#endif*/
-    if (*parm == ' '             /* starting a new parm */
-      && wbdata->len == 0)       /* skip leading space */
-       ++parm;
-diff -Naur xfractint-20.02p05-orig/miscres.c xfractint-20.02p05/miscres.c
---- xfractint-20.02p05-orig/miscres.c	2003-02-13 04:01:23.000000000 +0100
-+++ xfractint-20.02p05/miscres.c	2003-10-25 16:00:20.000000000 +0200
-@@ -6,12 +6,12 @@
- #include <ctype.h>
- #include <time.h>
- #include <malloc.h>
--#ifndef XFRACT
-+//#ifndef XFRACT
- #include <stdarg.h>
--#include <io.h>
--#else
--#include <varargs.h>
--#endif
-+//#include <io.h>
-+//#else
-+//#include <varargs.h>
-+//#endif
- /*#ifdef __TURBOC__
- #include <dir.h>
- #endif  */
-diff -Naur xfractint-20.02p05-orig/printer.c xfractint-20.02p05/printer.c
---- xfractint-20.02p05-orig/printer.c	2003-02-13 04:01:23.000000000 +0100
-+++ xfractint-20.02p05/printer.c	2003-10-25 16:01:27.000000000 +0200
-@@ -87,12 +87,12 @@
- #include <sys/types.h>
- #include <errno.h>
- 
--#ifndef XFRACT
--#include <conio.h>
-+//#ifndef XFRACT
-+//#include <conio.h>
- #include <stdarg.h>
--#else
--#include <varargs.h>
--#endif
-+//#else
-+//#include <varargs.h>
-+//#endif
- 
- #include <string.h>
- 
-@@ -136,11 +136,11 @@
- 
- /********      PROTOTYPES     ********/
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- static void Printer_printf(char far *fmt,...);
--#else
--static void Printer_printf();
--#endif
-+//#else
-+//static void Printer_printf();
-+//#endif
- static int  _fastcall printer(int c);
- static void _fastcall print_title(int,int,char *);
- static void printer_reset(void);
-@@ -1339,25 +1339,25 @@
- 
- /* This function prints a string to the the printer with BIOS calls. */
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- static void Printer_printf(char far *fmt,...)
--#else
-+/*#else
- static void Printer_printf(va_alist)
- va_dcl
--#endif
-+#endif*/
- {
- int i;
- char s[500];
- int x=0;
- va_list arg;
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- va_start(arg,fmt);
--#else
-+/*#else
- char far *fmt;
- va_start(arg);
- fmt = va_arg(arg,char far *);
--#endif
-+#endif*/
- 
- {
-    /* copy far to near string */
-diff -Naur xfractint-20.02p05-orig/prompts1.c xfractint-20.02p05/prompts1.c
---- xfractint-20.02p05-orig/prompts1.c	2003-02-13 04:01:23.000000000 +0100
-+++ xfractint-20.02p05/prompts1.c	2003-10-25 16:02:09.000000000 +0200
-@@ -1980,8 +1980,7 @@
- /* subrtn of get_file_entry, separated so that storage gets freed up */
- {
- #ifdef XFRACT
--   static FCODE o_instr[]={"Press "FK_F6" to select different file, "FK_F2" for details,
--"FK_F4" to toggle sort "};
-+   static FCODE o_instr[]={"Press "FK_F6" to select different file, "FK_F2" for details, "FK_F4" to toggle sort "};
- /* keep the above split on two lines, the carriage return is needed to keep the
-    line length < 80 characters */
- #else
-diff -Naur xfractint-20.02p05-orig/prototyp.h xfractint-20.02p05/prototyp.h
---- xfractint-20.02p05-orig/prototyp.h	2003-03-25 02:25:51.000000000 +0100
-+++ xfractint-20.02p05/prototyp.h	2003-10-25 15:56:44.000000000 +0200
-@@ -370,13 +370,13 @@
- 
- extern void calcfracinit(void);
- extern void adjust_corner(void);
--#ifndef XFRACT
-+//#ifndef XFRACT
- extern int put_resume(int ,... );
- extern int get_resume(int ,... );
--#else
-+/*#else
- extern int put_resume();
- extern int get_resume();
--#endif
-+#endif*/
- extern int alloc_resume(int ,int );
- extern int start_resume(void);
- extern void end_resume(void);
-@@ -607,13 +607,13 @@
- extern int pot_line(BYTE *,int );
- extern int sound_line(BYTE *,int );
- extern int sound_line(unsigned char *pixels,int linelen);
--#ifndef XFRACT
-+//#ifndef XFRACT
- extern int timer(int,int (*subrtn)(),...);
--extern int _cdecl _matherr(struct exception *);
--#else
--extern int timer();
-+//extern int _cdecl _matherr(struct exception *);
-+//#else
-+//extern int timer();
- extern int XZoomWaiting;
--#endif
-+//#endif*/
- 
- 
- extern void clear_zoombox(void);
diff --git a/x11-misc/xfractint/files/xfractint-20.03p00.patch b/x11-misc/xfractint/files/xfractint-20.03p00.patch
deleted file mode 100644
index 0dfb154f876d..000000000000
--- a/x11-misc/xfractint/files/xfractint-20.03p00.patch
+++ /dev/null
@@ -1,560 +0,0 @@
-diff -Naur xfract-fo-20.03p00-orig/editpal.c xfract-fo-20.03p00/editpal.c
---- xfract-fo-20.03p00-orig/editpal.c	2004-01-11 13:56:33.000000000 +0100
-+++ xfract-fo-20.03p00/editpal.c	2004-02-02 20:04:39.848745200 +0100
-@@ -114,11 +114,11 @@
- #endif
- 
- #include <string.h>
--#ifndef XFRACT
-+//#ifndef XFRACT
- #include <stdarg.h>
--#else
--#include <varargs.h>
--#endif
-+//#else
-+//#include <varargs.h>
-+//#endif
- 
- #ifdef __TURBOC__
- #   include <mem.h>   /* to get mem...() declarations */
-@@ -410,21 +410,21 @@
-    }
- 
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- static void displayf(int x, int y, int fg, int bg, char *format, ...)
--#else
-+/*#else
- static void displayf(va_alist)
- va_dcl
--#endif
-+#endif*/
-    {
-    char buff[81];
-    int  ctr;
- 
-    va_list arg_list;
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg_list, format);
--#else
-+/*#else
-    int x,y,fg,bg;
-    char *format;
- 
-@@ -434,7 +434,7 @@
-    fg = va_arg(arg_list,int);
-    bg = va_arg(arg_list,int);
-    format = va_arg(arg_list,char *);
--#endif
-+#endif*/
-    vsprintf(buff, format, arg_list);
-    va_end(arg_list);
- 
-diff -Naur xfract-fo-20.03p00-orig/fracsubr.c xfract-fo-20.03p00/fracsubr.c
---- xfract-fo-20.03p00-orig/fracsubr.c	2004-01-11 13:56:33.000000000 +0100
-+++ xfract-fo-20.03p00/fracsubr.c	2004-02-02 20:07:49.061980416 +0100
-@@ -3,9 +3,9 @@
- FRACTALS.C, i.e. which are non-fractal-specific fractal engine subroutines.
- */
- 
--#ifndef XFRACT
--#include <sys/timeb.h>
--#endif
-+//#ifndef XFRACT
-+//#include <sys/timeb.h>
-+//#endif
- #include <stdarg.h>
- #include <sys/types.h>
- #include <time.h>
-diff -Naur xfract-fo-20.03p00-orig/fractint.c xfract-fo-20.03p00/fractint.c
---- xfract-fo-20.03p00-orig/fractint.c	2004-01-11 13:56:33.000000000 +0100
-+++ xfract-fo-20.03p00/fractint.c	2004-02-02 20:04:39.879740488 +0100
-@@ -6,12 +6,12 @@
- #include <string.h>
- #include <time.h>
- #include <signal.h>
--#ifndef XFRACT
--#include <io.h>
-+//#ifndef XFRACT
-+//#include <io.h>
- #include <stdarg.h>
--#else
--#include <varargs.h>
--#endif
-+//#else
-+//#include <varargs.h>
-+//#endif
- #include <ctype.h>
- 
-   /* #include hierarchy for fractint is a follows:
-@@ -531,12 +531,12 @@
-      timer(1,NULL,int width)            decoder
-      timer(2)                           encoder
-   */
--#ifndef XFRACT
-+//#ifndef XFRACT
- int timer(int timertype,int(*subrtn)(),...)
--#else
-+/*#else
- int timer(va_alist)
- va_dcl
--#endif
-+#endif*/
- {
-    va_list arg_marker;  /* variable arg list */
-    char *timestring;
-@@ -546,15 +546,15 @@
-    int i;
-    int do_bench;
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg_marker,subrtn);
--#else
-+/*#else
-    int timertype;
-    int (*subrtn)();
-    va_start(arg_marker);
-    timertype = va_arg(arg_marker, int);
-    subrtn = (int (*)())va_arg(arg_marker, int *);
--#endif
-+#endif*/
- 
-    do_bench = timerflag; /* record time? */
-    if (timertype == 2)   /* encoder, record time only if debug=200 */
-diff -Naur xfract-fo-20.03p00-orig/framain2.c xfract-fo-20.03p00/framain2.c
---- xfract-fo-20.03p00-orig/framain2.c	2004-01-11 13:56:33.000000000 +0100
-+++ xfract-fo-20.03p00/framain2.c	2004-02-02 20:04:39.905736536 +0100
-@@ -1,11 +1,11 @@
- #include <string.h>
- #include <time.h>
--#ifndef XFRACT
--#include <io.h>
-+//#ifndef XFRACT
-+//#include <io.h>
- #include <stdarg.h>
--#else
--#include <varargs.h>
--#endif
-+//#else
-+//#include <varargs.h>
-+//#endif
- #include <ctype.h>
-   /* see Fractint.c for a description of the "include"  hierarchy */
- #include "port.h"
-diff -Naur xfract-fo-20.03p00-orig/hc.c xfract-fo-20.03p00/hc.c
---- xfract-fo-20.03p00-orig/hc.c	2004-01-11 13:56:33.000000000 +0100
-+++ xfract-fo-20.03p00/hc.c	2004-02-02 20:04:39.924733648 +0100
-@@ -56,7 +56,7 @@
- #include <io.h>
- #include <stdarg.h>
- #else
--#include <varargs.h>
-+#include <stdarg.h>
- #define strupr strlwr
- #endif
- #include <fcntl.h>
-@@ -301,24 +301,25 @@
-    }
- 
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- void fatal(int diff, char *format, ...)
--#else
--void fatal(va_alist)
--    va_dcl
--#endif
-+//#else
-+//void fatal(va_alist)
-+//    va_dcl
-+//#endif
-    {
-    va_list arg;
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg, format);
--#else
-+/*#else
-    int diff;
-    char *format;
--   va_start(arg);
-+   va_start(arg, format);
-    diff = va_arg(arg,int);
-    format = va_arg(arg,char *);
- #endif
-+*/
- 
-    print_msg("Fatal", srcline-diff, format, arg);
-    va_end(arg);
-@@ -330,24 +331,25 @@
-    }
- 
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- void error(int diff, char *format, ...)
--#else
--void error(va_alist)
--    va_dcl
--#endif
-+//#else
-+//void error(int diff, char *format, ...)
-+//void error(va_alist)
-+//    va_dcl
-+//#endif
-    {
-    va_list arg;
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg, format);
--#else
--   int diff;
-+//#else
-+/*   int diff;
-    char *format;
-    va_start(arg);
-    diff = va_arg(arg,int);
-    format = va_arg(arg,char *);
--#endif
-+#endif*/
-    print_msg("Error", srcline-diff, format, arg);
-    va_end(arg);
- 
-@@ -356,23 +358,23 @@
-    }
- 
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- void warn(int diff, char *format, ...)
--#else
-+/*#else
- void warn(va_alist)
-    va_dcl
--#endif
-+#endif*/
-    {
-    va_list arg;
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg, format);
--#else
-+/*#else
-    int diff;
-    char *format;
-    va_start(arg);
-    diff = va_arg(arg, int);
-    format = va_arg(arg, char *);
--#endif
-+#endif*/
-    print_msg("Warning", srcline-diff, format, arg);
-    va_end(arg);
- 
-@@ -381,47 +383,47 @@
-    }
- 
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- void notice(char *format, ...)
--#else
-+/*#else
- void notice(va_alist)
-     va_dcl
--#endif
-+#endif*/
-    {
-    va_list arg;
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg, format);
--#else
-+/*#else
-    char *format;
- 
-    va_start(arg);
-    format = va_arg(arg,char *);
--#endif
-+#endif*/
-    print_msg("Note", srcline, format, arg);
-    va_end(arg);
-    }
- 
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- void msg(char *format, ...)
--#else
-+/*#else
- void msg(va_alist)
- va_dcl
--#endif
-+#endif*/
-    {
-    va_list arg;
--#ifdef XFRACT
-+/*#ifdef XFRACT
-    char *format;
--#endif
-+#endif*/
- 
-    if (quiet_mode)
-       return;
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(arg, format);
--#else
-+/*#else
-    va_start(arg);
-    format = va_arg(arg,char *);
--#endif
-+#endif*/
-    print_msg(NULL, 0, format, arg);
-    va_end(arg);
-    }
-diff -Naur xfract-fo-20.03p00-orig/jiim.c xfract-fo-20.03p00/jiim.c
---- xfract-fo-20.03p00-orig/jiim.c	2004-01-11 13:56:33.000000000 +0100
-+++ xfract-fo-20.03p00/jiim.c	2004-02-02 20:04:39.954729088 +0100
-@@ -40,11 +40,11 @@
- 
- #include <string.h>
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- #include <stdarg.h>
--#else
-+/*#else
- #include <varargs.h>
--#endif
-+#endif*/
- 
- #ifdef __TURBOC__
- #   include <mem.h>   /* to get mem...() declarations */
-diff -Naur xfract-fo-20.03p00-orig/Makefile xfract-fo-20.03p00/Makefile
---- xfract-fo-20.03p00-orig/Makefile	2003-03-29 18:51:27.000000000 +0100
-+++ xfract-fo-20.03p00/Makefile	2004-02-02 20:04:39.962727872 +0100
-@@ -213,8 +213,11 @@
- 	cp xfractint $(BINDIR)/xfractint
- 	strip $(BINDIR)/xfractint
- 	chmod a+x $(BINDIR)/xfractint
--	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) ./maps/$(MAPFILES) $(SRCDIR)
--	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) )
-+	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(SRCDIR)
-+	mkdir $(SRCDIR)/maps
-+	(cd maps; cp $(MAPFILES) $(SRCDIR)/maps )	
-+	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) )
-+	(cd $(SRCDIR)/maps; chmod a+r $(MAPFILES) )
- 	cp xfractint.man $(MANDIR)/xfractint.1
- 	chmod a+r $(MANDIR)/xfractint.1
- 
-diff -Naur xfract-fo-20.03p00-orig/memory.c xfract-fo-20.03p00/memory.c
---- xfract-fo-20.03p00-orig/memory.c	2004-01-11 13:56:33.000000000 +0100
-+++ xfract-fo-20.03p00/memory.c	2004-02-02 20:04:39.965727416 +0100
-@@ -1,12 +1,12 @@
- #include <string.h>
- #include <limits.h>
- #include <malloc.h>
--#ifndef XFRACT
--#include <io.h>
-+//#ifndef XFRACT
-+//#include <io.h>
- #include <stdarg.h>
--#else
--#include <varargs.h>
--#endif
-+//#else
-+//#include <varargs.h>
-+//#endif
- #include <ctype.h>
- 
- #include "port.h"
-diff -Naur xfract-fo-20.03p00-orig/miscovl.c xfract-fo-20.03p00/miscovl.c
---- xfract-fo-20.03p00-orig/miscovl.c	2004-01-11 13:56:33.000000000 +0100
-+++ xfract-fo-20.03p00/miscovl.c	2004-02-02 20:06:05.635703600 +0100
-@@ -5,14 +5,14 @@
- #include <string.h>
- #include <ctype.h>
- #include <time.h>
--#ifndef XFRACT
--#include <malloc.h>
--#include <process.h>
-+//#ifndef XFRACT
-+//#include <malloc.h>
-+//#include <process.h>
- #include <stdarg.h>
--#include <io.h>
--#else
--#include <varargs.h>
--#endif
-+//#include <io.h>
-+//#else
-+//#include <varargs.h>
-+//#endif
-   /* see Fractint.c for a description of the "include"  hierarchy */
- #include "port.h"
- #include "prototyp.h"
-@@ -24,11 +24,11 @@
- static void write_batch_parms(char *colorinf,int colorsonly, int maxcolor,int i, int j);
- static void expand_comments(char far *target, char far *source);
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- static void put_parm(char *parm,...);
--#else
--static void put_parm();
--#endif
-+//#else
-+//static void put_parm();
-+//#endif
- 
- static void put_parm_line(void);
- static int getprec(double,double,double);
-@@ -1193,24 +1193,24 @@
-       }
- }
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- static void put_parm(char *parm,...)
--#else
-+/*#else
- static void put_parm(va_alist)
- va_dcl
--#endif
-+#endif*/
- {
-    char *bufptr;
-    va_list args;
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
-    va_start(args,parm);
--#else
-+/*#else
-    char * parm;
- 
-    va_start(args);
-    parm = va_arg(args,char *);
--#endif
-+#endif*/
-    if (*parm == ' '             /* starting a new parm */
-      && wbdata->len == 0)       /* skip leading space */
-       ++parm;
-diff -Naur xfract-fo-20.03p00-orig/miscres.c xfract-fo-20.03p00/miscres.c
---- xfract-fo-20.03p00-orig/miscres.c	2004-01-11 13:56:33.000000000 +0100
-+++ xfract-fo-20.03p00/miscres.c	2004-02-02 20:04:39.979725288 +0100
-@@ -6,12 +6,12 @@
- #include <ctype.h>
- #include <time.h>
- #include <malloc.h>
--#ifndef XFRACT
-+//#ifndef XFRACT
- #include <stdarg.h>
--#include <io.h>
--#else
--#include <varargs.h>
--#endif
-+//#include <io.h>
-+//#else
-+//#include <varargs.h>
-+//#endif
- /*#ifdef __TURBOC__
- #include <dir.h>
- #endif  */
-diff -Naur xfract-fo-20.03p00-orig/printer.c xfract-fo-20.03p00/printer.c
---- xfract-fo-20.03p00-orig/printer.c	2004-01-11 13:56:33.000000000 +0100
-+++ xfract-fo-20.03p00/printer.c	2004-02-02 20:04:40.021718904 +0100
-@@ -87,12 +87,12 @@
- #include <sys/types.h>
- #include <errno.h>
- 
--#ifndef XFRACT
--#include <conio.h>
-+//#ifndef XFRACT
-+//#include <conio.h>
- #include <stdarg.h>
--#else
--#include <varargs.h>
--#endif
-+//#else
-+//#include <varargs.h>
-+//#endif
- 
- #include <string.h>
- 
-@@ -136,11 +136,11 @@
- 
- /********      PROTOTYPES     ********/
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- static void Printer_printf(char far *fmt,...);
--#else
--static void Printer_printf();
--#endif
-+//#else
-+//static void Printer_printf();
-+//#endif
- static int  _fastcall printer(int c);
- static void _fastcall print_title(int,int,char *);
- static void printer_reset(void);
-@@ -1335,25 +1335,25 @@
- 
- /* This function prints a string to the the printer with BIOS calls. */
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- static void Printer_printf(char far *fmt,...)
--#else
-+/*#else
- static void Printer_printf(va_alist)
- va_dcl
--#endif
-+#endif*/
- {
- int i;
- char s[500];
- int x=0;
- va_list arg;
- 
--#ifndef XFRACT
-+//#ifndef XFRACT
- va_start(arg,fmt);
--#else
-+/*#else
- char far *fmt;
- va_start(arg);
- fmt = va_arg(arg,char far *);
--#endif
-+#endif*/
- 
- {
-    /* copy far to near string */
-diff -Naur xfract-fo-20.03p00-orig/prototyp.h xfract-fo-20.03p00/prototyp.h
---- xfract-fo-20.03p00-orig/prototyp.h	2004-01-11 13:52:36.000000000 +0100
-+++ xfract-fo-20.03p00/prototyp.h	2004-02-02 20:04:40.073711000 +0100
-@@ -558,13 +558,13 @@
- extern int pot_line(BYTE *,int );
- extern int sound_line(BYTE *,int );
- extern int sound_line(unsigned char *pixels,int linelen);
--#ifndef XFRACT
-+//#ifndef XFRACT
- extern int timer(int,int (*subrtn)(),...);
--extern int _cdecl _matherr(struct exception *);
--#else
--extern int timer();
-+//extern int _cdecl _matherr(struct exception *);
-+//#else
-+//extern int timer();
- extern int XZoomWaiting;
--#endif
-+//#endif*/
- 
- 
- extern void clear_zoombox(void);
diff --git a/x11-misc/xfractint/files/xfractint-20.03p01-make.patch b/x11-misc/xfractint/files/xfractint-20.03p01-make.patch
deleted file mode 100644
index 0a151207dd48..000000000000
--- a/x11-misc/xfractint/files/xfractint-20.03p01-make.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur xfractint-20.03p01-orig/Makefile xfractint-20.03p01/Makefile
---- xfractint-20.03p01-orig/Makefile	2004-02-08 15:24:31.000000000 +0100
-+++ xfractint-20.03p01/Makefile	2004-04-25 16:05:41.501995544 +0200
-@@ -224,8 +224,11 @@
- 	cp xfractint $(BINDIR)/xfractint
- 	strip $(BINDIR)/xfractint
- 	chmod a+x $(BINDIR)/xfractint
--	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) ./maps/$(MAPFILES) $(SRCDIR)
--	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) )
-+	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(SRCDIR)
-+	mkdir $(SRCDIR)/maps
-+	(cd maps; cp $(MAPFILES) $(SRCDIR)/maps )	
-+	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) )
-+	(cd $(SRCDIR)/maps; chmod a+r $(MAPFILES) )
- 	cp xfractint.man $(MANDIR)/xfractint.1
- 	chmod a+r $(MANDIR)/xfractint.1
- 
diff --git a/x11-misc/xfractint/files/xfractint-20.04_p07-Makefile.patch b/x11-misc/xfractint/files/xfractint-20.04_p07-Makefile.patch
new file mode 100644
index 000000000000..0b51a976ef30
--- /dev/null
+++ b/x11-misc/xfractint/files/xfractint-20.04_p07-Makefile.patch
@@ -0,0 +1,118 @@
+diff -ur xfractint-20.04p07.orig/Makefile xfractint-20.04p07/Makefile
+--- xfractint-20.04p07.orig/Makefile	2007-11-18 20:44:40.000000000 +0200
++++ xfractint-20.04p07/Makefile	2007-12-27 22:14:58.000000000 +0200
+@@ -4,7 +4,7 @@
+ # SRCDIR should also hold the .par, .frm, etc. files
+ SRCDIR = /usr/share/xfractint
+ # BINDIR is where you put your X11 binaries
+-BINDIR = /usr/X11R6/bin
++BINDIR = /usr/bin
+ # MANDIR is where you put your chapter 1 man pages
+ MANDIR = /usr/share/man/man1
+ 
+@@ -90,15 +90,13 @@
+ ifeq ($(AS),/usr/bin/nasm)
+ 
+ #CFLAGS = -I. -D_CONST $(DEFINES)
+-CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -O2 \
+-         -march=pentium -DNASM -fno-builtin
++CFLAGS += -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin
+ #         -march=athlon64 -DNASM -fno-builtin
+ #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -DNASM -fno-builtin
+ 
+ else
+ 
+-CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -O2 \
+-         -march=pentium -fno-builtin
++CFLAGS += -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -fno-builtin
+ #         -march=athlon64 -fno-builtin
+ #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -fno-builtin
+ 
+@@ -121,7 +119,7 @@
+ # if you get undefined symbols like "w32addch".
+ # For Linux, use
+ #LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses
+-LIBS = -L/usr/X11R6/lib -lX11 -lm -lncurses
++LIBS = -L/usr/lib -lX11 -lm -lncurses
+ #LIBS = -L/usr/X11R6/lib64 -lX11 -lm -lncurses
+ #LIBS = -lX11 -lm -lcurses
+ 
+@@ -261,38 +259,38 @@
+ 	cd $(UDIR) ; ${MAKE} clean
+ 
+ install: xfractint fractint.hlp
+-	strip xfractint
+-# only next 6 lines might need su
+-	sudo cp xfractint $(BINDIR)/xfractint;
+-	sudo chmod a+x $(BINDIR)/xfractint;
+-	sudo cp $(UDIR)/xfractint.man $(MANDIR)/xfractint.1;
+-	sudo chmod a+r $(MANDIR)/xfractint.1
+-	if [ ! -d $(SRCDIR) ] ; then sudo mkdir $(SRCDIR) ; fi
+-	cd $(SRCDIR); cd ..; sudo chmod -R a+rw $(SRCDIR)
+ # create directories if they don't exist
+-	if [ ! -d $(SRCDIR)/$(PDIR) ] ; then mkdir $(SRCDIR)/$(PDIR) ; fi
+-	if [ ! -d $(SRCDIR)/$(FDIR) ] ; then mkdir $(SRCDIR)/$(FDIR) ; fi
+-	if [ ! -d $(SRCDIR)/$(IDIR) ] ; then mkdir $(SRCDIR)/$(IDIR) ; fi
+-	if [ ! -d $(SRCDIR)/$(LDIR) ] ; then mkdir $(SRCDIR)/$(LDIR) ; fi
+-	if [ ! -d $(SRCDIR)/$(MDIR) ] ; then mkdir $(SRCDIR)/$(MDIR) ; fi
+-	if [ ! -d $(SRCDIR)/$(XDIR) ] ; then mkdir $(SRCDIR)/$(XDIR) ; fi
++	if [ ! -d $(DESTDIR)$(SRCDIR)/$(PDIR) ] ; then mkdir -p $(DESTDIR)$(BINDIR) ; fi
++	if [ ! -d $(DESTDIR)$(SRCDIR)/$(PDIR) ] ; then mkdir -p $(DESTDIR)$(MANDIR) ; fi
++	if [ ! -d $(DESTDIR)$(SRCDIR)/$(PDIR) ] ; then mkdir -p $(DESTDIR)$(SRCDIR) ; fi
++	if [ ! -d $(DESTDIR)$(SRCDIR)/$(PDIR) ] ; then mkdir -p $(DESTDIR)$(SRCDIR)/$(PDIR) ; fi
++	if [ ! -d $(DESTDIR)$(SRCDIR)/$(FDIR) ] ; then mkdir -p $(DESTDIR)$(SRCDIR)/$(FDIR) ; fi
++	if [ ! -d $(DESTDIR)$(SRCDIR)/$(IDIR) ] ; then mkdir -p $(DESTDIR)$(SRCDIR)/$(IDIR) ; fi
++	if [ ! -d $(DESTDIR)$(SRCDIR)/$(LDIR) ] ; then mkdir -p $(DESTDIR)$(SRCDIR)/$(LDIR) ; fi
++	if [ ! -d $(DESTDIR)$(SRCDIR)/$(MDIR) ] ; then mkdir -p $(DESTDIR)$(SRCDIR)/$(MDIR) ; fi
++	if [ ! -d $(DESTDIR)$(SRCDIR)/$(XDIR) ] ; then mkdir -p $(DESTDIR)$(SRCDIR)/$(XDIR) ; fi
+ # copy all the files to the appropriate directories
+-	cp fractint.hlp sstools.ini $(DOCS) $(SRCDIR)
+-	cd ./$(PDIR); cp $(PARFILES) $(SRCDIR)/$(PDIR)
+-	cd ./$(FDIR); cp $(FRMFILES) $(SRCDIR)/$(FDIR)
+-	cd ./$(IDIR); cp $(IFSFILES) $(SRCDIR)/$(IDIR)
+-	cd ./$(LDIR); cp $(LFILES) $(SRCDIR)/$(LDIR)
+-	cd ./$(MDIR); cp $(MAPFILES) $(SRCDIR)/$(MDIR)
+-	cd ./$(XDIR); cp $(XTRAFILES) $(SRCDIR)/$(XDIR)
++	cp xfractint $(DESTDIR)$(BINDIR)/xfractint;
++	cp $(UDIR)/xfractint.man $(DESTDIR)$(MANDIR)/xfractint.1;
++	cp fractint.hlp sstools.ini $(DOCS) $(DESTDIR)$(SRCDIR)
++	cd ./$(PDIR); cp $(PARFILES) $(DESTDIR)$(SRCDIR)/$(PDIR)
++	cd ./$(FDIR); cp $(FRMFILES) $(DESTDIR)$(SRCDIR)/$(FDIR)
++	cd ./$(IDIR); cp $(IFSFILES) $(DESTDIR)$(SRCDIR)/$(IDIR)
++	cd ./$(LDIR); cp $(LFILES) $(DESTDIR)$(SRCDIR)/$(LDIR)
++	cd ./$(MDIR); cp $(MAPFILES) $(DESTDIR)$(SRCDIR)/$(MDIR)
++	cd ./$(XDIR); cp $(XTRAFILES) $(DESTDIR)$(SRCDIR)/$(XDIR)
+ # set permissions
+-	cd $(SRCDIR); chmod a+r fractint.hlp
+-	cd $(SRCDIR); chmod a+rw sstools.ini
+-	cd $(SRCDIR)/$(PDIR); chmod a+rw $(PARFILES)
+-	cd $(SRCDIR)/$(FDIR); chmod a+rw $(FRMFILES)
+-	cd $(SRCDIR)/$(IDIR); chmod a+rw $(IFSFILES)
+-	cd $(SRCDIR)/$(LDIR); chmod a+rw $(LFILES)
+-	cd $(SRCDIR)/$(MDIR); chmod a+rw $(MAPFILES)
+-	cd $(SRCDIR)/$(XDIR); chmod a+rw $(XTRAFILES)
++	cd $(DESTDIR)$(SRCDIR); chmod -R 755 $(DESTDIR)$(SRCDIR)
++	chmod 755 $(DESTDIR)$(BINDIR)/xfractint
++	chmod 644 $(DESTDIR)$(MANDIR)/xfractint.1
++	cd $(DESTDIR)$(SRCDIR); chmod 644 fractint.hlp
++	cd $(DESTDIR)$(SRCDIR); chmod 644 sstools.ini
++	cd $(DESTDIR)$(SRCDIR)/$(PDIR); chmod 644 $(PARFILES)
++	cd $(DESTDIR)$(SRCDIR)/$(FDIR); chmod 644 $(FRMFILES)
++	cd $(DESTDIR)$(SRCDIR)/$(IDIR); chmod 644 $(IFSFILES)
++	cd $(DESTDIR)$(SRCDIR)/$(LDIR); chmod 644 $(LFILES)
++	cd $(DESTDIR)$(SRCDIR)/$(MDIR); chmod 644 $(MAPFILES)
++	cd $(DESTDIR)$(SRCDIR)/$(XDIR); chmod 644 $(XTRAFILES)
+ 
+ uninstall:
+ 	cd $(SRCDIR)/$(PDIR); rm -f $(PARFILES)
+@@ -304,8 +302,8 @@
+ 	cd $(SRCDIR); rm -f fractint.hlp sstools.ini $(DOCS)
+ 	cd $(SRCDIR); rmdir $(PDIR) $(FDIR) $(IDIR) $(LDIR) $(MDIR) $(XDIR)
+ # only next 2 lines might need su
+-	cd $(SRCDIR); cd ..; sudo rmdir $(SRCDIR)
+-	sudo rm -f $(BINDIR)/xfractint $(MANDIR)/xfractint.1
++	cd $(SRCDIR); cd ..; rmdir $(SRCDIR)
++	rm -f $(BINDIR)/xfractint $(MANDIR)/xfractint.1
+ 
+ fractint.hlp: hc $(DOSHELPDIR)/$(HELP)
+ 	cd $(DOSHELPDIR); ../hc /c; mv fractint.hlp ..
diff --git a/x11-misc/xfractint/xfractint-20.4.03.ebuild b/x11-misc/xfractint/xfractint-20.04_p03.ebuild
index 426ac3663a1f..9604d6eb1e58 100644
--- a/x11-misc/xfractint/xfractint-20.4.03.ebuild
+++ b/x11-misc/xfractint/xfractint-20.04_p03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.4.03.ebuild,v 1.9 2007/07/22 03:21:47 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.04_p03.ebuild,v 1.1 2007/12/27 20:42:56 drac Exp $
 
 inherit eutils flag-o-matic
 
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${PN}-20.4.03-makefile.patch
 }
 
 src_compile() {
diff --git a/x11-misc/xfractint/xfractint-20.04_p07.ebuild b/x11-misc/xfractint/xfractint-20.04_p07.ebuild
new file mode 100644
index 000000000000..b30c912a2209
--- /dev/null
+++ b/x11-misc/xfractint/xfractint-20.04_p07.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.04_p07.ebuild,v 1.1 2007/12/27 20:42:56 drac Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P=${P/_}
+
+DESCRIPTION="a fractal generator"
+HOMEPAGE="http://www.fractint.org"
+SRC_URI="http://www.fractint.org/ftp/current/linux/${MY_P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+#	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+	# Untested, any x86 archteam dev. is allowed to uncomment this.
+	local myasm="foo"
+#	use x86 && myasm="/usr/bin/nasm"
+	emake CC="$(tc-getCC)" AS="${myasm}" || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	newenvd "${FILESDIR}"/xfractint.envd 60xfractint
+}
+
+pkg_postinst() {
+	elog "XFractInt requires the FRACTDIR variable to be set in order to start."
+	elog "Please re-login or \`source /etc/profile\` to have this variable set."
+}
diff --git a/x11-misc/xfractint/xfractint-20.3.01.ebuild b/x11-misc/xfractint/xfractint-20.3.01.ebuild
deleted file mode 100644
index 6675a1074ef0..000000000000
--- a/x11-misc/xfractint/xfractint-20.3.01.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.3.01.ebuild,v 1.16 2007/07/22 03:21:47 dberkholz Exp $
-
-inherit eutils flag-o-matic
-
-MY_P=xfractint-20.03p01
-
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="The best fractal generator for X."
-HOMEPAGE="http://www.fractint.org"
-SRC_URI="http://dev.gentoo.org/~spock/portage/distfiles/${MY_P}.tar.bz2"
-
-KEYWORDS="x86 sparc ~ppc ~amd64"
-SLOT="0"
-LICENSE="freedist"
-IUSE=""
-
-RDEPEND="virtual/libc
-	>=sys-libs/ncurses-5.1
-	x11-libs/libX11"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${MY_P}-make.patch
-}
-
-src_compile() {
-	cd ${S}
-	cp Makefile Makefile.orig
-	replace-flags "-funroll-all-loops" "-funroll-loops"
-	sed -e "s:CFLAGS = :CFLAGS = $CFLAGS :" Makefile.orig >Makefile
-
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/xfractint
-	dodir /usr/man/man1
-
-	make \
-		BINDIR=${D}usr/bin \
-		MANDIR=${D}usr/man/man1 \
-		SRCDIR=${D}usr/share/xfractint \
-		install || die
-
-	newenvd ${FILESDIR}/xfractint.envd 60xfractint
-}
-
-pkg_postinst() {
-	einfo
-	einfo "XFractInt requires the FRACTDIR variable to be set in order to start."
-	einfo "Please re-login or \`source /etc/profile\` to have this variable set automatically."
-	einfo
-}
diff --git a/x11-misc/xfractint/xfractint-20.3.02.ebuild b/x11-misc/xfractint/xfractint-20.3.02.ebuild
deleted file mode 100644
index 9b1ef3bfdec6..000000000000
--- a/x11-misc/xfractint/xfractint-20.3.02.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.3.02.ebuild,v 1.11 2007/07/22 03:21:47 dberkholz Exp $
-
-inherit eutils flag-o-matic
-
-MY_P=xfractint-20.03p02
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="The best fractal generator for X."
-HOMEPAGE="http://www.fractint.org"
-SRC_URI="http://www.fractint.org/ftp/current/linux/${P/int-/}.tar.gz"
-
-KEYWORDS="x86 sparc ~ppc ~amd64"
-SLOT="0"
-LICENSE="freedist"
-IUSE=""
-
-RDEPEND="virtual/libc
-	>=sys-libs/ncurses-5.1
-	x11-libs/libX11"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-20.03p01-make.patch
-}
-
-src_compile() {
-	cd ${S}
-	cp Makefile Makefile.orig
-	replace-flags "-funroll-all-loops" "-funroll-loops"
-	sed -e "s:CFLAGS = :CFLAGS = $CFLAGS :" Makefile.orig >Makefile
-
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/xfractint
-	dodir /usr/man/man1
-
-	make \
-		BINDIR=${D}usr/bin \
-		MANDIR=${D}usr/man/man1 \
-		SRCDIR=${D}usr/share/xfractint \
-		install || die
-
-	newenvd ${FILESDIR}/xfractint.envd 60xfractint
-}
-
-pkg_postinst() {
-	einfo
-	einfo "XFractInt requires the FRACTDIR variable to be set in order to start."
-	einfo "Please re-login or \`source /etc/profile\` to have this variable set automatically."
-	einfo
-}
diff --git a/x11-misc/xfractint/xfractint-20.4.00.ebuild b/x11-misc/xfractint/xfractint-20.4.00.ebuild
deleted file mode 100644
index 92c951836a51..000000000000
--- a/x11-misc/xfractint/xfractint-20.4.00.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/xfractint-20.4.00.ebuild,v 1.8 2007/07/22 03:21:47 dberkholz Exp $
-
-inherit eutils flag-o-matic
-
-MY_P=xfractint-20.04p00
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="The best fractal generator for X."
-HOMEPAGE="http://www.fractint.org"
-SRC_URI="http://www.fractint.org/ftp/current/linux/${P/int-/}.tar.gz"
-
-KEYWORDS="amd64 ppc sparc x86"
-SLOT="0"
-LICENSE="freedist"
-IUSE=""
-
-RDEPEND="virtual/libc
-	>=sys-libs/ncurses-5.1
-	x11-libs/libX11"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-20.03p01-make.patch
-}
-
-src_compile() {
-	cd ${S}
-	cp Makefile Makefile.orig
-	replace-flags "-funroll-all-loops" "-funroll-loops"
-	sed -e "s:CFLAGS = :CFLAGS = $CFLAGS :" Makefile.orig >Makefile
-
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/xfractint
-	dodir /usr/man/man1
-
-	make \
-		BINDIR=${D}usr/bin \
-		MANDIR=${D}usr/man/man1 \
-		SRCDIR=${D}usr/share/xfractint \
-		install || die
-
-	newenvd ${FILESDIR}/xfractint.envd 60xfractint
-}
-
-pkg_postinst() {
-	einfo
-	einfo "XFractInt requires the FRACTDIR variable to be set in order to start."
-	einfo "Please re-login or \`source /etc/profile\` to have this variable set automatically."
-	einfo
-}