Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/lang/LuaJIT2/Makefile
+++ b/lang/LuaJIT2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2015/02/27 07:51:58 alnsn Exp $
+# $NetBSD: Makefile,v 1.6 2015/05/14 22:33:47 alnsn Exp $
 #

-DISTNAME=	LuaJIT-2.0.3
-PKGREVISION=	1
+DISTNAME=	LuaJIT-2.0.4
 PKGNAME=	${DISTNAME:S/LuaJIT/LuaJIT2/}
 CATEGORIES=	lang
 MASTER_SITES=	http://luajit.org/download/
--- a/lang/LuaJIT2/distinfo
+++ b/lang/LuaJIT2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2015/02/27 07:51:58 alnsn Exp $
+$NetBSD: distinfo,v 1.5 2015/05/14 22:33:47 alnsn Exp $

-SHA1 (LuaJIT-2.0.3.tar.gz) = 2db39e7d1264918c2266b0436c313fbd12da4ceb
-RMD160 (LuaJIT-2.0.3.tar.gz) = aa5c3fc367871a6ad15c7f9ad3300327c20462ec
-Size (LuaJIT-2.0.3.tar.gz) = 844927 bytes
+SHA1 (LuaJIT-2.0.4.tar.gz) = 6e533675180300e85d12c4bbeea2d0e41ad21172
+RMD160 (LuaJIT-2.0.4.tar.gz) = ef9ec596ebf81e3871f060c40303bcd2002474c4
+Size (LuaJIT-2.0.4.tar.gz) = 847615 bytes
 SHA1 (patch-Makefile) = 12e6a78839d975b667578baa7e4122efbecb0d92
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.405 2015/03/15 15:00:17 taca Exp $
+# $NetBSD: Makefile,v 1.414 2015/06/15 09:47:34 marino Exp $
 #

 COMMENT=	Programming languages
@@ -50,8 +50,8 @@ SUBDIR+=	g95
 SUBDIR+=	gambc
 SUBDIR+=	gauche
 SUBDIR+=	gawk
-SUBDIR+=	gcc
 SUBDIR+=	gcc-aux
+SUBDIR+=	gcc2
 SUBDIR+=	gcc3
 SUBDIR+=	gcc3-c
 SUBDIR+=	gcc3-c++
@@ -68,11 +68,11 @@ SUBDIR+=	gcc48
 SUBDIR+=	gcc48-libs
 SUBDIR+=	gcc49
 SUBDIR+=	gcc49-libs
+SUBDIR+=	gcc5-aux
 SUBDIR+=	gforth
 SUBDIR+=	ghc
 SUBDIR+=	ghc-bootstrap
 SUBDIR+=	ghc7
-SUBDIR+=	gnat-aux
 SUBDIR+=	gnat_util
 SUBDIR+=	go
 SUBDIR+=	gpc
@@ -93,6 +93,7 @@ SUBDIR+=	jasmin
 SUBDIR+=	java-lang-spec
 SUBDIR+=	java-vm-spec
 SUBDIR+=	jikes
+SUBDIR+=	jimtcl
 SUBDIR+=	jini
 SUBDIR+=	joos
 SUBDIR+=	js
@@ -124,6 +125,7 @@ SUBDIR+=	moscow_ml
 SUBDIR+=	mpd
 SUBDIR+=	nawk
 SUBDIR+=	newlisp
+SUBDIR+=	newsqueak
 SUBDIR+=	nhc98
 SUBDIR+=	nodejs
 SUBDIR+=	nqp
@@ -137,6 +139,8 @@ SUBDIR+=	opencobol
 SUBDIR+=	openjdk7
 SUBDIR+=	openjdk8
 SUBDIR+=	opensource-cobol
+SUBDIR+=	oracle-jdk8
+SUBDIR+=	oracle-jre8
 SUBDIR+=	ossp-js
 SUBDIR+=	p2c
 SUBDIR+=	p5-Switch
@@ -160,12 +164,10 @@ SUBDIR+=	py-hy
 SUBDIR+=	py-pyrex
 SUBDIR+=	py-pythonz
 SUBDIR+=	py-six
-SUBDIR+=	py26-html-docs
 SUBDIR+=	py27-html-docs
 SUBDIR+=	py33-html-docs
 SUBDIR+=	py34-html-docs
 #SUBDIR+=	python		# only contains Makefile fragments
-SUBDIR+=	python26
 SUBDIR+=	python27
 SUBDIR+=	python33
 SUBDIR+=	python34
--- a/lang/asn1c/Makefile
+++ b/lang/asn1c/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2014/05/29 23:36:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2015/06/12 10:50:15 wiz Exp $
 #

 DISTNAME=		asn1c-0.9.24
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		lang
 MASTER_SITES=		http://lionet.info/soft/

--- a/lang/basic256/Makefile
+++ b/lang/basic256/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2014/10/07 16:47:28 adam Exp $
+# $NetBSD: Makefile,v 1.28 2015/06/10 14:58:50 joerg Exp $
 #

 DISTNAME=	basic256_0.9.6.71
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	15
+PKGREVISION=	18
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kidbasic/}
 EXTRACT_SUFX=	.tgz
--- a/lang/basic256/distinfo
+++ b/lang/basic256/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2013/05/04 12:48:33 joerg Exp $
+$NetBSD: distinfo,v 1.4 2015/06/10 14:58:50 joerg Exp $

 SHA1 (basic256_0.9.6.71.tgz) = 3a8ee26230d5b14b5f325c3b6e0db511534d785f
 RMD160 (basic256_0.9.6.71.tgz) = 1edd4a2eb153eb9712f8b33e1ff2a64ebf1ba883
 Size (basic256_0.9.6.71.tgz) = 7924162 bytes
-SHA1 (patch-Interpreter.cpp) = 01800b5cd85f7c947b20ad803e04730839007ef0
+SHA1 (patch-Interpreter.cpp) = 23e0c4d7b611dff4366dbd6859d8c4eddf9d31ad
 SHA1 (patch-RunController.cpp) = 7716844575a393900b9cab1e61abd6b18cf5b138
+SHA1 (patch-Variables.h) = a350770e86e8b6913c92785b893e72d6a641f0eb
--- a/lang/basic256/patches/patch-Interpreter.cpp
+++ b/lang/basic256/patches/patch-Interpreter.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-Interpreter.cpp,v 1.1 2013/05/04 12:48:33 joerg Exp $
+$NetBSD: patch-Interpreter.cpp,v 1.2 2015/06/10 14:58:50 joerg Exp $

 Avoid overlap with std::mutex.

--- Interpreter.cpp.orig	2013-05-04 00:26:28.000000000 +0000
+--- Interpreter.cpp.orig	2012-08-06 14:57:58.000000000 +0000
 +++ Interpreter.cpp
@@ -69,6 +69,8 @@ using namespace std;
 QMutex keymutex;
@@ -13,3 +13,39 @@ Avoid overlap with std::mutex.
 extern QMutex mutex;
 extern QMutex debugmutex;
 extern QWaitCondition waitCond;
+@@ -2446,7 +2448,7 @@ Interpreter::execByteCode()
+ 					poly.drawPolygon(points, pairs);
+ 					poly.end();
+ 					if (!fastgraphics) waitForGraphics();
+-					delete points;
+					delete[] points;
+ 				}
+ 			} else {
+ 				errornum = ERROR_POLYARRAY;
+@@ -2487,7 +2489,7 @@ Interpreter::execByteCode()
+ 				poly.end();
+ 	
+ 				if (!fastgraphics) waitForGraphics();
+-				delete points;
+				delete[] points;
+ 			}
+ 		}
+ 		break;
+@@ -2538,7 +2540,7 @@ Interpreter::execByteCode()
+ 						poly.end();
+ 						if (!fastgraphics) waitForGraphics();
+ 
+-						delete points;
+						delete[] points;
+ 					}
+ 				}
+ 			} else {
+@@ -2608,7 +2610,7 @@ Interpreter::execByteCode()
+ 					poly.end();
+ 					
+ 					if (!fastgraphics) waitForGraphics();
+-					delete points;
+					delete[] points;
+ 				}
+ 			}
+ 		}
--- a/lang/basic256/patches/patch-Variables.h
+++ b/lang/basic256/patches/patch-Variables.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-Variables.h,v 1.1 2015/06/12 13:12:27 joerg Exp $
+
+--- Variables.h.orig	2015-06-09 23:15:06.000000000 +0000
+++ Variables.h
+@@ -34,7 +34,7 @@ struct variable
+   union {
+     char *string;
+     double floatval; 
+-    array *arr;
+    ::array *arr;
+   } value;
+ };
+ 
--- a/lang/boomerang/Makefile
+++ b/lang/boomerang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/01/20 14:24:36 jaapb Exp $
+# $NetBSD: Makefile,v 1.8 2015/04/30 06:49:58 markd Exp $
 #

 DISTNAME=	boomerang-0.2-source
@@ -20,7 +20,8 @@ BUILD_DEPENDS+=	tex-pgf-[0-9]*:../../print/tex-pgf
 BUILD_DEPENDS+=	tex-ms-[0-9]*:../../print/tex-ms
 BUILD_DEPENDS+=	tex-amscls-[0-9]*:../../print/tex-amscls
 BUILD_DEPENDS+=	tex-preprint-[0-9]*:../../print/tex-preprint
-BUILD_DEPENDS+=	teTeX-texmf-[0-9]*:../../print/teTeX3-texmf
+BUILD_DEPENDS+=	tex-natbib-[0-9]*:../../print/tex-natbib
+BUILD_DEPENDS+=	tex-psnfss-[0-9]*:../../fonts/tex-psnfss
 BUILD_DEPENDS+=	ocaml-findlib-[0-9]*:../../devel/ocaml-findlib

 WRKSRC=			${WRKDIR}/boomerang-20090902
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2012/10/02 20:11:36 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/05/20 07:28:05 wen Exp $

-DISTNAME=	bwbasic-2.50
+DISTNAME=	bwbasic-3.00
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bwbasic/}
 EXTRACT_SUFX=	.zip
@@ -15,6 +15,8 @@ GNU_CONFIGURE=	yes

 SHARE_DIR=	${PREFIX}/share/bwbasic

+CFLAGS+=		-DHAVE_ISNAN=1
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${SHARE_DIR}

 post-install:
--- a/lang/bwbasic/PLIST
+++ b/lang/bwbasic/PLIST
@@ -1,45 +1,226 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:03:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/05/20 07:28:05 wen Exp $
 bin/bwbasic
 man/man1/bwbasic.1
+share/bwbasic/bwbtest/00readme.txt
+share/bwbasic/bwbtest/00test.sh
+share/bwbasic/bwbtest/PAD80.BAS
+share/bwbasic/bwbtest/PAD80.INP
+share/bwbasic/bwbtest/abs.80
+share/bwbasic/bwbtest/abs.OUT
 share/bwbasic/bwbtest/abs.bas
+share/bwbasic/bwbtest/abs.dif
+share/bwbasic/bwbtest/abs.run
+share/bwbasic/bwbtest/assign.80
+share/bwbasic/bwbtest/assign.OUT
 share/bwbasic/bwbtest/assign.bas
+share/bwbasic/bwbtest/assign.dif
+share/bwbasic/bwbtest/assign.run
+share/bwbasic/bwbtest/callfunc.80
+share/bwbasic/bwbtest/callfunc.OUT
 share/bwbasic/bwbtest/callfunc.bas
+share/bwbasic/bwbtest/callfunc.dif
+share/bwbasic/bwbtest/callfunc.run
+share/bwbasic/bwbtest/callsub.80
+share/bwbasic/bwbtest/callsub.OUT
 share/bwbasic/bwbtest/callsub.bas
+share/bwbasic/bwbtest/callsub.dif
+share/bwbasic/bwbtest/callsub.run
+share/bwbasic/bwbtest/chain1.80
+share/bwbasic/bwbtest/chain1.OUT
 share/bwbasic/bwbtest/chain1.bas
+share/bwbasic/bwbtest/chain1.dif
+share/bwbasic/bwbtest/chain1.run
+share/bwbasic/bwbtest/chain2.80
+share/bwbasic/bwbtest/chain2.OUT
 share/bwbasic/bwbtest/chain2.bas
+share/bwbasic/bwbtest/chain2.dif
+share/bwbasic/bwbtest/chain2.run
+share/bwbasic/bwbtest/data.tmp
+share/bwbasic/bwbtest/dataread.80
+share/bwbasic/bwbtest/dataread.OUT
 share/bwbasic/bwbtest/dataread.bas
+share/bwbasic/bwbtest/dataread.dif
+share/bwbasic/bwbtest/dataread.run
+share/bwbasic/bwbtest/deffn.80
+share/bwbasic/bwbtest/deffn.OUT
 share/bwbasic/bwbtest/deffn.bas
+share/bwbasic/bwbtest/deffn.dif
+share/bwbasic/bwbtest/deffn.run
+share/bwbasic/bwbtest/dif.OUT
+share/bwbasic/bwbtest/dim.80
+share/bwbasic/bwbtest/dim.OUT
 share/bwbasic/bwbtest/dim.bas
+share/bwbasic/bwbtest/dim.dif
+share/bwbasic/bwbtest/dim.run
+share/bwbasic/bwbtest/doloop.80
+share/bwbasic/bwbtest/doloop.OUT
 share/bwbasic/bwbtest/doloop.bas
+share/bwbasic/bwbtest/doloop.dif
+share/bwbasic/bwbtest/doloop.run
+share/bwbasic/bwbtest/dowhile.80
+share/bwbasic/bwbtest/dowhile.OUT
 share/bwbasic/bwbtest/dowhile.bas
+share/bwbasic/bwbtest/dowhile.dif
+share/bwbasic/bwbtest/dowhile.run
+share/bwbasic/bwbtest/elseif.80
+share/bwbasic/bwbtest/elseif.INP
+share/bwbasic/bwbtest/elseif.OUT
 share/bwbasic/bwbtest/elseif.bas
+share/bwbasic/bwbtest/elseif.dif
+share/bwbasic/bwbtest/elseif.run
+share/bwbasic/bwbtest/end.80
+share/bwbasic/bwbtest/end.OUT
 share/bwbasic/bwbtest/end.bas
+share/bwbasic/bwbtest/end.dif
+share/bwbasic/bwbtest/end.run
+share/bwbasic/bwbtest/err.80
+share/bwbasic/bwbtest/err.OUT
 share/bwbasic/bwbtest/err.bas
+share/bwbasic/bwbtest/err.dif
+share/bwbasic/bwbtest/err.run
+share/bwbasic/bwbtest/fncallfn.80
+share/bwbasic/bwbtest/fncallfn.OUT
 share/bwbasic/bwbtest/fncallfn.bas
+share/bwbasic/bwbtest/fncallfn.dif
+share/bwbasic/bwbtest/fncallfn.run
+share/bwbasic/bwbtest/fornext.80
+share/bwbasic/bwbtest/fornext.OUT
 share/bwbasic/bwbtest/fornext.bas
+share/bwbasic/bwbtest/fornext.dif
+share/bwbasic/bwbtest/fornext.run
+share/bwbasic/bwbtest/function.80
+share/bwbasic/bwbtest/function.INP
+share/bwbasic/bwbtest/function.OUT
 share/bwbasic/bwbtest/function.bas
+share/bwbasic/bwbtest/function.dif
+share/bwbasic/bwbtest/function.run
+share/bwbasic/bwbtest/gosub.80
+share/bwbasic/bwbtest/gosub.INP
+share/bwbasic/bwbtest/gosub.OUT
 share/bwbasic/bwbtest/gosub.bas
+share/bwbasic/bwbtest/gosub.dif
+share/bwbasic/bwbtest/gosub.run
+share/bwbasic/bwbtest/gotolabl.80
+share/bwbasic/bwbtest/gotolabl.OUT
 share/bwbasic/bwbtest/gotolabl.bas
+share/bwbasic/bwbtest/gotolabl.dif
+share/bwbasic/bwbtest/gotolabl.run
+share/bwbasic/bwbtest/ifline.80
+share/bwbasic/bwbtest/ifline.OUT
 share/bwbasic/bwbtest/ifline.bas
+share/bwbasic/bwbtest/ifline.dif
+share/bwbasic/bwbtest/ifline.run
 share/bwbasic/bwbtest/index.txt
+share/bwbasic/bwbtest/input.80
+share/bwbasic/bwbtest/input.INP
+share/bwbasic/bwbtest/input.OUT
 share/bwbasic/bwbtest/input.bas
+share/bwbasic/bwbtest/input.dif
+share/bwbasic/bwbtest/input.run
+share/bwbasic/bwbtest/lof.80
+share/bwbasic/bwbtest/lof.INP
+share/bwbasic/bwbtest/lof.OUT
 share/bwbasic/bwbtest/lof.bas
+share/bwbasic/bwbtest/lof.dif
+share/bwbasic/bwbtest/lof.run
+share/bwbasic/bwbtest/loopuntl.80
+share/bwbasic/bwbtest/loopuntl.OUT
 share/bwbasic/bwbtest/loopuntl.bas
+share/bwbasic/bwbtest/loopuntl.dif
+share/bwbasic/bwbtest/loopuntl.run
+share/bwbasic/bwbtest/main.80
+share/bwbasic/bwbtest/main.OUT
 share/bwbasic/bwbtest/main.bas
+share/bwbasic/bwbtest/main.dif
+share/bwbasic/bwbtest/main.run
+share/bwbasic/bwbtest/mlifthen.80
+share/bwbasic/bwbtest/mlifthen.OUT
 share/bwbasic/bwbtest/mlifthen.bas
+share/bwbasic/bwbtest/mlifthen.dif
+share/bwbasic/bwbtest/mlifthen.run
+share/bwbasic/bwbtest/on.80
+share/bwbasic/bwbtest/on.INP
+share/bwbasic/bwbtest/on.OUT
 share/bwbasic/bwbtest/on.bas
+share/bwbasic/bwbtest/on.dif
+share/bwbasic/bwbtest/on.run
+share/bwbasic/bwbtest/onerr.80
+share/bwbasic/bwbtest/onerr.OUT
 share/bwbasic/bwbtest/onerr.bas
+share/bwbasic/bwbtest/onerr.dif
+share/bwbasic/bwbtest/onerr.run
+share/bwbasic/bwbtest/onerrlbl.80
+share/bwbasic/bwbtest/onerrlbl.OUT
 share/bwbasic/bwbtest/onerrlbl.bas
+share/bwbasic/bwbtest/onerrlbl.dif
+share/bwbasic/bwbtest/onerrlbl.run
+share/bwbasic/bwbtest/ongosub.80
+share/bwbasic/bwbtest/ongosub.INP
+share/bwbasic/bwbtest/ongosub.OUT
 share/bwbasic/bwbtest/ongosub.bas
+share/bwbasic/bwbtest/ongosub.dif
+share/bwbasic/bwbtest/ongosub.run
+share/bwbasic/bwbtest/opentest.80
+share/bwbasic/bwbtest/opentest.OUT
 share/bwbasic/bwbtest/opentest.bas
+share/bwbasic/bwbtest/opentest.dif
+share/bwbasic/bwbtest/opentest.run
+share/bwbasic/bwbtest/option.80
+share/bwbasic/bwbtest/option.OUT
 share/bwbasic/bwbtest/option.bas
+share/bwbasic/bwbtest/option.dif
+share/bwbasic/bwbtest/option.run
+share/bwbasic/bwbtest/pascaltr.80
+share/bwbasic/bwbtest/pascaltr.OUT
 share/bwbasic/bwbtest/pascaltr.bas
+share/bwbasic/bwbtest/pascaltr.dif
+share/bwbasic/bwbtest/pascaltr.run
+share/bwbasic/bwbtest/profile.bas
+share/bwbasic/bwbtest/putget.80
+share/bwbasic/bwbtest/putget.INP
+share/bwbasic/bwbtest/putget.OUT
 share/bwbasic/bwbtest/putget.bas
+share/bwbasic/bwbtest/putget.dif
+share/bwbasic/bwbtest/putget.run
+share/bwbasic/bwbtest/random.80
+share/bwbasic/bwbtest/random.OUT
 share/bwbasic/bwbtest/random.bas
+share/bwbasic/bwbtest/random.dif
+share/bwbasic/bwbtest/random.run
+share/bwbasic/bwbtest/selcase.80
+share/bwbasic/bwbtest/selcase.OUT
 share/bwbasic/bwbtest/selcase.bas
+share/bwbasic/bwbtest/selcase.dif
+share/bwbasic/bwbtest/selcase.run
+share/bwbasic/bwbtest/snglfunc.80
+share/bwbasic/bwbtest/snglfunc.OUT
 share/bwbasic/bwbtest/snglfunc.bas
+share/bwbasic/bwbtest/snglfunc.dif
+share/bwbasic/bwbtest/snglfunc.run
+share/bwbasic/bwbtest/stop.80
+share/bwbasic/bwbtest/stop.OUT
 share/bwbasic/bwbtest/stop.bas
+share/bwbasic/bwbtest/stop.dif
+share/bwbasic/bwbtest/stop.run
+share/bwbasic/bwbtest/term.80
+share/bwbasic/bwbtest/term.INP
+share/bwbasic/bwbtest/term.OUT
 share/bwbasic/bwbtest/term.bas
+share/bwbasic/bwbtest/term.dif
+share/bwbasic/bwbtest/term.run
+share/bwbasic/bwbtest/test.out
+share/bwbasic/bwbtest/whilwend.80
+share/bwbasic/bwbtest/whilwend.OUT
 share/bwbasic/bwbtest/whilwend.bas
+share/bwbasic/bwbtest/whilwend.dif
+share/bwbasic/bwbtest/whilwend.run
+share/bwbasic/bwbtest/width.80
+share/bwbasic/bwbtest/width.OUT
 share/bwbasic/bwbtest/width.bas
+share/bwbasic/bwbtest/width.dif
+share/bwbasic/bwbtest/width.run
+share/bwbasic/bwbtest/writeinp.80
+share/bwbasic/bwbtest/writeinp.OUT
 share/bwbasic/bwbtest/writeinp.bas
