(pkgsrc)

 - Update MASTER_SITES and HOMEPAGE
 - patches/patch-bltin.h  added to #include <time.h>
(upstream)
 - Update 0.20a to 0.23a
   ---------------------
Mon Jul 28 20:10:34 CEST 2014  Erik Schoenfelder  <schoenfr@web.de>

	* version increased to 0.23a

	* configure.in, Makefile.in: modified to work with newer autoconf
	version and creation of documentation. moved to more appropriate
	zip instead of old zoo format (oh yeah, those old dayes...).

	* a60-mkc.inc, a60.texinfo, test/*: add FILE_n input / output
	handling allowing channels 2 to 15 mapped to files.

Thu Jul 10 21:19:45 CEST 2014  Erik Schoenfelder  <schoenfr@web.de>

	* <many-files> change old e-mail addresses
	  schoenfr@ibr.cs.tu-bs.de and schoenfr@gaertner.de to a more
	  appropriate schoenfr@web.de address.

	* bltin.c, a60-mkc.inc, a60.texinfo: add builtin function
	  intinteger().

	* test/input.a60: add ininteger() test.

Thu Apr 21 00:42:11 MEST 2005  Erik Schoenfelder  <schoenfr@web.de>

	* a60.texinfo: fixed typo where write incorrectly state it
  	  would return an integer value.

	  Again, thanks to "Warren R. Carithers" <wrc@cs.rit.edu> for
	  pointing this out.

Wed Apr 13 18:49:44 MEST 2005  Erik Schoenfelder  <schoenfr@web.de>

	* insymbol(): the index now starts with 0, so the index
	  correspondents to outsymbol.

	* a60.texinfo: fixed typo where insymbol incorrectly state it
	  would return an integer value.

	* test/runtest.sh: addes test case input.a60

        * Thanks to "Warren R. Carithers" <wrc@cs.rit.edu> for
	  pointing this out.

6 files changed, 39 insertions, 24 deletions

diff --git a/lang/a60/Makefile b/lang/a60/Makefile
index f3b6200bb97..9e025aed067 100644
--- a/lang/a60/Makefile
+++ b/lang/a60/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.17 2014/01/02 04:09:11 dholland Exp $
+# $NetBSD: Makefile,v 1.18 2015/02/21 13:07:02 mef Exp $
 
-DISTNAME=	a60-0.20a
-PKGREVISION=	1
+DISTNAME=	a60-0.23a
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/algol60/
+MASTER_SITES=	http://www.bertnase.de/a60/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Algol 60 interpreter
+HOMEPAGE=	http://www.bertsane.de/a60/
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
diff --git a/lang/a60/PLIST b/lang/a60/PLIST
index 80bb2b52d7e..702fc72b8ab 100644
--- a/lang/a60/PLIST
+++ b/lang/a60/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2014/01/02 04:08:03 dholland Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/02/21 13:07:02 mef Exp $
 bin/a60
 info/RRA60.info
 info/a60.info
@@ -8,6 +8,7 @@ share/doc/a60/RRA60.ps
 share/doc/a60/a60.ps
 share/examples/a60/321.a60
 share/examples/a60/README
+share/examples/a60/demo3.a60
 share/examples/a60/inout.a60
 share/examples/a60/nqueen.a60
 share/examples/a60/prim.a60
diff --git a/lang/a60/distinfo b/lang/a60/distinfo
index 1c55b31065a..948a226f110 100644
--- a/lang/a60/distinfo
+++ b/lang/a60/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.7 2014/06/29 04:34:07 dholland Exp $
+$NetBSD: distinfo,v 1.8 2015/02/21 13:07:02 mef Exp $
 
-SHA1 (a60-0.20a.tar.gz) = cc643812cdd6016ca0dd9d29ed4a65e8ce03fddc
-RMD160 (a60-0.20a.tar.gz) = c2cbe06da31c98f9618f76d8770c1f3123550feb
-Size (a60-0.20a.tar.gz) = 626754 bytes
+SHA1 (a60-0.23a.tar.gz) = 6f02787e0ce5b2fa785eb709afbd02d6589e551b
+RMD160 (a60-0.23a.tar.gz) = 83eab797bb2a584b17d2a36aeca99feb5490aea9
+Size (a60-0.23a.tar.gz) = 1160801 bytes
 SHA1 (patch-a60-mkc.inc) = a986d4da044f209e4be6aec7a7b04ee58a32f46c
-SHA1 (patch-aa) = 9691006465781c892f5fa8fee5219eb6a3ce790a
+SHA1 (patch-aa) = dbe39003797380cc3a958fa8d600e11beac3a25e
 SHA1 (patch-ab) = 4bb58c57996c3995cb87632732fea324f1325c8d
-SHA1 (patch-ac) = da811477576ceed4e13c4cfc96a03843e16ca9d4
+SHA1 (patch-ac) = 8c9475aab091c06a44981ff16563b9f0db9e8493
+SHA1 (patch-bltin.h) = 4d75c6bb17ec798d1608abe846f4835e3ac1b1a6
diff --git a/lang/a60/patches/patch-aa b/lang/a60/patches/patch-aa
index f6d7caed09e..5fd1fd51589 100644
--- a/lang/a60/patches/patch-aa
+++ b/lang/a60/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2014/01/02 04:05:33 dholland Exp $
+$NetBSD: patch-aa,v 1.4 2015/02/21 13:07:02 mef Exp $
 
 Configure for pkgsrc.
 Honor CPPFLAGS and LDFLAGS via autoconf.
 
---- Makefile.in.orig	Mon Jul 12 08:15:42 1999
-+++ Makefile.in
+--- Makefile.in.orig	2014-07-29 00:27:10.000000000 +0900
++++ Makefile.in	2015-02-21 21:53:23.000000000 +0900
 @@ -34,7 +34,7 @@
  exec_prefix =	@exec_prefix@
  
@@ -24,15 +24,14 @@ Honor CPPFLAGS and LDFLAGS via autoconf.
  ## Flags for debugging and production:
  ##
  # FLAGS = -g
--FLAGS = -O
-+# FLAGS = -O
+ FLAGS = -g -O -DDEBUG
  # LDFLAGS = -g
 -LDFLAGS =
 +LDFLAGS = @LDFLAGS@
  
  ## Uncomment for profiling:
  # PROF = -pg
-@@ -148,7 +150,7 @@
+@@ -149,7 +151,7 @@
  SRCS = $(ISRCS) $(MSRCS)
  HDRS = $(IHDRS) $(MHDRS)
  
diff --git a/lang/a60/patches/patch-ac b/lang/a60/patches/patch-ac
index b9898b74e4e..d51ede0c67f 100644
--- a/lang/a60/patches/patch-ac
+++ b/lang/a60/patches/patch-ac
@@ -1,16 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2014/01/02 04:05:33 dholland Exp $
+$NetBSD: patch-ac,v 1.3 2015/02/21 13:07:02 mef Exp $
 
 Add info dir information.
 
---- a60.info.orig	Tue May 15 16:54:43 2001
-+++ a60.info
-@@ -1,6 +1,12 @@
- This is Info file a60.info, produced by Makeinfo-1.64 from the input
- file a60.texinfo.
+--- a60.info.orig	2014-07-28 23:38:10.000000000 +0900
++++ a60.info	2015-02-21 21:55:12.000000000 +0900
+@@ -1,5 +1,11 @@
+ This is a60.info, produced by makeinfo version 4.13 from a60.texinfo.
  
 +INFO-DIR-SECTION Algol
 +START-INFO-DIR-ENTRY
-+* a60: (a60).   	Algol 60 Interpreter
++* a60: (a60).          Algol 60 Interpreter
 +END-INFO-DIR-ENTRY
 +
 +
diff --git a/lang/a60/patches/patch-bltin.h b/lang/a60/patches/patch-bltin.h
new file mode 100644
index 00000000000..cde1fabde27
--- /dev/null
+++ b/lang/a60/patches/patch-bltin.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-bltin.h,v 1.1 2015/02/21 13:07:02 mef Exp $
+
+bltin.o: In function `bltin_rand':
+bltin.c:(.text+0x1ff): warning: warning: reference to compatibility time(); include <time.h> for correct reference
+=
+--- bltin.h~	2014-07-11 00:19:30.000000000 +0900
++++ bltin.h	2015-02-21 21:57:13.000000000 +0900
+@@ -31,6 +31,7 @@
+ # define P(x)  ()
+ #endif
+ 
++#include <time.h>
+ 
+ extern void init_bltin P((void));
+