Update to 3.11

Changelog:
Not available.
Linux/s390x works like before.

4 files changed, 18 insertions, 18 deletions

diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index 586fc411c7e..d60533b557c 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2014/05/29 23:36:33 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2015/03/24 15:04:11 ryoon Exp $
 
-DISTNAME=		hercules-3.09
-PKGREVISION=		1
+DISTNAME=		hercules-3.11
 CATEGORIES=		emulators
 MASTER_SITES=		http://downloads.hercules-390.eu/
 
diff --git a/emulators/hercules/PLIST b/emulators/hercules/PLIST
index 8dbac7e5cb5..3a06019d045 100644
--- a/emulators/hercules/PLIST
+++ b/emulators/hercules/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/10/15 14:14:53 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/03/24 15:04:11 ryoon Exp $
 bin/bldlvlck
 bin/cckd2ckd
 bin/cckdcdsk
@@ -50,6 +50,7 @@ lib/libhercd.la
 lib/libhercs.la
 lib/libherct.la
 lib/libhercu.la
+lib/libsoftfloat.la
 man/man1/cckddiag.1
 man/man1/dasdseq.1
 man/man1/hercules.1
diff --git a/emulators/hercules/distinfo b/emulators/hercules/distinfo
index b543916910a..e1e5d515aa3 100644
--- a/emulators/hercules/distinfo
+++ b/emulators/hercules/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2013/10/24 12:20:46 ryoon Exp $
+$NetBSD: distinfo,v 1.17 2015/03/24 15:04:11 ryoon Exp $
 
-SHA1 (hercules-3.09.tar.gz) = 5cbe89ec214de00b90e3077c27db636a7d2607f5
-RMD160 (hercules-3.09.tar.gz) = 88f546f374787a1084467e91c616ec46e8ca7e5d
-Size (hercules-3.09.tar.gz) = 2567052 bytes
-SHA1 (patch-Makefile.in) = 42eed4f193fc07732ca145b019af2604c8a2e8e0
+SHA1 (hercules-3.11.tar.gz) = f846995600e1be3f851790afa1e3e0f47e59f21a
+RMD160 (hercules-3.11.tar.gz) = 759799fb17e344fd3db7ad9e55473ce0580ea415
+Size (hercules-3.11.tar.gz) = 2623956 bytes
+SHA1 (patch-Makefile.in) = 16a9b4e47456b789a906f03c942d4e683f18b87a
 SHA1 (patch-autoconf_libtool.m4) = 713bc12bfd176e908fc01b401ee0163660f20da8
 SHA1 (patch-configure.ac) = 655e738191adcc79d509592c06089305ae743024
 SHA1 (patch-crypto_Makefile.in) = 0e9fa3ce7e2f629d9eaed21dcfe7625087f7103b
diff --git a/emulators/hercules/patches/patch-Makefile.in b/emulators/hercules/patches/patch-Makefile.in
index e1f3e5522cb..12f7b0f8d25 100644
--- a/emulators/hercules/patches/patch-Makefile.in
+++ b/emulators/hercules/patches/patch-Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.3 2013/10/15 14:14:53 ryoon Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2015/03/24 15:04:11 ryoon Exp $
 
 * Fix build. Use devel/libltdl instead of internal libltdl.
 
---- Makefile.in.orig	2013-07-28 17:12:17.000000000 +0000
+--- Makefile.in.orig	2014-09-15 16:38:35.000000000 +0000
 +++ Makefile.in
-@@ -294,10 +294,10 @@ libherct_la_LINK = $(LIBTOOL) --tag=CC $
+@@ -328,10 +328,10 @@ libherct_la_LINK = $(LIBTOOL) $(AM_V_lt)
  libhercu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libhercs.la
  am__libhercu_la_SOURCES_DIST = version.c hscutl.c hscutl2.c codepage.c \
  	logger.c logmsg.c hdl.c hostinfo.c hsocket.c memrchr.c \
@@ -17,16 +17,16 @@ $NetBSD: patch-Makefile.in,v 1.3 2013/10/15 14:14:53 ryoon Exp $
  am_libhercu_la_OBJECTS = version.lo hscutl.lo hscutl2.lo codepage.lo \
  	logger.lo logmsg.lo hdl.lo hostinfo.lo hsocket.lo memrchr.lo \
  	parser.lo pttrace.lo $(am__objects_6) $(am__objects_7)
-@@ -675,7 +675,7 @@ AUTOMAKE_OPTIONS = foreign 1.5
+@@ -744,7 +744,7 @@ AUTOMAKE_OPTIONS = foreign 1.5
  ACLOCAL_AMFLAGS = -I m4 -I autoconf
  lns = @LN_S@
- SUBDIRS = decNumber m4 util html man . crypto
+ SUBDIRS = decNumber softfloat m4 util html man . crypto
 -LDADD = @LIBS@
 +LDADD = @LIBS@ -lltdl
- AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/decNumber
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/decNumber -I$(top_srcdir)/softfloat
  @BUILD_HERCIFC_FALSE@HERCIFC = 
  @BUILD_HERCIFC_TRUE@HERCIFC = hercifc
-@@ -740,11 +740,11 @@ dyndev_SRC = commadpt.c  \
+@@ -809,11 +809,11 @@ dyndev_SRC = commadpt.c  \
  # -avoid-version  : needed.. Otherwise libtool gives crazy names to Windows
  #                   DLLs
  #
@@ -40,7 +40,7 @@ $NetBSD: patch-Makefile.in,v 1.3 2013/10/15 14:14:53 ryoon Exp $
  @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = 
  @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module         \
  @OPTION_DYNAMIC_LOAD_TRUE@                   -no-undefined    \
-@@ -969,7 +969,6 @@ EXTRA_libherc_la_SOURCES = $(fthreads_SR
+@@ -1038,7 +1038,6 @@ EXTRA_libherc_la_SOURCES = $(fthreads_SR
                               $(dynamic_SRC)   \
                               $(extra_SRC)     \
                               $(dyndev_SRC)    \
@@ -48,7 +48,7 @@ $NetBSD: patch-Makefile.in,v 1.3 2013/10/15 14:14:53 ryoon Exp $
  
  libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
  libherc_la_LIBADD = libhercs.la     \
-@@ -1211,7 +1210,6 @@ noinst_HEADERS = hostinfo.h     \
+@@ -1278,7 +1277,6 @@ noinst_HEADERS = hostinfo.h     \
                   hdl.h          \
                   crypto.h       \
                   sockdev.h      \