+share/bwbasic/bwbtest/writeinp.dif
+share/bwbasic/bwbtest/writeinp.run
--- a/lang/bwbasic/distinfo
+++ b/lang/bwbasic/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2012/01/15 15:29:31 ryoon Exp $
+$NetBSD: distinfo,v 1.12 2015/06/25 07:52:13 dholland Exp $

-SHA1 (bwbasic-2.50.zip) = 6e8e8af9fa791bff791534d429092b4904609424
-RMD160 (bwbasic-2.50.zip) = bccc94eb3dcbf903fc1535cda67353f7c372d520
-Size (bwbasic-2.50.zip) = 209629 bytes
+SHA1 (bwbasic-3.00.zip) = 89bb9e960bb91339752bb6d9796d93998d9ca3f6
+RMD160 (bwbasic-3.00.zip) = 3d78b2fc3c6a73856b92443c296d71cd5b39208e
+Size (bwbasic-3.00.zip) = 2777709 bytes
 SHA1 (patch-aa) = ca4a5d62dc7aebfcace1df368cdc6ffbaa2c60da
-SHA1 (patch-ac) = 99156f6cd267196af2c3ba62ca7e668ebfd38a24
-SHA1 (patch-bwbasic.h) = 52b19a328791da3b53832ca16cc17ff453558048
+SHA1 (patch-ac) = 1f8e3a3d6d75223abe2ceef63b5eb97a4b4cf4b4
+SHA1 (patch-renum.c) = 458affe1dd9742b54040b9721d2a8a7cfa82956b
--- a/lang/bwbasic/patches/patch-ac
+++ b/lang/bwbasic/patches/patch-ac
@@ -1,18 +1,21 @@
-$NetBSD: patch-ac,v 1.3 2012/01/15 15:29:31 ryoon Exp $
+$NetBSD: patch-ac,v 1.4 2015/05/20 07:27:21 wen Exp $

--- bwbasic.doc.orig	2006-10-24 05:40:18.000000000 +0000
+--- bwbasic.doc.orig	2015-05-20 14:17:40.000000000 +0000
 +++ bwbasic.doc
-@@ -1,33 +1,10 @@
+@@ -1,36 +1,10 @@
 -
 -
 -
 -
-               Bywater BASIC Interpreter/Shell, version 2.10
+-               Bywater BASIC Interpreter, version 3.00
 -               ---------------------------------------------
 -
 -                    Copyright (c) 1993, Ted A. Campbell
 -                  for bwBASIC version 2.10, 11 October 1993
 -
+-                  Copyright (c) 2014-2015, Howatd Wulf, AF5NE
+-                  for bwBASIC version 3.00, 2015-04-05
+-
 -
 -CONTENTS:
 -
@@ -43,16 +46,16 @@ $NetBSD: patch-ac,v 1.3 2012/01/15 15:29:31 ryoon Exp $
 
    The Bywater BASIC Interpreter (bwBASIC) implements a large
    superset of the ANSI Standard for Minimal BASIC (X3.60-1978)
-@@ -60,7 +37,7 @@ CONTENTS:
-    offer further shell-processing capabilities.
+@@ -53,7 +27,7 @@ CONTENTS:
+    into distinct lines as they are loaded.
 
 
 -2. TERMS OF USE:
-+.Sh TERMS OF USE
+.Sh TERMS OF USE:
 
    This version of Bywater BASIC is released under the terms of the 
    GNU General Public License (GPL), which is distributed with this 
-@@ -71,7 +48,7 @@ CONTENTS:
+@@ -64,7 +38,7 @@ CONTENTS:
    for information on which you should contact the author.
 
 
@@ -60,27 +63,27 @@ $NetBSD: patch-ac,v 1.3 2012/01/15 15:29:31 ryoon Exp $
 +.Sh QUICK REFERENCE LIST OF COMMANDS AND FUNCTIONS
 
    Be aware that many of these commands and functions will not be
-    available unless you have set certain flags in the header files
-@@ -199,7 +176,7 @@ CONTENTS:
-    WRITE [# device-number,] element [, element ]....
+    available unless you have enabled a particular dialect using
+@@ -380,7 +354,7 @@ CONTENTS:
+      WRITE [# device-number,] element [, .... ]
    
 
 -4. GENERAL NOTES ON USAGE:
-+.Sh GENERAL NOTES ON USAGE
+.Sh GENERAL NOTES ON USAGE:
 
    4.a. Interactive Environment
 
-@@ -305,7 +282,7 @@ CONTENTS:
-    aliases to allow Microsoft-style programs to be run.
- 
- 
+@@ -790,7 +764,7 @@ CONTENTS:
+    END FUNCTION
+    
+    
 -5. EXPANDED REFERENCE FOR COMMANDS AND FUNCTIONS
 +.Sh EXPANDED REFERENCE FOR COMMANDS AND FUNCTIONS
+    
+    bwBASIC provides a simple "HELP" command to assist you in
+    finding the command or function you are looking for.
+@@ -6965,7 +6939,7 @@ DESCRIPTION: For file X, sets the line w
 
-    The "Dependencies" listed in the folowing reference materials
-    refers to flags that must be set to TRUE in bwbasic.h for the
-@@ -1636,7 +1613,7 @@ CONTENTS:
-    ------------------------------------------
 
 
 -6. PREDEFINED VARIABLES
@@ -88,16 +91,16 @@ $NetBSD: patch-ac,v 1.3 2012/01/15 15:29:31 ryoon Exp $
 
    BWB.EDITOR$
    BWB.FILES$
-@@ -1669,7 +1646,7 @@ CONTENTS:
-    (specifically CLS, LOCATE, and INKEY$) may be available. 
- 
- 
+@@ -7003,7 +6977,7 @@ DESCRIPTION: For file X, sets the line w
+    return the current OPTION TERMINAL setting.
+    
+    
 -7. UNIMPLEMENTED COMMANDS AND FUNCTIONS, and AGENDA FOR DEVELOPMENT
 +.Sh UNIMPLEMENTED COMMANDS AND FUNCTIONS, and AGENDA FOR DEVELOPMENT
 
    There are some items not implemented that have been so long
    a part of standard BASICs that their absence will seem surprising.
-@@ -1853,7 +1830,7 @@ CONTENTS:
+@@ -7172,7 +7146,7 @@ DESCRIPTION: For file X, sets the line w
    ZONEWIDTH
 
 
@@ -106,13 +109,12 @@ $NetBSD: patch-ac,v 1.3 2012/01/15 15:29:31 ryoon Exp $
 
    This program was originally begun in 1982 by my grandmother, Mrs.
    Verda Spell of Beaumont, TX.  She was writing the program using
-@@ -1873,9 +1850,3 @@ CONTENTS:
-    bag and eventually managed to have it all copied over to a PC
-    diskette. I have revised it slightly prior to this release. You
+@@ -7194,7 +7168,7 @@ DESCRIPTION: For file X, sets the line w
    should know, though, that I myself am an historian, not a programmer.
-
-
+ 
+ 
 -9. COMMUNICATIONS:
-
-   email:  tcamp@delphi.com
-
+.Sh COMMUNICATIONS:
+ 
+    email:  tcamp@delphi.com
+ 
--- a/lang/bwbasic/patches/patch-bwbasic.h
+++ b/lang/bwbasic/patches/patch-bwbasic.h
@@ -1,23 +0,0 @@
-$NetBSD: patch-bwbasic.h,v 1.1 2012/01/15 15:29:31 ryoon Exp $
-
-* Suppress redefined messages.
-
--- bwbasic.h.orig	2009-06-04 12:50:18.000000000 +0000
-+++ bwbasic.h
-@@ -111,10 +111,16 @@
- ***************************************************************/
- 
- #ifdef __STDC__
-+#ifndef HAVE_RAISE
- #define HAVE_RAISE TRUE
-+#endif
-+#ifndef HAVE_STRING
- #define HAVE_STRING TRUE
-+#endif
-+#ifndef HAVE_STDLIB
- #define HAVE_STDLIB TRUE
- #endif
-+#endif
- 
- #ifdef __STDC__
- #define	HAVE_SIGNAL	TRUE
--- a/lang/bwbasic/patches/patch-renum.c
+++ b/lang/bwbasic/patches/patch-renum.c
@@ -0,0 +1,52 @@
+$NetBSD: patch-renum.c,v 1.1 2015/06/25 07:52:13 dholland Exp $
+
+- don't use gets()
+
+--- renum.c~	2015-01-21 03:55:10.000000000 +0000
+++ renum.c
+@@ -17,6 +17,18 @@ int f2, l2, n, x;
+ int sidx[1500][2];
+ char rstr[255];
+ 
+static void dogets(char *buf, size_t max)
+{
+   size_t len;
+
+   fgets(buf, max, stdin);
+   len = strlen(buf);
+   if (len > 0 && buf[len - 1] == '\n')
+   {
+      buf[len - 1] = '\0';
+   }
+}
+
+ main(argc, argv)
+    int argc;
+    char *argv[];
+@@ -34,7 +46,7 @@ main(argc, argv)
+    else
+    {
+       printf("Program in file? ");
+-      gets(pstr);
+      dogets(pstr, sizeof(pstr));
+    }
+    if (strlen(pstr) == 0) strcpy(pstr, "0.doc");
+ 
+@@ -124,7 +136,7 @@ main(argc, argv)
+       skip = 0;
+       bp = 0;
+       printf("RENUMBER-");
+-      gets(pstr);
+      dogets(pstr, sizeof(pstr));
+       p = strlen(pstr);
+ 
+       if (g == 0)
+@@ -268,7 +280,7 @@ main(argc, argv)
+       printf("%d -> %d\n", sidx[r][0], sidx[r][1]); */
+ 
+    printf("VERIFY? ");
+-   gets(pstr);
+   dogets(pstr, sizeof(pstr));
+    v1 = 0;
+    if (strcmp(midstr2(pstr, 1, 1), "N") == 0) v1 = 1;
+ 
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2014/05/29 23:36:42 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2015/06/12 10:50:15 wiz Exp $

 DISTNAME=		cim-3.30
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=cim/}

--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2015/03/04 13:57:42 tnn Exp $
+# $NetBSD: Makefile,v 1.40 2015/05/28 13:25:59 adam Exp $

 MAKE_DIRS=		etc/llvm
 INSTALLATION_DIRS=	bin lib libexec
--- a/lang/clang/Makefile.common
+++ b/lang/clang/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2015/03/22 16:07:59 tnn Exp $
+# $NetBSD: Makefile.common,v 1.6 2015/05/28 13:25:59 adam Exp $
 #
 # used by lang/clang/Makefile
 # used by lang/libLLVM/Makefile

-DISTNAME=	clang-3.6.0
+DISTNAME=	clang-3.6.1
 CATEGORIES=	lang
 MASTER_SITES=	http://llvm.org/releases/${PKGVERSION_NOREV}/
 DISTFILES=	llvm-${PKGVERSION_NOREV}.src.tar.xz \
@@ -84,6 +84,15 @@ SUBST_SED.fix-paths+=		-e 's,^.*cxa_finalize.*$$,		; //cxa_finalize.o,g'
 .  endif
 .endif

+# patch NetBSD::GetCXXStdlibType
+.if ${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mgcc)
+SUBST_CLASSES+=			libcxx
+SUBST_STAGE.libcxx=		pre-configure
+SUBST_MESSAGE.libcxx=		Patching toolchain to use libstdc++ as we're using GCC
+SUBST_FILES.libcxx=		tools/clang/lib/Driver/ToolChains.cpp
+SUBST_SED.libcxx=		-e 's,Major >= 7 || (Major == 6 && Minor == 99 && Micro >= 49) || Major == 0,false,'
+.endif
+
 post-extract:
 	mv ${WRKDIR}/libcxx-${PKGVERSION_NOREV}.src ${WRKSRC}/projects/libcxx
 	mv ${WRKDIR}/compiler-rt-${PKGVERSION_NOREV}.src ${WRKSRC}/projects/compiler-rt
--- a/lang/clang/PLIST.Linux
+++ b/lang/clang/PLIST.Linux
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2014/07/19 11:12:28 cheusov Exp $
+@comment $NetBSD: PLIST.Linux,v 1.2 2015/05/22 22:44:08 ryoon Exp $
 lib/clang/${PKGVERSION}/lib/linux/libclang_rt.asan-x86_64.a
+lib/clang/${PKGVERSION}/lib/linux/libclang_rt.asan_cxx-x86_64.a
+lib/clang/${PKGVERSION}/lib/linux/libclang_rt.builtins-x86_64.a
 lib/clang/${PKGVERSION}/lib/linux/libclang_rt.dfsan-x86_64.a
-lib/clang/${PKGVERSION}/lib/linux/libclang_rt.full-x86_64.a
 lib/clang/${PKGVERSION}/lib/linux/libclang_rt.lsan-x86_64.a
 lib/clang/${PKGVERSION}/lib/linux/libclang_rt.msan-x86_64.a
 lib/clang/${PKGVERSION}/lib/linux/libclang_rt.profile-x86_64.a
--- a/lang/clang/PLIST.shlib
+++ b/lang/clang/PLIST.shlib
@@ -1,129 +0,0 @@
-@comment $NetBSD: PLIST.shlib,v 1.2 2015/03/04 09:59:57 tnn Exp $
-lib/libLLVM-3.6.0.${SOEXT}
-lib/libLLVM-3.6.${SOEXT}
-lib/libLLVMAArch64AsmParser.${SOEXT}
-lib/libLLVMAArch64AsmPrinter.${SOEXT}
-lib/libLLVMAArch64CodeGen.${SOEXT}
-lib/libLLVMAArch64Desc.${SOEXT}
-lib/libLLVMAArch64Disassembler.${SOEXT}
-lib/libLLVMAArch64Info.${SOEXT}
-lib/libLLVMAArch64Utils.${SOEXT}
-lib/libLLVMARMAsmParser.${SOEXT}
-lib/libLLVMARMAsmPrinter.${SOEXT}
-lib/libLLVMARMCodeGen.${SOEXT}
-lib/libLLVMARMDesc.${SOEXT}
-lib/libLLVMARMDisassembler.${SOEXT}
-lib/libLLVMARMInfo.${SOEXT}
-lib/libLLVMAnalysis.${SOEXT}
-lib/libLLVMAsmParser.${SOEXT}
-lib/libLLVMAsmPrinter.${SOEXT}
-lib/libLLVMBitReader.${SOEXT}
-lib/libLLVMBitWriter.${SOEXT}
-lib/libLLVMCodeGen.${SOEXT}
-lib/libLLVMCore.${SOEXT}
-lib/libLLVMCppBackendCodeGen.${SOEXT}
-lib/libLLVMCppBackendInfo.${SOEXT}
-lib/libLLVMDebugInfo.${SOEXT}
-lib/libLLVMExecutionEngine.${SOEXT}
-lib/libLLVMHexagonCodeGen.${SOEXT}
-lib/libLLVMHexagonDesc.${SOEXT}
-lib/libLLVMHexagonDisassembler.${SOEXT}
-lib/libLLVMHexagonInfo.${SOEXT}
-lib/libLLVMIRReader.${SOEXT}
-lib/libLLVMInstCombine.${SOEXT}
-lib/libLLVMInstrumentation.${SOEXT}
-lib/libLLVMInterpreter.${SOEXT}
-lib/libLLVMLTO.${SOEXT}
-lib/libLLVMLineEditor.${SOEXT}
-lib/libLLVMLinker.${SOEXT}
-lib/libLLVMMC.${SOEXT}
-lib/libLLVMMCDisassembler.${SOEXT}
-lib/libLLVMMCJIT.${SOEXT}
-lib/libLLVMMCParser.${SOEXT}
-lib/libLLVMMSP430AsmPrinter.${SOEXT}
-lib/libLLVMMSP430CodeGen.${SOEXT}
-lib/libLLVMMSP430Desc.${SOEXT}
-lib/libLLVMMSP430Info.${SOEXT}
-lib/libLLVMMipsAsmParser.${SOEXT}
-lib/libLLVMMipsAsmPrinter.${SOEXT}
-lib/libLLVMMipsCodeGen.${SOEXT}
-lib/libLLVMMipsDesc.${SOEXT}
-lib/libLLVMMipsDisassembler.${SOEXT}
-lib/libLLVMMipsInfo.${SOEXT}
-lib/libLLVMNVPTXAsmPrinter.${SOEXT}
-lib/libLLVMNVPTXCodeGen.${SOEXT}
-lib/libLLVMNVPTXDesc.${SOEXT}
-lib/libLLVMNVPTXInfo.${SOEXT}
-lib/libLLVMObjCARCOpts.${SOEXT}
-lib/libLLVMObject.${SOEXT}
-lib/libLLVMOption.${SOEXT}
-lib/libLLVMPowerPCAsmParser.${SOEXT}
-lib/libLLVMPowerPCAsmPrinter.${SOEXT}
-lib/libLLVMPowerPCCodeGen.${SOEXT}
-lib/libLLVMPowerPCDesc.${SOEXT}
-lib/libLLVMPowerPCDisassembler.${SOEXT}
-lib/libLLVMPowerPCInfo.${SOEXT}
-lib/libLLVMProfileData.${SOEXT}
-lib/libLLVMR600AsmParser.${SOEXT}
-lib/libLLVMR600AsmPrinter.${SOEXT}
-lib/libLLVMR600CodeGen.${SOEXT}
-lib/libLLVMR600Desc.${SOEXT}
-lib/libLLVMR600Info.${SOEXT}
-lib/libLLVMRuntimeDyld.${SOEXT}
-lib/libLLVMScalarOpts.${SOEXT}
-lib/libLLVMSelectionDAG.${SOEXT}
-lib/libLLVMSparcAsmParser.${SOEXT}
-lib/libLLVMSparcAsmPrinter.${SOEXT}
-lib/libLLVMSparcCodeGen.${SOEXT}
-lib/libLLVMSparcDesc.${SOEXT}
-lib/libLLVMSparcDisassembler.${SOEXT}
-lib/libLLVMSparcInfo.${SOEXT}
-lib/libLLVMSupport.${SOEXT}
-lib/libLLVMSystemZAsmParser.${SOEXT}
-lib/libLLVMSystemZAsmPrinter.${SOEXT}
-lib/libLLVMSystemZCodeGen.${SOEXT}
-lib/libLLVMSystemZDesc.${SOEXT}
-lib/libLLVMSystemZDisassembler.${SOEXT}
-lib/libLLVMSystemZInfo.${SOEXT}
-lib/libLLVMTableGen.${SOEXT}
-lib/libLLVMTarget.${SOEXT}
-lib/libLLVMTransformUtils.${SOEXT}
-lib/libLLVMVectorize.${SOEXT}
-lib/libLLVMX86AsmParser.${SOEXT}
-lib/libLLVMX86AsmPrinter.${SOEXT}
-lib/libLLVMX86CodeGen.${SOEXT}
-lib/libLLVMX86Desc.${SOEXT}
-lib/libLLVMX86Disassembler.${SOEXT}
-lib/libLLVMX86Info.${SOEXT}
-lib/libLLVMX86Utils.${SOEXT}
-lib/libLLVMXCoreAsmPrinter.${SOEXT}
-lib/libLLVMXCoreCodeGen.${SOEXT}
-lib/libLLVMXCoreDesc.${SOEXT}
-lib/libLLVMXCoreDisassembler.${SOEXT}
-lib/libLLVMXCoreInfo.${SOEXT}
-lib/libLLVMipa.${SOEXT}
-lib/libLLVMipo.${SOEXT}
-lib/libclangARCMigrate.${SOEXT}
-lib/libclangAST.${SOEXT}
-lib/libclangASTMatchers.${SOEXT}
-lib/libclangAnalysis.${SOEXT}
-lib/libclangBasic.${SOEXT}
-lib/libclangCodeGen.${SOEXT}
-lib/libclangDriver.${SOEXT}
-lib/libclangDynamicASTMatchers.${SOEXT}
-lib/libclangEdit.${SOEXT}
-lib/libclangFormat.${SOEXT}
-lib/libclangFrontend.${SOEXT}
-lib/libclangFrontendTool.${SOEXT}
-lib/libclangIndex.${SOEXT}
-lib/libclangLex.${SOEXT}
-lib/libclangParse.${SOEXT}
-lib/libclangRewrite.${SOEXT}
-lib/libclangRewriteFrontend.${SOEXT}
-lib/libclangSema.${SOEXT}
-lib/libclangSerialization.${SOEXT}
-lib/libclangStaticAnalyzerCheckers.${SOEXT}
-lib/libclangStaticAnalyzerCore.${SOEXT}
-lib/libclangStaticAnalyzerFrontend.${SOEXT}
-lib/libclangTooling.${SOEXT}
-lib/libclangToolingCore.${SOEXT}
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,21 +1,22 @@
-$NetBSD: distinfo,v 1.30 2015/03/03 16:27:33 tnn Exp $
+$NetBSD: distinfo,v 1.33 2015/05/28 13:25:59 adam Exp $

-SHA1 (cfe-3.6.0.src.tar.xz) = 06b252867a3d118c95ca279fd3c4ac05f6730551
-RMD160 (cfe-3.6.0.src.tar.xz) = 2e04853d2f8133fea493ee12d7f05bc6b27dc988
-Size (cfe-3.6.0.src.tar.xz) = 8640776 bytes
-SHA1 (compiler-rt-3.6.0.src.tar.xz) = 771cbf0535dce1ca3a3be022377781e32fdea70e
-RMD160 (compiler-rt-3.6.0.src.tar.xz) = 716cbd5e101959b064331ad73bfe18fcb98347c5
-Size (compiler-rt-3.6.0.src.tar.xz) = 1140616 bytes
-SHA1 (libcxx-3.6.0.src.tar.xz) = 5445194366ae2291092fd2204030cb3d01ad6272
-RMD160 (libcxx-3.6.0.src.tar.xz) = 9221db789b801dde45ad89f57c7a74fd3b082cf4
-Size (libcxx-3.6.0.src.tar.xz) = 946380 bytes
-SHA1 (llvm-3.6.0.src.tar.xz) = 6eb2b7381d924bb3f267281c9058c817d825d824
-RMD160 (llvm-3.6.0.src.tar.xz) = cd2216a21871ba5be52e193e28e444bd04dacee2
-Size (llvm-3.6.0.src.tar.xz) = 12750908 bytes
+SHA1 (cfe-3.6.1.src.tar.xz) = b7221d8fdd27e3ed519d0281646e82e17b51122c
+RMD160 (cfe-3.6.1.src.tar.xz) = 2199271489c7a1c63aa41e80ff78089aeebdcd3e
+Size (cfe-3.6.1.src.tar.xz) = 8616132 bytes
+SHA1 (compiler-rt-3.6.1.src.tar.xz) = 85dccdc6ccd9675e871dfd2786b45fbf53518485
+RMD160 (compiler-rt-3.6.1.src.tar.xz) = 171af614b4656c121a6b8e58ce3e137b0495cd64
+Size (compiler-rt-3.6.1.src.tar.xz) = 1128460 bytes
+SHA1 (libcxx-3.6.1.src.tar.xz) = 7bf3a63082173eb6c42af330544d800e86b54590
+RMD160 (libcxx-3.6.1.src.tar.xz) = 3da38b89322c0ea4abf42df3823831d8033b764a
+Size (libcxx-3.6.1.src.tar.xz) = 943756 bytes
+SHA1 (llvm-3.6.1.src.tar.xz) = 01ecab99adc9030ee34e9a2e19e65dfe64e1affe
+RMD160 (llvm-3.6.1.src.tar.xz) = 9a66dc3f06078ffede1a190dcca95e071e63feb4
+Size (llvm-3.6.1.src.tar.xz) = 12798852 bytes
 SHA1 (patch-ab) = 8dd0da6d47a57ac25eea358996cf874dd3289e08
 SHA1 (patch-ac) = 0f0cc98d443ec957fc5374fb491809d27e4f9d4e
 SHA1 (patch-ad) = ad1f6720e4c73e57fce10ba968b03637a133602d
 SHA1 (patch-include_llvm_Support_Host.h) = 545f9542cd2aaa6cea58d3653902b4e1a9e7189a
 SHA1 (patch-tools_clang_tools_scan-build_scan-build) = a671f1e513fb43ddc0e73751a78235ab39aeaf9d
 SHA1 (patch-tools_lli_Makefile) = 9801878144833b9c871677110183539cd0a08e9a
+SHA1 (patch-tools_llvm-shlib_Makefile) = 5cd529e824a935abfe91c4b820cfd9c318e03102
 SHA1 (patch-unittests_ExecutionEngine_MCJIT_Makefile) = 8243131319b77f025568592acf9436cf6fe5219c
--- a/lang/clang/options.mk
+++ b/lang/clang/options.mk
@@ -1,28 +1,13 @@
-# $NetBSD: options.mk,v 1.2 2015/03/03 16:27:33 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2015/04/03 11:06:57 tnn Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.clang
-PKG_SUPPORTED_OPTIONS=	clang-static-analyzer shlib
+PKG_SUPPORTED_OPTIONS=	clang-static-analyzer
 PKG_SUGGESTED_OPTIONS=	# clang-static-analyzer disabled since it needs python and perl

 .include "../../mk/bsd.options.mk"

 PLIST_SRC=		${PLIST_SRC_DFLT}

-# XXX should be spun off to a libLLVM package when we have a use case for it
-.if !empty(PKG_OPTIONS:Mshlib)
-PLIST_SRC+=		PLIST.shlib
-CONFIGURE_ARGS+=	--enable-shared
-MAKE_ENV+=		SHARED_LIBRARY=1
-MAKE_ENV+=		LD_LIBRARY_PATH=${WRKSRC}/Release/lib
-# fixup shared library dependencies in a less intrusive way than patching
-BUILDLINK_TRANSFORM+=	l:clangTooling:clangToolingCore:clangASTMatchers:clangTooling
-BUILDLINK_TRANSFORM+=	l:LLVMMipsDesc:LLVMMipsAsmPrinter:LLVMMipsDesc
-BUILDLINK_TRANSFORM+=	l:LLVMARMAsmParser:LLVMARMInfo:LLVMARMAsmParser
-BUILDLINK_TRANSFORM+=	l:clangARCMigrate:clangStaticAnalyzerCore:clangStaticAnalyzerCheckers:clangARCMigrate
-BUILDLINK_TRANSFORM+=	l:clangStaticAnalyzerCheckers:clangStaticAnalyzerCore:clangStaticAnalyzerCheckers
-BUILDLINK_TRANSFORM+=	l:clangFrontendTool:clangStaticAnalyzerFrontend:clangFrontendTool
-.endif
-
 .if !empty(PKG_OPTIONS:Mclang-static-analyzer)
 PLIST_SRC+=		PLIST.static-analyzer

--- a/lang/clang/patches/patch-tools_llvm-shlib_Makefile
+++ b/lang/clang/patches/patch-tools_llvm-shlib_Makefile
@@ -0,0 +1,30 @@
+$NetBSD: patch-tools_llvm-shlib_Makefile,v 1.2 2015/04/26 13:08:38 tnn Exp $
+
+Add NetBSD support.
+Use full paths to archive files instead of -lfoo to avoid wrapper reordering.
+
+--- tools/llvm-shlib/Makefile.orig	2014-08-01 06:16:03.000000000 +0000
+++ tools/llvm-shlib/Makefile
+@@ -53,18 +53,18 @@ ifeq ($(HOST_OS),Darwin)
+     LLVMLibsOptions    := $(LLVMLibsOptions) -all_load
+ endif
+ 
+-ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD OpenBSD GNU Bitrig))
+ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD NetBSD OpenBSD GNU Bitrig))
+     # Include everything from the .a's into the shared library.
+-    LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \
+    LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsPaths) \
+                        -Wl,--no-whole-archive
+ endif
+ 
+-ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU))
+ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD NetBSD GNU))
+     # Add soname to the library.
+     LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
+ endif
+ 
+-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))
+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD NetBSD))
+     # Don't allow unresolved symbols.
+     LLVMLibsOptions += -Wl,--no-undefined
+ endif
--- a/lang/classpath-gui/Makefile
+++ b/lang/classpath-gui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2014/05/05 00:48:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.38 2015/04/25 14:23:26 tnn Exp $

 .include "../../lang/classpath/Makefile.common"

 PKGNAME=	${DISTNAME:S/classpath/classpath-gui/}
