Add support for NetBSD/sparc

Patches provided by David A. Holland <dholland@eecs.harvard.edu> in
pkg/10332

21 files changed, 290 insertions, 15 deletions

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 415f3ac72cb..c981905df7c 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/04/05 14:32:51 pooka Exp $
+# $NetBSD: Makefile,v 1.16 2000/06/19 15:56:26 pooka Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/02/12 08:39:15 tg Exp
 #
 
@@ -11,7 +11,7 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.cs.arizona.edu/icon/index.htm
 
-ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-i386
+ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-i386 NetBSD-*-sparc
 
 DIST_SUBDIR=		${PKGNAME}
 NO_WRKSUBDIR=		yes
diff --git a/lang/icon/files/patch-sum b/lang/icon/files/patch-sum
index 776e1828479..6c6f82481f9 100644
--- a/lang/icon/files/patch-sum
+++ b/lang/icon/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/04/05 14:32:52 pooka Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/19 15:56:27 pooka Exp $
 
 MD5 (patch-ab) = 39ebb003c327310b946704f1d450890e
 MD5 (patch-ac) = 92a8e84a7a942623a68d84ad5761ab5e
@@ -20,7 +20,7 @@ MD5 (patch-au) = 7be89d7b644916f00152fc983ec79077
 MD5 (patch-av) = a407066bb7e3454c799e0b9e0d32a4ef
 MD5 (patch-aw) = bc95fdfbd9f2ed22105f165219aa4116
 MD5 (patch-ax) = 0ecdee2d97b3623ceeb537101e30bf88
-MD5 (patch-ay) = 1a05a0913fa87a6d8545a58ddde89093
+MD5 (patch-ay) = 31f7b9d5ee5761fac067c6fbae8ee1ee
 MD5 (patch-ba) = 02230fb02841990614a94083bced8de9
 MD5 (patch-bb) = 3d0c4edb2683fe2ce16360858dfb3d05
 MD5 (patch-bc) = 8974c905fcfc4dc4aaf7300398ecc7e2
@@ -44,3 +44,20 @@ MD5 (patch-bt) = dfdcd993dcf387aa4de08fd1b33f8ea1
 MD5 (patch-bu) = b702916016d832ae3d7b70ecd4032d63
 MD5 (patch-bv) = c9489c97b889a52bf30f15cab5b5f5b9
 MD5 (patch-bw) = e4aa830a229ac936ba634a20b5b6c040
+MD5 (patch-ca) = bbba23a32790c20a5d91bd2cde58fc05
+MD5 (patch-cb) = ce8859c85f19f23e1c5d456c5b934a7e
+MD5 (patch-cc) = e1363e36b449f33a2e4778c89673f5bf
+MD5 (patch-cd) = 34e732ff177f842bca08a99c7ef8d8f4
+MD5 (patch-ce) = db9071039a87e7eafe722a6a937a63ab
+MD5 (patch-cf) = 4d87c1ca0ce11bed1851ec720e3c6b95
+MD5 (patch-cg) = 92618043c5d473fb1959b14b1cc41442
+MD5 (patch-ch) = 0c8d8a3b5e791f6afb893eed8a1edcfe
+MD5 (patch-ci) = 5c8a70059a6be84cb67357c6df414b13
+MD5 (patch-cj) = 2e3db6550a0d327db554229f0c3a0561
+MD5 (patch-ck) = d5fcf9da944f263641113f26c75aa3e5
+MD5 (patch-cl) = 9c495d94b3f39f94112d86d2023d7841
+MD5 (patch-cm) = a8c09d2c16f7e27246cf5aec3b86f732
+MD5 (patch-cn) = 383c6c7c8b06f83ac39e1bd46bea11a2
+MD5 (patch-co) = 25b6f33aa2ced250532b19dfdf19162f
+MD5 (patch-cp) = a74890495a13dfded89a92836fffbe78
+MD5 (patch-cq) = 1e4f670048308557d864cc675f3810c6
diff --git a/lang/icon/patches/patch-ay b/lang/icon/patches/patch-ay
index 5c72e2b1438..6a0c9b15bf5 100644
--- a/lang/icon/patches/patch-ay
+++ b/lang/icon/patches/patch-ay
@@ -1,17 +1,25 @@
-$NetBSD: patch-ay,v 1.2 1998/08/07 11:09:10 agc Exp $
+$NetBSD: patch-ay,v 1.3 2000/06/19 15:56:28 pooka Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/xpm.hdr	Wed Oct  1 17:32:26 1997
-@@ -0,0 +1 @@
-+DEFINES= -DZPIPE
---- src/common/save.c	1997/10/02 07:49:07	1.1
-+++ src/common/save.c	1997/10/02 08:00:57
-@@ -91,7 +91,11 @@
+--- /dev/null   Wed Oct  1 17:23:30 1997
++++ config/unix/intel_netbsd/xpm.hdr    Wed Oct  1 17:32:26 1997
+@@ -0,0 +1 @@                                                   
++DEFINES= -DZPIPE                                               
+--- src/common/save.c   1997/10/02 07:49:07     1.1             
++++ src/common/save.c   1997/10/02 08:00:57                     
+@@ -79,6 +79,7 @@
+  */
+ 
+ #ifdef GenericBSD
++#include <sys/param.h>
+ #include <a.out.h>
+ wrtexec(ef)
+ int ef;
+@@ -91,7 +92,11 @@
      * Construct the header.  The text and data region sizes must be multiples
      *  of 1024.
      */
 +#ifdef __NetBSD__
