View | Details | Raw Unified | Return to bug 173051
Collapse All | Expand All

(-)emulators/hercules/Makefile (-3 / +3 lines)
Lines 2-13 Link Here
2
# Date created:		Thu Jan 31 12:07:01 CET 2002
2
# Date created:		Thu Jan 31 12:07:01 CET 2002
3
# Whom:			Miguel Mendez <flynn@energyhq.homeip.net>
3
# Whom:			Miguel Mendez <flynn@energyhq.homeip.net>
4
#
4
#
5
# $FreeBSD: ports/emulators/hercules/Makefile,v 1.30 2012/11/17 05:57:20 svnexp Exp $
5
# $FreeBSD: ports/emulators/hercules/Makefile,v 1.29 2010/12/04 07:31:36 ade Exp $
6
#
6
#
7
7
8
PORTNAME=	hercules
8
PORTNAME=	hercules
9
PORTVERSION=	3.05
9
PORTVERSION=	3.07
10
PORTREVISION=	3
10
PORTREVISION=	
11
CATEGORIES=	emulators
11
CATEGORIES=	emulators
12
MASTER_SITES=	http://www.hercules-390.org/
12
MASTER_SITES=	http://www.hercules-390.org/
13
13
(-)emulators/hercules/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (hercules-3.05.tar.gz) = f190221fa25692c0316be331f618c0675f9f9875c44b8af3efa7a431d138b1e2
1
SHA256 (hercules-3.07.tar.gz) = 02d5f6c66d699d413a4db9ef5a799249a6645ac10f2af1edb37992e7fa1f7724
2
SIZE (hercules-3.05.tar.gz) = 2470621
2
SIZE (hercules-3.07.tar.gz) = 2701835
(-)emulators/hercules/files/patch-20080506-cvs-endian.diff (-168 lines)
Lines 1-168 Link Here
1
Index: control.c
2
===================================================================
3
RCS file: /usr/cvs/hercules/hercules/control.c,v
4
retrieving revision 1.266
5
retrieving revision 1.267
6
diff -u -p -r1.266 -r1.267
7
--- control.c	11 Apr 2008 14:28:00 -0000	1.266
8
+++ control.c	6 May 2008 22:15:42 -0000	1.267
9
@@ -1968,16 +1971,16 @@ U16     updated = 0;                    
10
         m = n;
11
 
12
     /* Copy from operand beginning */
13
-    for (i = 0; i < m; i++)
14
+    for (i = 0; i < m; i++, p1++)
15
     {
16
-        regs->CR_L((r1 + i) & 0xF) = fetch_fw (p1++);
17
+        regs->CR_L((r1 + i) & 0xF) = fetch_fw (p1);
18
         updated |= BIT((r1 + i) & 0xF);
19
     }
20
 
21
     /* Copy from next page */
22
-    for ( ; i < n; i++)
23
+    for ( ; i < n; i++, p2++)
24
     {
25
-        regs->CR_L((r1 + i) & 0xF) = fetch_fw (p2++);
26
+        regs->CR_L((r1 + i) & 0xF) = fetch_fw (p2);
27
         updated |= BIT((r1 + i) & 0xF);
28
     }
29
 
30
Index: esame.c
31
===================================================================
32
RCS file: /usr/cvs/hercules/hercules/esame.c,v
33
retrieving revision 1.201
34
retrieving revision 1.202
35
diff -u -p -r1.201 -r1.202
36
--- esame.c	11 Apr 2008 14:28:29 -0000	1.201
37
+++ esame.c	6 May 2008 22:15:42 -0000	1.202
38
@@ -4038,8 +4041,8 @@ U32    *p1, *p2;                        
39
     {
40
         /* Boundary not crossed */
41
         n >>= 2;
42
-        for (i = 0; i < n; i++)
43
-            regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1++);
44
+        for (i = 0; i < n; i++, p1++)
45
+            regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1);
46
     }
47
     else
48
     {
49
@@ -4052,11 +4055,11 @@ U32    *p1, *p2;                        
50
         {
51
             /* Addresses are word aligned */
52
             m >>= 2;
53
-            for (i = 0; i < m; i++)
54
-                regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1++);
55
+            for (i = 0; i < m; i++, p1++)
56
+                regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1);
57
             n >>= 2;
58
-            for ( ; i < n; i++)
59
-                regs->GR_H((r1 + i) & 0xF) = fetch_fw (p2++);
60
+            for ( ; i < n; i++, p2++)
61
+                regs->GR_H((r1 + i) & 0xF) = fetch_fw (p2);
62
         }
63
         else
