pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

sdl-hercules-hyperion: update to 4.3



Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Mon Nov 30 21:22:08 2020 +0100
Changeset:	f45633c335c06c8c8875ae3b3714c72ab16417b2

Modified Files:
	sdl-hercules-hyperion/Makefile
	sdl-hercules-hyperion/PLIST
	sdl-hercules-hyperion/distinfo
	sdl-hercules-hyperion/patches/patch-Makefile.am
	sdl-hercules-hyperion/patches/patch-configure.ac
	sdl-hercules-hyperion/patches/patch-hifr.h
	sdl-hercules-hyperion/patches/patch-tuntap.c
Added Files:
	sdl-hercules-hyperion/patches/patch-msgenu.h
Removed Files:
	sdl-hercules-hyperion/patches/patch-autoconf_hercules.m4
	sdl-hercules-hyperion/patches/patch-hercifc.c
	sdl-hercules-hyperion/patches/patch-hostopts.h
	sdl-hercules-hyperion/patches/patch-hscutl.c
	sdl-hercules-hyperion/patches/patch-hthreads.h
	sdl-hercules-hyperion/patches/patch-htypes.h
	sdl-hercules-hyperion/patches/patch-tuntap.h

Log Message:
sdl-hercules-hyperion: update to 4.3

What's new in release 4.3

