From c4b5123c3a5c1e2e351ef53bf98e0d231f811c8e Mon Sep 17 00:00:00 2001 From: rakuco Date: Fri, 14 Jun 2013 18:11:55 +0000 Subject: Update to 3.08. PR: ports/178386 Submitted by: Jukka Ukkonen Approved by: maintainer timeout (38 days) --- emulators/hercules/Makefile | 4 +- emulators/hercules/distinfo | 4 +- emulators/hercules/files/patch-libtool | 61 ++++++++++++++++++++++++++ emulators/hercules/files/patch-libtool22 | 75 -------------------------------- emulators/hercules/pkg-descr | 2 +- emulators/hercules/pkg-plist | 2 +- 6 files changed, 67 insertions(+), 81 deletions(-) create mode 100644 emulators/hercules/files/patch-libtool delete mode 100644 emulators/hercules/files/patch-libtool22 (limited to 'emulators') diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile index 2d93f66c9237..434c7638b03b 100644 --- a/emulators/hercules/Makefile +++ b/emulators/hercules/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= hercules -PORTVERSION= 3.07 +PORTVERSION= 3.08 CATEGORIES= emulators -MASTER_SITES= http://www.hercules-390.org/ +MASTER_SITES= http://downloads.hercules-390.eu/ MAINTAINER= bzeeb+freebsdports@zabbadoz.net COMMENT= System/370, ESA/390, and z/Architecture Emulator diff --git a/emulators/hercules/distinfo b/emulators/hercules/distinfo index cf3bcfda61e3..2ff1c9e2a26a 100644 --- a/emulators/hercules/distinfo +++ b/emulators/hercules/distinfo @@ -1,2 +1,2 @@ -SHA256 (hercules-3.07.tar.gz) = 02d5f6c66d699d413a4db9ef5a799249a6645ac10f2af1edb37992e7fa1f7724 -SIZE (hercules-3.07.tar.gz) = 2701835 +SHA256 (hercules-3.08.tar.gz) = 85e217773587f2278d4b6cb6bc815e042cfc982d0fc14baa0da4a84dea399e9d +SIZE (hercules-3.08.tar.gz) = 2684844 diff --git a/emulators/hercules/files/patch-libtool b/emulators/hercules/files/patch-libtool new file mode 100644 index 000000000000..b0653d91a5b8 --- /dev/null +++ b/emulators/hercules/files/patch-libtool @@ -0,0 +1,61 @@ +--- Makefile.in.orig 2013-04-04 14:07:19.184726980 +0300 ++++ Makefile.in 2013-04-04 14:08:33.594716391 +0300 +@@ -370,10 +370,10 @@ + 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 \ +- parser.c pttrace.c fthreads.c ltdl.c ++ parser.c pttrace.c fthreads.c + am__objects_5 = fthreads.lo + @BUILD_FTHREADS_TRUE@am__objects_6 = $(am__objects_5) +-@OPTION_DYNAMIC_LOAD_TRUE@am__objects_7 = ltdl.lo ++#@OPTION_DYNAMIC_LOAD_TRUE@am__objects_7 = ltdl.lo + 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) +@@ -833,8 +833,8 @@ + @BUILD_SHARED_TRUE@XSTATIC = + @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC) + @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = +-@OPTION_DYNAMIC_LOAD_FALSE@LTDL = +-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ltdl.c ++#@OPTION_DYNAMIC_LOAD_FALSE@LTDL = ++#@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ltdl.c + @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = + @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module \ + @OPTION_DYNAMIC_LOAD_TRUE@ -no-undefined \ +@@ -984,7 +984,7 @@ + parser.c \ + pttrace.c \ + $(FTHREADS) \ +- $(LTDL) ++# $(LTDL) + + libhercu_la_LDFLAGS = $(LIB_LD_FLAGS) + libhercu_la_LIBADD = $(LDADD) libhercs.la +@@ -1059,7 +1059,7 @@ + $(dynamic_SRC) \ + $(extra_SRC) \ + $(dyndev_SRC) \ +- ltdl.c ++# ltdl.c + + libherc_la_LDFLAGS = $(LIB_LD_FLAGS) + libherc_la_LIBADD = libhercs.la \ +@@ -1302,7 +1302,6 @@ + hdl.h \ + crypto.h \ + sockdev.h \ +- ltdl.h \ + herc_getopt.h \ + service.h \ + chsc.h \ +@@ -1711,7 +1710,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logmsg.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losc.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltdl.Plo@am__quote@ ++#@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltdl.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/machchk.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omatape.Plo@am__quote@ diff --git a/emulators/hercules/files/patch-libtool22 b/emulators/hercules/files/patch-libtool22 deleted file mode 100644 index 2fc025f142ad..000000000000 --- a/emulators/hercules/files/patch-libtool22 +++ /dev/null @@ -1,75 +0,0 @@ ---- crypto/Makefile.in.orig 2009-07-13 15:39:40.000000000 -0500 -+++ crypto/Makefile.in 2009-07-13 15:39:44.000000000 -0500 -@@ -244,7 +244,7 @@ - @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC) - @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = - @OPTION_DYNAMIC_LOAD_FALSE@LTDL = --@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c -+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = - @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = - @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module \ - @OPTION_DYNAMIC_LOAD_TRUE@ -no-undefined \ ---- decNumber/Makefile.in.orig 2009-07-13 15:40:23.000000000 -0500 -+++ decNumber/Makefile.in 2009-07-13 15:40:25.000000000 -0500 -@@ -258,7 +258,7 @@ - @BUILD_SHARED_FALSE@XSTATIC = -static - @BUILD_SHARED_TRUE@XSTATIC = - @OPTION_DYNAMIC_LOAD_FALSE@LTDL = --@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c -+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = - @OPTION_DYNAMIC_LOAD_FALSE@LIB_LD_FLAGS = $(XSTATIC) \ - @OPTION_DYNAMIC_LOAD_FALSE@ -no-undefined \ - @OPTION_DYNAMIC_LOAD_FALSE@ -avoid-version ---- Makefile.in.orig 2010-03-07 14:04:49.000000000 +0200 -+++ Makefile.in 2012-10-14 17:27:30.565513737 +0300 -@@ -304,13 +304,13 @@ - 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 \ -- parser.c pttrace.c fthreads.c fishhang.c ltdl.c -+ parser.c pttrace.c fthreads.c fishhang.c - am__objects_5 = fthreads.lo - @BUILD_FTHREADS_TRUE@am__objects_8 = $(am__objects_5) - am__objects_6 = fishhang.lo - @BUILD_FISHHANG_TRUE@@BUILD_FTHREADS_TRUE@am__objects_9 = \ - @BUILD_FISHHANG_TRUE@@BUILD_FTHREADS_TRUE@ $(am__objects_6) --@OPTION_DYNAMIC_LOAD_TRUE@am__objects_10 = ltdl.lo -+@OPTION_DYNAMIC_LOAD_TRUE@am__objects_10 = - 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_8) $(am__objects_9) \ -@@ -687,7 +687,7 @@ - @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC) - @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = - @OPTION_DYNAMIC_LOAD_FALSE@LTDL = --@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ltdl.c -+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = - @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = - @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module \ - @OPTION_DYNAMIC_LOAD_TRUE@ -no-undefined \ -@@ -913,8 +913,7 @@ - memrchr.c \ - $(dynamic_SRC) \ - $(extra_SRC) \ -- $(dyndev_SRC) \ -- ltdl.c -+ $(dyndev_SRC) - - libherc_la_LDFLAGS = $(LIB_LD_FLAGS) - libherc_la_LIBADD = libhercs.la \ -@@ -1166,7 +1165,6 @@ - hdl.h \ - crypto.h \ - sockdev.h \ -- ltdl.h \ - herc_getopt.h \ - service.h \ - chsc.h \ -@@ -1552,7 +1550,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logmsg.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losc.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltdl.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/machchk.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omatape.Plo@am__quote@ diff --git a/emulators/hercules/pkg-descr b/emulators/hercules/pkg-descr index 54acfdd6bcef..e5ae65449d0a 100644 --- a/emulators/hercules/pkg-descr +++ b/emulators/hercules/pkg-descr @@ -7,6 +7,6 @@ Jaeger designed and implemented many of the advanced features of Hercules, including dynamic reconfiguration, integrated console, interpretive execution and z/Architecture support. -WWW: http://www.hercules-390.org/ +WWW: http://www.hercules-390.eu/ -phk@FreeBSD.org diff --git a/emulators/hercules/pkg-plist b/emulators/hercules/pkg-plist index 5e9e3b367e34..d4b15286a8c1 100644 --- a/emulators/hercules/pkg-plist +++ b/emulators/hercules/pkg-plist @@ -1,3 +1,4 @@ +bin/bldlvlck bin/cckd2ckd bin/cckdcdsk bin/cckdcomp @@ -5,7 +6,6 @@ bin/cckddiag bin/cckdswap bin/cfba2fba bin/ckd2cckd -bin/cvslvlck bin/dasdcat bin/dasdconv bin/dasdcopy -- cgit