64
         {
65
@@ -6728,16 +6731,16 @@ U32    *p1, *p2 = NULL;                 
66
         m = n;
67
 
68
     /* Load from first page */
69
-    for (i = 0; i < m; i++)
70
+    for (i = 0; i < m; i++, p1++)
71
     {
72
-        regs->AR((r1 + i) & 0xF) = fetch_fw (p1++);
73
+        regs->AR((r1 + i) & 0xF) = fetch_fw (p1);
74
         SET_AEA_AR(regs, (r1 + i) & 0xF);
75
     }
76
 
77
     /* Load from next page */
78
-    for ( ; i < n; i++)
79
+    for ( ; i < n; i++, p2++)
80
     {
81
-        regs->AR((r1 + i) & 0xF) = fetch_fw (p2++);
82
+        regs->AR((r1 + i) & 0xF) = fetch_fw (p2);
83
         SET_AEA_AR(regs, (r1 + i) & 0xF);
84
     }
85
 
86
@@ -6811,8 +6814,8 @@ U32    *p1, *p2;                        
87
     {
88
         /* Boundary not crossed */
89
         n >>= 2;
90
-        for (i = 0; i < n; i++)
91
-            regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++);
92
+        for (i = 0; i < n; i++, p1++)
93
+            regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1);
94
     }
95
     else
96
     {
97
@@ -6825,11 +6828,11 @@ U32    *p1, *p2;                        
98
         {
99
             /* Addresses are word aligned */
100
             m >>= 2;
101
-            for (i = 0; i < m; i++)
102
-                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++);
103
+            for (i = 0; i < m; i++, p1++)
104
+                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1);
105
             n >>= 2;
106
-            for ( ; i < n; i++)
107
-                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2++);
108
+            for ( ; i < n; i++, p2++)
109
+                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2);
110
         }
111
         else
112
         {
113
Index: general1.c
114
===================================================================
115
RCS file: /usr/cvs/hercules/hercules/general1.c,v
116
retrieving revision 1.165
117
retrieving revision 1.166
118
diff -u -p -r1.165 -r1.166
119
--- general1.c	11 Apr 2008 14:28:44 -0000	1.165
120
+++ general1.c	6 May 2008 22:15:42 -0000	1.166
121
@@ -3413,16 +3416,16 @@ U32    *p1, *p2 = NULL;                 
122
         m = n;
123
 
124
     /* Copy from operand beginning */
125
-    for (i = 0; i < m; i++)
126
+    for (i = 0; i < m; i++, p1++)
127
     {
128
-        regs->AR((r1 + i) & 0xF) = fetch_fw (p1++);
129
+        regs->AR((r1 + i) & 0xF) = fetch_fw (p1);
130
         SET_AEA_AR (regs, (r1 + i) & 0xF);
131
     }
132
 
133
     /* Copy from next page */
134
-    for ( ; i < n; i++)
135
+    for ( ; i < n; i++, p2++)
136
     {
137
-        regs->AR((r1 + i) & 0xF) = fetch_fw (p2++);
138
+        regs->AR((r1 + i) & 0xF) = fetch_fw (p2);
139
         SET_AEA_AR (regs, (r1 + i) & 0xF);
140
     }
141
 
142
@@ -3580,8 +3583,8 @@ U32    *p1, *p2;                        
143
     {
144
         /* Boundary not crossed */
145
         n >>= 2;
146
-        for (i = 0; i < n; i++)
147
-            regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++);
148
+        for (i = 0; i < n; i++, p1++)
149
+            regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1);
150
     }
151
     else
152
     {
153
@@ -3594,11 +3597,11 @@ U32    *p1, *p2;                        
154
         {
155
             /* Addresses are word aligned */
156
             m >>= 2;
157
-            for (i = 0; i < m; i++)
158
-                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++);
159
+            for (i = 0; i < m; i++, p1++)
160
+                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1);
161
             n >>= 2;
162
-            for ( ; i < n; i++)
163
-                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2++);
164
+            for ( ; i < n; i++, p2++)
165
+                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2);
166
         }
167
         else
168
         {
(-)emulators/hercules/files/patch-libtool22 (-31 / +31 lines)
Lines 1-6 Link Here
1
--- Makefile.in.orig	2009-07-13 15:39:03.000000000 -0500
1
--- crypto/Makefile.in.orig	2009-07-13 15:39:40.000000000 -0500
2
+++ Makefile.in	2009-07-13 15:39:06.000000000 -0500
2
+++ crypto/Makefile.in	2009-07-13 15:39:44.000000000 -0500
3
@@ -257,13 +257,13 @@
3
@@ -244,7 +244,7 @@
4
 @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC)
5
 @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = 
6
 @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
7
-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
8
+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 
9
 @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = 
10
 @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module         \
11
 @OPTION_DYNAMIC_LOAD_TRUE@                   -no-undefined   \
12
--- decNumber/Makefile.in.orig	2009-07-13 15:40:23.000000000 -0500
13
+++ decNumber/Makefile.in	2009-07-13 15:40:25.000000000 -0500
14
@@ -258,7 +258,7 @@
15
 @BUILD_SHARED_FALSE@XSTATIC = -static
16
 @BUILD_SHARED_TRUE@XSTATIC = 
17
 @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
18
-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
19
+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 
20
 @OPTION_DYNAMIC_LOAD_FALSE@LIB_LD_FLAGS = $(XSTATIC)    \