-PKGREVISION=	22
+PKGREVISION=	23
 COMMENT+=	(GUI libraries)

 DEPENDS+=	classpath>=0.93:../../lang/classpath
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2015/01/20 14:24:36 jaapb Exp $
+# $NetBSD: Makefile,v 1.80 2015/04/25 13:41:18 jaapb Exp $
 #

-DISTNAME=	coq-8.4pl4
+DISTNAME=	coq-8.4pl6
 PKGNAME=	${DISTNAME} # to avoid prefixing with ocaml-
-PKGREVISION=	3
 CATEGORIES=	lang math
 MASTER_SITES=	http://coq.inria.fr/distrib/V${PKGVERSION_NOREV}/files/

--- a/lang/coq/PLIST
+++ b/lang/coq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2014/10/09 22:19:01 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.16 2015/04/25 13:41:18 jaapb Exp $
 bin/coq-tex
 bin/coq_makefile
 bin/coqc
@@ -651,6 +651,7 @@ lib/coq/theories/Logic/Epsilon.vo
 lib/coq/theories/Logic/Eqdep.vo
 lib/coq/theories/Logic/EqdepFacts.vo
 lib/coq/theories/Logic/Eqdep_dec.vo
+lib/coq/theories/Logic/ExtensionalityFacts.vo
 lib/coq/theories/Logic/FunctionalExtensionality.vo
 lib/coq/theories/Logic/Hurkens.vo
 lib/coq/theories/Logic/IndefiniteDescription.vo
--- a/lang/coq/distinfo
+++ b/lang/coq/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.20 2014/10/09 22:19:01 jaapb Exp $
+$NetBSD: distinfo,v 1.21 2015/04/25 13:41:18 jaapb Exp $

-SHA1 (coq-8.4pl4.tar.gz) = 4dfc3a1ae65f5c480ddc4387d21549a526183e00
-RMD160 (coq-8.4pl4.tar.gz) = 19e3fe905f5db09710b1f862f21e9b57c28f9704
-Size (coq-8.4pl4.tar.gz) = 4067355 bytes
+SHA1 (coq-8.4pl6.tar.gz) = c89525295659a805661ef91da24ecfb94e226953
+RMD160 (coq-8.4pl6.tar.gz) = f57f6e5732d3977f3346dda2749f4b9628604018
+Size (coq-8.4pl6.tar.gz) = 4099815 bytes
 SHA1 (patch-Makefile.build) = 3fa72d701a80f363ef637e3cbd0e4c2d410da6c4
-SHA1 (patch-kernel_univ.ml) = 2208e539870d6793b807bae46e0955b5f814f3fc
--- a/lang/coq/patches/patch-kernel_univ.ml
+++ b/lang/coq/patches/patch-kernel_univ.ml
@@ -1,14 +0,0 @@
-$NetBSD: patch-kernel_univ.ml,v 1.1 2014/10/09 22:19:01 jaapb Exp $
-
-Fix comment.
--- kernel/univ.ml.orig	2014-04-24 15:13:03.000000000 +0000
-+++ kernel/univ.ml
-@@ -226,7 +226,7 @@ let reprleq g arcu =
- 
- 
- (* between : UniverseLevel.t -> canonical_arc -> canonical_arc list *)
-(* between u v = {w|u<=w<=v, w canonical}          *)
-+(* between u v = { w | u<=w<=v, w canonical}          *)
- (* between is the most costly operation *)
- 
- let between g arcu arcv =
--- a/lang/erlang-doc/Makefile
+++ b/lang/erlang-doc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2013/10/18 11:41:18 bsiegert Exp $
+# $NetBSD: Makefile,v 1.12 2015/04/28 14:34:20 fhajny Exp $

-DISTNAME=		otp_doc_html_${DIST_VERSION_MAJOR}${DIST_VERSION_MINOR:D-${DIST_VERSION_MINOR}}
-PKGNAME=		erlang-doc-${ERLANG_VERSION}
+DISTNAME=		otp_doc_html_${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}
+PKGNAME=		${DISTNAME:S/otp_doc_html_/erlang-doc-/}
 CATEGORIES=		lang
 MASTER_SITES=		http://www.erlang.org/download/

@@ -12,7 +12,7 @@ COMMENT=		Documentation for Erlang, a concurrent functional programming language
 DIST_SUBDIR=		erlang

 # needs erlang installed for its directory structure
-DEPENDS+=		erlang-${ERLANG_VERSION}{,nb*}:../../lang/erlang
+DEPENDS+=		erlang-${PKGVERSION_NOREV}{,nb*}:../../lang/erlang

 NO_CONFIGURE=		yes
 NO_BUILD=		yes
--- a/lang/erlang-doc/PLIST
+++ b/lang/erlang-doc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2013/10/20 18:37:49 asau Exp $
+@comment $NetBSD: PLIST,v 1.17 2015/04/28 14:34:20 fhajny Exp $
 lib/erlang/doc/applications.html
 lib/erlang/doc/design_principles/applications.html
 lib/erlang/doc/design_principles/appup_cookbook.html
@@ -64,14 +64,13 @@ lib/erlang/doc/index.html
 lib/erlang/doc/installation_guide/INSTALL-CROSS.html
 lib/erlang/doc/installation_guide/INSTALL-WIN32.html
 lib/erlang/doc/installation_guide/INSTALL.html
-lib/erlang/doc/installation_guide/MARKDOWN.html
+lib/erlang/doc/installation_guide/OTP-PATCH-APPLY.html
 lib/erlang/doc/installation_guide/install-binary.html
 lib/erlang/doc/installation_guide/source/INSTALL-CROSS.html
 lib/erlang/doc/installation_guide/source/INSTALL-WIN32.html
 lib/erlang/doc/installation_guide/source/INSTALL.html
-lib/erlang/doc/installation_guide/source/MARKDOWN.html
+lib/erlang/doc/installation_guide/source/OTP-PATCH-APPLY.html
 lib/erlang/doc/installation_guide/users_guide.html
-lib/erlang/doc/installation_guide/verification.html
 lib/erlang/doc/js/erlresolvelinks.js
 lib/erlang/doc/js/flipmenu/flip_closed.gif
 lib/erlang/doc/js/flipmenu/flip_open.gif
@@ -92,6 +91,7 @@ lib/erlang/doc/programming_examples/funs.html
 lib/erlang/doc/programming_examples/list_comprehensions.html
 lib/erlang/doc/programming_examples/records.html
 lib/erlang/doc/programming_examples/users_guide.html
+lib/erlang/doc/reference_manual/character_set.html
 lib/erlang/doc/reference_manual/code_loading.html
 lib/erlang/doc/reference_manual/data_types.html
 lib/erlang/doc/reference_manual/distributed.html
@@ -112,7 +112,9 @@ lib/erlang/doc/system_architecture_intro/users_guide.html
 lib/erlang/doc/system_principles/create_target.html
 lib/erlang/doc/system_principles/error_logging.html
 lib/erlang/doc/system_principles/system_principles.html
+lib/erlang/doc/system_principles/upgrade.html
 lib/erlang/doc/system_principles/users_guide.html
+lib/erlang/doc/system_principles/versions.html
 lib/erlang/doc/tutorial/c_port.html
 lib/erlang/doc/tutorial/c_portdriver.html
 lib/erlang/doc/tutorial/cnode.html
@@ -166,26 +168,13 @@ lib/erlang/erts-${VERSION.erts}/doc/html/release_notes.html
 lib/erlang/erts-${VERSION.erts}/doc/html/run_erl.html
 lib/erlang/erts-${VERSION.erts}/doc/html/start.html
 lib/erlang/erts-${VERSION.erts}/doc/html/start_erl.html
+lib/erlang/erts-${VERSION.erts}/doc/html/time_correction.html
 lib/erlang/erts-${VERSION.erts}/doc/html/tty.html
 lib/erlang/erts-${VERSION.erts}/doc/html/users_guide.html
 lib/erlang/erts-${VERSION.erts}/doc/html/werl.html
 lib/erlang/erts-${VERSION.erts}/doc/html/zlib.html
 lib/erlang/erts-${VERSION.erts}/doc/pdf/erts-${VERSION.erts}.pdf
 lib/erlang/erts-${VERSION.erts}/info
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/html/app_win.gif
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/html/appmon.eix
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/html/appmon.html
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/html/appmon_chapter.html
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/html/index.html
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/html/listbox_win.gif
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/html/main_win.gif
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/html/note.gif
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/html/notes.html
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/html/pinfo_win.gif
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/html/release_notes.html
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/html/users_guide.html
-lib/erlang/lib/appmon-${VERSION.appmon}/doc/pdf/appmon-${VERSION.appmon}.pdf
-lib/erlang/lib/appmon-${VERSION.appmon}/info
 lib/erlang/lib/asn1-${VERSION.asn1}/doc/html/asn1.eix
 lib/erlang/lib/asn1-${VERSION.asn1}/doc/html/asn1_spec.html
 lib/erlang/lib/asn1-${VERSION.asn1}/doc/html/asn1_ug.html
@@ -214,6 +203,7 @@ lib/erlang/lib/common_test-${VERSION.common_test}/doc/html/ct_hooks_chapter.html
 lib/erlang/lib/common_test-${VERSION.common_test}/doc/html/ct_master.html
 lib/erlang/lib/common_test-${VERSION.common_test}/doc/html/ct_master_chapter.html
 lib/erlang/lib/common_test-${VERSION.common_test}/doc/html/ct_netconfc.html
+lib/erlang/lib/common_test-${VERSION.common_test}/doc/html/ct_property_test.html
 lib/erlang/lib/common_test-${VERSION.common_test}/doc/html/ct_rpc.html
 lib/erlang/lib/common_test-${VERSION.common_test}/doc/html/ct_run.html
 lib/erlang/lib/common_test-${VERSION.common_test}/doc/html/ct_slave.html
@@ -743,6 +733,7 @@ lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/e
 lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpErlangList.SubList.html
 lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpErlangList.html
 lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpErlangLong.html
+lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpErlangMap.html
 lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpErlangObject.Hash.html
 lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpErlangObject.html
 lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpErlangPid.html
@@ -905,16 +896,12 @@ lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/users_guide.html
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/warning.gif
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/pdf/mnesia-${VERSION.mnesia}.pdf
 lib/erlang/lib/mnesia-${VERSION.mnesia}/info
-lib/erlang/lib/observer-${VERSION.observer}/doc/html/crashdump_help.html
+lib/erlang/lib/observer-${VERSION.observer}/doc/html/cdv.html
 lib/erlang/lib/observer-${VERSION.observer}/doc/html/crashdump_ug.html
 lib/erlang/lib/observer-${VERSION.observer}/doc/html/crashdump_viewer.html
 lib/erlang/lib/observer-${VERSION.observer}/doc/html/et_modsprocs.gif
 lib/erlang/lib/observer-${VERSION.observer}/doc/html/et_processes.gif
 lib/erlang/lib/observer-${VERSION.observer}/doc/html/etop.html
-lib/erlang/lib/observer-${VERSION.observer}/doc/html/etop_5.gif
-lib/erlang/lib/observer-${VERSION.observer}/doc/html/etop_lines.gif
-lib/erlang/lib/observer-${VERSION.observer}/doc/html/etop_main.gif
-lib/erlang/lib/observer-${VERSION.observer}/doc/html/etop_opt.gif
 lib/erlang/lib/observer-${VERSION.observer}/doc/html/etop_ug.html
 lib/erlang/lib/observer-${VERSION.observer}/doc/html/index.html
 lib/erlang/lib/observer-${VERSION.observer}/doc/html/note.gif
@@ -1020,6 +1007,18 @@ lib/erlang/lib/os_mon-${VERSION.os_mon}/doc/html/release_notes.html
 lib/erlang/lib/os_mon-${VERSION.os_mon}/doc/html/warning.gif
 lib/erlang/lib/os_mon-${VERSION.os_mon}/doc/pdf/os_mon-${VERSION.os_mon}.pdf
 lib/erlang/lib/os_mon-${VERSION.os_mon}/info
+lib/erlang/lib/ose-${VERSION.ose}/doc/html/index.html
+lib/erlang/lib/ose-${VERSION.ose}/doc/html/notes.html
+lib/erlang/lib/ose-${VERSION.ose}/doc/html/ose.eix
+lib/erlang/lib/ose-${VERSION.ose}/doc/html/ose.html
+lib/erlang/lib/ose-${VERSION.ose}/doc/html/ose_app.html
+lib/erlang/lib/ose-${VERSION.ose}/doc/html/ose_erl_driver.html
+lib/erlang/lib/ose-${VERSION.ose}/doc/html/ose_intro.html
+lib/erlang/lib/ose-${VERSION.ose}/doc/html/ose_signals_chapter.html
+lib/erlang/lib/ose-${VERSION.ose}/doc/html/release_notes.html
+lib/erlang/lib/ose-${VERSION.ose}/doc/html/users_guide.html
+lib/erlang/lib/ose-${VERSION.ose}/doc/pdf/ose-${VERSION.ose}.pdf
+lib/erlang/lib/ose-${VERSION.ose}/info
 lib/erlang/lib/otp_mibs-${VERSION.otp_mibs}/doc/html/index.html
 lib/erlang/lib/otp_mibs-${VERSION.otp_mibs}/doc/html/introduction.html
 lib/erlang/lib/otp_mibs-${VERSION.otp_mibs}/doc/html/mibs.html
@@ -1063,18 +1062,6 @@ lib/erlang/lib/percept-${VERSION.percept}/doc/html/test4.gif
 lib/erlang/lib/percept-${VERSION.percept}/doc/html/users_guide.html
 lib/erlang/lib/percept-${VERSION.percept}/doc/pdf/percept-${VERSION.percept}.pdf
 lib/erlang/lib/percept-${VERSION.percept}/info
-lib/erlang/lib/pman-${VERSION.pman}/doc/html/index.html
-lib/erlang/lib/pman-${VERSION.pman}/doc/html/main_window.gif
-lib/erlang/lib/pman-${VERSION.pman}/doc/html/notes.html
-lib/erlang/lib/pman-${VERSION.pman}/doc/html/options.gif
-lib/erlang/lib/pman-${VERSION.pman}/doc/html/pman.eix
-lib/erlang/lib/pman-${VERSION.pman}/doc/html/pman.html
-lib/erlang/lib/pman-${VERSION.pman}/doc/html/pman_chapter.html
-lib/erlang/lib/pman-${VERSION.pman}/doc/html/release_notes.html
-lib/erlang/lib/pman-${VERSION.pman}/doc/html/trace.gif
-lib/erlang/lib/pman-${VERSION.pman}/doc/html/users_guide.html
-lib/erlang/lib/pman-${VERSION.pman}/doc/pdf/pman-${VERSION.pman}.pdf
-lib/erlang/lib/pman-${VERSION.pman}/info
 lib/erlang/lib/public_key-${VERSION.public_key}/doc/html/cert_records.html
 lib/erlang/lib/public_key-${VERSION.public_key}/doc/html/index.html
 lib/erlang/lib/public_key-${VERSION.public_key}/doc/html/introduction.html
@@ -1109,6 +1096,7 @@ lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/doc/html/notes.html
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/doc/html/release_notes.html
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/doc/html/runtime_tools.eix
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/doc/html/runtime_tools_app.html
+lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/doc/html/system_information.html
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/doc/html/users_guide.html
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/doc/pdf/runtime_tools-${VERSION.runtime_tools}.pdf
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/info
@@ -1281,6 +1269,7 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/io_protocol.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/lib.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/lists.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/log_mf_h.html
+lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/maps.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/math.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/ms_transform.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/notes.html
@@ -1346,18 +1335,6 @@ lib/erlang/lib/test_server-${VERSION.test_server}/doc/html/write_framework_chapt
 lib/erlang/lib/test_server-${VERSION.test_server}/doc/html/write_test_chapter.html
 lib/erlang/lib/test_server-${VERSION.test_server}/doc/pdf/test_server-${VERSION.test_server}.pdf
 lib/erlang/lib/test_server-${VERSION.test_server}/info
