diff options
| author | ben <ben> | 2004-07-14 21:06:57 +0000 |
|---|---|---|
| committer | ben <ben> | 2004-07-14 21:06:57 +0000 |
| commit | 0a858d2e65ad0df492bececdf526c6e8d39c07b0 (patch) | |
| tree | e9a63101c33e4f100facf089e4338469ae9b6d5d /x11/XaoS/patches | |
| parent | 4a3b257b1215009fec3fc06d65d23ca8e8dc7e49 (diff) | |
| download | pkgsrc-0a858d2e65ad0df492bececdf526c6e8d39c07b0.tar.gz | |
Update of x11/XaoS to 3.1, as requested in PR#26323.
Diffstat (limited to 'x11/XaoS/patches')
| -rw-r--r-- | x11/XaoS/patches/patch-aa | 20 | ||||
| -rw-r--r-- | x11/XaoS/patches/patch-ab | 22 |
2 files changed, 27 insertions, 15 deletions
diff --git a/x11/XaoS/patches/patch-aa b/x11/XaoS/patches/patch-aa index 33f1a214c83..9e30b254921 100644 --- a/x11/XaoS/patches/patch-aa +++ b/x11/XaoS/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1 2002/03/25 16:19:31 atatat Exp $ +$NetBSD: patch-aa,v 1.2 2004/07/14 21:06:57 ben Exp $ Rip out the 16 bit i387 specific code. --- src/engine/fractal.c-orig Wed Mar 4 16:49:12 1998 +++ src/engine/fractal.c Sun Mar 10 16:29:06 2002 -@@ -48,13 +48,6 @@ +@@ -49,13 +49,6 @@ #include <complex.h> #include <plane.h> - #include <timers.h> + #include "../include/timers.h" -#ifdef __GNUC__ -#ifdef __i386__ -#ifndef PC_64 @@ -18,27 +18,31 @@ Rip out the 16 bit i387 specific code. #ifdef __alpha__ #ifdef __linux__ #include <asm/fpu.h> -@@ -333,11 +326,6 @@ +@@ -382,15 +375,6 @@ { fractal_context *new_ctxt; +-#ifndef __BEOS__ -#ifdef __GNUC__ -#ifdef __i386__ +-#ifndef NOASSEMBLY - _control87 (PC_64 | MCW_EM | MCW_RC, MCW_PC | MCW_EM | MCW_RC); -#endif -#endif +-#endif +-#endif #ifdef __alpha__ #ifdef __linux__ - extern void ieee_set_fp_control(unsigned long); + extern void ieee_set_fp_control (unsigned long); --- src/engine/Makefile.in-orig Wed Mar 4 16:49:12 1998 +++ src/engine/Makefile.in Sun Mar 10 16:27:30 2002 -@@ -22,8 +22,7 @@ - stereogram.c \ +@@ -24,8 +24,7 @@ SRCS = formulas.c \ + 3d.c \ subwindow.c \ plane.c \ - julia.c \ - i386.c + julia.c - OBJS = $(SRCS:.c=.o) + OBJS = $(SRCS:.c=.o) diff --git a/x11/XaoS/patches/patch-ab b/x11/XaoS/patches/patch-ab index 806f340f5ad..0feeb9a54bf 100644 --- a/x11/XaoS/patches/patch-ab +++ b/x11/XaoS/patches/patch-ab @@ -1,12 +1,20 @@ -$NetBSD: patch-ab,v 1.3 2004/03/24 11:56:00 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2004/07/14 21:06:57 ben Exp $ --- Makefile.in.orig Wed Mar 4 22:49:12 1998 +++ Makefile.in -@@ -41,7 +41,6 @@ install: - @INSTALL@ -m 444 catalogs/* $(datadir)/XaoS/catalogs - @INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt doc/ANNOUNCE doc/PROBLEMS doc/tutorial.txt $(datadir)/XaoS/doc - @INSTALL@ -m 444 doc/xaos.6 $(mandir)/man6 +@@ -35,6 +35,7 @@ install: + @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/doc + @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help + @INSTALL@ -d $(DESTDIR)$(bindir) ++ @INSTALL@ -d $(DESTDIR)$(infodir) + @INSTALL@ -d $(DESTDIR)$(mandir)/man6 + @INSTALL@ -s bin/xaos $(DESTDIR)$(bindir) + @INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial +@@ -43,7 +44,6 @@ install: + @INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help + @INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt doc/AUTHORS doc/PROBLEMS $(DESTDIR)$(datadir)/XaoS/doc + @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6 - @STICKY@ - @INSTALL@ -m 444 doc/xaos.info $(infodir) + @INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir) #install-info doc/xaos.info - + if [ "@USE_NLS@" = "yes" ]; then $(MAKE) -C src/i18n/ install; fi |