From f02cc8681ece9623c794fc029cbd36b495d2f411 Mon Sep 17 00:00:00 2001 From: pooka Date: Wed, 5 Apr 2000 14:32:51 +0000 Subject: Upgrade to icon-9.3.2. For the Icon source code, this is primarily a maintenance release. The code has been reworked and simplified to increase portability. An ANSI C compiler is now required, and UNIX systems are expected to supply a POSIX (1003.1-1988) library. Version 9.3.2 adds one new feature: The files in a directory can be listed by opening the directory as a file. Subsequent reads return the names of the files contained in the directory. The names are returned in no particular order, and for UNIX, the directories "." and ".." are included. --- lang/icon/Makefile | 8 ++++---- lang/icon/files/md5 | 4 ++-- lang/icon/files/patch-sum | 18 +++++++----------- lang/icon/patches/patch-aa | 22 ---------------------- lang/icon/patches/patch-ab | 35 +++++++++++++++++++++-------------- lang/icon/patches/patch-ac | 30 ++++++++++++------------------ lang/icon/patches/patch-ae | 23 ----------------------- lang/icon/patches/patch-af | 23 ----------------------- lang/icon/patches/patch-az | 12 ------------ lang/icon/patches/patch-bt | 12 ++++++++---- lang/icon/patches/patch-bu | 17 ++++++++--------- lang/icon/patches/patch-bv | 12 ++++++++---- lang/icon/patches/patch-bw | 15 +++++++++++---- 13 files changed, 81 insertions(+), 150 deletions(-) delete mode 100644 lang/icon/patches/patch-aa delete mode 100644 lang/icon/patches/patch-ae delete mode 100644 lang/icon/patches/patch-af delete mode 100644 lang/icon/patches/patch-az (limited to 'lang/icon') diff --git a/lang/icon/Makefile b/lang/icon/Makefile index ad7baf79984..415f3ac72cb 100644 --- a/lang/icon/Makefile +++ b/lang/icon/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.14 1999/07/07 21:25:42 tron Exp $ +# $NetBSD: Makefile,v 1.15 2000/04/05 14:32:51 pooka Exp $ # FreeBSD Id: Makefile,v 1.8 1997/02/12 08:39:15 tg Exp # DISTNAME= unix -PKGNAME= icon-9.3.1 +PKGNAME= icon-9.3.2 CATEGORIES= lang MASTER_SITES= http://www.cs.arizona.edu/icon/ftp/packages/unix/ EXTRACT_SUFX= .tgz @@ -13,8 +13,8 @@ HOMEPAGE= http://www.cs.arizona.edu/icon/index.htm ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-i386 -DIST_SUBDIR= icon -NO_WRKSUBDIR= true +DIST_SUBDIR= ${PKGNAME} +NO_WRKSUBDIR= yes ALL_TARGET= Icon Icon-iconc MANCOMPRESSED_IF_MANZ= yes diff --git a/lang/icon/files/md5 b/lang/icon/files/md5 index 7ff76ac89d2..9a0b4e94359 100644 --- a/lang/icon/files/md5 +++ b/lang/icon/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 1998/08/07 13:24:57 agc Exp $ +$NetBSD: md5,v 1.4 2000/04/05 14:32:52 pooka Exp $ -MD5 (icon/unix.tgz) = 87b8628e24c1e7c14edbe593f46e06e4 +MD5 (icon-9.3.2/unix.tgz) = 3147586808024239962390cfa78a00a8 diff --git a/lang/icon/files/patch-sum b/lang/icon/files/patch-sum index 83d74c0f764..776e1828479 100644 --- a/lang/icon/files/patch-sum +++ b/lang/icon/files/patch-sum @@ -1,10 +1,7 @@ -$NetBSD: patch-sum,v 1.2 1999/11/15 19:23:38 rh Exp $ +$NetBSD: patch-sum,v 1.3 2000/04/05 14:32:52 pooka Exp $ -MD5 (patch-aa) = 21ed0ef02b0f36d930df4395f33f0218 -MD5 (patch-ab) = 991eb7c4cee4d0367a80987598e8ed1e -MD5 (patch-ac) = 40c1d0380ca4b8df4c45943e4e703de7 -MD5 (patch-ae) = 6eb352e04cf947c4bfd36e4f4e021d7d -MD5 (patch-af) = 4ce05d8598cab2582166f31ae11af3d0 +MD5 (patch-ab) = 39ebb003c327310b946704f1d450890e +MD5 (patch-ac) = 92a8e84a7a942623a68d84ad5761ab5e MD5 (patch-ag) = 830747e9a36f0644e7cb117158e3892a MD5 (patch-ah) = ef9c360be73038fec251a3381f87b6af MD5 (patch-ai) = ee4b9762b66b1883fc3e4593c3f5aa0d @@ -24,7 +21,6 @@ MD5 (patch-av) = a407066bb7e3454c799e0b9e0d32a4ef MD5 (patch-aw) = bc95fdfbd9f2ed22105f165219aa4116 MD5 (patch-ax) = 0ecdee2d97b3623ceeb537101e30bf88 MD5 (patch-ay) = 1a05a0913fa87a6d8545a58ddde89093 -MD5 (patch-az) = a25a210cbd690c95dc23bfb3ce730742 MD5 (patch-ba) = 02230fb02841990614a94083bced8de9 MD5 (patch-bb) = 3d0c4edb2683fe2ce16360858dfb3d05 MD5 (patch-bc) = 8974c905fcfc4dc4aaf7300398ecc7e2 @@ -44,7 +40,7 @@ MD5 (patch-bp) = 4d47fe431d44dacb1723d74da3f9e078 MD5 (patch-bq) = 8f220190fee02126efb627ad948780f6 MD5 (patch-br) = 5b3ddae52768f7e2a62b6d298fdb6e2c MD5 (patch-bs) = c15b43fcc1387d1876dad798f8b279d7 -MD5 (patch-bt) = aaa1d5ba951c4b93aeeb8f2dcf4d13ed -MD5 (patch-bu) = 05c2b33619d38fd3b90ba6d8e08a938f -MD5 (patch-bv) = 46261e231d56161d4402bf3d587f225a -MD5 (patch-bw) = afbc02819f38c876692ad5592fe1bd2a +MD5 (patch-bt) = dfdcd993dcf387aa4de08fd1b33f8ea1 +MD5 (patch-bu) = b702916016d832ae3d7b70ecd4032d63 +MD5 (patch-bv) = c9489c97b889a52bf30f15cab5b5f5b9 +MD5 (patch-bw) = e4aa830a229ac936ba634a20b5b6c040 diff --git a/lang/icon/patches/patch-aa b/lang/icon/patches/patch-aa deleted file mode 100644 index e12323498fe..00000000000 --- a/lang/icon/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.3 1998/08/07 11:09:04 agc Exp $ - ---- src/runtime/rmisc.r 1997/10/02 09:28:35 1.1 -+++ src/runtime/rmisc.r 1997/10/02 09:30:08 -@@ -123,14 +123,15 @@ - return buf; - #endif /* OS2EMX */ - --#if FreeBSD -+#if (defined(GenericBSD) && !defined(FreeBSD)) -+/* This is commented out in the FreeBSD ports collection */ - #define ecvt(w,x,y,z) 0 - - sprintf(buf, "%f", number); - for(i=strlen(buf); i>1 && buf[i-1]=='0' && buf[i-2]!='.'; i--) - buf[i-1] = '\0'; - return buf; --#endif /* FreeBSD */ -+#endif /* GenericBSD && !FreeBSD */ - - p1 = ecvt(number, ndigit, &decpt, &sign); - p2 = buf; diff --git a/lang/icon/patches/patch-ab b/lang/icon/patches/patch-ab index 56848de5fb8..44fca955427 100644 --- a/lang/icon/patches/patch-ab +++ b/lang/icon/patches/patch-ab @@ -1,23 +1,30 @@ -$NetBSD: patch-ab,v 1.4 1998/08/07 11:09:04 agc Exp $ +$NetBSD: patch-ab,v 1.5 2000/04/05 14:32:53 pooka Exp $ ---- Makefile.orig Fri Feb 13 07:18:30 1998 -+++ Makefile Fri Jun 19 04:31:38 1998 -@@ -188 +188,18 @@ - ################################################################## +--- Makefile.orig Thu Jul 1 20:39:20 1999 ++++ Makefile Wed Apr 5 16:16:27 2000 +@@ -186,6 +186,25 @@ + -cd src; $(MAKE) Clean + -cd tests; $(MAKE) Clean + ++# Install + +install: + @bin/patchstr bin/iconc ${PREFIX}/share/icon/ + @bin/patchstr bin/icont ${PREFIX}/bin/iconx -+ install -c -s -g bin -o bin -m 755 bin/iconc ${PREFIX}/bin/iconc -+ install -c -s -g bin -o bin -m 755 bin/icont ${PREFIX}/bin/icont -+ install -c -s -g bin -o bin -m 755 bin/iconx ${PREFIX}/bin/iconx -+ install -c -s -g bin -o bin -m 755 bin/patchstr ${PREFIX}/bin/patchstr ++ install -c -s -g wheel -o root -m 755 bin/iconc ${PREFIX}/bin/iconc ++ install -c -s -g wheel -o root -m 755 bin/icont ${PREFIX}/bin/icont ++ install -c -s -g wheel -o root -m 755 bin/iconx ${PREFIX}/bin/iconx ++ install -c -s -g wheel -o root -m 755 bin/patchstr ${PREFIX}/bin/patchstr + @mkdir -p ${PREFIX}/share/icon -+ install -c -g bin -o bin -m 644 bin/dlrgint.o ${PREFIX}/share/icon/dlrgint.o -+ install -c -g bin -o bin -m 644 bin/rt.a ${PREFIX}/share/icon/rt.a -+ install -c -g bin -o bin -m 644 bin/rt.db ${PREFIX}/share/icon/rt.db -+ install -c -g bin -o bin -m 644 bin/rt.h ${PREFIX}/share/icon/rt.h ++ install -c -g wheel -o root -m 644 bin/dlrgint.o ${PREFIX}/share/icon/dlrgint.o ++ install -c -g wheel -o root -m 644 bin/rt.a ${PREFIX}/share/icon/rt.a ++ install -c -g wheel -o root -m 644 bin/rt.db ${PREFIX}/share/icon/rt.db ++ install -c -g wheel -o root -m 644 bin/rt.h ${PREFIX}/share/icon/rt.h +# @mkdir -p ${PREFIX}/man/man1 -+# install -c -g bin -o bin -m 444 docs/icon.1 ${PREFIX}/man/man1/icon.1 ++# install -c -g wheel -o root -m 444 docs/icon.1 ${PREFIX}/man/man1/icon.1 +# @gzip -9fn ${PREFIX}/man/man1/icon.1 +# XXX (icon.1 missing from this distribution!) ++ + ################################################################## + # Entries beyond this point are for use at Arizona only. + # *** Do not delete the line above; it is used in trimming Makefiles diff --git a/lang/icon/patches/patch-ac b/lang/icon/patches/patch-ac index ba6ac4bc734..0f97f67e32a 100644 --- a/lang/icon/patches/patch-ac +++ b/lang/icon/patches/patch-ac @@ -1,19 +1,13 @@ -$NetBSD: patch-ac,v 1.2 1998/08/07 11:09:04 agc Exp $ +$NetBSD: patch-ac,v 1.3 2000/04/05 14:32:53 pooka Exp $ -*** config/unix/Config/Makefile.orig Fri Jul 29 21:40:55 1994 ---- config/unix/Config/Makefile Wed Mar 1 14:27:05 1995 -*************** -*** 1,7 **** -- CC=cc -- CFLAGS= -DVarTran -- LDFLAGS= - SHELL=/bin/sh - MAKE=make - - all: ---- 1,5 ---- - SHELL=/bin/sh -+ CFLAGS+= -DVarTran - MAKE=make - - all: +--- config/unix/Config/Makefile.orig Thu Jul 1 20:36:41 1999 ++++ config/unix/Config/Makefile Wed Apr 5 16:17:56 2000 +@@ -1,7 +1,5 @@ +-CC=cc +-CFLAGS= -DVarTran +-LDFLAGS= + SHELL=/bin/sh ++CFLAGS+= -DVarTran + MAKE=make + + all: diff --git a/lang/icon/patches/patch-ae b/lang/icon/patches/patch-ae deleted file mode 100644 index 320bccaae00..00000000000 --- a/lang/icon/patches/patch-ae +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ae,v 1.2 1998/08/07 11:09:04 agc Exp $ - -*** src/h/sys.h.orig Fri Jul 29 21:24:57 1994 ---- src/h/sys.h Wed Mar 1 15:43:55 1995 -*************** -*** 181,192 **** ---- 181,196 ---- - #include - #include - #include -+ #include -+ #if (defined(BSD) && BSD >= 199306) -+ #include -+ #endif - #endif /* HaveTioc */ - - #endif /* KeyboardFncs */ - - #ifdef LoadFunc - #include - #endif /* LoadFunc */ - - #endif /* UNIX */ diff --git a/lang/icon/patches/patch-af b/lang/icon/patches/patch-af deleted file mode 100644 index d4ba0ab4fa0..00000000000 --- a/lang/icon/patches/patch-af +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-af,v 1.3 1999/11/15 19:23:39 rh Exp $ - ---- src/runtime/fload.r.orig Fri Feb 13 15:12:48 1998 -+++ src/runtime/fload.r Mon Nov 15 20:19:05 1999 -@@ -24,6 +24,10 @@ - - #ifdef FreeBSD - -+/* Look at the DL_GETERRNO constant, if it exists this is FreeBSD 1.1.5 -+ or 2.0. If it doesn't exist this must be post 2.0 with an dlerror */ -+ -+#passthru #ifdef DL_GETERRNO - /* Sorry, no dlerror() on FreeBSD. Fake it. */ - char *dlerror(void) - { -@@ -34,6 +38,7 @@ - else - return(NULL); - } -+#passthru #endif - - #endif /* __FreeBSD__ */ - diff --git a/lang/icon/patches/patch-az b/lang/icon/patches/patch-az deleted file mode 100644 index 2abd2e60884..00000000000 --- a/lang/icon/patches/patch-az +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-az,v 1.2 1998/08/07 11:09:10 agc Exp $ - ---- src/iconc/ccode.c.orig Fri Jun 19 02:25:13 1998 -+++ src/iconc/ccode.c Fri Jun 19 02:26:35 1998 -@@ -3428,5 +3428,6 @@ - /* -+ XXX the Z thing is getting eaten by the comment! - cd->ElemTyp(i) = A_Str; - str = (char *)alloc(strlen(cur->csym->image)+8); -- sprintf(str, "\"%s\"/*Z*/", cur->csym->image); -+ sprintf(str, "\"%s\"X/*Z*X/", cur->csym->image); - cd->Str(i) = str; diff --git a/lang/icon/patches/patch-bt b/lang/icon/patches/patch-bt index 0513564b29c..090097090c6 100644 --- a/lang/icon/patches/patch-bt +++ b/lang/icon/patches/patch-bt @@ -1,9 +1,13 @@ -$NetBSD: patch-bt,v 1.2 1998/08/07 11:09:17 agc Exp $ +$NetBSD: patch-bt,v 1.3 2000/04/05 14:32:53 pooka Exp $ ---- config/unix/Config/iconc.make.orig Fri Jun 19 04:53:34 1998 -+++ config/unix/Config/iconc.make Fri Jun 19 04:53:44 1998 -@@ -25,3 +25,3 @@ +--- config/unix/Config/iconc.make.orig Thu Jul 1 20:36:41 1999 ++++ config/unix/Config/iconc.make Wed Apr 5 16:23:12 2000 +@@ -23,7 +23,7 @@ + iconc: $(OBJS) $(COBJS) + $(CC) $(LDFLAGS) -o iconc $(OBJS) $(COBJS) cp iconc ../../bin - strip ../../bin/iconc +# strip ../../bin/iconc + $(OBJS): ../h/config.h ../h/cpuconf.h ../h/cstructs.h ../h/define.h\ + ../h/proto.h ../h/mproto.h ../h/typedefs.h ../h/gsupport.h \ diff --git a/lang/icon/patches/patch-bu b/lang/icon/patches/patch-bu index 7454c8c5172..f6874a2298a 100644 --- a/lang/icon/patches/patch-bu +++ b/lang/icon/patches/patch-bu @@ -1,14 +1,13 @@ -$NetBSD: patch-bu,v 1.2 1998/08/07 11:09:17 agc Exp $ +$NetBSD: patch-bu,v 1.3 2000/04/05 14:32:53 pooka Exp $ ---- config/unix/Config/icont.make.orig Fri Jun 19 04:53:49 1998 -+++ config/unix/Config/icont.make Fri Jun 19 04:54:09 1998 -@@ -27,3 +27,3 @@ +--- config/unix/Config/icont.make.orig Thu Jul 1 20:36:41 1999 ++++ config/unix/Config/icont.make Wed Apr 5 16:24:37 2000 +@@ -21,7 +21,7 @@ + icont: $(OBJS) common + $(CC) $(CFLAGS) $(LDFLAGS) -o icont $(OBJS) $(COBJS) $(LIBS) cp icont ../../bin - strip ../../bin/icont +# strip ../../bin/icont -@@ -67,3 +67,3 @@ - -o iconx.hdr $(LIBS) -- strip iconx.hdr -+# strip iconx.hdr - ixhdr.o: ../h/path.h ../h/header.h + $(OBJS): ../h/define.h ../h/config.h ../h/cpuconf.h ../h/gsupport.h \ + ../h/proto.h ../h/mproto.h \ diff --git a/lang/icon/patches/patch-bv b/lang/icon/patches/patch-bv index 35e406b4010..95cc2d79fca 100644 --- a/lang/icon/patches/patch-bv +++ b/lang/icon/patches/patch-bv @@ -1,9 +1,13 @@ -$NetBSD: patch-bv,v 1.2 1998/08/07 11:09:17 agc Exp $ +$NetBSD: patch-bv,v 1.3 2000/04/05 14:32:53 pooka Exp $ ---- config/unix/Config/rtt.make.orig Fri Jun 19 04:54:16 1998 -+++ config/unix/Config/rtt.make Fri Jun 19 04:54:24 1998 -@@ -29,3 +29,3 @@ +--- config/unix/Config/rtt.make.orig Thu Jul 1 20:36:41 1999 ++++ config/unix/Config/rtt.make Wed Apr 5 16:26:31 2000 +@@ -27,7 +27,7 @@ + rtt: $(OBJ) + $(CC) $(LDFLAGS) -o rtt $(OBJ) cp rtt ../../bin - strip ../../bin/rtt +# strip ../../bin/rtt + library: $(OBJ) + rm -rf rtt.a diff --git a/lang/icon/patches/patch-bw b/lang/icon/patches/patch-bw index 23517ac6f60..994781fdc8d 100644 --- a/lang/icon/patches/patch-bw +++ b/lang/icon/patches/patch-bw @@ -1,9 +1,16 @@ -$NetBSD: patch-bw,v 1.2 1998/08/07 11:09:18 agc Exp $ +$NetBSD: patch-bw,v 1.3 2000/04/05 14:32:53 pooka Exp $ ---- config/unix/Config/runtime.make.orig Fri Jun 19 04:54:30 1998 -+++ config/unix/Config/runtime.make Fri Jun 19 04:54:37 1998 -@@ -40,3 +40,3 @@ +--- config/unix/Config/runtime.make.orig Thu Jul 1 20:36:41 1999 ++++ config/unix/Config/runtime.make Wed Apr 5 17:14:41 2000 +@@ -36,9 +36,9 @@ + $(MAKE) iconx + + iconx: $(OBJS) +- $(CC) $(LDFLAGS) -o iconx $(OBJS) $(XPMLIB) $(XLIB) $(LIBS) ++ $(CC) $(LDFLAGS) -o iconx $(OBJS) $(XPMLIB) $(XLIB) $(LIBS) -lm cp iconx ../../bin - strip ../../bin/iconx +# strip ../../bin/iconx + xcnv.o: cnv.r $(HDRS) + ../../bin/rtt -x cnv.r -- cgit v1.2.3