-lib/erlang/lib/toolbar-${VERSION.toolbar}/doc/html/bar.gif
-lib/erlang/lib/toolbar-${VERSION.toolbar}/doc/html/create_tool.gif
-lib/erlang/lib/toolbar-${VERSION.toolbar}/doc/html/index.html
-lib/erlang/lib/toolbar-${VERSION.toolbar}/doc/html/note.gif
-lib/erlang/lib/toolbar-${VERSION.toolbar}/doc/html/notes.html
-lib/erlang/lib/toolbar-${VERSION.toolbar}/doc/html/release_notes.html
-lib/erlang/lib/toolbar-${VERSION.toolbar}/doc/html/toolbar.eix
-lib/erlang/lib/toolbar-${VERSION.toolbar}/doc/html/toolbar.html
-lib/erlang/lib/toolbar-${VERSION.toolbar}/doc/html/toolbar_chapter.html
-lib/erlang/lib/toolbar-${VERSION.toolbar}/doc/html/users_guide.html
-lib/erlang/lib/toolbar-${VERSION.toolbar}/doc/pdf/toolbar-${VERSION.toolbar}.pdf
-lib/erlang/lib/toolbar-${VERSION.toolbar}/info
 lib/erlang/lib/tools-${VERSION.tools}/doc/html/cover.html
 lib/erlang/lib/tools-${VERSION.tools}/doc/html/cover_chapter.html
 lib/erlang/lib/tools-${VERSION.tools}/doc/html/cprof.html
@@ -1383,31 +1360,13 @@ lib/erlang/lib/tools-${VERSION.tools}/doc/html/xref.html
 lib/erlang/lib/tools-${VERSION.tools}/doc/html/xref_chapter.html
 lib/erlang/lib/tools-${VERSION.tools}/doc/pdf/tools-${VERSION.tools}.pdf
 lib/erlang/lib/tools-${VERSION.tools}/info
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/index.html
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/info_window.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/notes.html
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/release_notes.html
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/set_poll_int.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/table_visualizer.html
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv.eix
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv.html
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_create_table.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_record_editor_mnesia.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_row_marked.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_row_marked_popup.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_search_result.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_search_window.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_start.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_start_mnesia.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_start_other_node.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_start_pid_sorted.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_start_system.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_start_system_unreadable.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_table_browser.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/tv_table_browser_updated.gif
-lib/erlang/lib/tv-${VERSION.tv}/doc/html/users_guide.html
-lib/erlang/lib/tv-${VERSION.tv}/doc/pdf/tv-${VERSION.tv}.pdf
-lib/erlang/lib/tv-${VERSION.tv}/info
+lib/erlang/lib/typer-${VERSION.typer}/doc/html/TypEr_app.html
+lib/erlang/lib/typer-${VERSION.typer}/doc/html/index.html
+lib/erlang/lib/typer-${VERSION.typer}/doc/html/notes.html
+lib/erlang/lib/typer-${VERSION.typer}/doc/html/release_notes.html
+lib/erlang/lib/typer-${VERSION.typer}/doc/html/typer.eix
+lib/erlang/lib/typer-${VERSION.typer}/doc/pdf/typer-${VERSION.typer}.pdf
+lib/erlang/lib/typer-${VERSION.typer}/info
 lib/erlang/lib/webtool-${VERSION.webtool}/doc/html/index.html
 lib/erlang/lib/webtool-${VERSION.webtool}/doc/html/notes.html
 lib/erlang/lib/webtool-${VERSION.webtool}/doc/html/release_notes.html
@@ -1429,6 +1388,7 @@ lib/erlang/lib/wx-${VERSION.wx}/doc/html/wx.eix
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wx.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxAcceleratorEntry.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxAcceleratorTable.html
+lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxActivateEvent.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxArtProvider.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxAuiDockArt.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxAuiManager.html
@@ -1531,6 +1491,7 @@ lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxIconizeEvent.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxIdleEvent.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxImage.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxImageList.html
+lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxInitDialogEvent.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxJoystickEvent.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxKeyEvent.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxLayoutAlgorithm.html
@@ -1541,6 +1502,7 @@ lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxListItem.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxListItemAttr.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxListView.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxListbook.html
+lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxLocale.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxLogNull.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxMDIChildFrame.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxMDIClientWindow.html
@@ -1573,6 +1535,8 @@ lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxPanel.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxPasswordEntryDialog.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxPen.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxPickerBase.html
+lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxPopupTransientWindow.html
+lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxPopupWindow.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxPostScriptDC.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxPreviewCanvas.html
 lib/erlang/lib/wx-${VERSION.wx}/doc/html/wxPreviewControlBar.html
--- a/lang/erlang-doc/distinfo
+++ b/lang/erlang-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2013/10/20 18:37:49 asau Exp $
+$NetBSD: distinfo,v 1.14 2015/04/28 14:34:20 fhajny Exp $

-SHA1 (erlang/otp_doc_html_R16B02.tar.gz) = 142e0b4becc04d3b5bf46a7fa2d48aae43cc84d0
-RMD160 (erlang/otp_doc_html_R16B02.tar.gz) = 20315bfa218469d045f0f69a52305a89e138f6e6
-Size (erlang/otp_doc_html_R16B02.tar.gz) = 33241266 bytes
+SHA1 (erlang/otp_doc_html_17.5.tar.gz) = 2bf5c2c7dcc90cc6e54039b62d4611362cdbf249
+RMD160 (erlang/otp_doc_html_17.5.tar.gz) = 6ddf8086cbc36137d2c96453e9dc2370fee10c74
+Size (erlang/otp_doc_html_17.5.tar.gz) = 33510258 bytes
--- a/lang/erlang-man/Makefile
+++ b/lang/erlang-man/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/10/18 11:41:18 bsiegert Exp $
+# $NetBSD: Makefile,v 1.9 2015/04/28 14:34:20 fhajny Exp $

-DISTNAME=		otp_doc_man_${DIST_VERSION_MAJOR}${DIST_VERSION_MINOR:D-${DIST_VERSION_MINOR}}
-PKGNAME=		erlang-man-${ERLANG_VERSION}
+DISTNAME=		otp_doc_man_${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}
+PKGNAME=		${DISTNAME:S/otp_doc_man_/erlang-man-/}
 CATEGORIES=		lang
 MASTER_SITES=		http://www.erlang.org/download/

@@ -12,7 +12,7 @@ COMMENT=		Documentation for Erlang, a concurrent functional programming language
 DIST_SUBDIR=		erlang

 # needs erlang installed for its directory structure
-DEPENDS+=		erlang-${ERLANG_VERSION}{,nb*}:../../lang/erlang
+DEPENDS+=		erlang-${PKGVERSION_NOREV}{,nb*}:../../lang/erlang

 USE_TOOLS+=		pax

--- a/lang/erlang-man/PLIST
+++ b/lang/erlang-man/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.14 2013/10/20 18:37:49 asau Exp $
+@comment $NetBSD: PLIST,v 1.15 2015/04/28 14:34:20 fhajny Exp $
+lib/erlang/man/man1/cdv.1
 lib/erlang/man/man1/ct_run.1
-lib/erlang/man/man1/diameter_compile.1
+lib/erlang/man/man1/diameterc.1
 lib/erlang/man/man1/epmd.1
 lib/erlang/man/man1/erl.1
 lib/erlang/man/man1/erl_call.1
@@ -82,7 +83,6 @@ lib/erlang/man/man3/Module_Interface.3
 lib/erlang/man/man3/alarm_handler.3
 lib/erlang/man/man3/any.3
 lib/erlang/man/man3/application.3
-lib/erlang/man/man3/appmon.3
 lib/erlang/man/man3/array.3
 lib/erlang/man/man3/asn1ct.3
 lib/erlang/man/man3/asn1rt.3
@@ -114,6 +114,7 @@ lib/erlang/man/man3/ct_ftp.3
 lib/erlang/man/man3/ct_hooks.3
 lib/erlang/man/man3/ct_master.3
 lib/erlang/man/man3/ct_netconfc.3
+lib/erlang/man/man3/ct_property_test.3
 lib/erlang/man/man3/ct_rpc.3
 lib/erlang/man/man3/ct_slave.3
 lib/erlang/man/man3/ct_snmp.3
@@ -243,6 +244,7 @@ lib/erlang/man/man3/lname.3
 lib/erlang/man/man3/lname_component.3
 lib/erlang/man/man3/log_mf_h.3
 lib/erlang/man/man3/make.3
+lib/erlang/man/man3/maps.3
 lib/erlang/man/man3/math.3
 lib/erlang/man/man3/megaco.3
 lib/erlang/man/man3/megaco_codec_meas.3
@@ -280,13 +282,14 @@ lib/erlang/man/man3/ordsets.3
 lib/erlang/man/man3/os.3
 lib/erlang/man/man3/os_mon_mib.3
 lib/erlang/man/man3/os_sup.3
+lib/erlang/man/man3/ose.3
+lib/erlang/man/man3/ose_erl_driver.3
 lib/erlang/man/man3/otp_mib.3
 lib/erlang/man/man3/overload.3
 lib/erlang/man/man3/percept.3
 lib/erlang/man/man3/percept_profile.3
 lib/erlang/man/man3/pg.3
 lib/erlang/man/man3/pg2.3
-lib/erlang/man/man3/pman.3
 lib/erlang/man/man3/pool.3
 lib/erlang/man/man3/prettypr.3
 lib/erlang/man/man3/proc_lib.3
@@ -354,15 +357,14 @@ lib/erlang/man/man3/string.3
 lib/erlang/man/man3/supervisor.3
 lib/erlang/man/man3/supervisor_bridge.3
 lib/erlang/man/man3/sys.3
+lib/erlang/man/man3/system_information.3
 lib/erlang/man/man3/systools.3
 lib/erlang/man/man3/tags.3
 lib/erlang/man/man3/test_server.3
 lib/erlang/man/man3/test_server_ctrl.3
 lib/erlang/man/man3/tftp.3
 lib/erlang/man/man3/timer.3
-lib/erlang/man/man3/toolbar.3
 lib/erlang/man/man3/ttb.3
-lib/erlang/man/man3/tv.3
 lib/erlang/man/man3/unicode.3
 lib/erlang/man/man3/unix_telnet.3
 lib/erlang/man/man3/user.3
@@ -372,6 +374,7 @@ lib/erlang/man/man3/wrap_log_reader.3
 lib/erlang/man/man3/wx.3
 lib/erlang/man/man3/wxAcceleratorEntry.3
 lib/erlang/man/man3/wxAcceleratorTable.3
+lib/erlang/man/man3/wxActivateEvent.3
 lib/erlang/man/man3/wxArtProvider.3
 lib/erlang/man/man3/wxAuiDockArt.3
 lib/erlang/man/man3/wxAuiManager.3
@@ -474,6 +477,7 @@ lib/erlang/man/man3/wxIconizeEvent.3
 lib/erlang/man/man3/wxIdleEvent.3
 lib/erlang/man/man3/wxImage.3
 lib/erlang/man/man3/wxImageList.3
+lib/erlang/man/man3/wxInitDialogEvent.3
 lib/erlang/man/man3/wxJoystickEvent.3
 lib/erlang/man/man3/wxKeyEvent.3
 lib/erlang/man/man3/wxLayoutAlgorithm.3
@@ -484,6 +488,7 @@ lib/erlang/man/man3/wxListItem.3
 lib/erlang/man/man3/wxListItemAttr.3
 lib/erlang/man/man3/wxListView.3
 lib/erlang/man/man3/wxListbook.3
+lib/erlang/man/man3/wxLocale.3
 lib/erlang/man/man3/wxLogNull.3
 lib/erlang/man/man3/wxMDIChildFrame.3
 lib/erlang/man/man3/wxMDIClientWindow.3
@@ -516,6 +521,8 @@ lib/erlang/man/man3/wxPanel.3
 lib/erlang/man/man3/wxPasswordEntryDialog.3
 lib/erlang/man/man3/wxPen.3
 lib/erlang/man/man3/wxPickerBase.3
+lib/erlang/man/man3/wxPopupTransientWindow.3
+lib/erlang/man/man3/wxPopupWindow.3
 lib/erlang/man/man3/wxPostScriptDC.3
 lib/erlang/man/man3/wxPreviewCanvas.3
 lib/erlang/man/man3/wxPreviewControlBar.3
@@ -612,6 +619,7 @@ lib/erlang/man/man6/erl_docgen.6
 lib/erlang/man/man6/kernel.6
 lib/erlang/man/man6/observer.6
 lib/erlang/man/man6/os_mon.6
+lib/erlang/man/man6/ose.6
 lib/erlang/man/man6/runtime_tools.6
 lib/erlang/man/man6/sasl.6
 lib/erlang/man/man6/snmp.6
--- a/lang/erlang-man/distinfo
+++ b/lang/erlang-man/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2013/10/20 18:37:49 asau Exp $
+$NetBSD: distinfo,v 1.14 2015/04/28 14:34:20 fhajny Exp $

-SHA1 (erlang/otp_doc_man_R16B02.tar.gz) = c64c19d5ab176c8b7c1e05b02b4f2affbed7b0ef
-RMD160 (erlang/otp_doc_man_R16B02.tar.gz) = 5f0f36831d996882e55b168acd209892156e6bb8
-Size (erlang/otp_doc_man_R16B02.tar.gz) = 1318271 bytes
+SHA1 (erlang/otp_doc_man_17.5.tar.gz) = 222b2f7b6defe178521620b3a7975f667a549a7f
+RMD160 (erlang/otp_doc_man_17.5.tar.gz) = b3166f1a27622e4c290a0d929b9d935e0947e962
+Size (erlang/otp_doc_man_17.5.tar.gz) = 1363320 bytes
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2015/02/19 11:56:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.67 2015/06/12 10:50:15 wiz Exp $

-DISTNAME=		otp_src_${DIST_VERSION_MAJOR}${DIST_VERSION_MINOR:D-${DIST_VERSION_MINOR}}
-PKGREVISION=		4
-PKGNAME=		erlang-${ERLANG_VERSION}
+DISTNAME=		otp_src_${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}
+PKGNAME=		${DISTNAME:S/otp_src_/erlang-/}
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		http://www.erlang.org/download/

@@ -12,9 +12,6 @@ COMMENT=		Concurrent functional programming language
 LICENSE=		erlang-public-license

 DIST_SUBDIR=		erlang
-WRKSRC=			$(WRKDIR)/otp_src_${DIST_VERSION_MAJOR}
-
-MAKE_JOBS_SAFE=		no

 GNU_CONFIGURE=		yes
 USE_GNU_CONFIGURE_HOST=	${USE_CROSS_COMPILE}
@@ -50,13 +47,13 @@ REPLACE_INTERPRETER+=	escript
 REPLACE.escript.old=	.*escript
 REPLACE.escript.new=	${LOCALBASE}/bin/escript
 REPLACE_FILES.escript=	\
-	lib/reltool/examples/display_args \
-	lib/reltool/examples/mnesia_core_dump_viewer \
-	lib/snmp/src/compile/snmpc.src \
+	lib/diameter/bin/diameterc \
 	lib/erl_docgen/priv/bin/codeline_preprocessing.escript \
 	lib/erl_docgen/priv/bin/xml_from_edoc.escript \
+	lib/reltool/examples/display_args \
+	lib/reltool/examples/mnesia_core_dump_viewer \
 	lib/snmp/bin/snmpc \
-	lib/diameter/bin/diameterc
+	lib/snmp/src/compile/snmpc.src

 SUBST_CLASSES+=		target
 SUBST_STAGE.target=	post-patch
@@ -70,12 +67,6 @@ REPLACE_PERL+=		make/make_emakefile

 SMF_NAME=		epmd

-PLIST_SRC=		PLIST
-
-.if exists(${.CURDIR}/PLIST.${OPSYS})
-PLIST_SRC+=	${.CURDIR}/PLIST.${OPSYS}
-.endif
-
 .if ${OPSYS} == "DragonFly"
 CONFIGURE_ARGS+=	--disable-sctp
 .endif
--- a/lang/erlang/Makefile.versions
+++ b/lang/erlang/Makefile.versions
@@ -1,66 +1,61 @@
-# $NetBSD: Makefile.versions,v 1.17 2013/10/20 18:37:49 asau Exp $
+# $NetBSD: Makefile.versions,v 1.18 2015/04/28 14:34:20 fhajny Exp $

-ERLANG_VERSION=			16.1.2
-DIST_VERSION_MAJOR=		R16B02
-#DIST_VERSION_MINOR=		1
+DIST_VERSION_MAJOR=		17
+DIST_VERSION_MINOR=		5

 _VERSIONS=					\
-	appmon			2.1.14.2	\
-	asn1			2.0.3		\
-	common_test		1.7.3		\
-	compiler		4.9.3		\
-	cosEvent		2.1.14		\
-	cosEventDomain		1.1.13		\
-	cosFileTransfer		1.1.15		\
-	cosNotification		1.1.20		\
-	cosProperty		1.1.16		\
-	cosTime			1.1.13		\
-	cosTransactions		1.2.13		\
-	crypto			3.1		\
-	debugger		3.2.12		\
-	dialyzer		2.6.1		\
-	diameter		1.4.3		\
-	docbuilder		0.9.8.10	\
-	edoc			0.7.12.1	\
-	eldap			1.0.1		\
-	erl_docgen		0.3.4.1		\
-	erl_interface		3.7.14		\
-	erts			5.10.3		\
-	et			1.4.4.5		\
-	eunit			2.2.5		\
-	gs			1.5.15.2	\
-	hipe			3.10.2.1	\
-	ic			4.3.3		\
-	inets			5.9.6		\
-	jinterface		1.5.8		\
-	kernel			2.16.3		\
-	megaco			3.17.0.2	\
-	mnesia			4.10		\
-	observer		1.3.1.1		\
-	odbc			2.10.17		\
-	orber			3.6.26.1	\
-	os_mon			2.2.13		\
-	otp_mibs		1.0.8		\
-	parsetools		2.0.10		\
-	percept			0.8.8.2		\
-	pman			2.7.1.4		\
-	public_key		0.20		\
-	reltool			0.6.4.1		\
-	runtime_tools		1.8.12		\
-	sasl			2.3.3		\
-	snmp			4.24.2		\
-	ssh			2.1.8		\
-	ssl			5.3.1		\
-	stdlib			1.19.3		\
-	syntax_tools		1.6.11		\
-	test_server		3.6.3		\
-	toolbar			1.4.2.3		\
-	tools			2.6.12		\
-	tv			2.1.4.10	\
-	typer			0.9.5		\
-	webtool			0.8.9.2		\
-	wx			1.1		\
-	xmerl			1.3.4
+	asn1			3.0.4		\
+	common_test		1.10		\
+	compiler		5.0.4		\
+	cosEvent		2.1.15		\
+	cosEventDomain		1.1.14		\
+	cosFileTransfer		1.1.16		\
+	cosNotification		1.1.21		\
+	cosProperty		1.1.17		\
+	cosTime			1.1.14		\
+	cosTransactions		1.2.14		\
+	crypto			3.5		\
+	debugger		4.0.3		\
+	dialyzer		2.7.4		\
+	diameter		1.9		\
+	edoc			0.7.16		\
+	eldap			1.1.1		\
+	erl_docgen		0.3.7		\
+	erl_interface		3.7.20		\
+	erts			6.4		\
+	et			1.5		\
+	eunit			2.2.9		\
+	gs			1.5.16		\
+	hipe			3.11.3		\
+	ic			4.3.6		\
+	inets			5.10.6		\
+	jinterface		1.5.12		\
+	kernel			3.2		\
+	megaco			3.17.3		\
+	mnesia			4.12.5		\
+	observer		2.0.4		\
+	odbc			2.10.22		\
+	orber			3.7.1		\
+	os_mon			2.3.1		\
+	ose			1.0.2		\
+	otp_mibs		1.0.10		\
+	parsetools		2.0.12		\
+	percept			0.8.10		\
+	public_key		0.23		\
+	reltool			0.6.6		\
+	runtime_tools		1.8.16		\
+	sasl			2.4.1		\
+	snmp			5.1.1		\
+	ssh			3.2		\
+	ssl			6.0		\
+	stdlib			2.4		\
+	syntax_tools		1.6.18		\
+	test_server		3.8		\
+	tools			2.7.2		\
+	typer			0.9.8		\
+	webtool			0.8.10		\
+	wx			1.3.3		\
+	xmerl			1.3.7

 PLIST_SUBST+=	VERSION=${DIST_VERSION_MAJOR}

--- a/lang/erlang/PLIST
+++ b/lang/erlang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2015/02/19 11:56:18 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.17 2015/04/28 14:34:20 fhajny Exp $
 bin/ct_run
 bin/dialyzer
 bin/epmd
@@ -15,6 +15,7 @@ lib/erlang/bin/epmd
 lib/erlang/bin/erl
 lib/erlang/bin/erlc
 lib/erlang/bin/escript
+lib/erlang/bin/no_dot_erlang.boot
 lib/erlang/bin/run_erl
 lib/erlang/bin/start
 lib/erlang/bin/start.boot
@@ -50,6 +51,7 @@ lib/erlang/erts-${VERSION.erts}/include/erl_drv_nif.h
 lib/erlang/erts-${VERSION.erts}/include/erl_fixed_size_int_types.h
 lib/erlang/erts-${VERSION.erts}/include/erl_int_sizes_config.h
 lib/erlang/erts-${VERSION.erts}/include/erl_memory_trace_parser.h
+lib/erlang/erts-${VERSION.erts}/include/erl_native_features_config.h
 lib/erlang/erts-${VERSION.erts}/include/erl_nif.h
 lib/erlang/erts-${VERSION.erts}/include/erl_nif_api_funcs.h
 lib/erlang/erts-${VERSION.erts}/include/internal/README
@@ -65,6 +67,7 @@ lib/erlang/erts-${VERSION.erts}/include/internal/ethr_optimized_fallbacks.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ethread.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ethread.mk
 lib/erlang/erts-${VERSION.erts}/include/internal/ethread_header_config.h
