6 files changed, 17 insertions, 96 deletions

diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index 3d7c34e37bdf..58bf9a824641 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hercules
-PORTVERSION=	2.16.5
+PORTVERSION=	2.17.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.conmicro.cx/hercules/
 
diff --git a/emulators/hercules/distinfo b/emulators/hercules/distinfo
index 96762b2146d5..87fe5286c684 100644
--- a/emulators/hercules/distinfo
+++ b/emulators/hercules/distinfo
@@ -1 +1 @@
-MD5 (hercules-2.16.5.tar.gz) = 5c23268223e2e74a08fd7d148a159834
+MD5 (hercules-2.17.1.tar.gz) = e98138eb45d114f2c4a805db91fe308c
diff --git a/emulators/hercules/files/patch-hc-hack b/emulators/hercules/files/patch-hc-hack
index 207a0959697d..2795112da6d7 100644
--- a/emulators/hercules/files/patch-hc-hack
+++ b/emulators/hercules/files/patch-hc-hack
@@ -20,13 +20,13 @@ diff -ur ./Makefile.in ../../work/hercules-2.16.5/Makefile.in
  	diagmssf.$(OBJEXT) vm.$(OBJEXT) channel.$(OBJEXT) \
  	ckddasd.$(OBJEXT) fbadasd.$(OBJEXT) tapedev.$(OBJEXT) \
 @@ -402,6 +402,7 @@
- @AMDEP_TRUE@	./$(DEPDIR)/channel.Po ./$(DEPDIR)/ckd2cckd.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/ckddasd.Po ./$(DEPDIR)/cmpsc.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/config.Po ./$(DEPDIR)/console.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/codepage.Po ./$(DEPDIR)/config.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/console.Po ./$(DEPDIR)/control.Po \
 +@AMDEP_TRUE@	./$(DEPDIR)/hc.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/control.Po ./$(DEPDIR)/cpu.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/ctcadpt.Po ./$(DEPDIR)/dasdcat.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/dasdinit.Po ./$(DEPDIR)/dasdisup.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpu.Po ./$(DEPDIR)/ctc_ctci.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/ctc_lcs.Po ./$(DEPDIR)/ctcadpt.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/dasdcat.Po ./$(DEPDIR)/dasdcopy.Po \
 @@ -608,6 +609,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/console.Po@am__quote@
@@ -35,7 +35,6 @@ diff -ur ./Makefile.in ../../work/hercules-2.16.5/Makefile.in
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctcadpt.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dasdcat.Po@am__quote@
-Only in ../../work/hercules-2.16.5: Makefile.in.orig
 diff -ur ./configure.ac ../../work/hercules-2.16.5/configure.ac
 --- ./configure.ac	Mon Jul  8 14:55:42 2002
 +++ ../../work/hercules-2.16.5/configure.ac	Mon Dec 16 17:17:45 2002
@@ -66,9 +65,6 @@ diff -ur ./configure.ac ../../work/hercules-2.16.5/configure.ac
 +	    [Define if you have the GNU version of mtio.h (Linux)])
  
  AC_OUTPUT(Makefile util/Makefile html/Makefile)
-Only in ../../work/hercules-2.16.5: configure.ac.orig
-Only in ../../work/hercules-2.16.5: hc.c
-Only in ../../work/hercules-2.16.5: hc.c.orig
 diff -ur ./opcode.c ../../work/hercules-2.16.5/opcode.c
 --- ./opcode.c	Wed Jul  3 04:04:41 2002
 +++ ../../work/hercules-2.16.5/opcode.c	Mon Dec 16 17:17:45 2002
@@ -83,7 +79,6 @@ diff -ur ./opcode.c ../../work/hercules-2.16.5/opcode.c
   /*0105*/ GENx___x___x___ ,                                     /* CMSG      */
   /*0106*/ GENx___x___x___ ,                                     /* TMSG      */
   /*0107*/ GENx___x390x900 (set_clock_programmable_field,E,"SCKPF"),
-Only in ../../work/hercules-2.16.5: opcode.c.orig
 diff -ur ./opcode.h ../../work/hercules-2.16.5/opcode.h
 --- ./opcode.h	Mon Mar 11 18:40:40 2002
 +++ ../../work/hercules-2.16.5/opcode.h	Mon Dec 16 17:17:45 2002
@@ -99,43 +94,3 @@ diff -ur ./opcode.h ../../work/hercules-2.16.5/opcode.h
  /* Instructions in assist.c */
  DEF_INST(svc_assist);
  DEF_INST(obtain_local_lock);