-+   N_SETMAGIC(hdr, ZMAGIC, MID_I386, EX_DYNAMIC);
++   N_SETMAGIC(hdr, ZMAGIC, MID_MACHINE, EX_DYNAMIC);
 +#else
     hdr.a_magic = ZMAGIC;
 +#endif
diff --git a/lang/icon/patches/patch-ca b/lang/icon/patches/patch-ca
new file mode 100644
index 00000000000..4b55588385c
--- /dev/null
+++ b/lang/icon/patches/patch-ca
@@ -0,0 +1,56 @@
+$NetBSD: patch-ca,v 1.3 2000/06/19 15:56:28 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/common.hdr   Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,10 @@
++#  The -D$D option to CFLAGS makes it possible to specify a definition
++#  at the Make command level without revising the Makefile, as
++#  in
++#
++#      make D=Debug
++#
++D=NOTHING
++CFLAGS+= -D$D
++SHELL=/bin/sh
++RSWITCH=rswitch.c
+diff -u /dev/null config/unix/sun_netbsd/copybin.c
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/copybin.c    Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,3 @@
++#include "../../../src/h/define.h"
++#include "paths.h"
++#include "../Generic/copybin.h"
+diff -u /dev/null config/unix/sun_netbsd/define.h
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/define.h     Thu Jun  8 22:17:12 2000
+@@ -0,0 +1,30 @@
++#define Standard
++#define IconGcvt
++#define index strchr
++#define rindex strrchr
++#define GetHost
++#define MaxHdr 13400
++#define MaxStatSize 20480
++
++#define GenericBSD
++#define BSD_4_4_LITE    1      /* This is new, for 4.4Lite specific stuff */
++#define UNIX 1
++#define LoadFunc
++#define ExecImages
++
++#define KeyboardFncs
++#define HaveTioc
++#define USE_OLD_TTY
++#define AllowConst
++#define SysOpt
++#define CComp "gcc"
++#define COpts "-O2"
++
++/* Sun parameters */
++/*#define SUN*/
++#define ZERODIVIDE
++
++/* CPU architecture */
++#define Double
++#define StackAlign 8
++
diff --git a/lang/icon/patches/patch-cb b/lang/icon/patches/patch-cb
new file mode 100644
index 00000000000..6826cfa469b
--- /dev/null
+++ b/lang/icon/patches/patch-cb
@@ -0,0 +1,7 @@
+$NetBSD: patch-cb,v 1.1 2000/06/19 15:56:31 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/icon_pi.c    Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,2 @@
++#include "paths.h"
++#include "../Generic/icon_pi.h"
diff --git a/lang/icon/patches/patch-cc b/lang/icon/patches/patch-cc
new file mode 100644
index 00000000000..57cced8794c
--- /dev/null
+++ b/lang/icon/patches/patch-cc
@@ -0,0 +1,14 @@
+$NetBSD: patch-cc,v 1.4 2000/06/19 15:56:32 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/iconc.hdr    Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,9 @@
++#  The -D$D option to CFLAGS makes it possible to specify a definition
++#  at the Make command level without revising the Makefile, as
++#  in
++#
++#      make D=Debug
++#
++D=NOTHING
++CFLAGS+= -D$D
++SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-cd b/lang/icon/patches/patch-cd
new file mode 100644
index 00000000000..da69121c4c2
--- /dev/null
+++ b/lang/icon/patches/patch-cd
@@ -0,0 +1,6 @@
+$NetBSD: patch-cd,v 1.3 2000/06/19 15:56:33 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/icont.hdr    Thu Jun  8 22:10:28 2000
+@@ -0,0 +1 @@
++SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-ce b/lang/icon/patches/patch-ce
new file mode 100644
index 00000000000..8bbde22f615
--- /dev/null
+++ b/lang/icon/patches/patch-ce
@@ -0,0 +1,12 @@
+$NetBSD: patch-ce,v 1.1 2000/06/19 15:56:34 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/iconx.hdr    Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,7 @@
++SHELL=/bin/sh
++# the seek stuff is defined in a header file that they don't
++# include.  This is the easiest.  -Dconst= causes const to
++# be ignored.  This is needed because otherwise we get complaints
++# due to stdio.h defining some functions with const when they
++# are not defined that way in Icon's header files
++RSWITCH=rswitch.c
diff --git a/lang/icon/patches/patch-cf b/lang/icon/patches/patch-cf
new file mode 100644
index 00000000000..f1ae9cea3f3
--- /dev/null
+++ b/lang/icon/patches/patch-cf
@@ -0,0 +1,8 @@
+$NetBSD: patch-cf,v 1.1 2000/06/19 15:56:34 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/paths.h      Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,3 @@
++#define RootPath "/usr/local"
++#define IcontPath "/usr/local/lib/icon/icont"
++#define IconxPath "/usr/local/lib/icon/iconx"
diff --git a/lang/icon/patches/patch-cg b/lang/icon/patches/patch-cg
new file mode 100644
index 00000000000..91ff268f02f
--- /dev/null
+++ b/lang/icon/patches/patch-cg
@@ -0,0 +1,7 @@
+$NetBSD: patch-cg,v 1.1 2000/06/19 15:56:35 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/pi.hdr       Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,2 @@
++SHELL=/bin/sh
++CFLAGS+=-DPersInterp
diff --git a/lang/icon/patches/patch-ch b/lang/icon/patches/patch-ch
new file mode 100644
index 00000000000..0a74a096fd4
--- /dev/null
+++ b/lang/icon/patches/patch-ch
@@ -0,0 +1,15 @@
+$NetBSD: patch-ch,v 1.1 2000/06/19 15:56:36 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/preproc.hdr  Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,10 @@
++#  The -D$D option to CFLAGS makes it possible to specify a definition
++#  at the Make command level without revising the Makefile, as
++#  in
++#
++#      make D=Debug
++#
++D=NOTHING
++CC=cc
++CFLAGS+= -O -D$D
++SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-ci b/lang/icon/patches/patch-ci
new file mode 100644
index 00000000000..3e9932a6f8b
--- /dev/null
+++ b/lang/icon/patches/patch-ci
@@ -0,0 +1,44 @@
+$NetBSD: patch-ci,v 1.1 2000/06/19 15:56:36 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/rswitch.c    Thu Jun  8 22:14:54 2000
+@@ -0,0 +1,39 @@
++/*
++ * coswitch for Sun-4 Sparc.
++ * 
++ * Compile this with 'cc -c rswitch.c'.  Do not use cc -O.
++ */
++
++/* #include <sys/asm_linkage.h> */
++/*#include <sys/trap.h>*/
++
++int coswitch(old_cs, new_cs, first)
++int *old_cs, *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-cj b/lang/icon/patches/patch-cj
new file mode 100644
index 00000000000..40b24dcd055
--- /dev/null
+++ b/lang/icon/patches/patch-cj
@@ -0,0 +1,7 @@
+$NetBSD: patch-cj,v 1.1 2000/06/19 15:56:36 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/rtt.hdr      Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,2 @@
++CFLAGS+= -DTokDotH="\"../rtt/ltoken.h\""
++SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-ck b/lang/icon/patches/patch-ck
new file mode 100644
index 00000000000..57a252ffd12
--- /dev/null
+++ b/lang/icon/patches/patch-ck
@@ -0,0 +1,6 @@
+$NetBSD: patch-ck,v 1.1 2000/06/19 15:56:37 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/runtime.hdr  Thu Jun  8 22:10:28 2000
+@@ -0,0 +1 @@
++SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-cl b/lang/icon/patches/patch-cl
new file mode 100644
index 00000000000..a0c10e56405
--- /dev/null
+++ b/lang/icon/patches/patch-cl
@@ -0,0 +1,7 @@
+$NetBSD: patch-cl,v 1.1 2000/06/19 15:56:37 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/setpath.c    Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,2 @@
++#include "paths.h"
++#include "../Generic/setpath.h"
diff --git a/lang/icon/patches/patch-cm b/lang/icon/patches/patch-cm
new file mode 100644
index 00000000000..78986b554ab
--- /dev/null
+++ b/lang/icon/patches/patch-cm
@@ -0,0 +1,33 @@
+$NetBSD: patch-cm,v 1.1 2000/06/19 15:56:38 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/status       Thu Jun  8 22:21:08 2000
+@@ -0,0 +1,28 @@
++System configuration:
++
++       SPARC architecture running NetBSD 1.4
++
++Latest Icon version:
++
++       Version 9.3.2
++
++Installer:
++
++       David A. Holland
++       <dholland@eecs.harvard.edu>
++
++Missing features:
++
++       None.
++
++Known bugs:
++
++       None.
++
++Comments:
++
++       Mostly cribbed from a diff of intel_linux and sun_linux.
++
++Date:
++
++       Thu Jun  8 18:20:33 EDT 2000
diff --git a/lang/icon/patches/patch-cn b/lang/icon/patches/patch-cn
new file mode 100644
index 00000000000..e531bda6cb0
--- /dev/null
+++ b/lang/icon/patches/patch-cn
@@ -0,0 +1,7 @@
+$NetBSD: patch-cn,v 1.1 2000/06/19 15:56:39 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/vt.hdr       Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,2 @@
++SHELL=/bin/sh
++CFLAGS+= -DVarTran
diff --git a/lang/icon/patches/patch-co b/lang/icon/patches/patch-co
new file mode 100644
index 00000000000..0f3a4449634
--- /dev/null
+++ b/lang/icon/patches/patch-co
@@ -0,0 +1,7 @@
+$NetBSD: patch-co,v 1.1 2000/06/19 15:56:39 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/vtran.hdr    Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,2 @@
++SHELL=/bin/sh
++CFLAGS+= -DVarTran
diff --git a/lang/icon/patches/patch-cp b/lang/icon/patches/patch-cp
new file mode 100644
index 00000000000..0067dc10823
--- /dev/null
+++ b/lang/icon/patches/patch-cp
@@ -0,0 +1,8 @@
+$NetBSD: patch-cp,v 1.1 2000/06/19 15:56:40 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/xiconx.mak   Thu Jun  8 22:10:28 2000
+@@ -0,0 +1,3 @@
++# If you define EventMon, add the -lgmon below to get profil(2) under Linux
++#XLIB= -lX11 -lgmon
++XLIB= -L/usr/X11R6/lib -lX11
diff --git a/lang/icon/patches/patch-cq b/lang/icon/patches/patch-cq
new file mode 100644
index 00000000000..b3f23d90417
--- /dev/null
+++ b/lang/icon/patches/patch-cq
@@ -0,0 +1,6 @@
+$NetBSD: patch-cq,v 1.1 2000/06/19 15:56:40 pooka Exp $
+
+--- /dev/null   Thu Jan  1 00:00:00 1970
++++ config/unix/sun_netbsd/xpm.hdr      Thu Jun  8 22:10:28 2000
+@@ -0,0 +1 @@
++DEFINES= -DZPIPE
diff --git a/lang/icon/scripts/configure b/lang/icon/scripts/configure
index 3b890227aa6..7c5906fecff 100644
--- a/lang/icon/scripts/configure
+++ b/lang/icon/scripts/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: configure,v 1.4 1998/08/07 11:09:18 agc Exp $
+# $NetBSD: configure,v 1.5 2000/06/19 15:56:41 pooka Exp $
 #
 
-cd ${WRKSRC}; make Configure name=`uname -m| sed -e 's/i386/intel/'`_`uname -s|tr '[A-Z]' '[a-z]'`
+cd ${WRKSRC}; make Configure name=`uname -m| sed -e 's/i386/intel/;s/sparc/sun/'`_`uname -s|tr '[A-Z]' '[a-z]'`