+lib/erlang/erts-${VERSION.erts}/include/internal/ethread_inline.h
 lib/erlang/erts-${VERSION.erts}/include/internal/gcc/ethr_atomic.h
 lib/erlang/erts-${VERSION.erts}/include/internal/gcc/ethr_dw_atomic.h
 lib/erlang/erts-${VERSION.erts}/include/internal/gcc/ethr_membar.h
@@ -76,6 +79,7 @@ lib/erlang/erts-${VERSION.erts}/include/internal/i386/ethread.h
 lib/erlang/erts-${VERSION.erts}/include/internal/i386/rwlock.h
 lib/erlang/erts-${VERSION.erts}/include/internal/i386/spinlock.h
 lib/erlang/erts-${VERSION.erts}/include/internal/libatomic_ops/ethr_atomic.h
+lib/erlang/erts-${VERSION.erts}/include/internal/libatomic_ops/ethr_dw_atomic.h
 lib/erlang/erts-${VERSION.erts}/include/internal/libatomic_ops/ethr_membar.h
 lib/erlang/erts-${VERSION.erts}/include/internal/libatomic_ops/ethread.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ppc32/atomic.h
@@ -106,32 +110,6 @@ lib/erlang/erts-${VERSION.erts}/lib/internal/libethread.a
 lib/erlang/erts-${VERSION.erts}/lib/liberts.a
 lib/erlang/erts-${VERSION.erts}/lib/liberts_r.a
 lib/erlang/erts-${VERSION.erts}/src/setuid_socket_wrap.c
-lib/erlang/lib/appmon-${VERSION.appmon}/ebin/appmon.app
-lib/erlang/lib/appmon-${VERSION.appmon}/ebin/appmon.appup
-lib/erlang/lib/appmon-${VERSION.appmon}/ebin/appmon.beam
-lib/erlang/lib/appmon-${VERSION.appmon}/ebin/appmon_a.beam
-lib/erlang/lib/appmon-${VERSION.appmon}/ebin/appmon_dg.beam
-lib/erlang/lib/appmon-${VERSION.appmon}/ebin/appmon_lb.beam
-lib/erlang/lib/appmon-${VERSION.appmon}/ebin/appmon_place.beam
-lib/erlang/lib/appmon-${VERSION.appmon}/ebin/appmon_txt.beam
-lib/erlang/lib/appmon-${VERSION.appmon}/ebin/appmon_web.beam
-lib/erlang/lib/appmon-${VERSION.appmon}/ebin/process_info.beam
-lib/erlang/lib/appmon-${VERSION.appmon}/priv/appmon.gif
-lib/erlang/lib/appmon-${VERSION.appmon}/priv/appmon.tool
-lib/erlang/lib/appmon-${VERSION.appmon}/priv/appmon_help.txt
-lib/erlang/lib/appmon-${VERSION.appmon}/priv/blank.html
-lib/erlang/lib/appmon-${VERSION.appmon}/priv/info_frames.html
-lib/erlang/lib/appmon-${VERSION.appmon}/priv/main_frame.html
-lib/erlang/lib/appmon-${VERSION.appmon}/priv/start_info.html
-lib/erlang/lib/appmon-${VERSION.appmon}/src/appmon.erl
-lib/erlang/lib/appmon-${VERSION.appmon}/src/appmon_a.erl
-lib/erlang/lib/appmon-${VERSION.appmon}/src/appmon_dg.erl
-lib/erlang/lib/appmon-${VERSION.appmon}/src/appmon_dg.hrl
-lib/erlang/lib/appmon-${VERSION.appmon}/src/appmon_lb.erl
-lib/erlang/lib/appmon-${VERSION.appmon}/src/appmon_place.erl
-lib/erlang/lib/appmon-${VERSION.appmon}/src/appmon_txt.erl
-lib/erlang/lib/appmon-${VERSION.appmon}/src/appmon_web.erl
-lib/erlang/lib/appmon-${VERSION.appmon}/src/process_info.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/c_src/asn1_erl_nif.c
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1.app
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1.appup
@@ -144,6 +122,7 @@ lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_eval_ext.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_func.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen_ber_bin_v2.beam
+lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen_check.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen_per.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_imm.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_name.beam
@@ -156,7 +135,7 @@ lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1ct_value.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1rt.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/ebin/asn1rt_nif.beam
 lib/erlang/lib/asn1-${VERSION.asn1}/examples/P-Record.asn
-lib/erlang/lib/asn1-${VERSION.asn1}/priv/lib/asn1_erl_nif.so
+lib/erlang/lib/asn1-${VERSION.asn1}/priv/lib/asn1rt_nif.so
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1.app.src
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1.appup.src
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1_db.erl
@@ -169,6 +148,7 @@ lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_eval_ext.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_func.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_gen.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_gen_ber_bin_v2.erl
+lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_gen_check.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_gen_per.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_imm.erl
 lib/erlang/lib/asn1-${VERSION.asn1}/src/asn1ct_name.erl
@@ -202,6 +182,7 @@ lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_master_event.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_master_logs.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_master_status.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_netconfc.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_property_test.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_repeat.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_rpc.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_run.beam
@@ -245,6 +226,7 @@ lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_master_logs.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_master_status.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_netconfc.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_netconfc.hrl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_property_test.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_repeat.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_rpc.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_run.erl
@@ -1119,18 +1101,14 @@ lib/erlang/lib/cosTransactions-${VERSION.cosTransactions}/src/oe_CosTransactions
 lib/erlang/lib/crypto-${VERSION.crypto}/ebin/crypto.app
 lib/erlang/lib/crypto-${VERSION.crypto}/ebin/crypto.appup
 lib/erlang/lib/crypto-${VERSION.crypto}/ebin/crypto.beam
-lib/erlang/lib/crypto-${VERSION.crypto}/ebin/crypto_app.beam
-lib/erlang/lib/crypto-${VERSION.crypto}/ebin/crypto_server.beam
-lib/erlang/lib/crypto-${VERSION.crypto}/ebin/crypto_sup.beam
+lib/erlang/lib/crypto-${VERSION.crypto}/ebin/crypto_ec_curves.beam
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/lib/crypto.so
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/lib/crypto_callback.so
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/Makefile
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/crypto.o
 lib/erlang/lib/crypto-${VERSION.crypto}/priv/obj/crypto_callback.o
 lib/erlang/lib/crypto-${VERSION.crypto}/src/crypto.erl
-lib/erlang/lib/crypto-${VERSION.crypto}/src/crypto_app.erl
-lib/erlang/lib/crypto-${VERSION.crypto}/src/crypto_server.erl
-lib/erlang/lib/crypto-${VERSION.crypto}/src/crypto_sup.erl
+lib/erlang/lib/crypto-${VERSION.crypto}/src/crypto_ec_curves.erl
 lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_debugged.beam
 lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_icmd.beam
 lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_idb.beam
@@ -1138,20 +1116,6 @@ lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ieval.beam
 lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_iload.beam
 lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_iserver.beam
 lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_istk.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_break.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_break_win.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_edit.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_edit_win.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_filedialog_win.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_interpret.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_mon.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_mon_win.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_settings.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_trace.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_trace_win.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_view.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_win.beam
-lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_ui_winman.beam
 lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_wx_break.beam
 lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_wx_break_win.beam
 lib/erlang/lib/debugger-${VERSION.debugger}/ebin/dbg_wx_code.beam
@@ -1182,24 +1146,11 @@ lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ieval.hrl
 lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_iload.erl
 lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_iserver.erl
 lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_istk.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_break.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_break_win.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_edit.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_edit_win.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_filedialog_win.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_interpret.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_mon.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_mon_win.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_settings.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_trace.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_trace_win.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_view.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_win.erl
-lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_ui_winman.erl
 lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_wx_break.erl
 lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_wx_break_win.erl
 lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_wx_code.erl
 lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_wx_filedialog_win.erl
+lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_wx_filedialog_win.hrl
 lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_wx_interpret.erl
 lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_wx_mon.erl
 lib/erlang/lib/debugger-${VERSION.debugger}/src/dbg_wx_mon_win.erl
@@ -1227,7 +1178,6 @@ lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_coordinator.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_dataflow.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_dep.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_explanation.beam
-lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_gui.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_gui_wx.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_options.beam
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/ebin/dialyzer_plt.beam
@@ -1250,7 +1200,6 @@ lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_coordinator.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_dataflow.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_dep.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_explanation.erl
-lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_gui.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_gui_wx.erl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_gui_wx.hrl
 lib/erlang/lib/dialyzer-${VERSION.dialyzer}/src/dialyzer_options.erl
@@ -1311,7 +1260,7 @@ lib/erlang/lib/diameter-${VERSION.diameter}/ebin/diameter_watchdog_sup.beam
 lib/erlang/lib/diameter-${VERSION.diameter}/examples/code/GNUmakefile
 lib/erlang/lib/diameter-${VERSION.diameter}/examples/code/client.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/examples/code/client_cb.erl
-lib/erlang/lib/diameter-${VERSION.diameter}/examples/code/peer.erl
+lib/erlang/lib/diameter-${VERSION.diameter}/examples/code/node.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/examples/code/relay.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/examples/code/relay_cb.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/examples/code/server.erl
@@ -1335,9 +1284,7 @@ lib/erlang/lib/diameter-${VERSION.diameter}/src/base/diameter_callback.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/src/base/diameter_capx.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/src/base/diameter_codec.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/src/base/diameter_config.erl
-lib/erlang/lib/diameter-${VERSION.diameter}/src/base/diameter_dbg.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/src/base/diameter_dict.erl
-lib/erlang/lib/diameter-${VERSION.diameter}/src/base/diameter_info.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/src/base/diameter_internal.hrl
 lib/erlang/lib/diameter-${VERSION.diameter}/src/base/diameter_lib.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/src/base/diameter_misc_sup.erl
@@ -1374,6 +1321,8 @@ lib/erlang/lib/diameter-${VERSION.diameter}/src/gen/diameter_gen_base_accounting
 lib/erlang/lib/diameter-${VERSION.diameter}/src/gen/diameter_gen_base_rfc3588.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/src/gen/diameter_gen_base_rfc6733.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/src/gen/diameter_gen_relay.erl
+lib/erlang/lib/diameter-${VERSION.diameter}/src/info/diameter_dbg.erl
+lib/erlang/lib/diameter-${VERSION.diameter}/src/info/diameter_info.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/src/transport/diameter_etcp.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/src/transport/diameter_etcp_sup.erl
 lib/erlang/lib/diameter-${VERSION.diameter}/src/transport/diameter_sctp.erl
@@ -1485,6 +1434,8 @@ lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/src/docgen_edoc_xml_cb.erl
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/src/docgen_otp_specs.erl
 lib/erlang/lib/erl_docgen-${VERSION.erl_docgen}/src/docgen_xmerl_xml_cb.erl
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/bin/erl_call
+lib/erlang/lib/erl_interface-${VERSION.erl_interface}/ebin/erl_interface.app
+lib/erlang/lib/erl_interface-${VERSION.erl_interface}/ebin/erl_interface.appup
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/include/ei.h
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/include/ei_connect.h
 lib/erlang/lib/erl_interface-${VERSION.erl_interface}/include/eicode.h
@@ -1676,8 +1627,6 @@ lib/erlang/lib/et-${VERSION.et}/ebin/et.app
 lib/erlang/lib/et-${VERSION.et}/ebin/et.appup
 lib/erlang/lib/et-${VERSION.et}/ebin/et.beam
 lib/erlang/lib/et-${VERSION.et}/ebin/et_collector.beam
-lib/erlang/lib/et-${VERSION.et}/ebin/et_gs_contents_viewer.beam
-lib/erlang/lib/et-${VERSION.et}/ebin/et_gs_viewer.beam
 lib/erlang/lib/et-${VERSION.et}/ebin/et_selector.beam
 lib/erlang/lib/et-${VERSION.et}/ebin/et_viewer.beam
 lib/erlang/lib/et-${VERSION.et}/ebin/et_wx_contents_viewer.beam
@@ -1688,8 +1637,6 @@ lib/erlang/lib/et-${VERSION.et}/examples/et_trace_demo.erl
 lib/erlang/lib/et-${VERSION.et}/include/et.hrl
 lib/erlang/lib/et-${VERSION.et}/src/et.erl
 lib/erlang/lib/et-${VERSION.et}/src/et_collector.erl
-lib/erlang/lib/et-${VERSION.et}/src/et_gs_contents_viewer.erl
-lib/erlang/lib/et-${VERSION.et}/src/et_gs_viewer.erl
 lib/erlang/lib/et-${VERSION.et}/src/et_internal.hrl
 lib/erlang/lib/et-${VERSION.et}/src/et_selector.erl
 lib/erlang/lib/et-${VERSION.et}/src/et_viewer.erl
@@ -1716,6 +1663,7 @@ lib/erlang/lib/eunit-${VERSION.eunit}/include/eunit.hrl
 lib/erlang/lib/eunit-${VERSION.eunit}/src/eunit.erl
 lib/erlang/lib/eunit-${VERSION.eunit}/src/eunit_autoexport.erl
 lib/erlang/lib/eunit-${VERSION.eunit}/src/eunit_data.erl
+lib/erlang/lib/eunit-${VERSION.eunit}/src/eunit_internal.hrl
 lib/erlang/lib/eunit-${VERSION.eunit}/src/eunit_lib.erl
 lib/erlang/lib/eunit-${VERSION.eunit}/src/eunit_proc.erl
 lib/erlang/lib/eunit-${VERSION.eunit}/src/eunit_serial.erl
@@ -2153,6 +2101,7 @@ lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_acceptor.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_acceptor_sup.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_cgi.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_conf.beam
+lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_connection_sup.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_esi.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_example.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_file.beam
@@ -2368,6 +2317,7 @@ lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_acceptor.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_acceptor_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_cgi.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_conf.erl
+lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_connection_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_esi.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_example.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_file.erl
@@ -2519,6 +2469,7 @@ lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_boot_server.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_ddll.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_distribution.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_epmd.erl
+lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_epmd.hrl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/erl_reply.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/error_handler.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/error_logger.erl
@@ -2534,6 +2485,7 @@ lib/erlang/lib/kernel-${VERSION.kernel}/src/global_group.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/global_search.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/group.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/heart.erl
+lib/erlang/lib/kernel-${VERSION.kernel}/src/hipe_ext_format.hrl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/hipe_unified_loader.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/inet.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/inet6_sctp.erl
@@ -2899,16 +2851,35 @@ lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_subscr.erl
 lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_sup.erl
 lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_text.erl
 lib/erlang/lib/mnesia-${VERSION.mnesia}/src/mnesia_tm.erl
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_atom_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_bin_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_detail_wx.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_dist_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_ets_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_fun_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_gen_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_html_wx.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_info_wx.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_int_tab_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_mem_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_mod_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_multi_wx.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_port_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_proc_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_table_wx.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_term_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_timer_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_virtual_list_wx.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_wx.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/crashdump_viewer.beam
-lib/erlang/lib/observer-${VERSION.observer}/ebin/crashdump_viewer_html.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/etop.beam
-lib/erlang/lib/observer-${VERSION.observer}/ebin/etop_gui.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/etop_tr.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/etop_txt.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer.app
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer.appup
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer_app_wx.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/observer_html_lib.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer_lib.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer_perf_wx.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer_pro_wx.beam
@@ -2925,22 +2896,40 @@ lib/erlang/lib/observer-${VERSION.observer}/examples/multitrace.erl
 lib/erlang/lib/observer-${VERSION.observer}/include/etop.hrl
 lib/erlang/lib/observer-${VERSION.observer}/priv/bin/cdv
 lib/erlang/lib/observer-${VERSION.observer}/priv/bin/etop
-lib/erlang/lib/observer-${VERSION.observer}/priv/bin/getop
 lib/erlang/lib/observer-${VERSION.observer}/priv/crashdump_viewer.tool
 lib/erlang/lib/observer-${VERSION.observer}/priv/crashdump_viewer/collapsd.gif
 lib/erlang/lib/observer-${VERSION.observer}/priv/crashdump_viewer/exploded.gif
 lib/erlang/lib/observer-${VERSION.observer}/priv/erlang_observer.png
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_atom_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_bin_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_detail_wx.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_dist_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_ets_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_fun_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_gen_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_html_wx.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_info_wx.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_int_tab_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_mem_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_mod_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_multi_wx.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_port_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_proc_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_table_wx.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_term_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_timer_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_virtual_list_wx.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_wx.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/crashdump_viewer.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/crashdump_viewer.hrl
-lib/erlang/lib/observer-${VERSION.observer}/src/crashdump_viewer_html.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/etop.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/etop_defs.hrl
-lib/erlang/lib/observer-${VERSION.observer}/src/etop_gui.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/etop_tr.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/etop_txt.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/observer.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/observer_app_wx.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/observer_defs.hrl
+lib/erlang/lib/observer-${VERSION.observer}/src/observer_html_lib.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/observer_lib.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/observer_perf_wx.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/observer_pro_wx.erl
@@ -3211,6 +3200,10 @@ lib/erlang/lib/os_mon-${VERSION.os_mon}/src/os_mon.erl
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/os_mon_mib.erl
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/os_mon_sysinfo.erl
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/os_sup.erl
+lib/erlang/lib/ose-${VERSION.ose}/ebin/ose.app
+lib/erlang/lib/ose-${VERSION.ose}/ebin/ose.appup
+lib/erlang/lib/ose-${VERSION.ose}/ebin/ose.beam
+lib/erlang/lib/ose-${VERSION.ose}/src/ose.erl
 lib/erlang/lib/otp_mibs-${VERSION.otp_mibs}/ebin/otp_mib.beam
 lib/erlang/lib/otp_mibs-${VERSION.otp_mibs}/ebin/otp_mibs.app
 lib/erlang/lib/otp_mibs-${VERSION.otp_mibs}/ebin/otp_mibs.appup
@@ -3263,54 +3256,18 @@ lib/erlang/lib/percept-${VERSION.percept}/priv/server_root/scripts/percept_area_
 lib/erlang/lib/percept-${VERSION.percept}/priv/server_root/scripts/percept_error_handler.js
 lib/erlang/lib/percept-${VERSION.percept}/priv/server_root/scripts/percept_select_all.js
 lib/erlang/lib/percept-${VERSION.percept}/src/egd.erl
+lib/erlang/lib/percept-${VERSION.percept}/src/egd.hrl
 lib/erlang/lib/percept-${VERSION.percept}/src/egd_font.erl
 lib/erlang/lib/percept-${VERSION.percept}/src/egd_png.erl
 lib/erlang/lib/percept-${VERSION.percept}/src/egd_primitives.erl
 lib/erlang/lib/percept-${VERSION.percept}/src/egd_render.erl
 lib/erlang/lib/percept-${VERSION.percept}/src/percept.erl
+lib/erlang/lib/percept-${VERSION.percept}/src/percept.hrl
 lib/erlang/lib/percept-${VERSION.percept}/src/percept_analyzer.erl
 lib/erlang/lib/percept-${VERSION.percept}/src/percept_db.erl
 lib/erlang/lib/percept-${VERSION.percept}/src/percept_graph.erl
 lib/erlang/lib/percept-${VERSION.percept}/src/percept_html.erl
 lib/erlang/lib/percept-${VERSION.percept}/src/percept_image.erl
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman.app
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman.appup
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_buf.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_buf_buffer.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_buf_converter.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_buf_printer.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_buf_utils.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_main.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_module_info.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_options.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_process.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_relay.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_relay_server.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_shell.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_tool.beam
-lib/erlang/lib/pman-${VERSION.pman}/ebin/pman_win.beam
-lib/erlang/lib/pman-${VERSION.pman}/priv/pman.gif
-lib/erlang/lib/pman-${VERSION.pman}/priv/pman.tool
-lib/erlang/lib/pman-${VERSION.pman}/src/assert.hrl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_buf.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_buf.hrl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_buf_buffer.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_buf_converter.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_buf_printer.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_buf_utils.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_main.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_module_info.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_options.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_options.hrl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_process.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_relay.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_relay_server.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_shell.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_tool.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_win.erl
-lib/erlang/lib/pman-${VERSION.pman}/src/pman_win.hrl
 lib/erlang/lib/public_key-${VERSION.public_key}/asn1/InformationFramework.asn1
 lib/erlang/lib/public_key-${VERSION.public_key}/asn1/OTP-PKIX.asn1
 lib/erlang/lib/public_key-${VERSION.public_key}/asn1/OTP-PUB-KEY.asn1config
@@ -3328,6 +3285,7 @@ lib/erlang/lib/public_key-${VERSION.public_key}/asn1/PKIX1Algorithms88.asn1
 lib/erlang/lib/public_key-${VERSION.public_key}/asn1/PKIX1Explicit88.asn1
 lib/erlang/lib/public_key-${VERSION.public_key}/asn1/PKIX1Implicit88.asn1
 lib/erlang/lib/public_key-${VERSION.public_key}/asn1/PKIXAttributeCertificate.asn1
+lib/erlang/lib/public_key-${VERSION.public_key}/asn1/RFC5639.asn1
 lib/erlang/lib/public_key-${VERSION.public_key}/ebin/OTP-PUB-KEY.beam
 lib/erlang/lib/public_key-${VERSION.public_key}/ebin/PKCS-FRAME.beam
 lib/erlang/lib/public_key-${VERSION.public_key}/ebin/pubkey_cert.beam