Release date: 28 November 2020
Official Source and Binaries: Release_4.3
Refer to the Release notes for SDL Hyperion 4.3 web page
for important and more detailed information regarding some of the changes in this release.

    Fix ULONG_PTR typedef build errors on RHEL 6.10 (#245)
    Add missing 3203 printer to DEVEQU table (#250)
    Fix driver code incompatibility with other Herculeses (#251)
    Fix issue where thread names are incorrectly set (#254)
    Fix missing timestamp in daemon mode; add DATESTAMP option (#259), (#260)
    Fix CNSLPORT to honor new updated setting (#318)
    Watchdog monitoring reinstated.
    New PANOPT option MSGCOLOR=DARK/LIGHT
    Fix hang/deadlock in device-attention function (#277)
    Improved CTCE driver functionality (#269), (#273)
    TCPNJE device support. Refer to the README.TCPNJE document for details (#280)
    TCPNJE Connectivity And Stability Enhancements
    Fix RARP (Reverse ARP) Ethernet frame type constant
    Fix Linux panel high CPU usage (#289)
    Fix z/VM guest architecture switching (#295)
    Fix for IPL command without a LOADPARM (#296)
    Work around VS2019 compiler C4789 Warning bug.
    Fix crash if incomplete network device group defined.
    Fix ooRexx v5.0.0. load failure on Apple Mac (#301)
    Fix crash in CCKD dasd termination logic (#303)
    Fix KIMD instruction
    Fix VM FixPage assist
    Fix channel prefetch buffer overrun crash (#319)
    Fix instruction stepping invalidation/refetch bug (#321)
    New z15 Secure Boot (Secure IPL) Diagnose 0x308 support
    Preliminary (Experimental) Transactional-Execution Facility (TXF) support (#263)
    MANY other internal fixes and improvements

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f45633c335c06c8c8875ae3b3714c72ab16417b2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 sdl-hercules-hyperion/Makefile                     |  3 +-
 sdl-hercules-hyperion/PLIST                        |  3 +
 sdl-hercules-hyperion/distinfo                     | 21 ++---
 sdl-hercules-hyperion/patches/patch-Makefile.am    | 10 +--
 .../patches/patch-autoconf_hercules.m4             | 15 ----
 sdl-hercules-hyperion/patches/patch-configure.ac   | 92 +---------------------
 sdl-hercules-hyperion/patches/patch-hercifc.c      | 15 ----
 sdl-hercules-hyperion/patches/patch-hifr.h         | 20 +++--
 sdl-hercules-hyperion/patches/patch-hostopts.h     | 34 --------
 sdl-hercules-hyperion/patches/patch-hscutl.c       | 16 ----
 sdl-hercules-hyperion/patches/patch-hthreads.h     | 19 -----
 sdl-hercules-hyperion/patches/patch-htypes.h       | 16 ----
 sdl-hercules-hyperion/patches/patch-msgenu.h       | 15 ++++
 sdl-hercules-hyperion/patches/patch-tuntap.c       |  2 +-
 sdl-hercules-hyperion/patches/patch-tuntap.h       | 15 ----
 15 files changed, 44 insertions(+), 252 deletions(-)

diffs:
diff --git a/sdl-hercules-hyperion/Makefile b/sdl-hercules-hyperion/Makefile
index cb2edefa9c..1ec96636de 100644
--- a/sdl-hercules-hyperion/Makefile
+++ b/sdl-hercules-hyperion/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD$
 
-PKGNAME=	sdl-hercules-hyperion-4.2.1
-PKGREVISION=	1
+PKGNAME=	sdl-hercules-hyperion-4.3
 DISTNAME=	Release_${PKGVERSION_NOREV}
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
diff --git a/sdl-hercules-hyperion/PLIST b/sdl-hercules-hyperion/PLIST
index 4ff33e4028..2ea987b031 100644
--- a/sdl-hercules-hyperion/PLIST
+++ b/sdl-hercules-hyperion/PLIST
@@ -58,9 +58,11 @@ lib/hercules/hdt3420.la
 lib/hercules/hdt3505.la
 lib/hercules/hdt3525.la
 lib/hercules/hdt3705.la
+lib/hercules/hdtdummy.la
 lib/hercules/hdteq.la
 lib/hercules/hdtptp.la
 lib/hercules/hdtqeth.la
+lib/hercules/hdttcpnje.la
 lib/hercules/hdtzfcp.la
 lib/libhdt3420_not_mod.la
 lib/libherc.la
@@ -77,6 +79,7 @@ share/hercules/TMOUNT.txt
 share/hercules/awssl-v19g
 share/hercules/awswrite.jcl
 share/hercules/cckddasd.html
+share/hercules/cckddu64.hla
 share/hercules/cckddump.hla
 share/hercules/cckdload.hla
 share/hercules/fishgui.html
diff --git a/sdl-hercules-hyperion/distinfo b/sdl-hercules-hyperion/distinfo
index 3d2a9ab3ad..d08b936508 100644
--- a/sdl-hercules-hyperion/distinfo
+++ b/sdl-hercules-hyperion/distinfo
@@ -1,19 +1,12 @@
 $NetBSD$
 
-SHA1 (Release_4.2.1.tar.gz) = ca2f9c802c05c4ddd528718c2a3b4df01ae09564
-RMD160 (Release_4.2.1.tar.gz) = cc8fd7e5deb2b2a857215172c13b237f1525858b
-SHA512 (Release_4.2.1.tar.gz) = 8d8e94136b3ffa57fc03f687c3b8662ccffb150a29904e911d2383eadd09ae732e73c1712e00bf9a8350fbdd31936f10c498e64574c4bd4316e82c1fb535ca68
-Size (Release_4.2.1.tar.gz) = 11124925 bytes
-SHA1 (patch-Makefile.am) = 354add1d50bbbc09226e848f6b2e7350ad34f915
-SHA1 (patch-autoconf_hercules.m4) = 2ea0beaa0a0470050f0c41befcaebd9f73dad4d5
-SHA1 (patch-configure.ac) = 5e2a92b3530fa4bd61a4f1e28ff98eab20f7d1b5
-SHA1 (patch-hercifc.c) = 5661ca325cb3575726a44ecadbaeb951fcf2d0fd
+SHA1 (Release_4.3.tar.gz) = 45d756c88b495a932b9aa582868c1c76a2ea0f4f
+RMD160 (Release_4.3.tar.gz) = 2552fbe36d0db1dc630e734ea46dcca0d32bb73a
+SHA512 (Release_4.3.tar.gz) = e2591b16ecc08f952f16c013764a1d6bfd88aafe9620130dca9619a8af47f2cc04af7d7552c08f75ff6000854fe8e698350b344dbb573551701a610df68fd00a
+Size (Release_4.3.tar.gz) = 11609664 bytes
+SHA1 (patch-Makefile.am) = 85b65386cfde0d7c180abaeaab67e05ad7d07385
+SHA1 (patch-configure.ac) = ccec25f9f20ae0263905ccaea9e30a2aff6660fd
 SHA1 (patch-hercules.cnf) = cd0a09d39175e9673dab785703d2f8c1b92c8dc6
-SHA1 (patch-hifr.h) = d364bbd32143cf137aed84eb79f5af9f62f8210b
-SHA1 (patch-hostopts.h) = d464925f82570cbcf368f0b76d1b545a5eebacfd
-SHA1 (patch-hscutl.c) = 72ff77bff284e63bc42e124b56051fe735f74de6
-SHA1 (patch-hthreads.h) = 25004a78c3fd0a803c5f4e0b0de8d05819602ac9
-SHA1 (patch-htypes.h) = 7e057ae370b266758176fbe13964581cac5004f0
+SHA1 (patch-hifr.h) = 8c1164bdc04afb19aa3254f33ef5c6349e1bcf58
 SHA1 (patch-msgenu.h) = 89a1ac7373da138e79e3538aaaf96f85d07ab873
 SHA1 (patch-tuntap.c) = 9fc0be227907ae0eca4bb41c95be8c3540d6def5
-SHA1 (patch-tuntap.h) = 24946aab519beb6185800801f2bb38dccfdfef94
diff --git a/sdl-hercules-hyperion/patches/patch-Makefile.am b/sdl-hercules-hyperion/patches/patch-Makefile.am
index 0fca93453c..7b480b6a2a 100644
--- a/sdl-hercules-hyperion/patches/patch-Makefile.am
+++ b/sdl-hercules-hyperion/patches/patch-Makefile.am
@@ -3,7 +3,7 @@ $NetBSD$
 * Fix build. Use devel/libltdl instead of internal libltdl.
 - Build dynamic modules only dynamic (-shared), not also static.
 
---- Makefile.am.orig	2019-09-10 18:06:20.000000000 +0000
+--- Makefile.am.orig	2020-11-27 18:45:12.000000000 +0000
 +++ Makefile.am
 @@ -11,7 +11,7 @@ extpkg_headers = @EXTPKG_HEADERS@
  extpkg_ldadd   = @EXTPKG_LDADD@
@@ -14,7 +14,7 @@ $NetBSD$
  
  #------------------------------------------------------------------------------
  
-@@ -140,9 +140,9 @@ dyndev_SRC =  \
+@@ -142,9 +142,9 @@ dyndev_SRC =  \
  #                    to Windows DLLs
  #-----------------------------------------------------------------
  
@@ -26,7 +26,7 @@ $NetBSD$
  
  DYNMOD_LD_FLAGS =   \
    -module           \
-@@ -500,7 +500,6 @@ libherc_la_SOURCES = \
+@@ -512,7 +512,6 @@ libherc_la_SOURCES = \
    $(DYNSRC)
  
  EXTRA_libherc_la_SOURCES = \
@@ -34,8 +34,8 @@ $NetBSD$
    memrchr.c          \
    $(dynamic_SRC)     \
    $(dyndev_SRC)      \
-@@ -939,7 +938,6 @@ noinst_HEADERS =          \
-   inline.h                \
+@@ -956,7 +955,6 @@ noinst_HEADERS =          \
+   instfmts.h              \
    linklist.h              \
    logger.h                \
 -  ltdl.h                  \
diff --git a/sdl-hercules-hyperion/patches/patch-autoconf_hercules.m4 b/sdl-hercules-hyperion/patches/patch-autoconf_hercules.m4
deleted file mode 100644
index f7fde8c636..0000000000
--- a/sdl-hercules-hyperion/patches/patch-autoconf_hercules.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-test == is not portable.
-
---- autoconf/hercules.m4.orig	2019-09-10 18:06:20.000000000 +0000
-+++ autoconf/hercules.m4
-@@ -187,7 +187,7 @@ AC_DEFUN( [HC_GET_C11_LOCK_FREE_VALUE],
- [
-     c11_lock_free_name="$1"
- 
--    if test "x$c11_lock_free_name" == "x"; then
-+    if test "x$c11_lock_free_name" = "x"; then
-         # PROGRAMMING NOTE: note special m4 escape syntax used in the below
-         # message. Without it, our function name is (infinitely and recursively?)
-         # expanded to our actual (as-yet not yet fully defined!) macro VALUE(!),
diff --git a/sdl-hercules-hyperion/patches/patch-configure.ac b/sdl-hercules-hyperion/patches/patch-configure.ac
index ddbdd62eac..6cf26535c8 100644
--- a/sdl-hercules-hyperion/patches/patch-configure.ac
+++ b/sdl-hercules-hyperion/patches/patch-configure.ac
@@ -1,97 +1,11 @@
 $NetBSD$
 
-- test == is not portable.
-* 9efbcb8e This looks like a typo (variable does not match header file name)
-* e8c20aa1 More careful use of includes when testing for further features.
-* 73498d3c Add configure check for pthread_rwlockattr_setpshared().
 - Avoid -march=xxx because it makes binaries nonportable.
 
 
 --- configure.ac.orig	2019-09-10 18:06:20.000000000 +0000
 +++ configure.ac
-@@ -684,7 +684,7 @@ AC_CHECK_HEADERS( linux/ipv6.h,   [hc_cv
-       #include <sys/socket.h>
-     #endif
- ] )
--AC_CHECK_HEADERS( net/if_var.h,   [hc_cv_have_net_in_var_h=yes],   [hc_cv_have_net_in_var_h=no],
-+AC_CHECK_HEADERS( net/if_var.h,   [hc_cv_have_net_if_var_h=yes],   [hc_cv_have_net_if_var_h=no],
- [
-     #include <sys/types.h>
-     #ifdef HAVE_SYS_SOCKET_H
-@@ -700,8 +700,10 @@ AC_CHECK_HEADERS( netinet/in_var.h,  [hc
-     #ifdef HAVE_SYS_SOCKET_H
-       #include <sys/socket.h>
-     #endif
--    #ifdef HAVE_NET_IF_VAR_H
-+    #ifdef HAVE_NET_IF_H
-       #include <net/if.h>
-+    #endif
-+    #ifdef HAVE_NET_IF_VAR_H
-       #include <net/if_var.h>
-     #endif
-     #ifdef HAVE_NETINET_IN_H
-@@ -714,12 +716,16 @@ AC_CHECK_HEADERS( netinet6/in6_var.h,  [
-     #ifdef HAVE_SYS_SOCKET_H
-       #include <sys/socket.h>
-     #endif
--    #ifdef HAVE_NET_IF_VAR_H
-+    #ifdef HAVE_NET_IF_H
-       #include <net/if.h>
-+    #endif
-+    #ifdef HAVE_NET_IF_VAR_H
-       #include <net/if_var.h>
-     #endif
--    #ifdef HAVE_NETINET_IN_VAR_H
-+    #ifdef HAVE_NETINET_IN_H
-       #include <netinet/in.h>
-+    #endif
-+    #ifdef HAVE_NETINET_IN_VAR_H
-       #include <netinet/in_var.h>
-     #endif
- ] )
-@@ -1054,6 +1060,14 @@ if test "$hc_cv_have_getsetuid" != "yes"
- fi
- 
- 
-+if test "$hc_cv_have_pthread_h" = "yes"; then
-+    save_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS -pthread"
-+    AC_CHECK_FUNCS( pthread_create ) dnl tester for method of checking...
-+    AC_CHECK_FUNCS( pthread_rwlockattr_setpshared )
-+    CFLAGS="$save_CFLAGS"
-+fi
-+
- #  FIXME: Disabled because some builtin ffs seem to be causing a problem.
- #         (gcc 3.4 barfs on certain 'march=' settings?)
- #AC_CHECK_FUNCS( ffs )
-@@ -1139,10 +1153,16 @@ AC_CHECK_MEMBERS( [struct in6_ifreq.ifr_
-     #ifdef HAVE_LINUX_IPV6_H
-       #include <linux/ipv6.h>
-     #endif
--    #ifdef HAVE_NETINET6_IN6_VAR_H
-+    #ifdef HAVE_NET_IF_H
-       #include <net/if.h>
-+    #endif
-+    #ifdef HAVE_NET_IF_VAR_H
-       #include <net/if_var.h>
-+    #endif
-+    #ifdef HAVE_NETINET_IN_H
-       #include <netinet/in.h>
-+    #endif
-+    #ifdef HAVE_NETINET6_IN6_VAR_H
-       #include <netinet/in_var.h>  // Not the ipv6 file, please
-     #endif
- ] )
-@@ -1202,7 +1222,7 @@ AC_CHECK_SIZEOF(size_t)
- AC_CHECK_SIZEOF(int *)
- AC_CHECK_SIZEOF(off_t)
- 
--if test "$hc_cv_have_pthread_h" == "yes"; then
-+if test "$hc_cv_have_pthread_h" = "yes"; then
-   AC_CHECK_SIZEOF(pthread_t)
- fi
- 
-@@ -2740,7 +2760,8 @@ if test "$hc_cv_auto_optimize" = "yes"; 
+@@ -2828,7 +2828,8 @@ if test "$hc_cv_auto_optimize" = "yes"; 
      if test "$hc_cv_is_intel_x86_arch" = "yes"; then
  
          # Set CPU type
@@ -101,7 +15,7 @@ $NetBSD$
  
          # Dynamically inline small block string operations
          # (subroutine calls still made for large area calls)
-@@ -2943,9 +2964,9 @@ test  "$hc_cv_is_mingw"    =  "yes"  && 
+@@ -3031,9 +3032,9 @@ test  "$hc_cv_is_mingw"    =  "yes"  && 
  #------------------------------------------------------#
  
  if test "$hc_cv_opt_debug" = "yes"; then
@@ -113,7 +27,7 @@ $NetBSD$
  fi
  
  AC_CACHE_SAVE()
-@@ -3141,10 +3162,11 @@ extpkg_ldadd="${crypto_libdir}/${crypto_
+@@ -3229,10 +3231,11 @@ extpkg_ldadd="${crypto_libdir}/${crypto_
  ##----------------------------------------------------------------
  ##                         DEBUGGING
  ##----------------------------------------------------------------
diff --git a/sdl-hercules-hyperion/patches/patch-hercifc.c b/sdl-hercules-hyperion/patches/patch-hercifc.c
deleted file mode 100644
index 0c276c3ae5..0000000000
--- a/sdl-hercules-hyperion/patches/patch-hercifc.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-NetBSD doesn't have TUNSETIFF.
-
---- hercifc.c.orig	2019-09-10 18:06:20.000000000 +0000
-+++ hercifc.c
-@@ -115,7 +115,7 @@ int main( int argc, char **argv )
- 
-         switch( ctlreq.iCtlOp )
-         {
--#if !defined(__APPLE__) && !defined(__FreeBSD__)
-+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-         case TUNSETIFF:
-             pOp  = "TUNSETIFF";
-             pArg = &ctlreq.iru.hifr.ifreq;
diff --git a/sdl-hercules-hyperion/patches/patch-hifr.h b/sdl-hercules-hyperion/patches/patch-hifr.h
index 7760fca53a..2932ce2971 100644
--- a/sdl-hercules-hyperion/patches/patch-hifr.h
+++ b/sdl-hercules-hyperion/patches/patch-hifr.h
@@ -1,15 +1,13 @@
 $NetBSD$
 
-NetBSD is like FreeBSD here.
-
---- hifr.h.orig	2019-09-10 18:06:20.000000000 +0000
+--- hifr.h.orig	2020-11-30 19:36:38.734299287 +0000
 +++ hifr.h
-@@ -110,7 +110,7 @@ struct hifr
- };
- typedef struct hifr hifr;
- 
--#if defined(__APPLE__) || defined(__FreeBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
-   #define  hifr_name       ifreq.ifr_name
+@@ -119,7 +119,7 @@ typedef struct hifr hifr;
+   #define  hifr_netmask    ifreq.ifr_ifru.ifru_netmask
+   #define  hifr_broadaddr  ifreq.ifr_ifru.ifru_broadaddr
+   #define  hifr_hwaddr     ifreq.ifr_ifru.ifru_hwaddr
+-#if defined( FREEBSD_OR_NETBSD )
++#if defined( __FreeBSD__ )
+   /* short   ifru_flags[2];                                          */
+   #define  hifr_flags      ifreq.ifr_ifru.ifru_flags[0]
  #else
-   #define  hifr_name       ifreq.ifr_ifrn.ifrn_name
diff --git a/sdl-hercules-hyperion/patches/patch-hostopts.h b/sdl-hercules-hyperion/patches/patch-hostopts.h
deleted file mode 100644
index cbf67198c2..0000000000
--- a/sdl-hercules-hyperion/patches/patch-hostopts.h
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-Add "Hard-coded NetBSD-specific features and options..."
-    
-all of these should really be configure checks of course...
-
---- hostopts.h.orig	2019-09-10 18:06:20.000000000 +0000
-+++ hostopts.h
-@@ -297,6 +297,25 @@
- 
- 
- /*-------------------------------------------------------------------*/
-+/* Hard-coded NetBSD-specific features and options...                */
-+/*-------------------------------------------------------------------*/
-+#elif defined(__NetBSD__)               /* "NetBSD" options          */
-+
-+#define DLL_IMPORT   extern
-+#define DLL_EXPORT
-+#define TUNTAP_IFF_RUNNING_NEEDED       /* Needed by tuntap driver?? */
-+#undef  OPTION_SCSI_ERASE_TAPE          /* (NOT supported)           */
-+#undef  OPTION_SCSI_ERASE_GAP           /* (NOT supported)           */
-+#define MAX_DEVICE_THREADS          0   /* (0 == unlimited)          */
-+#define MIXEDCASE_FILENAMES_ARE_UNIQUE  /* ("Foo" and "fOo" unique)  */
-+#define HOW_TO_IMPLEMENT_SH_COMMAND       USE_ANSI_SYSTEM_API_FOR_SH_COMMAND
-+#define SET_CONSOLE_CURSOR_SHAPE_METHOD   CURSOR_SHAPE_NOT_SUPPORTED
-+#undef  OPTION_EXTCURS                  /* Normal cursor handling    */
-+#define SCANDIR_CONST_STRUCT_DIRENT     /* define if scandir uses
-+                                           const for struct dirent   */
-+
-+
-+/*-------------------------------------------------------------------*/
- /* Hard-coded GNU Linux-specific features and options...             */
- /*-------------------------------------------------------------------*/
- #elif defined(__gnu_linux__)            /* GNU Linux options         */
diff --git a/sdl-hercules-hyperion/patches/patch-hscutl.c b/sdl-hercules-hyperion/patches/patch-hscutl.c
deleted file mode 100644
index 9f807c797d..0000000000
--- a/sdl-hercules-hyperion/patches/patch-hscutl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Wrong number of arguments to pthread_setname_np:
-pthread_setname_np(pthread_t thread, const char *name, void *arg);
-
---- hscutl.c.orig	2019-09-10 18:06:20.000000000 +0000
-+++ hscutl.c
-@@ -1660,7 +1660,7 @@ DLL_EXPORT int nix_set_thread_name( pthr
-         return EINVAL;
-     rc = pthread_setname_np( threadname );
- #else
--    rc = pthread_setname_np( tid, threadname );
-+    rc = pthread_setname_np( tid, threadname, 0 );
- #endif
- 
-     /* Ignore any error; it either worked or it didn't */
diff --git a/sdl-hercules-hyperion/patches/patch-hthreads.h b/sdl-hercules-hyperion/patches/patch-hthreads.h
deleted file mode 100644
index c642459886..0000000000
--- a/sdl-hercules-hyperion/patches/patch-hthreads.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-pthread_rwlockattr_setpshared(3) is hidden on NetBSD; use configure to check for it.
-
---- hthreads.h.orig	2019-09-10 18:06:20.000000000 +0000
-+++ hthreads.h
-@@ -164,7 +164,11 @@ typedef pthread_rwlock_t        HRWLOCK;
- #define hthread_mutex_destroy( plk )            pthread_mutex_destroy( plk )
- 
- #define hthread_rwlockattr_init( pla )          pthread_rwlockattr_init( pla )
--#define hthread_rwlockattr_setpshared( pla, s ) pthread_rwlockattr_setpshared( (pla), (s) )
-+#if HAVE_PTHREAD_RWLOCKATTR_SETPSHARED
-+# define hthread_rwlockattr_setpshared( pla, s ) pthread_rwlockattr_setpshared( (pla), (s) )
-+#else /* HAVE_PTHREAD_RWLOCKATTR_SETPSHARED*/
-+# define hthread_rwlockattr_setpshared( pla, s ) 0
-+#endif /* HAVE_PTHREAD_RWLOCKATTR_SETPSHARED*/
- #define hthread_rwlockattr_destroy( pla )       pthread_rwlockattr_destroy( pla )
- 
- #define hthread_rwlock_init( plk, pla )         pthread_rwlock_init( (plk), (pla) )
diff --git a/sdl-hercules-hyperion/patches/patch-htypes.h b/sdl-hercules-hyperion/patches/patch-htypes.h
deleted file mode 100644
index c38c458de3..0000000000
--- a/sdl-hercules-hyperion/patches/patch-htypes.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Can't re-#define int32_t; this is a reserved name.
-
---- htypes.h.orig	2019-09-10 18:06:20.000000000 +0000
-+++ htypes.h
-@@ -48,7 +48,9 @@
- 
- #endif
- 
-+#ifndef int32_t
- #define int32_t                 int32_t         /* (used by extpkgs) */
-+#endif
- 
- #ifndef HAVE_U_INT8_T
-   typedef uint8_t               u_int8_t;
diff --git a/sdl-hercules-hyperion/patches/patch-msgenu.h b/sdl-hercules-hyperion/patches/patch-msgenu.h
new file mode 100644
index 0000000000..9db70b4532
--- /dev/null
+++ b/sdl-hercules-hyperion/patches/patch-msgenu.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- msgenu.h.orig	2019-09-10 18:06:20.000000000 +0000
++++ msgenu.h
+@@ -322,8 +322,8 @@ LOGM_DLL_IMPORT int  panel_command_captu
+ #define HHC00153 "Net device %s: Invalid prefix length %s"
+ #define HHC00154 "Preconfigured interface %s does not exist or is not accessible by Hercules (EPERM)"
+ #define HHC00155 "Net device %s: Invalid broadcast address %s"
+-//efine HHC00156 (available)
+-//efine HHC00157 (available)
++#define HHC00156 "IFF_TUN requested but not a tun device: %s"
++#define HHC00157 "IFF_TAP requested but not a tap device: %s"
+ //efine HHC00158 (available)
+ //efine HHC00159 (available)
+ #define HHC00160 "SCP %scommand: %s"
diff --git a/sdl-hercules-hyperion/patches/patch-tuntap.c b/sdl-hercules-hyperion/patches/patch-tuntap.c
index b299fcb45b..4739cb75a5 100644
--- a/sdl-hercules-hyperion/patches/patch-tuntap.c
+++ b/sdl-hercules-hyperion/patches/patch-tuntap.c
@@ -1,6 +1,6 @@
 $NetBSD$
 
-NetBSD is totally different. Patch the whole file out for now.
+NetBSD is not Linux. Conditionalize the compilation of Linux stuff.
 
 --- tuntap.c.orig	2019-09-10 18:06:20.000000000 +0000
 +++ tuntap.c
diff --git a/sdl-hercules-hyperion/patches/patch-tuntap.h b/sdl-hercules-hyperion/patches/patch-tuntap.h
deleted file mode 100644
index 475cda0f5c..0000000000
--- a/sdl-hercules-hyperion/patches/patch-tuntap.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-NetBSD also uses "/dev/tun".
-
---- tuntap.h.orig	2019-09-10 18:06:20.000000000 +0000
-+++ tuntap.h
-@@ -25,7 +25,7 @@
- //  TunTap ioctl codes and Standard and TUNSETIFF ifr interface flags
- // ====================================================================
- 
--#if defined(__APPLE__) || defined(__FreeBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
-   #define  HERCTUN_DEV  "/dev/tun"     // Default TUN/TAP char dev
- #else
-   #define  HERCTUN_DEV  "/dev/net/tun"  // Default TUN/TAP char dev


Home | Main Index | Thread Index | Old Index