pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/icon Update Icon to 9.4.3



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bcf23613d3cc
branches:  trunk
changeset: 554092:bcf23613d3cc
user:      asau <asau%pkgsrc.org@localhost>
date:      Sun Feb 08 12:51:04 2009 +0000

description:
Update Icon to 9.4.3


Notable changes in version 9.4.3:

The system-specific Icon configurations have been reorganized and renamed.
The several BSD configurations have been merged into one.

The macintosh configuration now supports the loadfunc function.

A new porting guide has been written, and a new posix configuration
has been added as a starting point in constructing new ports.

The core library files remain stable. Notable changes include:
- procs/dijkstra          new procedures implement Dijkstra's control structures
- procs/html              add procedure for canonicalization of paths
- procs/matrix2           new procedures for matrix manipulation
- procs/nestlist          new procedures for representing nested lists as strings
- procs/printf            add %e format and fix a rounding problem
- progs/noise             new program for producing a random bitstream
- progs/unclog            improve logic for combining adjacent entries
- gprogs/dlgvu            improve coverage map; allow altitude in GPS data
- gprogs/gallery          faster thumbnail loading for JPEG images
- gprogs/img              many new features
- gprogs/sier             better color choices
- gprogs/trkvu            accept GPS track logs with altitude as the last field

The undocumented save function, which only worked on a few platforms, has been removed.


Approved by <tnn>.

diffstat:

 lang/icon/Makefile         |   22 ++++----
 lang/icon/PLIST            |   11 +++-
 lang/icon/distinfo         |   37 +++++--------
 lang/icon/patches/patch-aa |   11 +---
 lang/icon/patches/patch-ab |   14 +---
 lang/icon/patches/patch-ac |  116 +++++++++++++++++++++++++++-----------------
 lang/icon/patches/patch-ad |   30 -----------
 lang/icon/patches/patch-ae |   51 -------------------
 lang/icon/patches/patch-af |   28 ----------
 lang/icon/patches/patch-ag |   38 --------------
 lang/icon/patches/patch-ah |   24 ---------
 lang/icon/patches/patch-ai |    4 +-
 lang/icon/patches/patch-aj |   32 ++++++-----
 lang/icon/patches/patch-ao |    4 +-
 lang/icon/patches/patch-ap |    4 +-
 lang/icon/patches/patch-aq |   43 ----------------
 lang/icon/patches/patch-aw |    8 +-
 lang/icon/patches/patch-ax |    8 +-
 lang/icon/patches/patch-az |   22 ++++----
 lang/icon/patches/patch-ba |   16 +++---
 lang/icon/patches/patch-bb |   13 -----
 21 files changed, 164 insertions(+), 372 deletions(-)

diffs (truncated from 782 to 300 lines):

diff -r 0a8068e362dc -r bcf23613d3cc lang/icon/Makefile
--- a/lang/icon/Makefile        Sun Feb 08 10:15:16 2009 +0000
+++ b/lang/icon/Makefile        Sun Feb 08 12:51:04 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2008/07/20 19:02:47 ahoka Exp $
+# $NetBSD: Makefile,v 1.46 2009/02/08 12:51:04 asau Exp $
 
-DISTNAME=              icon.v942src
-PKGNAME=               icon-9.4.2
-PKGREVISION=           1
+DISTNAME=              icon.v943src
+PKGNAME=               icon-9.4.3
+PKGREVISION=           #
 CATEGORIES=            lang
 MASTER_SITES=          http://www.cs.arizona.edu/icon/ftp/packages/unix/
 EXTRACT_SUFX=          .tgz
@@ -11,18 +11,19 @@
 HOMEPAGE=              http://www.cs.arizona.edu/icon/index.htm
 COMMENT=               The Icon programming language
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFIGURE_TARGET=      X-Configure
 BUILD_TARGET=          All
+INSTALL_TARGET=                Install
 TEST_TARGET=           Test
 MAKE_JOBS_SAFE=                no
 
-INSTALLATION_DIRS=     ${PKGMANDIR}/man1
-
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 
 .if ${OPSYS} == "NetBSD"
-NAME=  netbsd
+NAME=  bsd
 .  if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "i386") || \
        (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "powerpc") || \
        (${MACHINE_ARCH} == "mipseb") || (${MACHINE_ARCH} == "mipsel") || \