@@ -3753,12 +3711,13 @@ lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_cli.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_client_key_api.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_connection.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_connection_handler.beam
-lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_connection_manager.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_connection_sup.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_daemon_channel.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_file.beam
+lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_info.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_io.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_math.beam
+lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_message.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_no_io.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_server_key_api.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_sftp.beam
@@ -3770,7 +3729,6 @@ lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_subsystem_sup.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_sup.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_system_sup.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_transport.beam
-lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_userreg.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_xfer.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/sshc_sup.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/sshd_sup.beam
@@ -3791,12 +3749,13 @@ lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_client_key_api.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_connect.hrl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_connection.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_connection_handler.erl
-lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_connection_manager.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_connection_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_daemon_channel.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_file.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_info.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_io.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_math.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_message.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_no_io.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_server_key_api.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_sftp.erl
@@ -3809,12 +3768,12 @@ lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_system_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_transport.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_transport.hrl
-lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_userreg.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_xfer.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/sshc_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/sshd_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_connection.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_connection_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_handshake.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_record.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_v1.beam
@@ -3826,9 +3785,11 @@ lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_alert.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_app.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_certificate.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_cipher.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_connection_sup.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_config.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_connection.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_dist_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_handshake.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_listen_tracker_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_manager.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_pkix_db.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_record.beam
@@ -3843,6 +3804,7 @@ lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_v2.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_v3.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_connection.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_connection_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_handshake.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_record.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_v1.beam
@@ -3859,6 +3821,8 @@ lib/erlang/lib/ssl-${VERSION.ssl}/examples/src/Makefile
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/src/client_server.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_connection.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_connection.hrl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_connection_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_handshake.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_handshake.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_record.erl
@@ -3868,15 +3832,19 @@ lib/erlang/lib/ssl-${VERSION.ssl}/src/inet_tls_dist.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_alert.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_alert.hrl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_api.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_app.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_certificate.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_cipher.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_cipher.hrl
-lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_connection_sup.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_config.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_connection.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_connection.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_dist_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_handshake.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_handshake.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_internal.hrl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_listen_tracker_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_manager.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_pkix_db.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_record.erl
@@ -3893,6 +3861,8 @@ lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_v2.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_v3.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection.hrl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_handshake.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_handshake.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_record.erl
@@ -3949,6 +3919,7 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/io_lib_pretty.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/lib.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/lists.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/log_mf_h.beam
+lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/maps.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/math.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/ms_transform.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/orddict.beam
@@ -4037,6 +4008,7 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/src/io_lib_pretty.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/lib.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/lists.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/log_mf_h.erl
+lib/erlang/lib/stdlib-${VERSION.stdlib}/src/maps.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/math.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/ms_transform.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/orddict.erl
@@ -4104,19 +4076,7 @@ lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server_internal.hrl
 lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server_io.erl
 lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server_node.erl
 lib/erlang/lib/test_server-${VERSION.test_server}/src/test_server_sup.erl
-lib/erlang/lib/toolbar-${VERSION.toolbar}/ebin/canvasbutton.beam
-lib/erlang/lib/toolbar-${VERSION.toolbar}/ebin/toolbar.app
-lib/erlang/lib/toolbar-${VERSION.toolbar}/ebin/toolbar.appup
-lib/erlang/lib/toolbar-${VERSION.toolbar}/ebin/toolbar.beam
-lib/erlang/lib/toolbar-${VERSION.toolbar}/ebin/toolbar_graphics.beam
-lib/erlang/lib/toolbar-${VERSION.toolbar}/ebin/toolbar_lib.beam
-lib/erlang/lib/toolbar-${VERSION.toolbar}/ebin/toolbar_toolconfig.beam
-lib/erlang/lib/toolbar-${VERSION.toolbar}/src/canvasbutton.erl
-lib/erlang/lib/toolbar-${VERSION.toolbar}/src/toolbar.erl
-lib/erlang/lib/toolbar-${VERSION.toolbar}/src/toolbar.hrl
-lib/erlang/lib/toolbar-${VERSION.toolbar}/src/toolbar_graphics.erl
-lib/erlang/lib/toolbar-${VERSION.toolbar}/src/toolbar_lib.erl
-lib/erlang/lib/toolbar-${VERSION.toolbar}/src/toolbar_toolconfig.erl
+lib/erlang/lib/test_server-${VERSION.test_server}/src/ts.hrl
 lib/erlang/lib/tools-${VERSION.tools}/bin/emem
 lib/erlang/lib/tools-${VERSION.tools}/c_src/erl_memory.c
 lib/erlang/lib/tools-${VERSION.tools}/c_src/erl_memory_trace_block_table.c
@@ -4170,100 +4130,6 @@ lib/erlang/lib/tools-${VERSION.tools}/src/xref_parser.yrl
 lib/erlang/lib/tools-${VERSION.tools}/src/xref_reader.erl
 lib/erlang/lib/tools-${VERSION.tools}/src/xref_scanner.erl
 lib/erlang/lib/tools-${VERSION.tools}/src/xref_utils.erl
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv.app
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv.appup
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_comm_func.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_db.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_db_search.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_db_sort.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_ets_rpc.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_etsread.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_info.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_io_lib.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_io_lib_format.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_io_lib_pretty.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_ip.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_main.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_mnesia_rpc.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_new_table.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_nodewin.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pb.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pb_funcs.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pc.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pc_graph_ctrl.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pc_menu_handling.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pd.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pd_display.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pd_frames.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pd_scale.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pg.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pg_gridfcns.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_poll_dialog.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pw.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_pw_window.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_rec_edit.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_table_owner.beam
-lib/erlang/lib/tv-${VERSION.tv}/ebin/tv_utils.beam
-lib/erlang/lib/tv-${VERSION.tv}/priv/arrow_left.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/arrow_right.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/edit1.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/erlang.gif
-lib/erlang/lib/tv-${VERSION.tv}/priv/help.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/info.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/key.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/more.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/no_sort.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/open.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/poll.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/search.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/sort.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/sort_reverse.xbm
-lib/erlang/lib/tv-${VERSION.tv}/priv/tv.gif
-lib/erlang/lib/tv-${VERSION.tv}/priv/tv.tool
-lib/erlang/lib/tv-${VERSION.tv}/src/tv.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_comm_func.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_db.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_db_int_def.hrl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_db_search.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_db_sort.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_ets_rpc.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_etsread.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_info.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_int_def.hrl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_int_msg.hrl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_io_lib.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_io_lib_format.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_io_lib_pretty.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_ip.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_main.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_main.hrl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_mnesia_rpc.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_new_table.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_nodewin.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pb.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pb_funcs.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pb_int_def.hrl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pc.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pc_graph_ctrl.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pc_int_def.hrl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pc_menu_handling.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pd.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pd_display.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pd_frames.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pd_int_def.hrl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pd_int_msg.hrl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pd_scale.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pg.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pg_gridfcns.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pg_int_def.hrl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_poll_dialog.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pw.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pw_int_def.hrl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_pw_window.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_rec_edit.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_table_owner.erl
-lib/erlang/lib/tv-${VERSION.tv}/src/tv_utils.erl
 lib/erlang/lib/typer-${VERSION.typer}/ebin/typer.app
 lib/erlang/lib/typer-${VERSION.typer}/ebin/typer.appup
 lib/erlang/lib/typer-${VERSION.typer}/ebin/typer.beam
@@ -4286,6 +4152,7 @@ lib/erlang/lib/wx-${VERSION.wx}/ebin/wx.appup
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wx.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxAcceleratorEntry.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxAcceleratorTable.beam
+lib/erlang/lib/wx-${VERSION.wx}/ebin/wxActivateEvent.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxArtProvider.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxAuiDockArt.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxAuiManager.beam
@@ -4388,6 +4255,7 @@ lib/erlang/lib/wx-${VERSION.wx}/ebin/wxIconizeEvent.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxIdleEvent.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxImage.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxImageList.beam
+lib/erlang/lib/wx-${VERSION.wx}/ebin/wxInitDialogEvent.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxJoystickEvent.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxKeyEvent.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxLayoutAlgorithm.beam
@@ -4398,6 +4266,7 @@ lib/erlang/lib/wx-${VERSION.wx}/ebin/wxListItem.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxListItemAttr.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxListView.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxListbook.beam
+lib/erlang/lib/wx-${VERSION.wx}/ebin/wxLocale.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxLogNull.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxMDIChildFrame.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxMDIClientWindow.beam
@@ -4430,6 +4299,8 @@ lib/erlang/lib/wx-${VERSION.wx}/ebin/wxPanel.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxPasswordEntryDialog.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxPen.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxPickerBase.beam
+lib/erlang/lib/wx-${VERSION.wx}/ebin/wxPopupTransientWindow.beam
+lib/erlang/lib/wx-${VERSION.wx}/ebin/wxPopupWindow.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxPostScriptDC.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxPreviewCanvas.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxPreviewControlBar.beam
@@ -4618,6 +4489,7 @@ lib/erlang/lib/wx-${VERSION.wx}/src/gen/gl.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/glu.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxAcceleratorEntry.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxAcceleratorTable.erl
+lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxActivateEvent.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxArtProvider.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxAuiDockArt.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxAuiManager.erl
@@ -4720,6 +4592,7 @@ lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxIconizeEvent.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxIdleEvent.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxImage.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxImageList.erl
+lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxInitDialogEvent.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxJoystickEvent.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxKeyEvent.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxLayoutAlgorithm.erl
@@ -4730,6 +4603,7 @@ lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxListItem.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxListItemAttr.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxListView.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxListbook.erl
+lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxLocale.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxLogNull.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxMDIChildFrame.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxMDIClientWindow.erl
@@ -4762,6 +4636,8 @@ lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxPanel.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxPasswordEntryDialog.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxPen.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxPickerBase.erl
+lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxPopupTransientWindow.erl
+lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxPopupWindow.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxPostScriptDC.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxPreviewCanvas.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxPreviewControlBar.erl
@@ -4920,6 +4796,11 @@ lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_xsd.erl
 lib/erlang/lib/xmerl-${VERSION.xmerl}/src/xmerl_xsd_type.erl
 lib/erlang/misc/format_man_pages
 lib/erlang/misc/makewhatis
+lib/erlang/releases/${VERSION}/OTP_VERSION
+lib/erlang/releases/${VERSION}/installed_application_versions
+lib/erlang/releases/${VERSION}/no_dot_erlang.boot
+lib/erlang/releases/${VERSION}/no_dot_erlang.rel
+lib/erlang/releases/${VERSION}/no_dot_erlang.script
 lib/erlang/releases/${VERSION}/start.boot
 lib/erlang/releases/${VERSION}/start.script
 lib/erlang/releases/${VERSION}/start_all_example.rel
@@ -4942,6 +4823,7 @@ lib/erlang/usr/include/erl_fixed_size_int_types.h
 lib/erlang/usr/include/erl_int_sizes_config.h
 lib/erlang/usr/include/erl_interface.h
 lib/erlang/usr/include/erl_memory_trace_parser.h
+lib/erlang/usr/include/erl_native_features_config.h
 lib/erlang/usr/include/erl_nif.h
 lib/erlang/usr/include/erl_nif_api_funcs.h
 lib/erlang/usr/include/erlang.idl
--- a/lang/erlang/PLIST.hipe
+++ b/lang/erlang/PLIST.hipe
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST.hipe,v 1.2 2012/04/12 12:14:12 asau Exp $
+@comment $NetBSD: PLIST.hipe,v 1.4 2015/04/29 09:39:47 fhajny Exp $
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/elf_format.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_adj_list.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_assemble.beam
@@ -46,6 +47,10 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_heap_test.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ig.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ig_moves.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_jit.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_liveness.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_main.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_merge.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ls_regalloc.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_moves.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_node_sets.beam
@@ -96,6 +101,7 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssapre.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_symbolic.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_amd64.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_arm.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_llvm.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_ppc.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_sparc.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_x86.beam
@@ -128,7 +134,6 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin_color.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin_scan.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_tagscheme.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_temp_map.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_tool.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_vectors.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_assemble.beam
@@ -152,6 +157,16 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_specific_x87.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_spill_restore.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_x87.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_heap_test.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf32_format.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf64_format.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf_format.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf_format.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_arch.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_liveness.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_main.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_merge.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_rtl_to_llvm.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_data_pp.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_pack_constants.erl
--- a/lang/erlang/PLIST.java
+++ b/lang/erlang/PLIST.java
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.java,v 1.9 2011/04/14 19:34:07 asau Exp $
+@comment $NetBSD: PLIST.java,v 1.10 2015/04/28 14:34:20 fhajny Exp $
 lib/erlang/lib/ic-${VERSION.ic}/java_src/com/ericsson/otp/ic/Any.java
 lib/erlang/lib/ic-${VERSION.ic}/java_src/com/ericsson/otp/ic/AnyHelper.java
 lib/erlang/lib/ic-${VERSION.ic}/java_src/com/ericsson/otp/ic/AnyHolder.java
@@ -28,6 +28,8 @@ lib/erlang/lib/ic-${VERSION.ic}/java_src/com/ericsson/otp/ic/TermHelper.java
 lib/erlang/lib/ic-${VERSION.ic}/java_src/com/ericsson/otp/ic/TermHolder.java
 lib/erlang/lib/ic-${VERSION.ic}/java_src/com/ericsson/otp/ic/TypeCode.java
 lib/erlang/lib/ic-${VERSION.ic}/priv/ic.jar
+lib/erlang/lib/jinterface-${VERSION.jinterface}/ebin/jinterface.app
+lib/erlang/lib/jinterface-${VERSION.jinterface}/ebin/jinterface.appup
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/AbstractConnection.java
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/AbstractNode.java
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/GenericQueue.java
@@ -54,6 +56,7 @@ lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangList.java
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangLong.java
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangObject.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangMap.java
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangPid.java
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangPort.java
 lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangRangeException.java
--- a/lang/erlang/buildlink3.mk
+++ b/lang/erlang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/05/07 01:53:39 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2015/04/28 14:34:20 fhajny Exp $

 BUILDLINK_TREE+=	erlang

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	erlang
 ERLANG_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.erlang+=	erlang>=10.1
-BUILDLINK_ABI_DEPENDS.erlang+=	erlang>=10.1.9nb1
+BUILDLINK_ABI_DEPENDS.erlang+=	erlang>=17.5
 BUILDLINK_PKGSRCDIR.erlang?=	../../lang/erlang

 pkgbase := erlang
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.34 2015/02/19 11:56:18 jperkin Exp $
+$NetBSD: distinfo,v 1.35 2015/04/28 14:34:20 fhajny Exp $

-SHA1 (erlang/otp_src_R16B02.tar.gz) = 16accc21afaebf2bd9507c5a2610aecf8d6f8243
-RMD160 (erlang/otp_src_R16B02.tar.gz) = d10ad82b3bddf16d1cf52babd56965537b64faeb
-Size (erlang/otp_src_R16B02.tar.gz) = 66023455 bytes
+SHA1 (erlang/otp_src_17.5.tar.gz) = 433bafe9bb16a2230830de93985c1d6e02ec1c4e
+RMD160 (erlang/otp_src_17.5.tar.gz) = 609406d4e710c1c435dbd0090a0503e1fcb68d08
+Size (erlang/otp_src_17.5.tar.gz) = 67242289 bytes
 SHA1 (patch-ab) = 5f1602f3a49c05fd4c45884a7cd6be8d3f287ac3
-SHA1 (patch-ai) = 203d1208b3a8a6aa248cfe0e16c9c19ae25fe0ad
 SHA1 (patch-am) = 11ff769b6954f950d6447e69b033cdc0bfa767e9
 SHA1 (patch-ao) = a4ee17b0a81415d541cb55d76b3c1ecc3148c2c2
-SHA1 (patch-ay) = 7d1a7f79e8c3ea909b2f4476d9ff271ed1318234
-SHA1 (patch-configure) = 8bf08197747cbca07fcb7edba6782389787d7a1f
-SHA1 (patch-configure.in) = 4a36245a6a6b6dc4804cbb899c7e824ec1fe61e0
-SHA1 (patch-erts_configure) = 614bfdc28c7dea8a34a3ae4e00ac976fa83e81e2
-SHA1 (patch-lib_runtime__tools_c__src_Makefile.in) = b7fe63a8d07612464034303cf41d97e1ea701883
+SHA1 (patch-ay) = f5f1accdb11e404ba4779b056228431e3080e4cd
--- a/lang/erlang/hacks.mk
+++ b/lang/erlang/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2009/12/15 12:09:20 asau Exp $
+# $NetBSD: hacks.mk,v 1.2 2015/04/28 14:34:20 fhajny Exp $

 .if !defined(ERLANG_HACKS_MK)
 ERLANG_HACKS_MK=	# empty
@@ -16,7 +16,7 @@ BUILDLINK_TRANSFORM+=	opt:-O3:-O2
 .if (${OPSYS} == "NetBSD"  || \
     ${OPSYS} == "OpenBSD" || \
     ${OPSYS} == "FreeBSD" || \
-     ${OPSYS} == "Solaris")
+     ${OPSYS} == "SunOS")
 CFLAGS+=	-DMMAP_MAP_FIXED
 .endif

--- a/lang/erlang/options.mk
+++ b/lang/erlang/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2013/07/05 12:42:48 jperkin Exp $
+# $NetBSD: options.mk,v 1.8 2015/04/28 14:34:20 fhajny Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.erlang
 PKG_SUPPORTED_OPTIONS=	java erlang-hipe
@@ -23,6 +23,7 @@ PKG_SUPPORTED_OPTIONS+=	dtrace

 .include "../../mk/bsd.options.mk"

+PLIST_SRC=	${PLIST_SRC_DFLT}
 PLIST_VARS+=	odbc dtrace

 .if !empty(PKG_OPTIONS:Mjava)
@@ -48,12 +49,12 @@ CONFIGURE_ARGS+=	--disable-hipe
 .  include "../../databases/iodbc/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-odbc=${BUILDLINK_PREFIX.iodbc}
 PLIST.odbc=	yes
-.endif
-
-.if !empty(PKG_OPTIONS:Munixodbc)
+.elif !empty(PKG_OPTIONS:Munixodbc)
 .  include "../../databases/unixodbc/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-odbc=${BUILDLINK_PREFIX.unixodbc}
 PLIST.odbc=	yes
+.else
+CONFIGURE_ARGS+=	--without-odbc
 .endif

 ###
--- a/lang/erlang/patches/patch-ai
+++ b/lang/erlang/patches/patch-ai
@@ -1,86 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2012/04/12 12:14:13 asau Exp $
-
--- lib/gs/src/tool_utils.erl.orig	2011-12-14 14:22:11.000000000 +0400
-+++ lib/gs/src/tool_utils.erl	2012-01-05 04:38:39.000000000 +0400
-@@ -40,6 +40,9 @@
- 	       }).
- 
- 
-+%% Browser executable list (openURL command line protocol required)
-+-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera"]).
-+
- %%----------------------------------------------------------------------
- %% open_help(Parent, File)
- %%   Parent = gsobj()  (GS root object or parent window)
-@@ -80,7 +83,7 @@
- 		      {unix,Type} ->
-                           case Type of
-                                darwin -> "open " ++ File;
-                               _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\""
-+                               _Else -> unix_url_command("file:" ++ File)
- 			  end;
- 		      {win32,_AnyType} ->
- 			  "start " ++ filename:nativename(File);
-@@ -95,7 +98,7 @@
- 		      {unix,Type} ->
-                           case Type of
-                                darwin -> "open " ++ File;
-                               _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\""
-+                               _Else -> unix_url_command("file:" ++ File)
- 			  end;
- 		      {win32,_AnyType} ->
- 			  "netscape.exe -h " ++
-@@ -430,3 +433,53 @@
-     [Last];
- insert_newlines(Other) ->
-     Other.
-+
-+%% find_browser(BrowserList) => string() | false
-+%%   BrowserList - [string()]
-+%% Given a list of basenames, find the first available executable.
-+
-+find_browser([]) ->
-+    false;
-+
-+find_browser([H | T]) ->
-+    case os:find_executable(H) of
-+        false ->
-+          find_browser(T);
-+        Browser ->
-+          Browser
-+    end.
-+
-+%% unix_url_command(URL) => string()
-+%%   URL - string()
-+%% Open an URL, using a browser which supports the openURL command
-+%% line protocol. If no browser is found, the empty string will be
-+%% returned.
-+
-+unix_url_command(URL) ->
-+    Template = "BROWSER -remote \"openURL(" ++ URL ++ ")\" || BROWSER " ++ URL ++ "&",
-+
-+    case os:getenv("BROWSER") of
-+	false ->
-+	    %% look for a compatible browser
-+	    case find_browser(?BROWSERS) of
-+		false ->
-+		    "";
-+		Browser ->
-+		    case regexp:gsub(Template, "BROWSER", Browser) of
-+			{ok, Command, 0} ->
-+			    %% Template does not contain "BROWSER" placeholder
-+			    "";
-+			{ok, Command, _} ->
-+			    Command
-+		    end
-+	    end;
-+
-+	Value ->
-+	    case regexp:gsub(Template, "BROWSER", Value) of
-+		{ok, Command2, 0} ->
-+		    %% no placeholder
-+		    "";
-+		{ok, Command2, _} ->
-+		    Command2
-+	    end
-+    end.
--- a/lang/erlang/patches/patch-ay
+++ b/lang/erlang/patches/patch-ay
@@ -1,4 +1,6 @@
-$NetBSD: patch-ay,v 1.1 2011/04/14 19:34:09 asau Exp $
+$NetBSD: patch-ay,v 1.2 2015/04/28 14:34:20 fhajny Exp $
+
+Pass in proper LDFLAGS. Fixes build with iodbc.

 --- lib/odbc/c_src/Makefile.in.orig	2010-02-19 20:07:30.000000000 +0200
 +++ lib/odbc/c_src/Makefile.in	2010-06-21 23:28:49.000000000 +0300
@@ -7,7 +9,7 @@ $NetBSD: patch-ay,v 1.1 2011/04/14 19:34:09 asau Exp $
 EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET)
 LD = @LD@
 -LDFLAGS =  $(ODBC_LIB) $(EI_LDFLAGS)
-+LDFLAGS = -Wl,-R$(PREFIX)/lib $(ODBC_LIB) $(EI_LDFLAGS)
+LDFLAGS = @LDFLAGS@ $(ODBC_LIB) $(EI_LDFLAGS)
 LIBS = @LIBS@ @THR_LIBS@ $(EI_LIB)
 INCLUDES = -I. $(ODBC_INCLUDE) $(EI_INCLUDE)
 TARGET_FLAGS =  @TARGET_FLAGS@
