ports/173051: emulators/hercules update from 3.05 to 3.07
Jukka A. Ukkonen
jau at oxit.fi
Thu Dec 6 09:10:01 UTC 2012
The following reply was made to PR ports/173051; it has been noted by GNATS.
From: "Jukka A. Ukkonen" <jau at oxit.fi>
To: bug-followup at FreeBSD.org, jau at iki.fi
Cc:
Subject: Re: ports/173051: emulators/hercules update from 3.05 to 3.07
Date: Thu, 06 Dec 2012 10:58:49 +0200
This is a multi-part message in MIME format.
--------------030808070602070404000907
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Find an attempt for a diff style version patch attached.
--jau
--------------030808070602070404000907
Content-Type: text/plain; charset=UTF-8;
name="Hercules-3.05-3.07.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="Hercules-3.05-3.07.patch"
diff -u -r emulators/hercules-3.05/Makefile emulators/hercules/Makefile
--- emulators/hercules-3.05/Makefile 2012-11-23 07:45:33.000000000 +0200
+++ emulators/hercules/Makefile 2012-12-06 10:49:04.370215795 +0200
@@ -2,12 +2,12 @@
# Date created: Thu Jan 31 12:07:01 CET 2002
# Whom: Miguel Mendez <flynn at energyhq.homeip.net>
#
-# $FreeBSD: ports/emulators/hercules/Makefile,v 1.30 2012/11/17 05:57:20 svnexp Exp $
+# $FreeBSD: ports/emulators/hercules/Makefile,v 1.29 2010/12/04 07:31:36 ade Exp $
#
PORTNAME= hercules
-PORTVERSION= 3.05
-PORTREVISION= 3
+PORTVERSION= 3.07
+PORTREVISION=
CATEGORIES= emulators
MASTER_SITES= http://www.hercules-390.org/
diff -u -r emulators/hercules-3.05/distinfo emulators/hercules/distinfo
--- emulators/hercules-3.05/distinfo 2011-07-02 20:14:08.000000000 +0300
+++ emulators/hercules/distinfo 2012-12-06 10:49:04.377215177 +0200
@@ -1,2 +1,2 @@
-SHA256 (hercules-3.05.tar.gz) = f190221fa25692c0316be331f618c0675f9f9875c44b8af3efa7a431d138b1e2
-SIZE (hercules-3.05.tar.gz) = 2470621
+SHA256 (hercules-3.07.tar.gz) = 02d5f6c66d699d413a4db9ef5a799249a6645ac10f2af1edb37992e7fa1f7724
+SIZE (hercules-3.07.tar.gz) = 2701835
diff -u -r emulators/hercules-3.05/files/patch-20080506-cvs-endian.diff emulators/hercules/files/patch-20080506-cvs-endian.diff
--- emulators/hercules-3.05/files/patch-20080506-cvs-endian.diff 2008-05-14 20:25:19.000000000 +0300
+++ emulators/hercules/files/patch-20080506-cvs-endian.diff 2012-12-06 10:48:28.040214004 +0200
@@ -1,168 +0,0 @@
-Index: control.c
-===================================================================
-RCS file: /usr/cvs/hercules/hercules/control.c,v
-retrieving revision 1.266
-retrieving revision 1.267
-diff -u -p -r1.266 -r1.267
---- control.c 11 Apr 2008 14:28:00 -0000 1.266
-+++ control.c 6 May 2008 22:15:42 -0000 1.267
-@@ -1968,16 +1971,16 @@ U16 updated = 0;
- m = n;
-
- /* Copy from operand beginning */
-- for (i = 0; i < m; i++)
-+ for (i = 0; i < m; i++, p1++)
- {
-- regs->CR_L((r1 + i) & 0xF) = fetch_fw (p1++);
-+ regs->CR_L((r1 + i) & 0xF) = fetch_fw (p1);
- updated |= BIT((r1 + i) & 0xF);
- }
-
- /* Copy from next page */
-- for ( ; i < n; i++)
-+ for ( ; i < n; i++, p2++)
- {
-- regs->CR_L((r1 + i) & 0xF) = fetch_fw (p2++);
-+ regs->CR_L((r1 + i) & 0xF) = fetch_fw (p2);
- updated |= BIT((r1 + i) & 0xF);
- }
-
-Index: esame.c
-===================================================================
-RCS file: /usr/cvs/hercules/hercules/esame.c,v
-retrieving revision 1.201
-retrieving revision 1.202
-diff -u -p -r1.201 -r1.202
---- esame.c 11 Apr 2008 14:28:29 -0000 1.201
-+++ esame.c 6 May 2008 22:15:42 -0000 1.202
-@@ -4038,8 +4041,8 @@ U32 *p1, *p2;
- {
- /* Boundary not crossed */
- n >>= 2;
-- for (i = 0; i < n; i++)
-- regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1++);
-+ for (i = 0; i < n; i++, p1++)
-+ regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1);
- }
- else
- {
-@@ -4052,11 +4055,11 @@ U32 *p1, *p2;
- {
- /* Addresses are word aligned */
- m >>= 2;
-- for (i = 0; i < m; i++)
-- regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1++);
-+ for (i = 0; i < m; i++, p1++)
-+ regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1);
- n >>= 2;
-- for ( ; i < n; i++)
-- regs->GR_H((r1 + i) & 0xF) = fetch_fw (p2++);
-+ for ( ; i < n; i++, p2++)
-+ regs->GR_H((r1 + i) & 0xF) = fetch_fw (p2);
- }
- else
- {
-@@ -6728,16 +6731,16 @@ U32 *p1, *p2 = NULL;
- m = n;
-
- /* Load from first page */
-- for (i = 0; i < m; i++)
-+ for (i = 0; i < m; i++, p1++)
- {
-- regs->AR((r1 + i) & 0xF) = fetch_fw (p1++);
-+ regs->AR((r1 + i) & 0xF) = fetch_fw (p1);
- SET_AEA_AR(regs, (r1 + i) & 0xF);
- }
-
- /* Load from next page */
-- for ( ; i < n; i++)
-+ for ( ; i < n; i++, p2++)
- {
-- regs->AR((r1 + i) & 0xF) = fetch_fw (p2++);
-+ regs->AR((r1 + i) & 0xF) = fetch_fw (p2);
- SET_AEA_AR(regs, (r1 + i) & 0xF);
- }
-
-@@ -6811,8 +6814,8 @@ U32 *p1, *p2;
- {
- /* Boundary not crossed */
- n >>= 2;
-- for (i = 0; i < n; i++)
-- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++);
-+ for (i = 0; i < n; i++, p1++)
-+ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1);
- }
- else
- {
-@@ -6825,11 +6828,11 @@ U32 *p1, *p2;
- {
- /* Addresses are word aligned */
- m >>= 2;
-- for (i = 0; i < m; i++)
-- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++);
-+ for (i = 0; i < m; i++, p1++)
-+ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1);
- n >>= 2;
-- for ( ; i < n; i++)
-- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2++);
-+ for ( ; i < n; i++, p2++)
-+ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2);
- }
- else
- {
-Index: general1.c
-===================================================================
-RCS file: /usr/cvs/hercules/hercules/general1.c,v
-retrieving revision 1.165
-retrieving revision 1.166
-diff -u -p -r1.165 -r1.166
---- general1.c 11 Apr 2008 14:28:44 -0000 1.165
-+++ general1.c 6 May 2008 22:15:42 -0000 1.166
-@@ -3413,16 +3416,16 @@ U32 *p1, *p2 = NULL;
- m = n;
-
- /* Copy from operand beginning */
-- for (i = 0; i < m; i++)
-+ for (i = 0; i < m; i++, p1++)
- {
-- regs->AR((r1 + i) & 0xF) = fetch_fw (p1++);
-+ regs->AR((r1 + i) & 0xF) = fetch_fw (p1);
- SET_AEA_AR (regs, (r1 + i) & 0xF);
- }
-
- /* Copy from next page */
-- for ( ; i < n; i++)
-+ for ( ; i < n; i++, p2++)
- {
-- regs->AR((r1 + i) & 0xF) = fetch_fw (p2++);
-+ regs->AR((r1 + i) & 0xF) = fetch_fw (p2);
- SET_AEA_AR (regs, (r1 + i) & 0xF);
- }
-
-@@ -3580,8 +3583,8 @@ U32 *p1, *p2;
- {
- /* Boundary not crossed */
- n >>= 2;
-- for (i = 0; i < n; i++)
-- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++);
-+ for (i = 0; i < n; i++, p1++)
-+ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1);
- }
- else
- {
-@@ -3594,11 +3597,11 @@ U32 *p1, *p2;
- {
- /* Addresses are word aligned */
- m >>= 2;
-- for (i = 0; i < m; i++)
-- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++);
-+ for (i = 0; i < m; i++, p1++)
-+ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1);
- n >>= 2;
-- for ( ; i < n; i++)
-- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2++);
-+ for ( ; i < n; i++, p2++)
-+ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2);
- }
- else
- {
diff -u -r emulators/hercules-3.05/files/patch-libtool22 emulators/hercules/files/patch-libtool22
--- emulators/hercules-3.05/files/patch-libtool22 2009-08-02 22:33:43.000000000 +0300
+++ emulators/hercules/files/patch-libtool22 2012-12-06 10:49:04.445214973 +0200
@@ -1,6 +1,28 @@
---- Makefile.in.orig 2009-07-13 15:39:03.000000000 -0500
-+++ Makefile.in 2009-07-13 15:39:06.000000000 -0500
-@@ -257,13 +257,13 @@
+--- 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 at DYNSRC = $(dyndev_SRC)
+ @OPTION_DYNAMIC_LOAD_TRUE at DYNSRC =
+ @OPTION_DYNAMIC_LOAD_FALSE at LTDL =
+- at OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
++ at OPTION_DYNAMIC_LOAD_TRUE@LTDL =
+ @OPTION_DYNAMIC_LOAD_FALSE at DYNMOD_LD_FLAGS =
+ @OPTION_DYNAMIC_LOAD_TRUE at 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 at XSTATIC = -static
+ @BUILD_SHARED_TRUE at XSTATIC =
+ @OPTION_DYNAMIC_LOAD_FALSE at LTDL =
+- at OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
++ at OPTION_DYNAMIC_LOAD_TRUE@LTDL =
+ @OPTION_DYNAMIC_LOAD_FALSE at 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 \
@@ -16,7 +38,7 @@
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) \
-@@ -626,7 +626,7 @@
+@@ -687,7 +687,7 @@
@OPTION_DYNAMIC_LOAD_FALSE at DYNSRC = $(dyndev_SRC)
@OPTION_DYNAMIC_LOAD_TRUE at DYNSRC =
@OPTION_DYNAMIC_LOAD_FALSE at LTDL =
@@ -25,7 +47,7 @@
@OPTION_DYNAMIC_LOAD_FALSE at DYNMOD_LD_FLAGS =
@OPTION_DYNAMIC_LOAD_TRUE at DYNMOD_LD_FLAGS = -module \
@OPTION_DYNAMIC_LOAD_TRUE@ -no-undefined \
-@@ -843,8 +843,7 @@
+@@ -913,8 +913,7 @@
memrchr.c \
$(dynamic_SRC) \
$(extra_SRC) \
@@ -35,7 +57,7 @@
libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
libherc_la_LIBADD = libhercs.la \
-@@ -1089,7 +1088,6 @@
+@@ -1166,7 +1165,6 @@
hdl.h \
crypto.h \
sockdev.h \
@@ -43,33 +65,11 @@
herc_getopt.h \
service.h \
chsc.h \
-@@ -1465,7 +1463,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/loadparm.Plo at am__quote@
+@@ -1552,7 +1550,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/logger.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/logmsg.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/losc.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ltdl.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/machchk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memrchr.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/opcode.Plo at am__quote@
---- 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 at DYNSRC = $(dyndev_SRC)
- @OPTION_DYNAMIC_LOAD_TRUE at DYNSRC =
- @OPTION_DYNAMIC_LOAD_FALSE at LTDL =
-- at OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
-+ at OPTION_DYNAMIC_LOAD_TRUE@LTDL =
- @OPTION_DYNAMIC_LOAD_FALSE at DYNMOD_LD_FLAGS =
- @OPTION_DYNAMIC_LOAD_TRUE at 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 at XSTATIC = -static
- @BUILD_SHARED_TRUE at XSTATIC =
- @OPTION_DYNAMIC_LOAD_FALSE at LTDL =
-- at OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
-+ at OPTION_DYNAMIC_LOAD_TRUE@LTDL =
- @OPTION_DYNAMIC_LOAD_FALSE at LIB_LD_FLAGS = $(XSTATIC) \
- @OPTION_DYNAMIC_LOAD_FALSE@ -no-undefined \
- @OPTION_DYNAMIC_LOAD_FALSE@ -avoid-version
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/omatape.Plo at am__quote@
--------------030808070602070404000907--
More information about the freebsd-ports-bugs
mailing list