Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 May 2013 07:14:48 GMT
From:      Jukka Ukkonen <jau@oxit.fi>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/178386: Hercules version in ports is more than 2 years old while 3.08 of Dec. 2012 exists
Message-ID:  <201305070714.r477EmtT003183@oldred.FreeBSD.org>
Resent-Message-ID: <201305070720.r477K2QS069092@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         178386
>Category:       ports
>Synopsis:       Hercules version in ports is more than 2 years old while 3.08 of Dec. 2012 exists
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 07 07:20:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Jukka Ukkonen
>Release:        9.1-STABLE
>Organization:
-----
>Environment:
FreeBSD sleipnir 9.1-STABLE FreeBSD 9.1-STABLE #0 r250323M: Tue May  7 09:17:44 EEST 2013     root@sleipnir:/usr/obj/usr/src/sys/Sleipnir  amd64
>Description:
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.

>How-To-Repeat:
Check the current version number in ports and then the web page...
http://www.hercules-390.eu/hercnew.html

>Fix:
Update the port as shown in the attached patch.


Patch attached with submission follows:

diff -u -r emulators/hercules-3.07/Makefile emulators/hercules/Makefile
--- emulators/hercules-3.07/Makefile	2013-02-05 20:37:00.995192996 +0200
+++ emulators/hercules/Makefile	2013-04-04 13:45:01.420560911 +0300
@@ -2,9 +2,9 @@
 # $FreeBSD: head/emulators/hercules/Makefile 310255 2013-01-12 00:41:29Z ak $
 
 PORTNAME=	hercules
-PORTVERSION=	3.07
+PORTVERSION=	3.08
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.hercules-390.org/
+MASTER_SITES=	http://www.hercules-390.eu/
 
 MAINTAINER=	bzeeb+freebsdports@zabbadoz.net
 COMMENT=	System/370, ESA/390, and z/Architecture Emulator
diff -u -r emulators/hercules-3.07/distinfo emulators/hercules/distinfo
--- emulators/hercules-3.07/distinfo	2013-02-05 20:37:00.996193181 +0200
+++ emulators/hercules/distinfo	2013-04-04 13:47:17.424566275 +0300
@@ -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 -u -r emulators/hercules-3.07/pkg-descr emulators/hercules/pkg-descr
--- emulators/hercules-3.07/pkg-descr	2013-02-05 20:37:00.998193552 +0200
+++ emulators/hercules/pkg-descr	2013-04-04 14:17:33.888660345 +0300
@@ -7,6 +7,6 @@
 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
--- emulators/hercules/files/patch-libtool22	2013-02-05 20:37:01.000192456 +0200
+++ emulators/hercules/files/patch-libtool22	2013-04-04 14:22:00.520825321 +0300
@@ -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@
--- /dev/null	2013-04-04 14:24:07.761097315 +0300
+++ emulators/hercules/files/patch-libtool	2013-04-04 14:08:54.060579349 +0300
@@ -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@


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305070714.r477EmtT003183>