@@ -33,7 +34,7 @@
 .  endif
 
 .elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-NAME=  freebsd
+NAME=  bsd
 
 .elif ${OPSYS} == "Linux"
 NAME=  linux
@@ -62,13 +63,12 @@
        ${MKDIR} ${WRKSRC}/lib/icon
 
 do-configure:
-       cd ${WRKSRC}/config/netbsd && \
+       cd ${WRKSRC}/config/bsd && \
        ${SED} -e 's:@X11BASE@:${X11BASE}:g' define.h.in \
                > define.h
        cd ${WRKSRC} && ${MAKE} ${CONFIGURE_TARGET} name=${NAME}
 
-do-install:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} dest=${PREFIX} Install
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
diff -r 0a8068e362dc -r bcf23613d3cc lang/icon/PLIST
--- a/lang/icon/PLIST   Sun Feb 08 10:15:16 2009 +0000
+++ b/lang/icon/PLIST   Sun Feb 08 12:51:04 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/06/06 08:58:42 jtb Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/02/08 12:51:04 asau Exp $
 bin/colrbook
 bin/colrpick
 bin/fontpick
@@ -149,6 +149,8 @@
 lib/icon/dif.u2
 lib/icon/digitcnt.u1
 lib/icon/digitcnt.u2
+lib/icon/dijkstra.u1
+lib/icon/dijkstra.u2
 lib/icon/distance.u1
 lib/icon/distance.u2
 lib/icon/divide.u1
@@ -421,6 +423,8 @@
 lib/icon/math.u2
 lib/icon/matrix.u1
 lib/icon/matrix.u2
+lib/icon/matrix2.u1
+lib/icon/matrix2.u2
 lib/icon/memlog.u1
 lib/icon/memlog.u2
 lib/icon/memrfncs.u1
@@ -444,6 +448,8 @@
 lib/icon/namepfx.u2
 lib/icon/navitrix.u1
 lib/icon/navitrix.u2
+lib/icon/nestlist.u1
+lib/icon/nestlist.u2
 lib/icon/ngrams.u1
 lib/icon/ngrams.u2
 lib/icon/noncase.u1
@@ -851,7 +857,10 @@
 share/doc/icon/install.htm
 share/doc/icon/istyle.css
 share/doc/icon/lb80.jpg
+share/doc/icon/macintosh.htm
+share/doc/icon/port.htm
 share/doc/icon/relnotes.htm
+share/doc/icon/shortcut.gif
 share/doc/icon/wwwcube.gif
 @dirrm share/doc/icon
 @dirrm lib/icon
diff -r 0a8068e362dc -r bcf23613d3cc lang/icon/distinfo
--- a/lang/icon/distinfo        Sun Feb 08 10:15:16 2009 +0000
+++ b/lang/icon/distinfo        Sun Feb 08 12:51:04 2009 +0000
@@ -1,32 +1,25 @@
-$NetBSD: distinfo,v 1.15 2008/06/28 17:14:25 tnn Exp $
+$NetBSD: distinfo,v 1.16 2009/02/08 12:51:04 asau Exp $
 
