summaryrefslogtreecommitdiff
path: root/lang/icon/patches
diff options
context:
space:
mode:
Diffstat (limited to 'lang/icon/patches')
-rw-r--r--lang/icon/patches/patch-aa11
-rw-r--r--lang/icon/patches/patch-ab14
-rw-r--r--lang/icon/patches/patch-ac116
-rw-r--r--lang/icon/patches/patch-ad30
-rw-r--r--lang/icon/patches/patch-ae51
-rw-r--r--lang/icon/patches/patch-af28
-rw-r--r--lang/icon/patches/patch-ag38
-rw-r--r--lang/icon/patches/patch-ah24
-rw-r--r--lang/icon/patches/patch-ai4
-rw-r--r--lang/icon/patches/patch-aj32
-rw-r--r--lang/icon/patches/patch-ao4
-rw-r--r--lang/icon/patches/patch-ap4
-rw-r--r--lang/icon/patches/patch-aq43
-rw-r--r--lang/icon/patches/patch-aw8
-rw-r--r--lang/icon/patches/patch-ax8
-rw-r--r--lang/icon/patches/patch-az22
-rw-r--r--lang/icon/patches/patch-ba16
-rw-r--r--lang/icon/patches/patch-bb13
18 files changed, 128 insertions, 338 deletions
diff --git a/lang/icon/patches/patch-aa b/lang/icon/patches/patch-aa
index c181e5e835f..a1528e6686d 100644
--- a/lang/icon/patches/patch-aa
+++ b/lang/icon/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2003/06/06 08:58:42 jtb Exp $
+$NetBSD: patch-aa,v 1.8 2009/02/08 12:51:04 asau Exp $
--- config/setup.sh.orig
+++ config/setup.sh
@@ -11,12 +11,3 @@ $NetBSD: patch-aa,v 1.7 2003/06/06 08:58:42 jtb Exp $
NoGraphics) XL= ;;
*) echo "$USAGE" 1>&2; exit 1;;
esac
-@@ -31,7 +31,7 @@
- # find and copy the context switch code.
- # use pthreads version if specified, or as a last resort.
- # by default, look for `uname -m`.[cs] and then rswitch.[cs].
--ARCH=`uname -m`
-+ARCH=`uname -p`
- if [ "$CSW" = "pthreads" ]; then
- RSW=pthreads.c
- COCLEAN="#define CoClean"
diff --git a/lang/icon/patches/patch-ab b/lang/icon/patches/patch-ab
index 4f24cccc975..4eb51468ac1 100644
--- a/lang/icon/patches/patch-ab
+++ b/lang/icon/patches/patch-ab
@@ -1,17 +1,13 @@
-$NetBSD: patch-ab,v 1.8 2003/06/06 08:58:42 jtb Exp $
+$NetBSD: patch-ab,v 1.9 2009/02/08 12:51:04 asau Exp $
---- /dev/null Mon Mar 24 07:25:29 2003
-+++ config/netbsd/define.h.in
-@@ -0,0 +1,14 @@
+--- /dev/null 2009-02-08 02:30:41.000000000 +0300
++++ config/bsd/define.h.in 2009-02-08 03:08:28.000000000 +0300
+@@ -0,0 +1,10 @@
+/*
-+ * Icon configuration file for NetBSD
++ * Icon configuration file for BSD
+ */
+
+#define UNIX 1
-+#define GenericBSD
-+#define BSD_4_4_LITE 1 /* This is new, for 4.4Lite specific stuff */
-+#define NetBSD /* This is for NetBSD stuff (save) */
-+
+#define LoadFunc
+
+#define CComp "gcc"
diff --git a/lang/icon/patches/patch-ac b/lang/icon/patches/patch-ac
index e3c9f9fe080..2ac64130a64 100644
--- a/lang/icon/patches/patch-ac
+++ b/lang/icon/patches/patch-ac
@@ -1,51 +1,79 @@
-$NetBSD: patch-ac,v 1.9 2003/06/29 23:06:47 jtb Exp $
+$NetBSD: patch-ac,v 1.10 2009/02/08 12:51:04 asau Exp $
---- /dev/null
-+++ config/netbsd/powerpc.s
-@@ -0,0 +1,46 @@
-+#
-+# coswitch for the PowerPC
-+#
-+
-+ .file "rswitch.s"
-+
+--- config/bsd/powerpc.s.orig 2005-06-16 19:55:17.000000000 +0400
++++ config/bsd/powerpc.s 2009-02-08 02:27:54.000000000 +0300
+@@ -1,9 +1,11 @@
+ #
+-# coswitch for the PowerPC architecture
++# coswitch for the PowerPC architecture
+ #
+
+ .file "rswitch.s"
+
+ .set RSIZE, 80 # room for regs 14-31, rounded up mod16
+
-+ .data
-+errmsg: .string "new_context() returned in coswitch\n"
-+
-+ .text
-+ .align 2
-+ .globl coswitch
-+ .type coswitch,@function
-+
-+coswitch:
+ .data
+ errmsg: .string "new_context() returned in coswitch\n"
+
+@@ -13,30 +15,13 @@
+ .type coswitch,@function
+
+ coswitch:
+- stwu 1, -80(1) # allocate stack frame
+ stwu 1, -RSIZE(1) # allocate stack frame
-+
-+ # Save Old Context:
-+ stw 1, 0(3) # SP
-+ mflr 0
-+ stw 0, 4(3) # LR (return address)
+
+ # Save Old Context:
+ stw 1, 0(3) # SP
+ mflr 0
+ stw 0, 4(3) # LR (return address)
+- stw 14, 0(1) # GPRs 14-31 (save on stack)
+- stw 15, 4(1)
+- stw 16, 8(1)
+- stw 17, 12(1)
+- stw 18, 16(1)
+- stw 19, 20(1)
+- stw 20, 24(1)
+- stw 21, 28(1)
+- stw 22, 32(1)
+- stw 23, 36(1)
+- stw 24, 40(1)
+- stw 25, 44(1)
+- stw 26, 48(1)
+- stw 27, 52(1)
+- stw 28, 56(1)
+- stw 29, 60(1)
+- stw 30, 64(1)
+- stw 31, 68(1)
+ stmw 14, -RSIZE(1) # GPRs 14-31 (save on stack)
-+
-+ cmpi 0, 5, 0
-+ beq first # if first time
-+
-+ # Restore new context:
-+ lwz 1, 0(4) # SP
-+ lwz 0, 4(4) # LR
-+ mtlr 0
+
+ cmpi 0, 5, 0
+ beq first # if first time
+@@ -45,26 +30,9 @@
+ lwz 1, 0(4) # SP
+ lwz 0, 4(4) # LR
+ mtlr 0
+- lwz 14, 0(1) # GPRs 14-31 (from stack)
+- lwz 15, 4(1)
+- lwz 16, 8(1)
+- lwz 17, 12(1)
+- lwz 18, 16(1)
+- lwz 19, 20(1)
+- lwz 20, 24(1)
+- lwz 21, 28(1)
+- lwz 22, 32(1)
+- lwz 23, 36(1)
+- lwz 24, 40(1)
+- lwz 25, 44(1)
+- lwz 26, 48(1)
+- lwz 27, 52(1)
+- lwz 28, 56(1)
+- lwz 29, 60(1)
+- lwz 30, 64(1)
+- lwz 31, 68(1)
+ lmw 14, -RSIZE(1) # GPRs 14-31 (from stack)
-+
+
+- addic 1, 1, 80 # deallocate stack frame
+ addic 1, 1, RSIZE # deallocate stack frame
-+ blr # return into new context
-+
-+first: # First-time call:
-+ lwz 1, 0(4) # SP as figured by Icon
-+ addic 1, 1, -64 # save area for callee
-+ addi 3, 0, 0 # arg1
-+ addi 4, 0, 0 # arg2
-+ bl new_context # new_context(0,0)
-+ lis 3, errmsg@ha
-+ la 3, errmsg@l(3)
-+ bl syserr
+ blr # return into new context
+
+ first: # First-time call:
diff --git a/lang/icon/patches/patch-ad b/lang/icon/patches/patch-ad
deleted file mode 100644
index 578dc12e298..00000000000
--- a/lang/icon/patches/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/06/06 08:58:43 jtb Exp $
-
---- /dev/null
-+++ config/netbsd/m68k.c
-@@ -0,0 +1,25 @@
-+/*
-+ * coswitch for the m68k architecture
-+ */
-+
-+int
-+coswitch (int *old_cs, int *new_cs, int first)
-+{
-+ asm ("movl %a6@(8),%a0"); /* a0 = old */
-+ asm ("movl %a6@(12),%a1"); /* a1 = new */
-+ asm ("movl %a7,%a0@"); /* save sp in cstate[0] */
-+ asm ("movl %a6,%a0@(4)"); /* save a6 (fp) in cstate[0] */
-+ asm ("moveml #0x3cfc,%a0@(8)"); /* store d2-d7, a2-a6 in old->cstate */
-+
-+ if (first == 0) { /* this is first activation */
-+ asm ("movl %a1@,%a7");
-+ asm ("movl #0,%a6");
-+ new_context (0, 0);
-+ syserr ("new_context() returned in coswitch");
-+ }
-+ else {
-+ asm ("movl %a1@,%a7"); /* restore sp */
-+ asm ("movl %a1@(4),%a6"); /* restore fp */
-+ asm ("moveml %a1@(8),#0x3cfc"); /* restore d2-d7, a2-a6 */
-+ }
-+}
diff --git a/lang/icon/patches/patch-ae b/lang/icon/patches/patch-ae
deleted file mode 100644
index 82ea62be774..00000000000
--- a/lang/icon/patches/patch-ae
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2003/06/06 08:58:43 jtb Exp $
-
---- /dev/null
-+++ config/netbsd/alpha.s
-@@ -0,0 +1,46 @@
-+/*
-+ * coswitch(old_cs, new_cs, first) for DEC Alpha architecture
-+ * $16 $17 $18
-+ */
-+ .data
-+errmsg: .ascii "new_context() returned in coswitch\X00"
-+
-+ .text
-+ .globl coswitch
-+ .ent coswitch
-+coswitch:
-+ lda $sp, -72($sp) /* make room on stack */
-+ stq $sp, 0($16) /* save stack pointer */
-+ stq $9, 0($sp) /* save registers on stack */
-+ stq $10, 8($sp)
-+ stq $11, 16($sp)
-+ stq $12, 24($sp)
-+ stq $13, 32($sp)
-+ stq $14, 40($sp)
-+ stq $15, 48($sp)
-+ stq $27, 56($sp)
-+ stq $26, 64($sp) /* return address */
-+ beq $18, first /* if first time */
-+
-+ ldq $sp, 0($17) /* load new stack pointer */
-+ ldq $9, 0($sp) /* load registers from stack */
-+ ldq $10, 8($sp)
-+ ldq $11, 16($sp)
-+ ldq $12, 24($sp)
-+ ldq $13, 32($sp)
-+ ldq $14, 40($sp)
-+ ldq $15, 48($sp)
-+ ldq $27, 56($sp)
-+ ldq $26, 64($sp) /* return address */
-+ lda $sp, 72($sp) /* reset sp */
-+ jsr_coroutine $31, ($26), 0 /* jump into new_context */
-+
-+first:
-+ ldq $sp, 0($17) /* load stack pointer only */
-+ bis $31, $31, $16 /* r16 = 0 */
-+ bis $31, $31, $17 /* r17 = 0 */
-+ jsr $26, new_context /* new_context(0,0) */
-+ lda $16, errmsg
-+ jsr $26, syserr /* shouldn't get here */
-+
-+ .end coswitch
diff --git a/lang/icon/patches/patch-af b/lang/icon/patches/patch-af
deleted file mode 100644
index 20e628621e6..00000000000
--- a/lang/icon/patches/patch-af
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-af,v 1.10 2003/06/29 23:06:47 jtb Exp $
-
---- /dev/null
-+++ config/netbsd/i386.c
-@@ -0,0 +1,23 @@
-+/*
-+ * coswitch for i386 architecture
-+ */
-+
-+int
-+coswitch (int *old_cs, int *new_cs, int first)
-+{
-+ asm ("movl 8(%ebp),%eax");
-+ asm ("movl %esp,0(%eax)");
-+ asm ("movl %ebp,4(%eax)");
-+ asm ("movl 12(%ebp),%eax");
-+
-+ if (first == 0) { /* this is the first activation */
-+ asm ("movl 0(%eax),%esp");
-+ asm ("movl $0,%ebp");
-+ new_context (0, 0);
-+ syserr ("new_context() returned in coswitch");
-+ }
-+ else {
-+ asm ("movl 0(%eax),%esp");
-+ asm ("movl 4(%eax),%ebp");
-+ }
-+}
diff --git a/lang/icon/patches/patch-ag b/lang/icon/patches/patch-ag
deleted file mode 100644
index a32b355eb82..00000000000
--- a/lang/icon/patches/patch-ag
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2003/06/06 08:58:43 jtb Exp $
-
---- /dev/null
-+++ config/netbsd/sparc.c
-@@ -0,0 +1,33 @@
-+/*
-+ * coswitch for NetBSD SPARC
-+ */
-+
-+int
-+coswitch (int *old_cs, int *new_cs, int first)
-+{
-+ asm("ta 0x03"); /* ST_FLUSH_WINDOWS in trap.h */
-+ asm("ld [%fp+0x44], %o0"); /* load old_cs into %o0 */
-+ asm("st %sp,[%o0]"); /* Save user stack pointer */
-+ asm("st %fp,[%o0+0x4]"); /* Save frame pointer */
-+ asm("st %i7,[%o0+0x8]"); /* Save return address */
-+
-+ if (first == 0) { /* this is the first activation */
-+ asm("ld [%fp+0x48], %o0"); /* load new_cs into %o0 */
-+ asm("ld [%o0], %o1"); /* load %o1 from cstate[0] */
-+
-+ /* Decrement new stack pointer value before loading it into sp. */
-+ /* The top 64 bytes of the stack are reserved for the kernel, to */
-+ /* save the 8 local and 8 in registers into, on context switches, */
-+ /* interrupts, traps, etc. */
-+
-+ asm("save %o1,-96, %sp"); /* load %sp from %o1 */
-+ new_context(0,0);
-+ syserr("new_context() returned in coswitch");
-+
-+ } else {
-+ asm("ld [%fp+0x48], %o0"); /* load new_cs into %o0 */
-+ asm("ld [%o0+0x4],%fp"); /* Load frame pointer */
-+ asm("ld [%o0+0x8],%i7"); /* Load return address */
-+ asm("ld [%o0],%sp"); /* Load user stack pointer */
-+ }
-+}
diff --git a/lang/icon/patches/patch-ah b/lang/icon/patches/patch-ah
deleted file mode 100644
index fc6103ecfbc..00000000000
--- a/lang/icon/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ah,v 1.6 2003/07/10 13:46:05 jtb Exp $
-
---- /dev/null
-+++ config/netbsd/Makedefs
-@@ -0,0 +1,19 @@
-+# Makefile definitions from config/netbsd
-+
-+# CC C compiler
-+# CFLAGS flags for building C files
-+# CFDYN additional flags for dynamic functions
-+# RLINK flags for linking run-time system
-+# RLIBS libraries to link with run-time system
-+# XLIBS libraries to link for graphics
-+# XPMDEFS definitions for building XPM library
-+
-+CC ?= cc
-+CFDYN = -fPIC
-+RLINK = -Wl,-E
-+RLIBS = -lm
-+CFLAGS += -I$(X11BASE)/include
-+XLIBS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11
-+XPMDEFS = -DZPIPE -I$(X11BASE)/include
-+GDIR= xpm
-+TLIBS= -lpthread
diff --git a/lang/icon/patches/patch-ai b/lang/icon/patches/patch-ai
index 74e05bcdc09..e4c5a441a2b 100644
--- a/lang/icon/patches/patch-ai
+++ b/lang/icon/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.6 2003/06/06 08:58:43 jtb Exp $
+$NetBSD: patch-ai,v 1.7 2009/02/08 12:51:05 asau Exp $
--- /dev/null
-+++ config/netbsd/status
++++ config/bsd/status.netbsd
@@ -0,0 +1,26 @@
+System configuration:
+
diff --git a/lang/icon/patches/patch-aj b/lang/icon/patches/patch-aj
index 1fb3c203495..0b495a6938e 100644
--- a/lang/icon/patches/patch-aj
+++ b/lang/icon/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.6 2003/06/06 08:58:43 jtb Exp $
+$NetBSD: patch-aj,v 1.7 2009/02/08 12:51:05 asau Exp $
---- Makefile.orig
-+++ Makefile
+--- Makefile.orig 2005-11-09 02:24:34.000000000 +0300
++++ Makefile 2009-02-08 01:57:40.000000000 +0300
@@ -14,7 +14,7 @@
#
# Default targets.
@@ -11,9 +11,11 @@ $NetBSD: patch-aj,v 1.6 2003/06/06 08:58:43 jtb Exp $
config/$(name)/status src/h/define.h:
:
-@@ -97,16 +97,22 @@
+@@ -95,18 +95,23 @@
- D=$(dest)
+ # Installation: "make Install dest=new-icon-directory"
+
+-D=$(dest)
Install:
- mkdir $D
- mkdir $D/bin $D/lib $D/doc $D/man $D/man/man1
@@ -25,22 +27,22 @@ $NetBSD: patch-aj,v 1.6 2003/06/06 08:58:43 jtb Exp $
- cp lib/*.* $D/lib
- cp doc/*.* $D/doc
- cp man/man1/*.* $D/man/man1
-+ ./bin/patchstr ./bin/icont $(PREFIX)/bin/iconx
-+ ./bin/patchstr ./bin/iconc $(PREFIX)/lib/icon/
++ ./bin/patchstr ./bin/icont $(DESTDIR)$(PREFIX)/bin/iconx
++ ./bin/patchstr ./bin/iconc $(DESTDIR)$(PREFIX)/lib/icon/
+ cd bin; $(BSD_INSTALL_PROGRAM) icont iconx iconc \
-+ patchstr rtt $D/bin
-+ cd $(PREFIX)/bin && ln -sf icont icon
-+ $(BSD_INSTALL_DATA_DIR) $D/lib/icon
-+ $(BSD_INSTALL_DATA) lib/icon/*.* $D/lib/icon
-+ $(BSD_INSTALL_DATA_DIR) $D/share/doc/icon
++ patchstr rtt $(DESTDIR)$(PREFIX)/bin
++ cd $(DESTDIR)$(PREFIX)/bin && ln -sf icont icon
++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/lib/icon
++ $(BSD_INSTALL_DATA) lib/icon/*.* $(DESTDIR)$(PREFIX)/lib/icon
++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/doc/icon
+ for f in colrbook colrpick fontpick palette vib \
+ wevents xgamma; do \
+ if [ -f bin/$$f ]; then \
-+ ${BSD_INSTALL_SCRIPT} bin/$$f $D/bin; \
++ ${BSD_INSTALL_SCRIPT} bin/$$f $(DESTDIR)$(PREFIX)/bin; \
+ fi; \
+ done
-+ $(BSD_INSTALL_DATA) doc/*.* $D/share/doc/icon
-+ $(BSD_INSTALL_MAN) man/man1/* $D/man/man1
++ $(BSD_INSTALL_DATA) doc/*.* $(DESTDIR)$(PREFIX)/share/doc/icon
++ $(BSD_INSTALL_MAN) man/man1/* $(DESTDIR)$(PREFIX)/man/man1
# Bundle up for binary distribution.
diff --git a/lang/icon/patches/patch-ao b/lang/icon/patches/patch-ao
index d5c43893aa7..596981da480 100644
--- a/lang/icon/patches/patch-ao
+++ b/lang/icon/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.6 2003/06/06 08:58:43 jtb Exp $
+$NetBSD: patch-ao,v 1.7 2009/02/08 12:51:05 asau Exp $
--- /dev/null
-+++ config/netbsd/mipseb.s
++++ config/bsd/mipseb.s
@@ -0,0 +1,76 @@
+ .data
+ .align 0
diff --git a/lang/icon/patches/patch-ap b/lang/icon/patches/patch-ap
index 68349900ae5..1273392f70f 100644
--- a/lang/icon/patches/patch-ap
+++ b/lang/icon/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.7 2003/06/06 08:58:43 jtb Exp $
+$NetBSD: patch-ap,v 1.8 2009/02/08 12:51:05 asau Exp $
--- /dev/null
-+++ config/netbsd/mipsel.s
++++ config/bsd/mipsel.s
@@ -0,0 +1,76 @@
+ .data
+ .align 0
diff --git a/lang/icon/patches/patch-aq b/lang/icon/patches/patch-aq
deleted file mode 100644
index c3f61835726..00000000000
--- a/lang/icon/patches/patch-aq
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aq,v 1.7 2003/06/23 20:48:24 jtb Exp $
-
---- /dev/null
-+++ config/netbsd/vax.c
-@@ -0,0 +1,38 @@
-+/*
-+ * coswitch for the VAX architecture.
-+ */
-+
-+int
-+coswitch (int *old_cs, int *new_cs, int first)
-+{
-+ asm ("movl 4(%ap),%r0");
-+ asm ("movl 8(%ap),%r1");
-+ asm ("movl %sp,0(%r0)");
-+ asm ("movl %fp,4(%r0)");
-+ asm ("movl %ap,8(%r0)");
-+ asm ("movl %r11,16(%r0)");
-+ asm ("movl %r10,20(%r0)");
-+ asm ("movl %r9,24(%r0)");
-+ asm ("movl %r8,28(%r0)");
-+ asm ("movl %r7,32(%r0)");
-+ asm ("movl %r6,36(%r0)");
-+
-+ if (first == 0) { /* this is the first activation */
-+ asm ("movl 0(%r1),%sp");
-+ asm ("clrl %fp");
-+ asm ("clrl %ap");
-+ new_context (0,0);
-+ syserr ("new_context() returned in coswitch");
-+ }
-+ else {
-+ asm ("movl 0(%r1),%sp");
-+ asm ("movl 4(%r1),%fp");
-+ asm ("movl 8(%r1),%ap");
-+ asm ("movl 16(%r1),%r11");
-+ asm ("movl 20(%r1),%r10");
-+ asm ("movl 24(%r1),%r9");
-+ asm ("movl 28(%r1),%r8");
-+ asm ("movl 32(%r1),%r7");
-+ asm ("movl 36(%r1),%r6");
-+ }
-+}
diff --git a/lang/icon/patches/patch-aw b/lang/icon/patches/patch-aw
index b437d0501f4..ac978647b5e 100644
--- a/lang/icon/patches/patch-aw
+++ b/lang/icon/patches/patch-aw
@@ -1,10 +1,10 @@
-$NetBSD: patch-aw,v 1.5 2003/06/06 08:58:43 jtb Exp $
+$NetBSD: patch-aw,v 1.6 2009/02/08 12:51:05 asau Exp $
---- src/common/Makefile.orig
-+++ src/common/Makefile
+--- src/common/Makefile.orig 2003-07-05 21:30:35.000000000 +0400
++++ src/common/Makefile 2009-02-08 01:41:40.000000000 +0300
@@ -5,7 +5,7 @@
munix.o literals.o rswitch.o alloc.o long.o getopt.o time.o\
- save.o xwindow.o dlrgint.o ipp.o
+ xwindow.o dlrgint.o ipp.o
-common: doincl $(OBJS) gpxmaybe
+common: doincl patchstr $(OBJS) fixheaders gpxmaybe
diff --git a/lang/icon/patches/patch-ax b/lang/icon/patches/patch-ax
index 6600b785767..76917045332 100644
--- a/lang/icon/patches/patch-ax
+++ b/lang/icon/patches/patch-ax
@@ -1,12 +1,12 @@
-$NetBSD: patch-ax,v 1.5 2003/06/06 08:58:43 jtb Exp $
+$NetBSD: patch-ax,v 1.6 2009/02/08 12:51:05 asau Exp $
---- src/runtime/Makefile.orig
-+++ src/runtime/Makefile
+--- src/runtime/Makefile.orig 2005-07-07 21:36:06.000000000 +0400
++++ src/runtime/Makefile 2009-02-08 01:43:04.000000000 +0300
@@ -41,7 +41,6 @@
cd ../common; $(MAKE)
$(CC) $(RLINK) -o iconx $(OBJS) $(XL) $(RLIBS) $(TL)
cp iconx ../../bin
-- strip ../../bin/iconx$(EXE)
+- strip $(SFLAGS) ../../bin/iconx$(EXE)
xcnv.o: cnv.r $(HDRS)
../../bin/rtt -x cnv.r
diff --git a/lang/icon/patches/patch-az b/lang/icon/patches/patch-az
index 7c5543a7d7a..82a2bb71b98 100644
--- a/lang/icon/patches/patch-az
+++ b/lang/icon/patches/patch-az
@@ -1,13 +1,13 @@
-$NetBSD: patch-az,v 1.6 2006/03/19 15:57:36 joerg Exp $
+$NetBSD: patch-az,v 1.7 2009/02/08 12:51:05 asau Exp $
---- ipl/cfuncs/mklib.sh.orig 2006-03-19 15:16:00.000000000 +0000
-+++ ipl/cfuncs/mklib.sh
-@@ -21,7 +21,7 @@ case "$SYS" in
- ld -shared -o $LIBNAME "$@";;
- OSF*)
- ld -shared -expect_unresolved '*' -o $LIBNAME "$@" -lc;;
-- Linux*|BSD/OS*|OpenBSD*|NetBSD*|GNU*)
-+ Linux*|BSD/OS*|OpenBSD*|NetBSD*|GNU*|DragonFly*)
+--- ipl/cfuncs/mklib.sh.orig 2005-07-07 21:36:06.000000000 +0400
++++ ipl/cfuncs/mklib.sh 2009-02-08 01:44:18.000000000 +0300
+@@ -10,7 +10,7 @@
+ SYS=`uname -s`
+ set -x
+ case "$SYS" in
+- Linux*|*BSD*|GNU*)
++ Linux*|*BSD*|GNU*|DragonFly*)
gcc -shared -o $LIBNAME -fPIC "$@";;
- FreeBSD*)
- ld -Bshareable -o $LIBNAME "$@" -lc;;
+ Darwin*)
+ cc -bundle -undefined suppress -flat_namespace -o $LIBNAME "$@";;
diff --git a/lang/icon/patches/patch-ba b/lang/icon/patches/patch-ba
index dc94ebe4fd8..918a82575bf 100644
--- a/lang/icon/patches/patch-ba
+++ b/lang/icon/patches/patch-ba
@@ -1,12 +1,12 @@
-$NetBSD: patch-ba,v 1.5 2006/03/19 15:57:36 joerg Exp $
+$NetBSD: patch-ba,v 1.6 2009/02/08 12:51:05 asau Exp $
---- config/freebsd/Makedefs.orig 2006-03-19 15:21:42.000000000 +0000
-+++ config/freebsd/Makedefs
-@@ -14,6 +14,6 @@ CFDYN = -fPIC
+--- config/bsd/Makedefs.orig 2005-06-16 19:55:17.000000000 +0400
++++ config/bsd/Makedefs 2009-02-08 01:46:07.000000000 +0300
+@@ -14,6 +14,6 @@
RLINK = -Wl,-E
RLIBS = -lm
- TLIBS = -pthread
--XLIBS = -L/usr/X11R6/lib -lX11
-+XLIBS = -R${X11BASE}/lib -L${X11BASE}/lib -lX11
- XPMDEFS = -DZPIPE
+ TLIBS = -lpthread
+-XLIBS = -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib -lX11
++XLIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lX11
+ XPMDEFS = -DZPIPE -I/usr/X11R6/include
GDIR = xpm
diff --git a/lang/icon/patches/patch-bb b/lang/icon/patches/patch-bb
deleted file mode 100644
index 416a8920047..00000000000
--- a/lang/icon/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.4 2008/06/28 17:14:25 tnn Exp $
-
---- src/common/time.c.orig 2002-07-09 18:49:27.000000000 +0200
-+++ src/common/time.c
-@@ -32,7 +32,7 @@ long millisec()
- t = cptime();
- if (starttime == -2)
- starttime = t;
-- return (long) ((1000.0 / CLK_TCK) * (t - starttime));
-+ return (long) ((1000.0 / sysconf(_SC_CLK_TCK)) * (t - starttime));
- }
-
- #else /* NoPosixTimes */
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 13:47:30 +0000