--- a/lang/erlang/patches/patch-configure
+++ b/lang/erlang/patches/patch-configure
@@ -1,13 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/10/20 18:37:49 asau Exp $
-
--- configure.orig	2013-10-17 22:17:44.000000000 +0000
-+++ configure
-@@ -3576,7 +3576,7 @@ fi
- rm -f $ERL_TOP/lib/SKIP-APPLICATIONS
- for app in `cd lib && ls -d *`; do
-     var=`eval echo \\$with_$app`
-    if test X${var} == Xno; then
-+    if test X${var} = Xno; then
-        echo "$app" >> $ERL_TOP/lib/SKIP-APPLICATIONS
-      fi
- done
--- a/lang/erlang/patches/patch-configure.in
+++ b/lang/erlang/patches/patch-configure.in
@@ -1,13 +0,0 @@
-$NetBSD: patch-configure.in,v 1.1 2013/10/20 18:37:49 asau Exp $
-
--- configure.in.orig	2013-09-16 18:12:18.000000000 +0000
-+++ configure.in
-@@ -394,7 +394,7 @@ AC_SUBST(NATIVE_LIBS_ENABLED)
- rm -f $ERL_TOP/lib/SKIP-APPLICATIONS
- for app in `cd lib && ls -d *`; do
-     var=`eval echo \\$with_$app`
-    if test X${var} == Xno; then
-+    if test X${var} = Xno; then
-        echo "$app" >> $ERL_TOP/lib/SKIP-APPLICATIONS
-      fi
- done
--- a/lang/erlang/patches/patch-erts_configure
+++ b/lang/erlang/patches/patch-erts_configure
@@ -1,16 +0,0 @@
-$NetBSD: patch-erts_configure,v 1.1 2015/02/19 11:56:18 jperkin Exp $
-
-Fix for DTrace 1.11 and newer.
-
--- erts/configure.orig	2013-09-16 18:12:18.000000000 +0000
-+++ erts/configure
-@@ -37343,6 +37343,9 @@ echo "$as_me: error: Could not precompil
-                         { echo "$as_me:$LINENO: dtrace precompilation for 2-stage DTrace successful" >&5
- echo "$as_me: dtrace precompilation for 2-stage DTrace successful" >&6;}
-                 else
-+			case `dtrace -V 2>/dev/null` in
-+			*"Sun D "1.1[1-9]*) DTRACE_ENABLED_2STEP=yes;;
-+			esac
-                         { echo "$as_me:$LINENO: dtrace precompilation for 1-stage DTrace successful" >&5
- echo "$as_me: dtrace precompilation for 1-stage DTrace successful" >&6;}
-                 fi
--- a/lang/erlang/patches/patch-lib_runtime__tools_c__src_Makefile.in
+++ b/lang/erlang/patches/patch-lib_runtime__tools_c__src_Makefile.in
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_runtime__tools_c__src_Makefile.in,v 1.1 2015/02/19 11:56:18 jperkin Exp $
-
-Avoid building empty DTrace probes, fixes D 1.11+.
-
--- lib/runtime_tools/c_src/Makefile.in.orig	2013-09-16 18:12:18.000000000 +0000
-+++ lib/runtime_tools/c_src/Makefile.in
-@@ -121,7 +121,7 @@ DTRACE_USER_HEADER=
- endif
- 
- DTRACE_OBJS =
-ifdef DTRACE_ENABLED_2STEP
-+ifdef notDTRACE_ENABLED_2STEP
- DTRACE_OBJS += $(OBJDIR)/dtrace_user.o
- $(OBJDIR)/dtrace_user.o: $(before_DTrace_OBJS) $(OBJDIR)/dtrace_user.h
- 	$(dtrace_verbose)dtrace -G -C \
--- a/lang/fort77/Makefile
+++ b/lang/fort77/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2014/05/29 23:36:42 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/06/12 10:50:15 wiz Exp $
 #

 DISTNAME=		fort77-1.18
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=devel/lang/fortran/}

--- a/lang/g95/Makefile
+++ b/lang/g95/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2014/07/16 12:16:31 rodent Exp $
+# $NetBSD: Makefile,v 1.25 2015/06/12 10:50:15 wiz Exp $

 DISTNAME=	g95_source
 PKGNAME=	g95-0.93
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.g95.org/v${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2014/10/09 14:06:38 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2015/05/28 06:35:25 wiz Exp $

-DISTNAME=	gawk-4.1.1
+DISTNAME=	gawk-4.1.3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gawk/}
 EXTRACT_SUFX=	.tar.xz
--- a/lang/gawk/PLIST
+++ b/lang/gawk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2014/06/06 23:24:10 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.23 2015/05/01 02:02:40 wen Exp $
 bin/gawk
 bin/${PKGNAME}
 bin/igawk
@@ -48,11 +48,13 @@ share/awk/libintl.awk
 share/awk/noassign.awk
 share/awk/ord.awk
 share/awk/passwd.awk
+share/awk/processarray.awk
 share/awk/quicksort.awk
 share/awk/readable.awk
 share/awk/readfile.awk
 share/awk/rewind.awk
 share/awk/round.awk
+share/awk/shellquote.awk
 share/awk/strtonum.awk
 share/awk/walkarray.awk
 share/awk/zerofile.awk
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.31 2014/07/15 14:58:08 ryoon Exp $
+$NetBSD: distinfo,v 1.34 2015/05/28 06:35:25 wiz Exp $

-SHA1 (gawk-4.1.1.tar.xz) = 547feb48d20e923aff58daccee97c94e047fdc18
-RMD160 (gawk-4.1.1.tar.xz) = a5a6ab9491bf702310cef7c035531cc7fad0a62d
-Size (gawk-4.1.1.tar.xz) = 2196904 bytes
-SHA1 (patch-Makefile.in) = 12eb8f205fa224634b9f5122cfca55803382516f
+SHA1 (gawk-4.1.3.tar.xz) = 76b0acbbdeaa0e58466675c5faf68895eedd8306
+RMD160 (gawk-4.1.3.tar.xz) = b092cbbcb48db2e5a0cef0638f85f3657b2a9fee
+Size (gawk-4.1.3.tar.xz) = 2311268 bytes
+SHA1 (patch-Makefile.in) = 8330ac068dcb712539465a467a42f713ee4a8a73
 SHA1 (patch-awk.h) = 2292be5ec392e7fea5688fbb18012a735e43803f
-SHA1 (patch-extension_Makefile.in) = bc735eebe2e094c97e46b08a782b143d2042a865
+SHA1 (patch-debug.c) = 40c423e2ddbb7de1eb35bb4b7b4452f8f2ebec01
+SHA1 (patch-extension_Makefile.in) = 7a03efc54d0fe54ef94fbe6f35d5145b61cb0f07
 SHA1 (patch-extension_filefuncs.c) = 212774354ab55f69ff67728470ab23b43e038093
 SHA1 (patch-extension_gawkfts.c) = a6c59c42c3f5564ee078b373c9a8d09aa6732a0b
 SHA1 (patch-test_Makefile.in) = 7610407e0735f4b78b568e24717f3f103f8566d3
--- a/lang/gawk/patches/patch-Makefile.in
+++ b/lang/gawk/patches/patch-Makefile.in
@@ -1,10 +1,9 @@
-$NetBSD: patch-Makefile.in,v 1.2 2013/05/15 11:55:20 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2015/05/28 06:35:25 wiz Exp $

 Correct locale location, use names gawk and pgawk unconditionally
-
--- Makefile.in.orig	2013-05-09 12:59:40.000000000 +0000
+--- Makefile.in.orig	2015-05-19 13:38:35.000000000 +0000
 +++ Makefile.in
-@@ -285,7 +285,7 @@ CFLAGS = @CFLAGS@
+@@ -324,7 +324,7 @@ CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -13,12 +12,12 @@ Correct locale location, use names gawk and pgawk unconditionally
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
-@@ -1131,9 +1131,7 @@ uninstall-am: uninstall-binPROGRAMS unin
- install-exec-hook:
+@@ -1178,9 +1178,7 @@ install-exec-hook:
 	(cd $(DESTDIR)$(bindir); \
- 	$(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
-	if [ ! -f awk ]; \
-	then	$(LN_S) gawk$(EXEEXT) awk; \
+ 	name=`echo gawk | sed '$(transform)'` ; \
+ 	$(LN) $${name}$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
+-	if [ ! -f awk$(EXEEXT) ]; \
+-	then	$(LN_S) $${name}$(EXEEXT) awk$(EXEEXT); \
 -	fi; exit 0)
 +	exit 0)
 
--- a/lang/gawk/patches/patch-debug.c
+++ b/lang/gawk/patches/patch-debug.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-debug.c,v 1.1 2015/04/19 14:26:06 tnn Exp $
+
+Avoid conflict with serialize(2) system call on HP-UX.
+
+--- debug.c.orig	2014-03-05 04:31:02.000000000 +0000
+++ debug.c
+@@ -200,6 +200,9 @@ static const char *const env_variable[] 
+ "DGAWK_HISTORY",
+ "DGAWK_OPTION",
+ };
+#if defined(__hpux)
+#define serialize gawk_serialize
+#endif
+ static void serialize(int );
+ static void unserialize(int );
+ static const char *commands_string = NULL;
--- a/lang/gawk/patches/patch-extension_Makefile.in
+++ b/lang/gawk/patches/patch-extension_Makefile.in
@@ -1,11 +1,11 @@
-$NetBSD: patch-extension_Makefile.in,v 1.2 2014/06/06 23:24:10 ryoon Exp $
+$NetBSD: patch-extension_Makefile.in,v 1.3 2015/05/01 02:02:40 wen Exp $

 Install into a separate directory, otherwise these shadow e.g. time(3).
 Install *.la file for extensions, reduce PLIST divergence.

--- extension/Makefile.in.orig	2014-04-08 16:13:03.000000000 +0000
+--- extension/Makefile.in.orig	2015-05-01 09:36:09.000000000 +0000
 +++ extension/Makefile.in
-@@ -300,7 +300,7 @@ am__can_run_installinfo = \
+@@ -291,7 +291,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
@@ -14,7 +14,7 @@ Install *.la file for extensions, reduce PLIST divergence.
 NROFF = nroff
 MANS = $(dist_man_MANS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-@@ -1154,7 +1154,6 @@ info-am:
+@@ -1152,7 +1152,6 @@ info-am:
 
 install-data-am: install-man install-pkgextensionLTLIBRARIES
 	@$(NORMAL_INSTALL)
@@ -22,7 +22,7 @@ Install *.la file for extensions, reduce PLIST divergence.
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
-@@ -1217,7 +1216,7 @@ uninstall-man: uninstall-man3
+@@ -1215,7 +1214,7 @@ uninstall-man: uninstall-man3
 	distclean-hdr distclean-libtool distclean-tags distcleancheck \
 	distdir distuninstallcheck dvi dvi-am html html-am info \
 	info-am install install-am install-data install-data-am \
@@ -31,15 +31,3 @@ Install *.la file for extensions, reduce PLIST divergence.
 	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-man3 install-pdf \
 	install-pdf-am install-pkgextensionLTLIBRARIES install-ps \
-@@ -1229,11 +1228,6 @@ uninstall-man: uninstall-man3
- 	uninstall-man3 uninstall-pkgextensionLTLIBRARIES
- 
- 
-install-data-hook:
-	for i in $(pkgextension_LTLIBRARIES) ; do \
-		$(RM) $(pkgextensiondir)/$$i ; \
-	done
-
- # Keep the uninstall check working:
- uninstall-so:
- 	$(RM) $(pkgextensiondir)/*.so
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2014/12/07 10:45:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2015/06/15 18:22:55 marino Exp $
 #

 PKGNAME=	gcc-aux-${SNAPSHOT}
 DISTNAME=	gcc-${GCC_VERSION}
-PKGREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 DISTFILES=	${DISTNAME}.tar.bz2
@@ -25,7 +24,7 @@ APPLY_DIFFS=	core ada cxx
 # Requires bootstrap compiler, which is only available for on selected systems
 # Disable SunOS for now until multilib version can be built and tested.

-ONLY_FOR_PLATFORM=	DragonFly-*-*        \
+ONLY_FOR_PLATFORM=	DragonFly-*-x86_64   \
 			FreeBSD-*-i386       \
 			FreeBSD-*-x86_64     \
 			NetBSD-[5-9]*-i386   \
@@ -33,8 +32,6 @@ ONLY_FOR_PLATFORM=	DragonFly-*-*        \
 			SunOS-5.1[1-9]*-i386 \
 			SunOS-5.1[1-9]*-x86_64

-#ONLY_FOR_PLATFORM+=	OpenBSD-*-amd64 MirBSD-*-amd64
-
 GARCH=			${MACHINE_ARCH:S/amd64/x86_64/}
 BLD_TARGET=		${GARCH}-aux-${LOWER_OPSYS}${OS_VERSION}
 OS_LABEL4VERS=		[${OPSYS}${GARCH:M*64:S/amd_//:S/x86_//}]
@@ -55,22 +52,38 @@ BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2
 .endif

 .if ${OPSYS} == NetBSD
-.if !empty(OS_VERSION:M6.99.*)
-   NSUFF=	7.0_DEV
-.elif !empty(OS_VERSION:M7.99.*)
-   NSUFF=	8.0_DEV
-.else
-   NSUFF=	${OS_VERSION}
-.endif
-.if ${GARCH} == i386
-   NELF=	elf
-.endif
+.  if !empty(OS_VERSION:M6.99.*)
+NSUFF=	7.0_DEV
+.  elif !empty(OS_VERSION:M7.99.*)
+NSUFF=	8.0_DEV
+.  else
+NSUFF=	${OS_VERSION}
+.  endif
+.  if ${GARCH} == i386
+NELF=	elf
+.  endif
 XLDF=			-lm
-.if empty(OS_VERSION:M7.99.*)
+.  if ${OS_VERSION:R} < 7
 MODERN_BINUTILS=	yes
-.endif
+.  endif
 BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.netbsd.614.tar.bz2
 BLD_TARGET=		${MACHINE_ARCH}-aux-netbsd${NELF}${NSUFF}
+.  if ${OS_VERSION:R} == 5
+CORRECTIONS=		g-socthi-bsd.adb
+CRXN=			C5
+.  else
+CORRECTIONS=		g-socthi-bsd.adb g-socthi.ads \
+			s-osinte-netbsd.ads s-osprim-posix.adb
+CRXN=			C6
+.  endif
+C5_g-socthi-bsd.adb=	Syscall_Socket/__socket30
+C6_g-socthi-bsd.adb=	Syscall_Socket/__socket30
+C6_g-socthi.ads=	C_Select/__select50
+C6_s-osinte-netbsd.ads=	nanosleep/__nanosleep50 \
+			clock_getres/__clock_getres50 \
+			clock_gettime/__clock_gettime50
+C6_s-osprim-posix.adb=	nanosleep/__nanosleep50 \
+			gettimeofday/__gettimeofday50
 .endif

 .if ${OPSYS} == SunOS
@@ -87,16 +100,6 @@ MODERN_BINUTILS=	yes
 NATIVE_LINKER!=		which ld
 .endif

-.if ${OPSYS} == OpenBSD || ${OPSYS} == MirBSD
-OPENMIR=		yes
-MODERN_BINUTILS=	yes
-EXTRA_CONFARGS+=	--disable-libstdcxx-pch
-EXTRA_CONFARGS+=	--disable-tls
-EXTRA_CONFARGS+=	--enable-cpp
-EXTRA_CONFARGS+=	--enable-wchar_t
-BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.openbsd.55.tar.bz2
-.endif
-
 .if defined(MODERN_BINUTILS)
 BUILDLINK_DEPMETHOD.binutils=	full
 .include "../../devel/binutils/buildlink3.mk"
@@ -165,7 +168,6 @@ DISTFILES= \
   ada-bootstrap.x86_64.freebsd.84.tar.bz2 \
   ada-bootstrap.x86_64.freebsd.100B.tar.bz2 \
   ada-bootstrap.x86_64.netbsd.614.tar.bz2 \
-   ada-bootstrap.x86_64.openbsd.55.tar.bz2 \
   ada-bootstrap.x86_64.solaris.511.tar.bz2
 .endif

@@ -192,6 +194,8 @@ CONFIGURE_ARGS+=	--enable-checking=release
 CONFIGURE_ARGS+=	--disable-libmudflap
 CONFIGURE_ARGS+=	--disable-libgomp
 CONFIGURE_ARGS+=	--disable-libssp
+CONFIGURE_ARGS+=	--disable-libcilkrts
+CONFIGURE_ARGS+=	--disable-libitm
 CONFIGURE_ARGS+=	${EXTRA_CONFARGS}

 # Automatic package list generation
@@ -220,31 +224,26 @@ post-extract:
 	  -pe 's|se_NO|no_NO|g;' \
 	  -pe 's|es_MX|es_ES|g;' \
 	  -pe 's|ru_RU.UTF8|ru_RU.UTF-8|g' ${LOCALE22FIX})
+.if ${OPSYS} == NetBSD
+.  for sysfile in ${CORRECTIONS}
+.    for pair in ${${CRXN}_${sysfile}}
+	${PERL5} -pi -e 's|C, ${pair:H}, ".*"|C, ${pair:H}, "${pair:T}"|' \
+		${WRKSRC}/gcc/ada/${sysfile}
+.    endfor
+.  endfor
+.  if ${CRXN} == C5
+	${PERL5} -pi -e 's|new int64_t|new int|' \
+		${WRKSRC}/gcc/ada/s-osinte-netbsd.ads
+	${PERL5} -pi -e 's|new Long_Integer|new Integer|' \
+		${WRKSRC}/gcc/ada/s-osprim-posix.adb
+.  endif
+.endif
 .if defined(STATIC_BUILD) || !empty(PKG_OPTIONS:Mbootstrap)
 .  if ${OPSYS} != SunOS
 	# Ensure GNAT tools are built statically
 	${PERL5} -pi -e 's/^GCC_LINK_FLAGS=.*/GCC_LINK_FLAGS=-static/' \
 	  ${WRKSRC}/gcc/ada/gcc-interface/Makefile.in
 .  endif
-.else
-.  if defined(OPENMIR)
-	# OpenBSD has no system libraries ending in ".so" so the pkgsrc linker
-	# fails to link things like "-lutil -lm".  Work around this oddity.
-	${MKDIR} ${SYSLIBDIR}
-.    for sl in c m z util pthread
-	${LN} -s `ls /usr/lib/lib${sl}.so* | head -1` ${SYSLIBDIR}/lib${sl}.so
-.    endfor
-	${PERL5} -i.bak -pe 's|\$$\(MISCLIB\)|-L${SYSLIBDIR} \$$(MISCLIB)|g;' \
-		-pe 's|\$$\(THREADSLIB\)|-L${SYSLIBDIR} \$$(THREADSLIB)|g' \
-		${WRKSRC}/gcc/ada/gcc-interface/Makefile.in
-	${PERL5} -i.bak -pe 's|-lm|-L${SYSLIBDIR} -lm|g' \
-		${WRKSRC}/libquadmath/Makefile.in \
-		${WRKSRC}/libgfortran/Makefile.in
-	${PERL5} -i.bak -pe 's|-lpthread|-L${SYSLIBDIR} -lpthread|g;' \
-		-pe 's|\@XCFLAGS\@|-L${SYSLIBDIR} \@XCFLAGS\@|g;' \
-		${WRKSRC}/libcilkrts/Makefile.in \
-		${WRKSRC}/libitm/Makefile.in
-.  endif
 .endif
 .if !exists(${LOCALBASE}/gcc-aux/bin/ada) && ${OPSYS} == SunOS
 	# In case /usr/pkg/bin/gas doesn't exist, establish fallback
--- a/lang/gcc-aux/Makefile.version
+++ b/lang/gcc-aux/Makefile.version
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.2 2014/12/07 10:45:32 ryoon Exp $
+# $NetBSD: Makefile.version,v 1.3 2015/06/14 19:46:51 marino Exp $
 #

-SNAPSHOT=	20140422
+SNAPSHOT=	20141023
 GCC_BRANCH=	4.9
 GCC_POINT=	2
 GCC_VERSION=	${GCC_BRANCH}.${GCC_POINT}
--- a/lang/gcc-aux/distinfo
+++ b/lang/gcc-aux/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2014/12/07 10:45:32 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2015/06/14 19:46:51 marino Exp $

 SHA1 (ada-bootstrap.i386.dragonfly.36A.tar.bz2) = 7e0725889ae752e6a9fdbac5b1d2ef0e3f62822e
 RMD160 (ada-bootstrap.i386.dragonfly.36A.tar.bz2) = f62c00515588804ce69368507822f30380d7e48d
@@ -24,9 +24,6 @@ Size (ada-bootstrap.x86_64.freebsd.84.tar.bz2) = 40227668 bytes
 SHA1 (ada-bootstrap.x86_64.netbsd.614.tar.bz2) = 683f58e6e394a508a52ec1dc5f3d9ca2869d5252
 RMD160 (ada-bootstrap.x86_64.netbsd.614.tar.bz2) = 4574857089e82fb80725161cc8b625ce75f6810e
 Size (ada-bootstrap.x86_64.netbsd.614.tar.bz2) = 39348972 bytes
-SHA1 (ada-bootstrap.x86_64.openbsd.55.tar.bz2) = 18ee97939bd95e70cfc5773eb4cfb075f22e50e6
-RMD160 (ada-bootstrap.x86_64.openbsd.55.tar.bz2) = 8563f665f52e13ae4a379ae71a183bb01470fb78
-Size (ada-bootstrap.x86_64.openbsd.55.tar.bz2) = 38753186 bytes
 SHA1 (ada-bootstrap.x86_64.solaris.511.tar.bz2) = abb16c1582e2a6ffe37df4afd96d04c44f2eea7b
 RMD160 (ada-bootstrap.x86_64.solaris.511.tar.bz2) = 41677e2fd0cb02c89f200fb97b112ad3be7f19cd
 Size (ada-bootstrap.x86_64.solaris.511.tar.bz2) = 60110383 bytes
--- a/lang/gcc-aux/files/diff-ada
+++ b/lang/gcc-aux/files/diff-ada
--- a/lang/gcc-aux/files/diff-core
+++ b/lang/gcc-aux/files/diff-core
@@ -327,62 +327,6 @@
 +
 +#define INTPTR_TYPE       (LONG_TYPE_SIZE == 64 ? "long int" : "int")
 +#define UINTPTR_TYPE      (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
--- gcc/config/openbsd-libpthread.h.orig
-+++ gcc/config/openbsd-libpthread.h
-@@ -18,5 +18,5 @@
-    along with GCC; see the file COPYING3.  If not see
-    <http://www.gnu.org/licenses/>.  */
- 
-#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread} -lc}"
-+#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}} %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}"
- 
--- gcc/config/openbsd.h.orig
-+++ gcc/config/openbsd.h
-@@ -108,9 +108,9 @@
-    This two-stage defines makes it easy to pick that for targets that
-    have subspecs.  */
- #ifdef CPP_CPU_SPEC
-#define OBSD_CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}"
-+#define OBSD_CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
- #else
-#define OBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}"
-+#define OBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
- #endif
- 
- #undef LIB_SPEC
-@@ -143,6 +143,9 @@
- #define LIB_SPEC OBSD_LIB_SPEC
- #endif
- 
-+#undef LINK_PIE_SPEC
-+#define LINK_PIE_SPEC "%{pie:-pie} %{p|pg|nopie:-nopie} "
-+
- #define TARGET_POSIX_IO
- 
- /* All new versions of OpenBSD have C99 functions.  We redefine this hook
-@@ -285,5 +288,12 @@
- 
- /* Storage layout.  */
- 
-+/* Silence "unsafe GNU crap" messages */
-+#define NO_UNSAFE_BUILTINS
-+
-+/* The system headers on OpenBSD are C++-aware.  */
-+#undef NO_IMPLICIT_EXTERN_C
-+#define NO_IMPLICIT_EXTERN_C
-+
- 
- #define HAVE_ENABLE_EXECUTE_STACK
--- gcc/config/openbsd.opt.orig
-+++ gcc/config/openbsd.opt
-@@ -32,4 +32,7 @@
- pthread
- Driver
- 
-+rdynamic
-+Driver
-+
- ; This comment is to ensure we retain the blank line above.
 --- /dev/null
 +++ gcc/config/i386/dragonfly.h
@@ -0,0 +1,105 @@
@@ -565,46 +509,6 @@
 +#if defined(HAVE_LD_EH_FRAME_HDR)
 +#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
 +#endif
--- gcc/config/i386/openbsd.h.orig
-+++ gcc/config/i386/openbsd.h
-@@ -38,10 +38,10 @@
- 
- /* This must agree with <machine/ansi.h> */
- #undef SIZE_TYPE
-#define SIZE_TYPE "unsigned int"
-+#define SIZE_TYPE "long unsigned int"
- 
- #undef PTRDIFF_TYPE
-#define PTRDIFF_TYPE "int"
-+#define PTRDIFF_TYPE "long int"
- 
- #undef WCHAR_TYPE
- #define WCHAR_TYPE "int"
-@@ -49,6 +49,9 @@
- #undef WCHAR_TYPE_SIZE
- #define WCHAR_TYPE_SIZE 32
- 
-+#undef WINT_TYPE
-+#define WINT_TYPE "int"
-+
- /* Assembler format: overall framework.  */
- 
- #undef ASM_APP_ON
--- gcc/config/i386/openbsdelf.h.orig
-+++ gcc/config/i386/openbsdelf.h
-@@ -97,9 +97,12 @@
-    %{shared:-shared} %{R*} \
-    %{static:-Bstatic} \
-    %{!static:-Bdynamic} \
-+   %{rdynamic:-export-dynamic} \
-    %{assert*} \
-    -dynamic-linker /usr/libexec/ld.so"
- 
-+#define SUBTARGET32_DEFAULT_CPU "i486"
-+
- #undef STARTFILE_SPEC
- #define STARTFILE_SPEC "\
- 	%{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} %{!p:crt0%O%s}} \
 --- gcc/ginclude/stddef.h.orig
 +++ gcc/ginclude/stddef.h