-Only in ../../work/hercules-2.16.5: opcode.h.orig
-Only in ../../work/hercules-2.16.5: tapecopy.c.rej
-Only in ../../work/hercules-2.16.5: tapedev.c.rej
-diff -ur ./version.c ../../work/hercules-2.16.5/version.c
---- ./version.c	Mon Dec 16 17:15:30 2002
-+++ ../../work/hercules-2.16.5/version.c	Mon Dec 16 17:17:48 2002
-@@ -20,6 +20,14 @@
- 
- static const char *build_info[] = {
- 
-+#if defined(GNU_MTIO_SUPPORT)
-+    "Using GNU tape handling",
-+#elif defined(HAVE_MTIO_H)
-+    "Using generic UNIX tape handling",
-+#else
-+    "No SCSI tape support",
-+#endif
-+
- #if defined(CUSTOM_BUILD_STRING)
-     CUSTOM_BUILD_STRING,
- #endif
-diff -ur ./version.c.orig ../../work/hercules-2.16.5/version.c.orig
---- ./version.c.orig	Mon May 20 23:02:41 2002
-+++ ../../work/hercules-2.16.5/version.c.orig	Mon Dec 16 17:17:29 2002
-@@ -106,6 +106,14 @@
-     "No HET BZIP2 support",
- #endif
- 
-+#if defined(GNU_MTIO_SUPPORT)
-+	 "Using GNU tape handling",
-+#elif defined(HAVE_MTIO_H)
-+	 "Using generic Unix tape handling",
-+#else
-+	 "No SCSI tape support",
-+#endif
-+
-   " "
- 
- };
-Only in .: version.c.orig.rej
diff --git a/emulators/hercules/files/patch-hercules.h2 b/emulators/hercules/files/patch-hercules.h2
deleted file mode 100644
index 524288cf1b8d..000000000000
--- a/emulators/hercules/files/patch-hercules.h2
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur hercules.h.orig hercules.h
---- hercules.h.orig Wed Dec  4 16:53:55 2002
-+++ hercules.h	Wed Dec  4 10:09:08 2002
-@@ -49,6 +49,7 @@
-  #include "hbyteswp.h"
- #endif
- #include <sys/types.h>
-+#include <sys/time.h>
- #include <sys/resource.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-@@ -289,8 +290,10 @@
- #endif // !defined(WIN32)
- #define thread_id() \
-         pthread_self()
-+#if 0
- #define exit_thread(exitvar_ptr) \
-         pthread_exit((exitvar_ptr))
-+#endif
- #endif // defined(OPTION_FTHREADS)
- #else
- typedef int                             TID;
diff --git a/emulators/hercules/files/patch-opcode.h b/emulators/hercules/files/patch-opcode.h
deleted file mode 100644
index 5681b94ca395..000000000000
--- a/emulators/hercules/files/patch-opcode.h
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur ./opcode.h ../../work__/hercules-2.16.5/opcode.h
---- ./opcode.h	Tue Dec 17 07:39:27 2002
-+++ ../../work__/hercules-2.16.5/opcode.h	Tue Dec 17 07:33:01 2002
-@@ -104,7 +104,7 @@
-     }
- 
- 
--typedef ATTR_REGPARM(3) void (*zz_func) (BYTE inst[], int execflag, REGS *regs);
-+typedef void (ATTR_REGPARM(3) *zz_func) (BYTE inst[], int execflag, REGS *regs);
- 
- /* Gabor Hoffer (performance option) */
- extern zz_func s370_opcode_table[];
diff --git a/emulators/hercules/files/patch-tapecopy.c b/emulators/hercules/files/patch-tapecopy.c
index 237c636de0c0..15eb57e1451a 100644
--- a/emulators/hercules/files/patch-tapecopy.c
+++ b/emulators/hercules/files/patch-tapecopy.c
@@ -1,6 +1,6 @@
---- tapecopy.c.orig	Mon Sep  2 11:00:59 2002
-+++ tapecopy.c	Mon Sep  2 11:03:21 2002
-@@ -32,6 +32,7 @@
+--- tapecopy.c	Sat Feb  1 20:34:57 2003
++++ ../work/hercules-2.17.1/tapecopy.c	Mon Apr 28 21:21:15 2003
+@@ -42,6 +42,7 @@
  static BYTE hdrlbl[] = "\xC8\xC4\xD9";  /* EBCDIC characters "HDR"   */
  static BYTE eoflbl[] = "\xC5\xD6\xC6";  /* EBCDIC characters "EOF"   */
  static BYTE eovlbl[] = "\xC5\xD6\xE5";  /* EBCDIC characters "EOV"   */
@@ -8,7 +8,7 @@
  static struct mt_tape_info tapeinfo[] = MT_TAPE_INFO;
  static struct mt_tape_info densinfo[] = {
      {0x01, "NRZI (800 bpi)"},
-@@ -59,6 +60,7 @@
+@@ -69,6 +70,7 @@
      {0x8C, "EXB-8505 compressed"},
      {0x90, "EXB-8205 compressed"},
      {0, NULL}};
@@ -16,15 +16,15 @@
  static BYTE buf[65500];
  
  /*-------------------------------------------------------------------*/
-@@ -71,6 +73,7 @@
+@@ -76,6 +78,7 @@
  /*-------------------------------------------------------------------*/
  static void print_status (BYTE *devname, long stat)
  {
 +#ifdef GNU_MTIO_SUPPORT
-     printf ("%s status: %8.8lX", devname, stat);
+     printf ("HHCTC015I %s status: %8.8lX", devname, stat);
      if (GMT_EOF(stat)) printf (" EOF");
      if (GMT_BOT(stat)) printf (" BOT");
-@@ -84,6 +87,7 @@
+@@ -89,6 +92,7 @@
      if (GMT_D_800(stat)) printf (" 800");
      if (GMT_DR_OPEN(stat)) printf (" NOTAPE");
      printf ("\n");
@@ -32,7 +32,7 @@
  
  } /* end function print_status */
  
-@@ -104,10 +108,12 @@
+@@ -109,10 +113,12 @@
          return -1;
      }
  
@@ -45,7 +45,7 @@
  
      return 0;
  } /* end function print_status */
-@@ -188,6 +194,7 @@
+@@ -205,6 +211,7 @@
          exit (7);
      }
  
@@ -53,7 +53,7 @@
      /* Display tape status information */
      for (i = 0; tapeinfo[i].t_type != 0
                  && tapeinfo[i].t_type != stblk.mt_type; i++);
-@@ -215,6 +222,7 @@
+@@ -233,6 +240,7 @@
  
      /* Set the tape device to process variable length blocks */
      opblk.mt_op = MTSETBLK;