Tue Mar 24 15:04:11 2015 UTC ()
Update to 3.11

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


(ryoon)
diff -r1.33 -r1.34 pkgsrc/emulators/hercules/Makefile
diff -r1.4 -r1.5 pkgsrc/emulators/hercules/PLIST
diff -r1.16 -r1.17 pkgsrc/emulators/hercules/distinfo
diff -r1.3 -r1.4 pkgsrc/emulators/hercules/patches/patch-Makefile.in
cvs diff -r1.33 -r1.34 pkgsrc/emulators/hercules/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/hercules/Makefile 2014/05/29 23:36:33 1.33
+++ pkgsrc/emulators/hercules/Makefile 2015/03/24 15:04:11 1.34
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.33 2014/05/29 23:36:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.34 2015/03/24 15:04:11 ryoon Exp $
2 2
3DISTNAME= hercules-3.09 3DISTNAME= hercules-3.11
4PKGREVISION= 1 
5CATEGORIES= emulators 4CATEGORIES= emulators
6MASTER_SITES= http://downloads.hercules-390.eu/ 5MASTER_SITES= http://downloads.hercules-390.eu/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.hercules-390.eu/ 8HOMEPAGE= http://www.hercules-390.eu/
10COMMENT= S370 emulator 9COMMENT= S370 emulator
11LICENSE= qpl-v1.0 10LICENSE= qpl-v1.0
12 11
13DEPENDS+= hercules-images-[0-9]*:../../emulators/hercules-images 12DEPENDS+= hercules-images-[0-9]*:../../emulators/hercules-images
14 13
15AUTOCONF_REQD= 2.50 14AUTOCONF_REQD= 2.50
16USE_TOOLS+= autoconf gmake bash:run 15USE_TOOLS+= autoconf gmake bash:run
17GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
cvs diff -r1.4 -r1.5 pkgsrc/emulators/hercules/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/hercules/PLIST 2013/10/15 14:14:53 1.4
+++ pkgsrc/emulators/hercules/PLIST 2015/03/24 15:04:11 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2013/10/15 14:14:53 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.5 2015/03/24 15:04:11 ryoon Exp $
2bin/bldlvlck 2bin/bldlvlck
3bin/cckd2ckd 3bin/cckd2ckd
4bin/cckdcdsk 4bin/cckdcdsk
5bin/cckdcomp 5bin/cckdcomp
6bin/cckddiag 6bin/cckddiag
7bin/cckdswap 7bin/cckdswap
8bin/cfba2fba 8bin/cfba2fba
9bin/ckd2cckd 9bin/ckd2cckd
10bin/dasdcat 10bin/dasdcat
11bin/dasdconv 11bin/dasdconv
12bin/dasdcopy 12bin/dasdcopy
13bin/dasdinit 13bin/dasdinit
14bin/dasdisup 14bin/dasdisup
@@ -40,26 +40,27 @@ lib/hercules/hdt3088.la @@ -40,26 +40,27 @@ lib/hercules/hdt3088.la
40lib/hercules/hdt3270.la 40lib/hercules/hdt3270.la
41lib/hercules/hdt3420.la 41lib/hercules/hdt3420.la
42lib/hercules/hdt3505.la 42lib/hercules/hdt3505.la
43lib/hercules/hdt3525.la 43lib/hercules/hdt3525.la
44lib/hercules/hdt3705.la 44lib/hercules/hdt3705.la
45lib/hercules/hdteq.la 45lib/hercules/hdteq.la
46lib/hercules/hdtqeth.la 46lib/hercules/hdtqeth.la
47lib/libdecNumber.la 47lib/libdecNumber.la
48lib/libherc.la 48lib/libherc.la
49lib/libhercd.la 49lib/libhercd.la
50lib/libhercs.la 50lib/libhercs.la
51lib/libherct.la 51lib/libherct.la
52lib/libhercu.la 52lib/libhercu.la
 53lib/libsoftfloat.la