@@ -50,6 +50,11 @@
@@ -1338,60 +1242,6 @@
 #endif
 +#endif
 }
--- gcc/builtins.c.orig
-+++ gcc/builtins.c
-@@ -125,9 +125,11 @@
- static rtx expand_builtin_mempcpy (tree, rtx, enum machine_mode);
- static rtx expand_builtin_mempcpy_args (tree, tree, tree, rtx,
- 					enum machine_mode, int);
-+#ifndef NO_UNSAFE_BUILTINS
- static rtx expand_builtin_strcpy (tree, rtx);
- static rtx expand_builtin_strcpy_args (tree, tree, rtx);
- static rtx expand_builtin_stpcpy (tree, rtx, enum machine_mode);
-+#endif
- static rtx expand_builtin_strncpy (tree, rtx);
- static rtx builtin_memset_gen_str (void *, HOST_WIDE_INT, enum machine_mode);
- static rtx expand_builtin_memset (tree, rtx, enum machine_mode);
-@@ -3370,6 +3372,7 @@
- # define CODE_FOR_movstr CODE_FOR_nothing
- #endif
- 
-+#ifndef NO_UNSAFE_BUILTINS
- /* Expand into a movstr instruction, if one is available.  Return NULL_RTX if
-    we failed, the caller should emit a normal call, otherwise try to
-    get the result in TARGET, if convenient.  If ENDP is 0 return the
-@@ -3521,6 +3524,7 @@
-       return expand_movstr (dst, src, target, /*endp=*/2);
-     }
- }
-+#endif
- 
- /* Callback routine for store_by_pieces.  Read GET_MODE_BITSIZE (MODE)
-    bytes from constant string DATA + OFFSET and return it as target
-@@ -6140,9 +6144,11 @@
-       break;
- 
-     case BUILT_IN_STRCPY:
-+#ifndef NO_UNSAFE_BUILTINS
-       target = expand_builtin_strcpy (exp, target);
-       if (target)
- 	return target;
-+#endif
-       break;
- 
-     case BUILT_IN_STRNCPY:
-@@ -6152,9 +6158,11 @@
-       break;
- 
-     case BUILT_IN_STPCPY:
-+#ifndef NO_UNSAFE_BUILTINS
-       target = expand_builtin_stpcpy (exp, target, mode);
-       if (target)
- 	return target;
-+#endif
-       break;
- 
-     case BUILT_IN_MEMCPY:
 --- gcc/config.gcc.orig
 +++ gcc/config.gcc
@@ -687,6 +687,26 @@
@@ -1429,7 +1279,7 @@
   tmake_file="t-slibgcc"
   gas=yes
   gnu_ld=yes
-@@ -1352,6 +1373,14 @@
+@@ -1357,6 +1378,14 @@
     tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h i386/rdos.h i386/rdos64.h"
     tmake_file="i386/t-i386elf t-svr4"
     ;;
@@ -1444,7 +1294,7 @@
 i[34567]86-*-freebsd*)
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
 	;;
-@@ -1359,12 +1388,14 @@
+@@ -1364,12 +1393,14 @@
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
 	;;
 i[34567]86-*-netbsdelf*)
@@ -1461,7 +1311,7 @@
 	;;
 i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
 	tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
-@@ -1375,6 +1406,7 @@
+@@ -1380,6 +1411,7 @@
 	use_collect2=yes
 	;;
 i[34567]86-*-openbsd*)
@@ -1469,7 +1319,7 @@
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
 	tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h i386/openbsdelf.h"
 	extra_options="${extra_options} openbsd.opt"
-@@ -1382,6 +1414,7 @@
+@@ -1387,6 +1419,7 @@
 	gnu_ld=yes
 	;;
 x86_64-*-openbsd*)
@@ -1477,7 +1327,7 @@
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
 	tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h i386/x86-64.h i386/openbsdelf.h"
 	extra_options="${extra_options} openbsd.opt"
-@@ -2927,6 +2960,12 @@
+@@ -2935,6 +2968,12 @@
     arch_without_sse2=yes
     arch_without_64bit=yes
     ;;
@@ -1490,7 +1340,7 @@
   i386-*-*)
     arch=i386
     cpu=i386
-@@ -4109,6 +4148,8 @@
+@@ -4114,6 +4153,8 @@
 		;;
 	i[34567]86-*-mingw* | x86_64-*-mingw*)
 		;;
@@ -1501,7 +1351,7 @@
 	ia64*-*-linux*)
 --- gcc/configure.orig
 +++ gcc/configure
-@@ -27421,6 +27421,20 @@
+@@ -27477,6 +27477,20 @@
       gcc_cv_target_dl_iterate_phdr=no
     fi
     ;;
@@ -1573,7 +1423,7 @@
 insn-preds.c: s-preds; @true
 tm-preds.h: s-preds-h; @true
 tm-constrs.h: s-constrs-h; @true
-@@ -3217,6 +3228,9 @@
+@@ -3219,6 +3230,9 @@
 	  ( cd $(DESTDIR)$(bindir) && \
 	    $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) ); \
 	fi
@@ -1697,7 +1547,7 @@
     // showed that calling _mm_delay_32() (or doing nothing) was a better
 --- libitm/configure.tgt.orig
 +++ libitm/configure.tgt
-@@ -138,6 +138,7 @@
+@@ -139,6 +139,7 @@
 	;;
 
   *-*-gnu* | *-*-k*bsd*-gnu \
--- a/lang/gcc-aux/files/diff-cxx
+++ b/lang/gcc-aux/files/diff-cxx
@@ -1049,21 +1049,6 @@
     return __high;
   }
 
--- libstdc++-v3/config/os/bsd/openbsd/os_defines.h.orig
-+++ libstdc++-v3/config/os/bsd/openbsd/os_defines.h
-@@ -38,4 +38,12 @@
- #define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC _GLIBCXX_USE_C99_DYNAMIC
- #define _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC _GLIBCXX_USE_C99_DYNAMIC
- 
-+/* max_align_t is defined in ginclude/stddef.h which OpenBSD intentionally
-+   excludes.  Bringing the definition here fixes the libstdc++ build. */
-+
-+typedef struct {
-+  long long __max_align_ll __attribute__((__aligned__(__alignof__(long long))));
-+  long double __max_align_ld __attribute__((__aligned__(__alignof__(long double))));
-+} max_align_t;
-+
- #endif
 --- libstdc++-v3/acinclude.m4.orig
 +++ libstdc++-v3/acinclude.m4
@@ -1989,6 +1989,9 @@
--- a/lang/gcc-aux/files/diff-fortran
+++ b/lang/gcc-aux/files/diff-fortran
@@ -1,6 +1,6 @@
 --- gcc/fortran/f95-lang.c.orig
 +++ gcc/fortran/f95-lang.c
-@@ -718,10 +718,17 @@
+@@ -742,10 +742,17 @@
 
   gfc_define_builtin ("__builtin_cabsl", func_clongdouble_longdouble, 
 		      BUILT_IN_CABSL, "cabsl", ATTR_CONST_NOTHROW_LEAF_LIST);
@@ -31,7 +31,7 @@
       ;;
 --- libgfortran/configure.orig
 +++ libgfortran/configure
-@@ -26340,7 +26340,7 @@
+@@ -26346,7 +26346,7 @@
 
   fi
   case "$host" in
--- a/lang/gcc-aux/options.mk
+++ b/lang/gcc-aux/options.mk
@@ -1,8 +1,11 @@
-# $NetBSD: options.mk,v 1.4 2014/05/13 08:18:04 marino Exp $
+# $NetBSD: options.mk,v 1.5 2015/06/14 19:46:51 marino Exp $
+
+# NLS is failing, might be linking with wrong iconv lib.
+# Disable option until further notice

 PKG_OPTIONS_VAR=	PKG_OPTIONS.gcc-aux
-PKG_SUPPORTED_OPTIONS=  fortran objc testsuite nls static bootstrap
-PKG_SUGGESTED_OPTIONS=  fortran objc nls
+PKG_SUPPORTED_OPTIONS=  fortran objc testsuite static bootstrap #nls
+PKG_SUGGESTED_OPTIONS=  fortran objc #nls

 .include "../../mk/bsd.options.mk"

--- a/lang/gcc/buildlink3.mk
+++ b/lang/gcc/buildlink3.mk
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.16 2014/09/06 08:20:28 jperkin Exp $
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-BUILDLINK_TREE+=	gcc
-
-.if !defined(GCC_BUILDLINK3_MK)
-GCC_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gcc+=		gcc>=2.95
-BUILDLINK_ABI_DEPENDS.gcc+=	gcc>=2.95.3nb7
-BUILDLINK_PKGSRCDIR.gcc?=	../../lang/gcc
-BUILDLINK_LIBDIRS.gcc?=		\
-	${_GCC_PREFIX:S/^${BUILDLINK_PREFIX.gcc}\///}lib \
-	${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc}\///}
-
-# Packages that link against shared libraries need a full dependency.
-.  if defined(_USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc+=	full
-.  else
-BUILDLINK_DEPMETHOD.gcc?=	build
-.  endif
-.endif # GCC_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-gcc
--- a/lang/gcc2/DESCR
+++ b/lang/gcc2/DESCR
--- a/lang/gcc2/MESSAGE
+++ b/lang/gcc2/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2003/07/04 16:11:55 seb Exp $
+$NetBSD: MESSAGE,v 1.1 2015/04/25 10:32:07 wiz Exp $

 To use ${PKGNAME} include
 "${PREFIX}/share/examples/${DISTNAME}/mk.conf"
--- a/lang/gcc2/Makefile
+++ b/lang/gcc2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2014/07/27 04:04:44 dholland Exp $
+# $NetBSD: Makefile,v 1.1 2015/04/25 10:32:07 wiz Exp $

 DISTNAME=		gcc-2.95.3
+PKGNAME=		${DISTNAME:S/gcc/gcc2/}
 PKGREVISION=		7
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/}
--- a/lang/gcc2/PLIST
+++ b/lang/gcc2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2011/07/15 08:47:22 asau Exp $
+@comment $NetBSD: PLIST,v 1.1 2015/04/25 10:32:07 wiz Exp $
 ${GCC_PREFIX}/bin/c++
 ${GCC_PREFIX}/bin/c++filt
 ${GCC_PREFIX}/bin/cc
--- a/lang/gcc2/buildlink3.mk
+++ b/lang/gcc2/buildlink3.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/04/25 10:32:07 wiz Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+BUILDLINK_TREE+=	gcc2
+
+.if !defined(GCC2_BUILDLINK3_MK)
+GCC2_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gcc2+=	gcc2>=2.95
+BUILDLINK_ABI_DEPENDS.gcc2+=	gcc2>=2.95.3nb7
+BUILDLINK_PKGSRCDIR.gcc2?=	../../lang/gcc2
+BUILDLINK_LIBDIRS.gcc2?=		\
+	${_GCC_PREFIX:S/^${BUILDLINK_PREFIX.gcc2}\///}lib \
+	${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc2}\///}
+
+# Packages that link against shared libraries need a full dependency.
+.  if defined(_USE_GCC_SHLIB)
+BUILDLINK_DEPMETHOD.gcc2+=	full
+.  else
+BUILDLINK_DEPMETHOD.gcc2?=	build
+.  endif
+.endif # GCC2_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-gcc2
--- a/lang/gcc2/distinfo
+++ b/lang/gcc2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2011/07/15 08:47:22 asau Exp $
+$NetBSD: distinfo,v 1.1 2015/04/25 10:32:07 wiz Exp $

 SHA1 (gcc-2.95.3.tar.gz) = 535d27038d161c0e7c2662702e11a48aa97ef622
 RMD160 (gcc-2.95.3.tar.gz) = 2c506b7e80cb2b4d9953f4f9753d581cb885f610
--- a/lang/gcc2/files/UPDATE.txt
+++ b/lang/gcc2/files/UPDATE.txt
@@ -1,4 +1,4 @@
-# $NetBSD: UPDATE.txt,v 1.3 2002/10/05 20:42:37 dmcmahill Exp $
+# $NetBSD: UPDATE.txt,v 1.1 2015/04/25 10:32:07 wiz Exp $

 This file documents the steps taken to update this package.

--- a/lang/gcc2/files/arm_netbsd-elf.h
+++ b/lang/gcc2/files/arm_netbsd-elf.h
--- a/lang/gcc2/files/gcc.mk
+++ b/lang/gcc2/files/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.7 2003/07/13 13:16:04 grant Exp $
+# $NetBSD: gcc.mk,v 1.1 2015/04/25 10:32:07 wiz Exp $
 #
 # make configuration file for @DISTNAME@

--- a/lang/gcc2/files/i386_netbsd-elf.h
+++ b/lang/gcc2/files/i386_netbsd-elf.h
--- a/lang/gcc2/files/i386_xm-uwin.h
+++ b/lang/gcc2/files/i386_xm-uwin.h
--- a/lang/gcc2/files/m68k_netbsd-elf.h
+++ b/lang/gcc2/files/m68k_netbsd-elf.h
--- a/lang/gcc2/files/mips_t-mipseb
+++ b/lang/gcc2/files/mips_t-mipseb
--- a/lang/gcc2/files/rs6000_netbsd.h
+++ b/lang/gcc2/files/rs6000_netbsd.h
--- a/lang/gcc2/files/sh_netbsd-elf-little.h
+++ b/lang/gcc2/files/sh_netbsd-elf-little.h
--- a/lang/gcc2/files/sh_netbsd-elf.h
+++ b/lang/gcc2/files/sh_netbsd-elf.h
--- a/lang/gcc2/files/sparc_netbsd-elf-common.h
+++ b/lang/gcc2/files/sparc_netbsd-elf-common.h
--- a/lang/gcc2/files/sparc_netbsd-elf.h
+++ b/lang/gcc2/files/sparc_netbsd-elf.h
--- a/lang/gcc2/files/sparc_netbsd64.h
+++ b/lang/gcc2/files/sparc_netbsd64.h
--- a/lang/gcc2/files/sparc_t-netbsd
+++ b/lang/gcc2/files/sparc_t-netbsd
--- a/lang/gcc2/files/vax_netbsd-elf.h
+++ b/lang/gcc2/files/vax_netbsd-elf.h
--- a/lang/gcc2/files/xm-netbsd.h
+++ b/lang/gcc2/files/xm-netbsd.h
--- a/lang/gcc2/files/xm-target64.h
+++ b/lang/gcc2/files/xm-target64.h
--- a/lang/gcc2/patches/patch-Makefile.in
+++ b/lang/gcc2/patches/patch-Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.in,v 1.1 2011/07/15 08:47:22 asau Exp $
+$NetBSD: patch-Makefile.in,v 1.1 2015/04/25 10:32:07 wiz Exp $

 --- Makefile.in.orig	1999-06-22 22:44:42.000000000 +0000
 +++ Makefile.in
--- a/lang/gcc2/patches/patch-aa
+++ b/lang/gcc2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2003/11/25 22:35:14 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.1 2015/04/25 10:32:07 wiz Exp $
 from revision 1.5 of patch-ae:

 Hand edit the alpha/netbsd.h patch. -current gcc relies on a new linker script
--- a/lang/gcc2/patches/patch-ab
+++ b/lang/gcc2/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2011/07/15 08:47:22 asau Exp $
+$NetBSD: patch-ab,v 1.1 2015/04/25 10:32:07 wiz Exp $

 Enable building the shared libstdc++

--- a/lang/gcc2/patches/patch-ac
+++ b/lang/gcc2/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2011/07/15 08:47:22 asau Exp $
+$NetBSD: patch-ac,v 1.1 2015/04/25 10:32:07 wiz Exp $

 --- libiberty/Makefile.in.orig	2011-07-12 16:13:20.000000000 +0400
 +++ libiberty/Makefile.in	2011-07-12 16:41:39.000000000 +0400
--- a/lang/gcc2/patches/patch-ad
+++ b/lang/gcc2/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2002/10/21 20:54:14 jlam Exp $
+$NetBSD: patch-ad,v 1.1 2015/04/25 10:32:07 wiz Exp $

 --- ../gcc-2.95.3/config/mh-sparcpic.orig	Thu Feb  5 19:33:03 1998
 +++ ../gcc-2.95.3/config/mh-sparcpic
--- a/lang/gcc2/patches/patch-ae
+++ b/lang/gcc2/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.7 2002/10/21 20:54:14 jlam Exp $
+$NetBSD: patch-ae,v 1.1 2015/04/25 10:32:07 wiz Exp $

 --- ../gcc-2.95.3/config/mt-sparcpic.orig	Thu Feb  5 19:33:04 1998
 +++ ../gcc-2.95.3/config/mt-sparcpic
--- a/lang/gcc2/patches/patch-af
+++ b/lang/gcc2/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.9 2003/07/12 08:53:40 jtb Exp $
+$NetBSD: patch-af,v 1.1 2015/04/25 10:32:07 wiz Exp $

 --- ../gcc-2.95.3/gcc/config/netbsd.h
 +++ ../gcc-2.95.3/gcc/config/netbsd.h.orig
--- a/lang/gcc2/patches/patch-ag
+++ b/lang/gcc2/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.8 2003/07/12 08:53:40 jtb Exp $
+$NetBSD: patch-ag,v 1.1 2015/04/25 10:32:07 wiz Exp $

 --- ../gcc-2.95.3/gcc/gcc.c.orig
 +++ ../gcc-2.95.3/gcc/gcc.c
--- a/lang/gcc2/patches/patch-ah
+++ b/lang/gcc2/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.8 2003/12/18 15:44:24 ben Exp $
+$NetBSD: patch-ah,v 1.1 2015/04/25 10:32:07 wiz Exp $

 --- gcc/ch/loop.c.orig	1999-01-11 05:17:29.000000000 -0800
 +++ gcc/ch/loop.c
--- a/lang/gcc2/patches/patch-ai
+++ b/lang/gcc2/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.5 2010/10/12 22:57:56 joerg Exp $
+$NetBSD: patch-ai,v 1.1 2015/04/25 10:32:07 wiz Exp $

 --- gcc/java/parse.y.orig	2010-10-12 22:33:34.000000000 +0000
 +++ gcc/java/parse.y
--- a/lang/gcc2/patches/patch-aj
+++ b/lang/gcc2/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.5 2010/10/12 22:57:56 joerg Exp $
+$NetBSD: patch-aj,v 1.1 2015/04/25 10:32:07 wiz Exp $

 --- gcc/f/com.c.orig	2010-10-12 22:37:49.000000000 +0000
 +++ gcc/f/com.c
--- a/Show More
+++ b/Show More