diff options
Diffstat (limited to 'x11-misc/xfractint')
| -rw-r--r-- | x11-misc/xfractint/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/xfractint/Manifest | 22 | ||||
| -rw-r--r-- | x11-misc/xfractint/files/xfractint-20.04_p07-Makefile.patch | 118 | ||||
| -rw-r--r-- | x11-misc/xfractint/files/xfractint-20.04p07-filename-buffer-overflow-fix.patch | 117 | ||||
| -rw-r--r-- | x11-misc/xfractint/files/xfractint-20.04p07-xioerror.patch | 50 | ||||
| -rw-r--r-- | x11-misc/xfractint/files/xfractint-20.04p08-Makefile.patch | 75 | ||||
| -rw-r--r-- | x11-misc/xfractint/xfractint-20.04_p07.ebuild | 47 |
7 files changed, 18 insertions, 420 deletions
diff --git a/x11-misc/xfractint/ChangeLog b/x11-misc/xfractint/ChangeLog index 5947bf0d8e51..bd0e5ea00493 100644 --- a/x11-misc/xfractint/ChangeLog +++ b/x11-misc/xfractint/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-misc/xfractint # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.62 2012/08/27 18:01:08 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfractint/ChangeLog,v 1.63 2012/08/29 13:32:29 kensington Exp $ + + 29 Aug 2012; Michael Palimaka <kensington@gentoo.org> + -files/xfractint-20.04_p07-Makefile.patch, + -files/xfractint-20.04p07-filename-buffer-overflow-fix.patch, + -files/xfractint-20.04p07-xioerror.patch, + -files/xfractint-20.04p08-Makefile.patch, -xfractint-20.04_p07.ebuild: + Remove old. 27 Aug 2012; Raúl Porcel <armin76@gentoo.org> xfractint-20.04_p07.ebuild, xfractint-20.04_p12.ebuild: diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest index 8be167b2c5ea..5715ea472030 100644 --- a/x11-misc/xfractint/Manifest +++ b/x11-misc/xfractint/Manifest @@ -1,22 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -AUX xfractint-20.04_p07-Makefile.patch 5492 SHA256 fe0d347d3faa45daa0c64315c71f5351d5b8674f1a0d142c48ac63e910895b8c SHA512 b5762da920cd7b96dc42a6099d857624671b36fd6cc2b171d505a95a49432ec1fe72eaa88056e908858b5f163ceefbfed648fda42294c27981ffc83a3e8ab958 WHIRLPOOL ca9842eefa409f62d1a91b3429571727cd25ed93f8b6c1da6dfeda252bdeef21a6d314b683f84be51806ebab0983b64e36e80db2686aa6f5f226d0fc4eb11a0f -AUX xfractint-20.04p07-filename-buffer-overflow-fix.patch 4695 SHA256 5cd6dd38f15eb32e6a10743a5043b256647356998fb8b24ff7e4e997026db7be SHA512 83b0b7d282cc085db4a762930f798220e3e71412e475c6ef724bcdf7045e8f8aee8375c0cfd3924c451880c1391033d2f5c81af58d1b8fa3e7ff510fb2955ece WHIRLPOOL 4977569f04ceda71debf53ab3033520c1defe55ef15bd299567914fe4b98fcbf7cb92095eef81c9e81191111fdec1d60ad9ad9f3fc4acc735497fca184aa5088 -AUX xfractint-20.04p07-xioerror.patch 1435 SHA256 0bc72fee9d4ab1444c88290a5f5318d4c9c1b0c52aaf0cf858e637b47c250858 SHA512 f7397851943bcb2f1e7ea8dcc195cd436dc5e8a27b39e66155fa6ab9a2d4f1e955a3d8da333e7ba1ad052857dbe9b01f451ef5d6511bc88fb636819340f3d6ab WHIRLPOOL 4909f5c372678f981b2e82acba78840fbb057a4d8168b8c02454e67cf74e57a60ce69e3cff9492cf5fa6f13450a662eeb74a0b7ed9ad2814c07ecfe5f0cf14ed -AUX xfractint-20.04p08-Makefile.patch 3151 SHA256 b4ee61978f96b34cc7acd781225a43fb30edb368274adfc1626224f9b68951d5 SHA512 586bbe740705fdb38591535cc40fc31d9db03448670d322341518940b6231f55b0a36092d89a4ff463bdba62b34f3225f2948d98a4dfaaf33d0ae9f735d33e65 WHIRLPOOL 7bca85200cfb0f5ecdacd84ab920993f9cfab783e349b6ce30f0b80fdba30d5fbc2ef2b72e5421f9102d6633e9f01358458b54f039e0ca4bbe79ea9fc5018591 AUX xfractint-20.04p09-ldflags.patch 1063 SHA256 0da3670026a960233d0b604631b7b75f9beaaa33d088d74a387f297e26ff7b0e SHA512 803f0e922218e721de01012a2d6cefa7ed0ab7fa52ddf78e554245560347cbc6df171c1caef857c64afcfc31b5ce163e1af6b7dcc6a0574ca71ef324ff025661 WHIRLPOOL b0122e87bc6b764cfcda89f8ec8902d723ce9ed2359691b0ee784d4aebcf21d6f3970982ab115015d1b475c4f7f339e26377c0b7778d940b3e33a99183faa6a0 AUX xfractint.envd 63 SHA256 e79fe65b29137d40f6d4e26cff359be9e5422c1408138c5657f85380e9b82b4d SHA512 1e923957e93a53af47a8bc3205c350b9fe4bbfa9f955c5eb5673c1ce857808bdf0ad020c643c7f81dda1c0b5caf2480005c2f31eabdaa39908ef68649687b5a2 WHIRLPOOL 08bc84219a91e043598fc17f6c7d55b750edc0e579179dc7aa0a016dd43e65509a9dc88b8113911af3d445d93f76ef41a7f58e4f4488e3fc8fc5907622888c71 -DIST xfractint-20.04p07.tar.gz 1322518 SHA256 557118b6ba9f6e14800ca932a2ec2a11528c707aa5bf06b0816fad2820fdf520 DIST xfractint-20.04p12.tar.gz 1335480 SHA256 e81affa9d3b3826f14502cedf1fc4a4dd41bcfa71ba32f8e4224748c5b9c69e0 SHA512 ef233b417ccdff153e53b70f4ac0500be99e9fc6e87360b341640573592320b2485f18fd6426436432d968d33fa41d4862babf193c3b11c480f514a4602bb8f2 WHIRLPOOL 47a2f4c0919232109309a00a131ffc4a5a87519727469af09f51101f7984b54851e71d928147faed27d51d167ce3c13f5332cd0747e63cf96c18cbed2d81b404 -EBUILD xfractint-20.04_p07.ebuild 1288 SHA256 919fc40580dc025341a2567fe616d28b1d0b508933647c5d9abedb62ad39b52b SHA512 88fd49feb828a7c8832fbe5d91d9766dc2def32c42f5c2f81434deb9cb2e0071fcf0883fbbb3e4c7d9e25b2cf816ca759006386346e44436204da4a7ebbfaeab WHIRLPOOL 17940c91912a193e06152d6ab7e7eb0b2600c67f7195ae722d42e23b47aa7dad508035f31588f24657938cae699d2bb874491b98b67ad905ed6baad8db3ebbb8 EBUILD xfractint-20.04_p12.ebuild 1156 SHA256 8c960874c96737454c24d8377e4eafd1a25ff30deb3de642dedeb52a0e1eb19c SHA512 129b705e72d38daa458978228db553d75bf4b0f7344b4a844d85fff6f40eb167496d5f16f394183e389cdc61faf491c7259cbb7d33493a5f1138b231f2bc4ea8 WHIRLPOOL d5865c2c026dfeb4ee7dcc2a4ff5358bb41bdce3f6bc59c474f5f36382c016d7651757e61770789e4f5c2cf97a64c09180f2969466348eb75f29edd8ab3b58d8 -MISC ChangeLog 9370 SHA256 ced6512a8b151b10c898f18af493e1c196d6eed5a05c7021492564fadae30cb6 SHA512 f1f77301eb14788c3090c1ad2a0939b860abc34546d480e528f75e6475f95a077dbaf97b2b1bba31423c9357dbb97e29707088e2156cbc8ddf0736821c428f13 WHIRLPOOL cd641a757284949600f893b594d4f0e30df1469117cad33deb937812c311e417c270fbe9f78ba67bfa0a899f177f5e8b5ad1a2fe657f63f850d2f484b51b8366 +MISC ChangeLog 9670 SHA256 a6b23dca7a8f2074f8e4a50d00a7fe896807eef1b3e75ba583e0cfc24d6660ed SHA512 5558958095cd92ea5c1462688501327b44949cc30ded8f2112bfb9cabd5c708029d15d56ca5024e75141932b2e35eb3ea07c35314bbc1aae07f268dd45d98b06 WHIRLPOOL 3a751d41f6361bb95185c490f7d084aa3b677829920689258a3279d25cff7533ca866e5e46ac16df0a00f8b3c609c1f0c8855de6faa26e8c8e59fbfb5098af50 MISC metadata.xml 212 SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 SHA512 85ac7770baae8cc7c2c52dcd077a448cfb394ec6585e274ffa01c8f92a862d22c6ba0553b71cf2ae6b6f28f6faa5c3d615537f35f9fe0da9f43a2c9043953784 WHIRLPOOL 221b2f4e9b984954eb7268028287339e8678c794c7b4e40ab2baaa037c8e87bac30c8b64473efade9b3ee1ce226aab4ad36760147eee5af7cfd7c081473c839b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAlA7teoACgkQuQc30/atMkBYKwCgnSkvwgU5Oh2VQdLr1WYcA6qY -ljcAnA6qZLdmlDtMwPB6xEQ17DMK31yL -=fjjg +iQEcBAEBCAAGBQJQPhnJAAoJEMbwO6tnXQ0sTrQIAKbEvl25EDwhw2yIOfWMJZ+i +1n+gKBGdwwCs7kA7X4J8AWmeUk+7htDDk9JqF5bzT8IH+XtlvqndkwEtCWpPQK04 +Lzw3cselmqik2Lf970Xs+1im5TpE1XZ34B6LB5wwfHUQn6bzhKQ8/5ilaGRdY8Qn +HrqEbVMgJ4S9eRgL6vgfzK0kkQL7xMF3TADPyObTZuJCQkgQLUO2YPaK3eyM1Ix8 +YtntvVo4ajHkYmosckjXayzIfVZZa157ZDPXDmZYfO3EJo3iK7rvF/HPbm587Pg6 +3Tpc8j46jJl6sasux5fZKDkK8PKNPbevPCb/QNmHOypZTa4JCjiNmw7AysCe9zM= +=cHDo -----END PGP SIGNATURE----- diff --git a/x11-misc/xfractint/files/xfractint-20.04_p07-Makefile.patch b/x11-misc/xfractint/files/xfractint-20.04_p07-Makefile.patch deleted file mode 100644 index 0b51a976ef30..000000000000 --- a/x11-misc/xfractint/files/xfractint-20.04_p07-Makefile.patch +++ /dev/null @@ -1,118 +0,0 @@ -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/files/xfractint-20.04p07-filename-buffer-overflow-fix.patch b/x11-misc/xfractint/files/xfractint-20.04p07-filename-buffer-overflow-fix.patch deleted file mode 100644 index 7f9a2ecbc503..000000000000 --- a/x11-misc/xfractint/files/xfractint-20.04p07-filename-buffer-overflow-fix.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -urN ../xfractint-20.04p07-orig/dos_help/hc.c ../xfractint-20.04p07/dos_help/hc.c ---- ../xfractint-20.04p07-orig/dos_help/hc.c 2006-03-15 10:30:47 +0900 -+++ ../xfractint-20.04p07/dos_help/hc.c 2007-12-28 16:05:53 +0900 -@@ -72,8 +72,8 @@ - # include <dir.h> - # define FNSPLIT fnsplit - #else --# define MAXFILE _MAX_FNAME --# define MAXEXT _MAX_EXT -+# define MAXFILE FILE_MAX_FNAME -+# define MAXEXT FILE_MAX_EXT - # define FNSPLIT _splitpath - #endif - -diff -urN ../xfractint-20.04p07-orig/headers/fractint.h ../xfractint-20.04p07/headers/fractint.h ---- ../xfractint-20.04p07-orig/headers/fractint.h 2006-11-26 04:43:07 +0900 -+++ ../xfractint-20.04p07/headers/fractint.h 2007-12-28 16:07:02 +0900 -@@ -47,31 +47,6 @@ - #define RESTORESTART 3 - #define CONTINUE 4 - --/* these are used to declare arrays for file names */ --#ifdef XFRACT --#define FILE_MAX_PATH 256 /* max length of path+filename */ --#define FILE_MAX_DIR 256 /* max length of directory name */ --#else --#define FILE_MAX_PATH 80 /* max length of path+filename */ --#define FILE_MAX_DIR 80 /* max length of directory name */ --#endif --#define FILE_MAX_DRIVE 3 /* max length of drive letter */ -- --#if 1 --#define FILE_MAX_FNAME 9 /* max length of filename */ --#define FILE_MAX_EXT 5 /* max length of extension */ --#else --/* --The filename limits were increased in Xfract 3.02. But alas, --in this poor program that was originally developed on the --nearly-brain-dead DOS operating system, quite a few things --in the UI would break if file names were bigger than DOS 8-3 --names. So for now humor us and let's keep the names short. --*/ --#define FILE_MAX_FNAME 64 /* max length of filename */ --#define FILE_MAX_EXT 64 /* max length of extension */ --#endif -- - #define MAXMAXLINELENGTH 128 /* upper limit for maxlinelength for PARs */ - #define MINMAXLINELENGTH 40 /* lower limit for maxlinelength for PARs */ - -diff -urN ../xfractint-20.04p07-orig/headers/port.h ../xfractint-20.04p07/headers/port.h ---- ../xfractint-20.04p07-orig/headers/port.h 2006-11-26 04:43:07 +0900 -+++ ../xfractint-20.04p07/headers/port.h 2007-12-28 16:11:15 +0900 -@@ -260,6 +260,36 @@ - #endif - #endif - -+ -+/* The following FILE_* #defines were moved here from fractint.h to -+ * avoid inconsistent declarations in dos_help/hc.c and unix/unix.c. */ -+ -+/* these are used to declare arrays for file names */ -+#ifdef XFRACT -+#define FILE_MAX_PATH 256 /* max length of path+filename */ -+#define FILE_MAX_DIR 256 /* max length of directory name */ -+#else -+#define FILE_MAX_PATH 80 /* max length of path+filename */ -+#define FILE_MAX_DIR 80 /* max length of directory name */ -+#endif -+#define FILE_MAX_DRIVE 3 /* max length of drive letter */ -+ -+#if 1 -+#define FILE_MAX_FNAME 9 /* max length of filename */ -+#define FILE_MAX_EXT 5 /* max length of extension */ -+#else -+/* -+The filename limits were increased in Xfract 3.02. But alas, -+in this poor program that was originally developed on the -+nearly-brain-dead DOS operating system, quite a few things -+in the UI would break if file names were bigger than DOS 8-3 -+names. So for now humor us and let's keep the names short. -+*/ -+#define FILE_MAX_FNAME 64 /* max length of filename */ -+#define FILE_MAX_EXT 64 /* max length of extension */ -+#endif -+ -+ - /* Uses big_access32(), big_set32(),... functions instead of macros. */ - /* Some little endian machines may require this as well. */ - #if BYTE_ORDER == BIG_ENDIAN -diff -urN ../xfractint-20.04p07-orig/headers/unix.h ../xfractint-20.04p07/headers/unix.h ---- ../xfractint-20.04p07-orig/headers/unix.h 2006-11-26 04:43:07 +0900 -+++ ../xfractint-20.04p07/headers/unix.h 2007-12-28 15:52:47 +0900 -@@ -28,8 +28,6 @@ - #define max(a,b) ((a)>(b)?(a):(b)) - #define min(a,b) ((a)<(b)?(a):(b)) - #define remove(x) unlink(x) --#define _MAX_FNAME 20 --#define _MAX_EXT 4 - #define chsize(fd,len) ftruncate(fd,len) - - #define inp(x) 0 -diff -urN ../xfractint-20.04p07-orig/unix/unix.c ../xfractint-20.04p07/unix/unix.c ---- ../xfractint-20.04p07-orig/unix/unix.c 2005-07-28 09:55:02 +0900 -+++ ../xfractint-20.04p07/unix/unix.c 2007-12-28 16:05:56 +0900 -@@ -15,12 +15,6 @@ - #include <ctype.h> - #include "port.h" - --#define FILE_MAX_PATH 256 /* max length of path+filename */ --#define FILE_MAX_DIR 256 /* max length of directory name */ --#define FILE_MAX_DRIVE 3 /* max length of drive letter */ --#define FILE_MAX_FNAME 9 /* max length of filename */ --#define FILE_MAX_EXT 5 /* max length of extension */ -- - int iocount; - - /* diff --git a/x11-misc/xfractint/files/xfractint-20.04p07-xioerror.patch b/x11-misc/xfractint/files/xfractint-20.04p07-xioerror.patch deleted file mode 100644 index ac458e1f4f06..000000000000 --- a/x11-misc/xfractint/files/xfractint-20.04p07-xioerror.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naurp xfractint-20.04p07/unix/unixscr.c xfractint-20.04p07-fixed/unix/unixscr.c ---- xfractint-20.04p07/unix/unixscr.c 2005-11-22 23:51:24.000000000 +0100 -+++ xfractint-20.04p07-fixed/unix/unixscr.c 2007-12-28 13:40:50.000000000 +0100 -@@ -137,6 +137,7 @@ static int doredraw = 0; /* 1 if we have - static Window FindRootWindow(void); - static Window pr_dwmroot(Display *dpy, Window pwin); - static int errhand(Display *dp, XErrorEvent *xe); -+static int ioerrhand(Display *dp); - static int getachar(void); - static int handleesc(void); - static int translatekey(int ch); -@@ -345,6 +346,30 @@ XErrorEvent *xe; - return(0); - } - -+/* -+ *---------------------------------------------------------------------- -+ * -+ * ioerrhand -- -+ * -+ * Called on an X IO server error. -+ * -+ * Results: -+ * None. -+ * -+ * Side effects: -+ * Prints the error message. -+ * -+ *---------------------------------------------------------------------- -+ */ -+static int ioerrhand(dp) -+Display *dp; -+{ -+ UnixDone(); -+ fflush(stdout); -+ printf("Fatal X IO error on display %s\n", DisplayString(dp)); -+ return(0); -+} -+ - #ifdef FPUERR - /* - *---------------------------------------------------------------------- -@@ -552,6 +577,7 @@ initUnixWindow() - XSynchronize(Xdp, True); - } - XSetErrorHandler(errhand); -+ XSetIOErrorHandler(ioerrhand); - Xsc = ScreenOfDisplay(Xdp, Xdscreen); - select_visual(); - if (fixcolors > 0) { diff --git a/x11-misc/xfractint/files/xfractint-20.04p08-Makefile.patch b/x11-misc/xfractint/files/xfractint-20.04p08-Makefile.patch deleted file mode 100644 index 46fbeaa4b218..000000000000 --- a/x11-misc/xfractint/files/xfractint-20.04p08-Makefile.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -Naurp xfractint-20.04p08-orig/Makefile xfractint-20.04p08/Makefile ---- xfractint-20.04p08-orig/Makefile 2008-09-13 23:53:43.000000000 +0200 -+++ xfractint-20.04p08/Makefile 2008-09-14 00:13:18.000000000 +0200 -@@ -1,4 +1,6 @@ --SHELL=/bin/sh -+SHELL = /bin/sh -+STRIP = strip -+INSTALL = /usr/bin/install - - # Architecture - # automatic detection -@@ -330,40 +332,18 @@ clean: - cd $(UDIR) ; ${MAKE} clean - - install: xfractint fractint.hlp -- strip xfractint --# only next 6 lines might need su -- sudo cp xfractint $(BINDIR)/xfractint; --# install fractint if built -- if [ -x fractint ] ; then sudo install -c -s fractint $(BINDIR) ; fi -- 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 --# copy all the files to the appropriate directories -- cp fractint.hlp sstools.ini $(DOCS) $(SRCDIR) -- cp $(PARFILES) $(SRCDIR)/$(PDIR) -- cp $(FRMFILES) $(SRCDIR)/$(FDIR) -- cp $(IFSFILES) $(SRCDIR)/$(IDIR) -- cp $(LFILES) $(SRCDIR)/$(LDIR) -- cp $(MAPFILES) $(SRCDIR)/$(MDIR) -- cp $(XTRAFILES) $(SRCDIR)/$(XDIR) --# set permissions -- cd $(SRCDIR); chmod a+r fractint.hlp -- cd $(SRCDIR); chmod a+rw sstools.ini -- cd $(SRCDIR); chmod a+rw $(PARFILES) -- cd $(SRCDIR); chmod a+rw $(FRMFILES) -- cd $(SRCDIR); chmod a+rw $(IFSFILES) -- cd $(SRCDIR); chmod a+rw $(LFILES) -- cd $(SRCDIR); chmod a+rw $(MAPFILES) -- cd $(SRCDIR); chmod a+rw $(XTRAFILES) -+ $(STRIP) xfractint -+ $(INSTALL) -d $(BINDIR) $(MANDIR) $(SRCDIR)/$(PDIR) $(SRCDIR)/$(FDIR) \ -+ $(SRCDIR)/$(IDIR) $(SRCDIR)/$(LDIR) $(SRCDIR)/$(MDIR) $(SRCDIR)/$(XDIR) -+ $(INSTALL) xfractint -T $(BINDIR)/xfractint; -+ $(INSTALL) -m 644 -T $(UDIR)/xfractint.man $(MANDIR)/xfractint.1; -+ $(INSTALL) -m 644 -t $(SRCDIR) fractint.hlp sstools.ini $(DOCS) -+ $(INSTALL) -m 644 -t $(SRCDIR)/$(PDIR) $(PARFILES) -+ $(INSTALL) -m 644 -t $(SRCDIR)/$(FDIR) $(FRMFILES) -+ $(INSTALL) -m 644 -t $(SRCDIR)/$(IDIR) $(IFSFILES) -+ $(INSTALL) -m 644 -t $(SRCDIR)/$(LDIR) $(LFILES) -+ $(INSTALL) -m 644 -t $(SRCDIR)/$(MDIR) $(MAPFILES) -+ $(INSTALL) -m 644 -t $(SRCDIR)/$(XDIR) $(XTRAFILES) - - uninstall: - cd $(SRCDIR); rm -f $(PARFILES) -@@ -375,8 +355,8 @@ uninstall: - 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.04_p07.ebuild b/x11-misc/xfractint/xfractint-20.04_p07.ebuild deleted file mode 100644 index 2cfdf2d26ed6..000000000000 --- a/x11-misc/xfractint/xfractint-20.04_p07.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2012 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.8 2012/08/27 18:01:08 armin76 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 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 - epatch "${FILESDIR}"/xfractint-20.04p07-filename-buffer-overflow-fix.patch - epatch "${FILESDIR}"/xfractint-20.04p07-xioerror.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." -} |