53man/man1/cckddiag.1 54man/man1/cckddiag.1
54man/man1/dasdseq.1 55man/man1/dasdseq.1
55man/man1/hercules.1 56man/man1/hercules.1
56man/man4/cckd.4 57man/man4/cckd.4
57share/examples/hercules/hercules.cnf 58share/examples/hercules/hercules.cnf
58share/hercules/TMOUNT.txt 59share/hercules/TMOUNT.txt
59share/hercules/awssl-v19g 60share/hercules/awssl-v19g
60share/hercules/awswrite.jcl 61share/hercules/awswrite.jcl
61share/hercules/cckddasd.html 62share/hercules/cckddasd.html
62share/hercules/cckddump.hla 63share/hercules/cckddump.hla
63share/hercules/cckdload.hla 64share/hercules/cckdload.hla
64share/hercules/fishgui.html 65share/hercules/fishgui.html
65share/hercules/hercconf.html 66share/hercules/hercconf.html
cvs diff -r1.16 -r1.17 pkgsrc/emulators/hercules/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/hercules/distinfo 2013/10/24 12:20:46 1.16
+++ pkgsrc/emulators/hercules/distinfo 2015/03/24 15:04:11 1.17
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.16 2013/10/24 12:20:46 ryoon Exp $ 1$NetBSD: distinfo,v 1.17 2015/03/24 15:04:11 ryoon Exp $
2 2
3SHA1 (hercules-3.09.tar.gz) = 5cbe89ec214de00b90e3077c27db636a7d2607f5 3SHA1 (hercules-3.11.tar.gz) = f846995600e1be3f851790afa1e3e0f47e59f21a
4RMD160 (hercules-3.09.tar.gz) = 88f546f374787a1084467e91c616ec46e8ca7e5d 4RMD160 (hercules-3.11.tar.gz) = 759799fb17e344fd3db7ad9e55473ce0580ea415
5Size (hercules-3.09.tar.gz) = 2567052 bytes 5Size (hercules-3.11.tar.gz) = 2623956 bytes
6SHA1 (patch-Makefile.in) = 42eed4f193fc07732ca145b019af2604c8a2e8e0 6SHA1 (patch-Makefile.in) = 16a9b4e47456b789a906f03c942d4e683f18b87a
7SHA1 (patch-autoconf_libtool.m4) = 713bc12bfd176e908fc01b401ee0163660f20da8 7SHA1 (patch-autoconf_libtool.m4) = 713bc12bfd176e908fc01b401ee0163660f20da8
8SHA1 (patch-configure.ac) = 655e738191adcc79d509592c06089305ae743024 8SHA1 (patch-configure.ac) = 655e738191adcc79d509592c06089305ae743024
9SHA1 (patch-crypto_Makefile.in) = 0e9fa3ce7e2f629d9eaed21dcfe7625087f7103b 9SHA1 (patch-crypto_Makefile.in) = 0e9fa3ce7e2f629d9eaed21dcfe7625087f7103b
10SHA1 (patch-decNumber_Makefile.in) = 98228044642007e894fde580e010c6da874454af 10SHA1 (patch-decNumber_Makefile.in) = 98228044642007e894fde580e010c6da874454af
11SHA1 (patch-hercifc.h) = 29674ad8f23f69032248098647811e30438c2e98 11SHA1 (patch-hercifc.h) = 29674ad8f23f69032248098647811e30438c2e98
12SHA1 (patch-hostopts.h) = f99dbfa7aed8b9e72ec82f32615ac4e3d1900ef9 12SHA1 (patch-hostopts.h) = f99dbfa7aed8b9e72ec82f32615ac4e3d1900ef9
13SHA1 (patch-hstructs.h) = 040561caac5fa52db26c9dad064ef6a41a23e0d2 13SHA1 (patch-hstructs.h) = 040561caac5fa52db26c9dad064ef6a41a23e0d2
14SHA1 (patch-htypes.h) = a3d53bd1d1c7633993b39e34b7c091d036a01816 14SHA1 (patch-htypes.h) = a3d53bd1d1c7633993b39e34b7c091d036a01816
15SHA1 (patch-scsitape.c) = 13bd1172b5d688ee56c473a1236894d7c5961c71 15SHA1 (patch-scsitape.c) = 13bd1172b5d688ee56c473a1236894d7c5961c71
16SHA1 (patch-tapecopy.c) = c2ef850430f37ae7151985cd7881e6861b5dc538 16SHA1 (patch-tapecopy.c) = c2ef850430f37ae7151985cd7881e6861b5dc538
cvs diff -r1.3 -r1.4 pkgsrc/emulators/hercules/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/emulators/hercules/patches/patch-Makefile.in 2013/10/15 14:14:53 1.3
+++ pkgsrc/emulators/hercules/patches/patch-Makefile.in 2015/03/24 15:04:11 1.4
@@ -1,58 +1,58 @@ @@ -1,58 +1,58 @@
1$NetBSD: patch-Makefile.in,v 1.3 2013/10/15 14:14:53 ryoon Exp $ 1$NetBSD: patch-Makefile.in,v 1.4 2015/03/24 15:04:11 ryoon Exp $
2 2
3* Fix build. Use devel/libltdl instead of internal libltdl. 3* Fix build. Use devel/libltdl instead of internal libltdl.
4 4
5--- Makefile.in.orig 2013-07-28 17:12:17.000000000 +0000 5--- Makefile.in.orig 2014-09-15 16:38:35.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -294,10 +294,10 @@ libherct_la_LINK = $(LIBTOOL) --tag=CC $ 7@@ -328,10 +328,10 @@ libherct_la_LINK = $(LIBTOOL) $(AM_V_lt)
8 libhercu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libhercs.la 8 libhercu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libhercs.la
9 am__libhercu_la_SOURCES_DIST = version.c hscutl.c hscutl2.c codepage.c \ 9 am__libhercu_la_SOURCES_DIST = version.c hscutl.c hscutl2.c codepage.c \
10 logger.c logmsg.c hdl.c hostinfo.c hsocket.c memrchr.c \ 10 logger.c logmsg.c hdl.c hostinfo.c hsocket.c memrchr.c \
11- parser.c pttrace.c fthreads.c ltdl.c 11- parser.c pttrace.c fthreads.c ltdl.c
12+ parser.c pttrace.c fthreads.c 12+ parser.c pttrace.c fthreads.c
13 am__objects_5 = fthreads.lo 13 am__objects_5 = fthreads.lo
14 @BUILD_FTHREADS_TRUE@am__objects_6 = $(am__objects_5) 14 @BUILD_FTHREADS_TRUE@am__objects_6 = $(am__objects_5)
15-@OPTION_DYNAMIC_LOAD_TRUE@am__objects_7 = ltdl.lo 15-@OPTION_DYNAMIC_LOAD_TRUE@am__objects_7 = ltdl.lo
16+@OPTION_DYNAMIC_LOAD_TRUE@am__objects_7 = 16+@OPTION_DYNAMIC_LOAD_TRUE@am__objects_7 =
17 am_libhercu_la_OBJECTS = version.lo hscutl.lo hscutl2.lo codepage.lo \ 17 am_libhercu_la_OBJECTS = version.lo hscutl.lo hscutl2.lo codepage.lo \
18 logger.lo logmsg.lo hdl.lo hostinfo.lo hsocket.lo memrchr.lo \ 18 logger.lo logmsg.lo hdl.lo hostinfo.lo hsocket.lo memrchr.lo \
19 parser.lo pttrace.lo $(am__objects_6) $(am__objects_7) 19 parser.lo pttrace.lo $(am__objects_6) $(am__objects_7)
20@@ -675,7 +675,7 @@ AUTOMAKE_OPTIONS = foreign 1.5 20@@ -744,7 +744,7 @@ AUTOMAKE_OPTIONS = foreign 1.5
21 ACLOCAL_AMFLAGS = -I m4 -I autoconf 21 ACLOCAL_AMFLAGS = -I m4 -I autoconf
22 lns = @LN_S@ 22 lns = @LN_S@
23 SUBDIRS = decNumber m4 util html man . crypto 23 SUBDIRS = decNumber softfloat m4 util html man . crypto
24-LDADD = @LIBS@ 24-LDADD = @LIBS@
25+LDADD = @LIBS@ -lltdl 25+LDADD = @LIBS@ -lltdl
26 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/decNumber 26 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/decNumber -I$(top_srcdir)/softfloat
27 @BUILD_HERCIFC_FALSE@HERCIFC =  27 @BUILD_HERCIFC_FALSE@HERCIFC =
28 @BUILD_HERCIFC_TRUE@HERCIFC = hercifc 28 @BUILD_HERCIFC_TRUE@HERCIFC = hercifc
29@@ -740,11 +740,11 @@ dyndev_SRC = commadpt.c \ 29@@ -809,11 +809,11 @@ dyndev_SRC = commadpt.c \
30 # -avoid-version : needed.. Otherwise libtool gives crazy names to Windows 30 # -avoid-version : needed.. Otherwise libtool gives crazy names to Windows
31 # DLLs 31 # DLLs
32 # 32 #
33-@BUILD_SHARED_TRUE@XSTATIC =  33-@BUILD_SHARED_TRUE@XSTATIC =
34+@BUILD_SHARED_TRUE@XSTATIC = -shared 34+@BUILD_SHARED_TRUE@XSTATIC = -shared
35 @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC) 35 @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC)
36 @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC =  36 @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC =
37 @OPTION_DYNAMIC_LOAD_FALSE@LTDL =  37 @OPTION_DYNAMIC_LOAD_FALSE@LTDL =
38-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ltdl.c 38-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ltdl.c
39+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 39+@OPTION_DYNAMIC_LOAD_TRUE@LTDL =
40 @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS =  40 @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS =
41 @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module \ 41 @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module \
42 @OPTION_DYNAMIC_LOAD_TRUE@ -no-undefined \ 42 @OPTION_DYNAMIC_LOAD_TRUE@ -no-undefined \
43@@ -969,7 +969,6 @@ EXTRA_libherc_la_SOURCES = $(fthreads_SR 43@@ -1038,7 +1038,6 @@ EXTRA_libherc_la_SOURCES = $(fthreads_SR
44 $(dynamic_SRC) \ 44 $(dynamic_SRC) \
45 $(extra_SRC) \ 45 $(extra_SRC) \
46 $(dyndev_SRC) \ 46 $(dyndev_SRC) \
47- ltdl.c 47- ltdl.c
48  48
49 libherc_la_LDFLAGS = $(LIB_LD_FLAGS) 49 libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
50 libherc_la_LIBADD = libhercs.la \ 50 libherc_la_LIBADD = libhercs.la \
51@@ -1211,7 +1210,6 @@ noinst_HEADERS = hostinfo.h \ 51@@ -1278,7 +1277,6 @@ noinst_HEADERS = hostinfo.h \
52 hdl.h \ 52 hdl.h \
53 crypto.h \ 53 crypto.h \
54 sockdev.h \ 54 sockdev.h \
55- ltdl.h \ 55- ltdl.h \
56 herc_getopt.h \ 56 herc_getopt.h \
57 service.h \ 57 service.h \
58 chsc.h \ 58 chsc.h \