21
 @OPTION_DYNAMIC_LOAD_FALSE@		   -no-undefined \
22
 @OPTION_DYNAMIC_LOAD_FALSE@		   -avoid-version
23
--- Makefile.in.orig	2010-03-07 14:04:49.000000000 +0200
24
+++ Makefile.in	2012-10-14 17:27:30.565513737 +0300
25
@@ -304,13 +304,13 @@
4
 libhercu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libhercs.la
26
 libhercu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libhercs.la
5
 am__libhercu_la_SOURCES_DIST = version.c hscutl.c hscutl2.c codepage.c \
27
 am__libhercu_la_SOURCES_DIST = version.c hscutl.c hscutl2.c codepage.c \
6
 	logger.c logmsg.c hdl.c hostinfo.c hsocket.c memrchr.c \
28
 	logger.c logmsg.c hdl.c hostinfo.c hsocket.c memrchr.c \
Lines 16-22 Link Here
16
 am_libhercu_la_OBJECTS = version.lo hscutl.lo hscutl2.lo codepage.lo \
38
 am_libhercu_la_OBJECTS = version.lo hscutl.lo hscutl2.lo codepage.lo \
17
 	logger.lo logmsg.lo hdl.lo hostinfo.lo hsocket.lo memrchr.lo \
39
 	logger.lo logmsg.lo hdl.lo hostinfo.lo hsocket.lo memrchr.lo \
18
 	parser.lo pttrace.lo $(am__objects_8) $(am__objects_9) \
40
 	parser.lo pttrace.lo $(am__objects_8) $(am__objects_9) \
19
@@ -626,7 +626,7 @@
41
@@ -687,7 +687,7 @@
20
 @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC)
42
 @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC)
21
 @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = 
43
 @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = 
22
 @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
44
 @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
Lines 25-31 Link Here
25
 @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = 
47
 @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = 
26
 @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module         \
48
 @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module         \
27
 @OPTION_DYNAMIC_LOAD_TRUE@                   -no-undefined    \
49
 @OPTION_DYNAMIC_LOAD_TRUE@                   -no-undefined    \
28
@@ -843,8 +843,7 @@
50
@@ -913,8 +913,7 @@
29
                              memrchr.c        \
51
                              memrchr.c        \
30
                              $(dynamic_SRC)   \
52
                              $(dynamic_SRC)   \
31
                              $(extra_SRC)     \
53
                              $(extra_SRC)     \
Lines 35-41 Link Here
35
 
57
 
36
 libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
58
 libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
37
 libherc_la_LIBADD = libhercs.la     \
59
 libherc_la_LIBADD = libhercs.la     \
38
@@ -1089,7 +1088,6 @@
60
@@ -1166,7 +1165,6 @@
39
                  hdl.h          \
61
                  hdl.h          \
40
                  crypto.h       \
62
                  crypto.h       \
41
                  sockdev.h      \
63
                  sockdev.h      \
Lines 43-75 Link Here
43
                  herc_getopt.h  \
65
                  herc_getopt.h  \
44
                  service.h      \
66
                  service.h      \
45
                  chsc.h         \
67
                  chsc.h         \
46
@@ -1465,7 +1463,6 @@
68
@@ -1552,7 +1550,6 @@
47
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadparm.Plo@am__quote@
48
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@
69
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@
49
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logmsg.Plo@am__quote@
70
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logmsg.Plo@am__quote@
71
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losc.Plo@am__quote@
50
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltdl.Plo@am__quote@
72
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltdl.Plo@am__quote@
51
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/machchk.Plo@am__quote@
73
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/machchk.Plo@am__quote@
52
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Plo@am__quote@
74
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Plo@am__quote@
53
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opcode.Plo@am__quote@
75
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omatape.Plo@am__quote@
54
--- crypto/Makefile.in.orig	2009-07-13 15:39:40.000000000 -0500
55
+++ crypto/Makefile.in	2009-07-13 15:39:44.000000000 -0500
56
@@ -244,7 +244,7 @@
57
 @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC)
58
 @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = 
59
 @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
60
-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
61
+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 
62
 @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = 
63
 @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module         \
64
 @OPTION_DYNAMIC_LOAD_TRUE@                   -no-undefined   \
65
--- decNumber/Makefile.in.orig	2009-07-13 15:40:23.000000000 -0500
66
+++ decNumber/Makefile.in	2009-07-13 15:40:25.000000000 -0500
67
@@ -258,7 +258,7 @@
68
 @BUILD_SHARED_FALSE@XSTATIC = -static
69
 @BUILD_SHARED_TRUE@XSTATIC = 
70
 @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
71
-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
72
+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 
73
 @OPTION_DYNAMIC_LOAD_FALSE@LIB_LD_FLAGS = $(XSTATIC)    \
74
 @OPTION_DYNAMIC_LOAD_FALSE@		   -no-undefined \
75
 @OPTION_DYNAMIC_LOAD_FALSE@		   -avoid-version

Return to bug 173051