-SHA1 (icon.v942src.tgz) = 9536e9346188deb2dc5853e03b5f7a85991314b1
-RMD160 (icon.v942src.tgz) = 7e0ec62b714c433acb23a31bad62028424f72ead
-Size (icon.v942src.tgz) = 3204076 bytes
-SHA1 (patch-aa) = 4466461cf703d3506d505bd12e5627ebbc581f9c
-SHA1 (patch-ab) = 751e605b803e2e046cf71375d512c69792b3bdb9
-SHA1 (patch-ac) = 8d283b4b6db50b3b9d1d9a6b5a0d328fbd47c184
-SHA1 (patch-ad) = 20f718bcaed88e210d9c4e5d5b652043dff04f00
-SHA1 (patch-ae) = 6e83f7f256e096cb0ac879cc03766c12f05ebf97
-SHA1 (patch-af) = b29abc57596d3e8f1bbb531539215aa5283cae5b
-SHA1 (patch-ag) = 8d9b913a1d28adf6c672a09ab45516f13f6f5459
-SHA1 (patch-ah) = 912bdb9620807a9c0e205c694416805814e718dd
-SHA1 (patch-ai) = 7009e2d51e3cde5f3ef97f69a85ab217ef1c13bf
-SHA1 (patch-aj) = a712ff27937237a4c69f62605ab5310056a04016
+SHA1 (icon.v943src.tgz) = 92bd3347807b333fb903edf61a2805f2e1159577
+RMD160 (icon.v943src.tgz) = af75af7f106920cd59a7f8ac85954aa472ae78e7
+Size (icon.v943src.tgz) = 3218627 bytes
+SHA1 (patch-aa) = 5d9a996a9957e391333c4b934f9f1d8ed7a681d6
+SHA1 (patch-ab) = 077c92c85e689084fe2b0d4c57a01a5f967a4c78
+SHA1 (patch-ac) = 10e4dd6d012aab3853cd3af279b44f5a03443c4f
+SHA1 (patch-ai) = 16cbd079625d81d38d6cd58a976e5f3062098677
+SHA1 (patch-aj) = 5498067a68c575c8b563b4214436ad92c5409708
 SHA1 (patch-ak) = 64a2cc88155db10b618b314a23f101587ec86761
 SHA1 (patch-al) = c4705ab795093189196eb512c9182d8b55fa7c96
 SHA1 (patch-am) = fe2a7e2a41d27e1c26fab74235ecc0ed7e6bb80d
 SHA1 (patch-an) = 487bd5d35d94026ac2ef7ce08e197a2d378b73e7
-SHA1 (patch-ao) = 1473a8f2f60cd571585cb901ac62b77bcf0cdfcf
-SHA1 (patch-ap) = 8a2db8e1e4af55be36956e8c66c2e5f426bc3c49
-SHA1 (patch-aq) = cee577fb4e572d9d54184a9bc5ff8e5e09758958
+SHA1 (patch-ao) = 68cd2c4e4c7320127f66a0abd5d94a73c35ccf35
+SHA1 (patch-ap) = 3f8cc180a440feb42a0c4ae1475f5ac8d3709b2c
 SHA1 (patch-as) = e8749720bce4362c708c266a0f049f49742eddd2
 SHA1 (patch-at) = 7588ea1056dde3f8776c04e4f8786ca56462aedb
 SHA1 (patch-au) = de4bba2ee4c08ab4e20ec29132b46ed17bd03de4
 SHA1 (patch-av) = c7eda8b5e28a03b13ec6f037c168fab33c1bb214
-SHA1 (patch-aw) = 32fbb57aff56ab9ddffb0ab01872dbc79d7ce654
-SHA1 (patch-ax) = 2da62632e50bf9f60b0784598e74b8a15a245d1e
+SHA1 (patch-aw) = 2474d54ce778118a74ebac66018c8ae382b051ea
+SHA1 (patch-ax) = 834f3f62fd5ec7f4501d518957ccfb7c71198e8c
 SHA1 (patch-ay) = 34186d788599e3e62fd1f27e931feb240c5aab2d
-SHA1 (patch-az) = 49785eb95d1ee006a6788e92031e0782e081ee71
-SHA1 (patch-ba) = f077eaee178fba82da8a35ab8b6a046dc4df4809
-SHA1 (patch-bb) = 0a8dd463a16e8436db153c87ebda3af448cdb1ac
+SHA1 (patch-az) = 682d436f650731b771021be67a06b955ee5f058e
+SHA1 (patch-ba) = ffc6650779867e2b6c6521c64bc153d5357211dc
diff -r 0a8068e362dc -r bcf23613d3cc lang/icon/patches/patch-aa
--- a/lang/icon/patches/patch-aa        Sun Feb 08 10:15:16 2009 +0000
+++ b/lang/icon/patches/patch-aa        Sun Feb 08 12:51:04 2009 +0000
@@ -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 @@
     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 -r 0a8068e362dc -r bcf23613d3cc lang/icon/patches/patch-ab
--- a/lang/icon/patches/patch-ab        Sun Feb 08 10:15:16 2009 +0000
+++ b/lang/icon/patches/patch-ab        Sun Feb 08 12:51:04 2009 +0000
@@ -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 -r 0a8068e362dc -r bcf23613d3cc lang/icon/patches/patch-ac
--- a/lang/icon/patches/patch-ac        Sun Feb 08 10:15:16 2009 +0000
+++ b/lang/icon/patches/patch-ac        Sun Feb 08 12:51:04 2009 +0000
@@ -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



Home | Main Index | Thread Index | Old Index