The current ports version of Hercules s390x emulator is quite outdated. Version 3.07 is more than 2 years old while there exists a relatively fresh 3.08 of 2012-12-08 with a reasonable amount of enhancements. Fix: Update the port as shown in the attached patch. Patch attached with submission follows: How-To-Repeat: Check the current version number in ports and then the web page... http://www.hercules-390.eu/hercnew.html
Maintainer of emulators/hercules, Please note that PR ports/178386 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/178386 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
I've tried your patch, but MASTER_SITE doesn't work. After fixing that, there was a problem with the plist: with the default options, bin/cvslvlck was not installed. Can you check those things and send an updated patch?
On 06/11/13 22:21, Raphael Kubo da Costa wrote: > I've tried your patch, but MASTER_SITE doesn't work. After fixing that, > there was a problem with the plist: with the default options, > bin/cvslvlck was not installed. > > Can you check those things and send an updated patch? The MASTER_SITE and the following link certainly work for me http://downloads.hercules-390.eu/hercules-3.08.tar.gz If they do not work for you, please, check whether something is blocking your access there. OTOH bin/cvslvlck is really extra and should not be in the pkg-plist file at all. My bad. Sorry. --jau
Jukka Ukkonen <jau@oxit.fi> writes: > On 06/11/13 22:21, Raphael Kubo da Costa wrote: >> I've tried your patch, but MASTER_SITE doesn't work. After fixing that, >> there was a problem with the plist: with the default options, >> bin/cvslvlck was not installed. >> >> Can you check those things and send an updated patch? > > The MASTER_SITE and the following link certainly work for me > > http://downloads.hercules-390.eu/hercules-3.08.tar.gz This one works, but http://www.hercules-309.eu/hercules-3.08.tar.gz definitely returns a 404 error page, which is what I was complaining about. > OTOH > bin/cvslvlck is really extra and should not be in the pkg-plist > file at all. My bad. Sorry. OK, I'll fix that and commit. Next time, please run `port test' with your patch.
Author: rakuco Date: Fri Jun 14 18:11:55 2013 New Revision: 320958 URL: http://svnweb.freebsd.org/changeset/ports/320958 Log: Update to 3.08. PR: ports/178386 Submitted by: Jukka Ukkonen <jau@oxit.fi> Approved by: maintainer timeout (38 days) Added: head/emulators/hercules/files/patch-libtool - copied, changed from r320955, head/emulators/hercules/files/patch-libtool22 Deleted: head/emulators/hercules/files/patch-libtool22 Modified: head/emulators/hercules/Makefile head/emulators/hercules/distinfo head/emulators/hercules/pkg-descr head/emulators/hercules/pkg-plist Modified: head/emulators/hercules/Makefile ============================================================================== --- head/emulators/hercules/Makefile Fri Jun 14 18:11:36 2013 (r320957) +++ head/emulators/hercules/Makefile Fri Jun 14 18:11:55 2013 (r320958) @@ -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 Modified: head/emulators/hercules/distinfo ============================================================================== --- head/emulators/hercules/distinfo Fri Jun 14 18:11:36 2013 (r320957) +++ head/emulators/hercules/distinfo Fri Jun 14 18:11:55 2013 (r320958) @@ -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 Copied and modified: head/emulators/hercules/files/patch-libtool (from r320955, head/emulators/hercules/files/patch-libtool22) ============================================================================== --- head/emulators/hercules/files/patch-libtool22 Fri Jun 14 17:21:30 2013 (r320955, copy source) +++ head/emulators/hercules/files/patch-libtool Fri Jun 14 18:11:55 2013 (r320958) @@ -1,63 +1,48 @@ ---- 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 @@ +--- 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 fishhang.c ltdl.c -+ parser.c pttrace.c fthreads.c fishhang.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_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 = + @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_8) $(am__objects_9) \ -@@ -687,7 +687,7 @@ + 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_FALSE@LTDL = -@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ltdl.c -+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ++#@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 \ -@@ -913,8 +913,7 @@ - memrchr.c \ +@@ -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) \ + $(dyndev_SRC) \ - ltdl.c -+ $(dyndev_SRC) ++# ltdl.c libherc_la_LDFLAGS = $(LIB_LD_FLAGS) libherc_la_LIBADD = libhercs.la \ -@@ -1166,7 +1165,6 @@ +@@ -1302,7 +1302,6 @@ hdl.h \ crypto.h \ sockdev.h \ @@ -65,11 +50,12 @@ herc_getopt.h \ service.h \ chsc.h \ -@@ -1552,7 +1550,6 @@ +@@ -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@ Modified: head/emulators/hercules/pkg-descr ============================================================================== --- head/emulators/hercules/pkg-descr Fri Jun 14 18:11:36 2013 (r320957) +++ head/emulators/hercules/pkg-descr Fri Jun 14 18:11:55 2013 (r320958) @@ -7,6 +7,6 @@ Jaeger designed and implemented many of 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 Modified: head/emulators/hercules/pkg-plist ============================================================================== --- head/emulators/hercules/pkg-plist Fri Jun 14 18:11:36 2013 (r320957) +++ head/emulators/hercules/pkg-plist Fri Jun 14 18:11:55 2013 (r320958) @@ -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 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed, with minor changes. Thanks!
On 06/14/13 20:56, Raphael Kubo da Costa wrote: > Jukka Ukkonen <jau@oxit.fi> writes: > >> On 06/11/13 22:21, Raphael Kubo da Costa wrote: >>> I've tried your patch, but MASTER_SITE doesn't work. After fixing that, >>> there was a problem with the plist: with the default options, >>> bin/cvslvlck was not installed. >>> >>> Can you check those things and send an updated patch? >> The MASTER_SITE and the following link certainly work for me >> >> http://downloads.hercules-390.eu/hercules-3.08.tar.gz > This one works, but http://www.hercules-309.eu/hercules-3.08.tar.gz > definitely returns a 404 error page, which is what I was complaining > about. Uh-er...? My patch was sent "Tue May 07 07:20:02 UTC 2013". OTOH the page "http://www.hercules-390.eu/" which contains the download link has been modified 2 weeks later "Tue May 21 12:42:53 2013". So, the link which worked when I sent the patch may have changed on the origin site 2 weeks after the patch was sent. Now the current date is more than 5 weeks after the patch was sent and more than 3 weeks after the origin site was changed. The proper time to complain about the link has certainly expired already. Sorry. ;-) --jau
Jukka Ukkonen <jau@oxit.fi> writes: > So, the link which worked when I sent the patch may > have changed on the origin site 2 weeks after the patch > was sent. Yet you say "The MASTER_SITE certainly _works_ for me". > The proper time to complain about the link has certainly expired > already. Sorry. ;-) Sorry if I'm taking this the wrong way, but there isn't a "proper time" to complain. I, for one, was browsing through random PRs and decided to spend some time on this one. I could have just said "this doesn't fetch, send a new version", and it would be a proper complaint.