pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/hercules4sdl*: moved to pkgsrc emulators/hercules4sdl.
Module Name: pkgsrc-wip
Committed By: Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By: rhialto
Date: Sun Nov 7 17:31:24 2021 +0100
Changeset: 85c310c36ef81b4cedd6658624ae3a5e435a40f1
Modified Files:
Makefile
Removed Files:
hercules4sdl-crypto/DESCR
hercules4sdl-crypto/Makefile
hercules4sdl-crypto/PLIST
hercules4sdl-crypto/buildlink3.mk
hercules4sdl-crypto/distinfo
hercules4sdl-crypto/patches/patch-cflags.txt
hercules4sdl-decnumber/DESCR
hercules4sdl-decnumber/Makefile
hercules4sdl-decnumber/PLIST
hercules4sdl-decnumber/buildlink3.mk
hercules4sdl-decnumber/distinfo
hercules4sdl-decnumber/patches/patch-cflags.txt
hercules4sdl-softfloat/DESCR
hercules4sdl-softfloat/Makefile
hercules4sdl-softfloat/PLIST
hercules4sdl-softfloat/buildlink3.mk
hercules4sdl-softfloat/distinfo
hercules4sdl-softfloat/patches/patch-cflags.txt
hercules4sdl-telnet/DESCR
hercules4sdl-telnet/Makefile
hercules4sdl-telnet/PLIST
hercules4sdl-telnet/buildlink3.mk
hercules4sdl-telnet/distinfo
hercules4sdl-telnet/patches/patch-cflags.txt
hercules4sdl/DESCR
hercules4sdl/Makefile
hercules4sdl/PLIST
hercules4sdl/distinfo
hercules4sdl/patches/patch-Makefile.am
hercules4sdl/patches/patch-configure.ac
hercules4sdl/patches/patch-hifr.h
hercules4sdl/patches/patch-msgenu.h
hercules4sdl/patches/patch-tuntap.c
Log Message:
wip/hercules4sdl*: moved to pkgsrc emulators/hercules4sdl.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=85c310c36ef81b4cedd6658624ae3a5e435a40f1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 5 -
hercules4sdl-crypto/DESCR | 8 -
hercules4sdl-crypto/Makefile | 30 ----
hercules4sdl-crypto/PLIST | 10 --
hercules4sdl-crypto/buildlink3.mk | 14 --
hercules4sdl-crypto/distinfo | 7 -
hercules4sdl-crypto/patches/patch-cflags.txt | 33 ----
hercules4sdl-decnumber/DESCR | 17 --
hercules4sdl-decnumber/Makefile | 30 ----
hercules4sdl-decnumber/PLIST | 14 --
hercules4sdl-decnumber/buildlink3.mk | 14 --
hercules4sdl-decnumber/distinfo | 7 -
hercules4sdl-decnumber/patches/patch-cflags.txt | 33 ----
hercules4sdl-softfloat/DESCR | 17 --
hercules4sdl-softfloat/Makefile | 30 ----
hercules4sdl-softfloat/PLIST | 11 --
hercules4sdl-softfloat/buildlink3.mk | 14 --
hercules4sdl-softfloat/distinfo | 7 -
hercules4sdl-softfloat/patches/patch-cflags.txt | 33 ----
hercules4sdl-telnet/DESCR | 16 --
hercules4sdl-telnet/Makefile | 30 ----
hercules4sdl-telnet/PLIST | 6 -
hercules4sdl-telnet/buildlink3.mk | 14 --
hercules4sdl-telnet/distinfo | 7 -
hercules4sdl-telnet/patches/patch-cflags.txt | 33 ----
hercules4sdl/DESCR | 12 --
hercules4sdl/Makefile | 56 -------
hercules4sdl/PLIST | 198 ------------------------
hercules4sdl/distinfo | 11 --
hercules4sdl/patches/patch-Makefile.am | 44 ------
hercules4sdl/patches/patch-configure.ac | 45 ------
hercules4sdl/patches/patch-hifr.h | 15 --
hercules4sdl/patches/patch-msgenu.h | 17 --
hercules4sdl/patches/patch-tuntap.c | 61 --------
34 files changed, 899 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 575b49a9f5..d400b18957 100644
--- a/Makefile
+++ b/Makefile
@@ -5166,11 +5166,6 @@ SUBDIR+= sdd
SUBDIR+= sddm
SUBDIR+= sdict-tools
SUBDIR+= sdif-git
-SUBDIR+= sdl-hercules-crypto
-SUBDIR+= sdl-hercules-decnumber
-SUBDIR+= sdl-hercules-hyperion
-SUBDIR+= sdl-hercules-softfloat
-SUBDIR+= sdl-hercules-telnet
SUBDIR+= sds
SUBDIR+= seafile-client
SUBDIR+= seafile-gui
diff --git a/hercules4sdl-crypto/DESCR b/hercules4sdl-crypto/DESCR
deleted file mode 100644
index f1e0f37e79..0000000000
--- a/hercules4sdl-crypto/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Simple AES/DES encryption and SHA1/SHA2 hashing library
-
-Crypto provides a simple implementation of the Rijndael (now AES) and DES
-encryption algorithms as well as the SHA1 and SHA2 hashing algorithms. The
-library is almost a verbatim copy of the code from OpenBSD and PuTTY.
-
-This version is the one used by the SoftDevLabs version of
-Hercules 4.x (Hyperion).
diff --git a/hercules4sdl-crypto/Makefile b/hercules4sdl-crypto/Makefile
deleted file mode 100644
index e472a4ccaa..0000000000
--- a/hercules4sdl-crypto/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD$
-
-DISTNAME= hercules4sdl-crypto-1.0.0
-PKGREVISION= 20210105
-CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
-GITHUB_PROJECT= crypto
-GITHUB_TAG= 837705eff938ca044f2eab5f1ea5cd83b2b0ece7 # 5 Jan 2021
-
-MAINTAINER= rhialto%NetBSD.org@localhost
-HOMEPAGE= https://github.com/SDL-Hercules-390/crypto
-COMMENT= The SoftDevLabs version of crypto for Hercules 4.x
-LICENSE= modified-bsd # some parts are less restricted
-
-USE_TOOLS+= cmake
-USE_LANGUAGES+= c
-
-USE_CMAKE= yes
-BLDDIR= ${WRKDIR}/crypto64.Release
-CONFIGURE_DIRS= ${BLDDIR}
-CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/hercules4sdl
-
-pre-configure:
- ${MKDIR} ${BLDDIR}
-
-post-install:
- cd ${DESTDIR}${PREFIX}/lib/hercules4sdl/lib && ${MV} libcrypto64.a libcrypto_pic.a
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/hercules4sdl-crypto/PLIST b/hercules4sdl-crypto/PLIST
deleted file mode 100644
index d0bede82c0..0000000000
--- a/hercules4sdl-crypto/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD$
-lib/hercules4sdl/crypto.LICENSE.txt
-lib/hercules4sdl/crypto.README.txt
-lib/hercules4sdl/include/crypto.h
-lib/hercules4sdl/include/crypto_version.h
-lib/hercules4sdl/include/rijndael.h
-lib/hercules4sdl/include/sha1.h
-lib/hercules4sdl/include/sha2.h
-lib/hercules4sdl/include/sshdes.h
-lib/hercules4sdl/lib/libcrypto_pic.a
diff --git a/hercules4sdl-crypto/buildlink3.mk b/hercules4sdl-crypto/buildlink3.mk
deleted file mode 100644
index 984356644f..0000000000
--- a/hercules4sdl-crypto/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= hercules4sdl-crypto
-
-.if !defined(HERCULES4SDL_CRYPTO_BUILDLINK3_MK)
-HERCULES4SDL_CRYPTO_BUILDLINK3_MK:=
-
-BUILDLINK_DEPMETHOD.hercules4sdl-crypto?= build
-
-BUILDLINK_API_DEPENDS.hercules4sdl-crypto+= hercules4sdl-crypto>=1.0.0
-BUILDLINK_PKGSRCDIR.hercules4sdl-crypto?= ../../wip/hercules4sdl-crypto
-.endif # HERCULES4SDL_CRYPTO_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -hercules4sdl-crypto
diff --git a/hercules4sdl-crypto/distinfo b/hercules4sdl-crypto/distinfo
deleted file mode 100644
index 6656e98e25..0000000000
--- a/hercules4sdl-crypto/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-SHA1 (hercules4sdl-crypto-1.0.0-837705eff938ca044f2eab5f1ea5cd83b2b0ece7.tar.gz) = a249ea5a4dad5522cb86c60dbbc89fd8f13dff3f
-RMD160 (hercules4sdl-crypto-1.0.0-837705eff938ca044f2eab5f1ea5cd83b2b0ece7.tar.gz) = 1e5ed0aa98ca2aca7ab9a4e4324fab902688b1b4
-SHA512 (hercules4sdl-crypto-1.0.0-837705eff938ca044f2eab5f1ea5cd83b2b0ece7.tar.gz) = 295d9f04b27e35d9c22a6709583840170675796cf1896350bb2463689e6fe0d5adce6b224bbf924946b7ccb2d2a52496982f5f529411938af12974a2549e4b38
-Size (hercules4sdl-crypto-1.0.0-837705eff938ca044f2eab5f1ea5cd83b2b0ece7.tar.gz) = 81375 bytes
-SHA1 (patch-cflags.txt) = 8e5833c2d43e7973dcf9d6c442976efefac30b26
diff --git a/hercules4sdl-crypto/patches/patch-cflags.txt b/hercules4sdl-crypto/patches/patch-cflags.txt
deleted file mode 100644
index dbc1910d99..0000000000
--- a/hercules4sdl-crypto/patches/patch-cflags.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-We just want do do a native-wordsize build.
-Do not depend on the object directory name to set the wordsize.
-
---- cflags.txt.orig 2020-11-13 09:38:36.000000000 +0000
-+++ cflags.txt
-@@ -38,25 +38,8 @@ set( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMA
-
- if( NOT WIN32 )
-
-- set( TEMP_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}" )
-- set( CMAKE_REQUIRED_FLAGS "-m32" )
-- Check_C_Compiler_Flag( -m32 OK )
--
-- if( OK )
-- set( m32 "-m32" )
-- else()
- set( m32 "" )
-- endif()
--
-- set( CMAKE_REQUIRED_FLAGS "-m64" )
-- Check_C_Compiler_Flag( -m64 OK )
-- set( CMAKE_REQUIRED_FLAGS "${TEMP_CMAKE_REQUIRED_FLAGS}" )
--
-- if( OK )
-- set( m64 "-m64" )
-- else()
- set( m64 "" )
-- endif()
-
- endif()
-
diff --git a/hercules4sdl-decnumber/DESCR b/hercules4sdl-decnumber/DESCR
deleted file mode 100644
index e2bb04e943..0000000000
--- a/hercules4sdl-decnumber/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-ANSI C General Decimal Arithmetic Library
-
-The decNumber library implements the General Decimal Arithmetic Specification
-in ANSI C. This specification defines a decimal arithmetic which meets the
-requirements of commercial, financial, and human-oriented applications. It also
-matches the decimal arithmetic in the IEEE 754 Standard for Floating Point
-Arithmetic.
-
-The library fully implements the specification, and hence supports integer,
-fixed-point, and floating-point decimal numbers directly, including infinite,
-NaN (Not a Number), and subnormal values. Both arbitrary-precision and
-fixed-size representations are supported.
-
-Refer to the package's PDF file for more information.
-
-This version is the one used by the SoftDevLabs version of
-Hercules 4.x (Hyperion).
diff --git a/hercules4sdl-decnumber/Makefile b/hercules4sdl-decnumber/Makefile
deleted file mode 100644
index 5c70fde30c..0000000000
--- a/hercules4sdl-decnumber/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD$
-
-DISTNAME= hercules4sdl-decnumber-3.68.0
-PKGREVISION= 20210105
-CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
-GITHUB_PROJECT= decNumber
-GITHUB_TAG= da6650957d7dea21b5647c1fa80fa432f2891550 # 5 Jan 2021
-
-MAINTAINER= rhialto%NetBSD.org@localhost
-HOMEPAGE= https://github.com/SDL-Hercules-390/decNumber
-COMMENT= The SoftDevLabs version of decNumber for Hercules 4.x
-LICENSE= modified-bsd # in essence; see README.md
-
-USE_TOOLS+= cmake
-USE_LANGUAGES+= c
-
-USE_CMAKE= yes
-BLDDIR= ${WRKDIR}/decNumber64.Release
-CONFIGURE_DIRS= ${BLDDIR}
-CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/hercules4sdl
-
-pre-configure:
- ${MKDIR} ${BLDDIR}
-
-post-install:
- cd ${DESTDIR}${PREFIX}/lib/hercules4sdl/lib && ${MV} libdecNumber64.a libdecNumber_pic.a
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/hercules4sdl-decnumber/PLIST b/hercules4sdl-decnumber/PLIST
deleted file mode 100644
index 0240ab2cb7..0000000000
--- a/hercules4sdl-decnumber/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD$
-lib/hercules4sdl/decnumber.ERRATA
-lib/hercules4sdl/decnumber.ICU-license.html
-lib/hercules4sdl/decnumber.pdf
-lib/hercules4sdl/decnumber.readme.txt
-lib/hercules4sdl/include/decContext.h
-lib/hercules4sdl/include/decNumber.h
-lib/hercules4sdl/include/decPacked.h
-lib/hercules4sdl/include/decQuad.h
-lib/hercules4sdl/include/decimal128.h
-lib/hercules4sdl/include/decimal32.h
-lib/hercules4sdl/include/decimal64.h
-lib/hercules4sdl/include/decnumber_version.h
-lib/hercules4sdl/lib/libdecNumber_pic.a
diff --git a/hercules4sdl-decnumber/buildlink3.mk b/hercules4sdl-decnumber/buildlink3.mk
deleted file mode 100644
index 81fec7a0b1..0000000000
--- a/hercules4sdl-decnumber/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= hercules4sdl-decnumber
-
-.if !defined(HERCULES4SDL_DECNUMBER_BUILDLINK3_MK)
-HERCULES4SDL_DECNUMBER_BUILDLINK3_MK:=
-
-BUILDLINK_DEPMETHOD.hercules4sdl-decnumber?= build
-
-BUILDLINK_API_DEPENDS.hercules4sdl-decnumber+= hercules4sdl-decnumber>=3.68.0
-BUILDLINK_PKGSRCDIR.hercules4sdl-decnumber?= ../../wip/hercules4sdl-decnumber
-.endif # HERCULES4SDL_DECNUMBER_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -hercules4sdl-decnumber
diff --git a/hercules4sdl-decnumber/distinfo b/hercules4sdl-decnumber/distinfo
deleted file mode 100644
index 562d9928e4..0000000000
--- a/hercules4sdl-decnumber/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-SHA1 (hercules4sdl-decnumber-3.68.0-da6650957d7dea21b5647c1fa80fa432f2891550.tar.gz) = 8cff80716c91288d0f24ab877e1917c3be552c5e
-RMD160 (hercules4sdl-decnumber-3.68.0-da6650957d7dea21b5647c1fa80fa432f2891550.tar.gz) = c53cf8c287d45a2aa9c063bbdb14f0881ea64053
-SHA512 (hercules4sdl-decnumber-3.68.0-da6650957d7dea21b5647c1fa80fa432f2891550.tar.gz) = 3b20fa4ecb81eedc90fe919cc06dcb150f74b56771e8521a72648149135923ce3dd19e7b66e0ce660bb66b8e3ff4aa5be38be71b2e9f1de44978e755498f00f2
-Size (hercules4sdl-decnumber-3.68.0-da6650957d7dea21b5647c1fa80fa432f2891550.tar.gz) = 785599 bytes
-SHA1 (patch-cflags.txt) = 8e5833c2d43e7973dcf9d6c442976efefac30b26
diff --git a/hercules4sdl-decnumber/patches/patch-cflags.txt b/hercules4sdl-decnumber/patches/patch-cflags.txt
deleted file mode 100644
index dbc1910d99..0000000000
--- a/hercules4sdl-decnumber/patches/patch-cflags.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-We just want do do a native-wordsize build.
-Do not depend on the object directory name to set the wordsize.
-
---- cflags.txt.orig 2020-11-13 09:38:36.000000000 +0000
-+++ cflags.txt
-@@ -38,25 +38,8 @@ set( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMA
-
- if( NOT WIN32 )
-
-- set( TEMP_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}" )
-- set( CMAKE_REQUIRED_FLAGS "-m32" )
-- Check_C_Compiler_Flag( -m32 OK )
--
-- if( OK )
-- set( m32 "-m32" )
-- else()
- set( m32 "" )
-- endif()
--
-- set( CMAKE_REQUIRED_FLAGS "-m64" )
-- Check_C_Compiler_Flag( -m64 OK )
-- set( CMAKE_REQUIRED_FLAGS "${TEMP_CMAKE_REQUIRED_FLAGS}" )
--
-- if( OK )
-- set( m64 "-m64" )
-- else()
- set( m64 "" )
-- endif()
-
- endif()
-
diff --git a/hercules4sdl-softfloat/DESCR b/hercules4sdl-softfloat/DESCR
deleted file mode 100644
index e2bb04e943..0000000000
--- a/hercules4sdl-softfloat/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-ANSI C General Decimal Arithmetic Library
-
-The decNumber library implements the General Decimal Arithmetic Specification
-in ANSI C. This specification defines a decimal arithmetic which meets the
-requirements of commercial, financial, and human-oriented applications. It also
-matches the decimal arithmetic in the IEEE 754 Standard for Floating Point
-Arithmetic.
-
-The library fully implements the specification, and hence supports integer,
-fixed-point, and floating-point decimal numbers directly, including infinite,
-NaN (Not a Number), and subnormal values. Both arbitrary-precision and
-fixed-size representations are supported.
-
-Refer to the package's PDF file for more information.
-
-This version is the one used by the SoftDevLabs version of
-Hercules 4.x (Hyperion).
diff --git a/hercules4sdl-softfloat/Makefile b/hercules4sdl-softfloat/Makefile
deleted file mode 100644
index 2471e0602c..0000000000
--- a/hercules4sdl-softfloat/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD$
-
-DISTNAME= hercules4sdl-softfloat-3.5.0
-PKGREVISION= 20210105
-CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
-GITHUB_PROJECT= SoftFloat
-GITHUB_TAG= 42f2f99a479a724de5b601a0551e46678a5e3c57 # 5 Jan 2021
-
-MAINTAINER= rhialto%NetBSD.org@localhost
-HOMEPAGE= https://github.com/SDL-Hercules-390/SoftFloat
-COMMENT= The SoftDevLabs version of SoftFloat for Hercules 4.x
-LICENSE= modified-bsd
-
-USE_TOOLS+= cmake
-USE_LANGUAGES+= c
-
-USE_CMAKE= yes
-BLDDIR= ${WRKDIR}/SoftFloat64.Release
-CONFIGURE_DIRS= ${BLDDIR}
-CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/hercules4sdl
-
-pre-configure:
- ${MKDIR} ${BLDDIR}
-
-post-install:
- cd ${DESTDIR}${PREFIX}/lib/hercules4sdl/lib && ${MV} libSoftFloat64.a libSoftFloat_pic.a
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/hercules4sdl-softfloat/PLIST b/hercules4sdl-softfloat/PLIST
deleted file mode 100644
index 77feb5f657..0000000000
--- a/hercules4sdl-softfloat/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD$
-lib/hercules4sdl/doc/SoftFloat-history.html
-lib/hercules4sdl/doc/SoftFloat-source.html
-lib/hercules4sdl/doc/SoftFloat.html
-lib/hercules4sdl/include/softfloat.h
-lib/hercules4sdl/include/softfloat_types.h
-lib/hercules4sdl/include/softfloat_version.h
-lib/hercules4sdl/lib/libSoftFloat_pic.a
-lib/hercules4sdl/softfloat.LICENSE.txt
-lib/hercules4sdl/softfloat.README.html
-lib/hercules4sdl/softfloat.README.txt
diff --git a/hercules4sdl-softfloat/buildlink3.mk b/hercules4sdl-softfloat/buildlink3.mk
deleted file mode 100644
index 1771b85684..0000000000
--- a/hercules4sdl-softfloat/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= hercules4sdl-softfloat
-
-.if !defined(HERCULES4SDL_SOFTFLOAT_BUILDLINK3_MK)
-HERCULES4SDL_SOFTFLOAT_BUILDLINK3_MK:=
-
-BUILDLINK_DEPMETHOD.hercules4sdl-softfloat?= build
-
-BUILDLINK_API_DEPENDS.hercules4sdl-softfloat+= hercules4sdl-softfloat>=3.5.0
-BUILDLINK_PKGSRCDIR.hercules4sdl-softfloat?= ../../wip/hercules4sdl-softfloat
-.endif # HERCULES4SDL_SOFTFLOAT_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -hercules4sdl-softfloat
diff --git a/hercules4sdl-softfloat/distinfo b/hercules4sdl-softfloat/distinfo
deleted file mode 100644
index 113e2273f9..0000000000
--- a/hercules4sdl-softfloat/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-SHA1 (hercules4sdl-softfloat-3.5.0-42f2f99a479a724de5b601a0551e46678a5e3c57.tar.gz) = dcd94c0568f52bf1eebe67a293a8ee927f50ceaf
-RMD160 (hercules4sdl-softfloat-3.5.0-42f2f99a479a724de5b601a0551e46678a5e3c57.tar.gz) = 4b1e9a7604ef97de3ff42706e57b42d32c5b3734
-SHA512 (hercules4sdl-softfloat-3.5.0-42f2f99a479a724de5b601a0551e46678a5e3c57.tar.gz) = 92ee7b5645cb3535064c55a013c160760fbfca8de57ebde570b59205a78c3b9c3253d89004baba0129faa7cb63d2bd862d2c4927b21e69b8ad4c6085ad234030
-Size (hercules4sdl-softfloat-3.5.0-42f2f99a479a724de5b601a0551e46678a5e3c57.tar.gz) = 237166 bytes
-SHA1 (patch-cflags.txt) = 8e5833c2d43e7973dcf9d6c442976efefac30b26
diff --git a/hercules4sdl-softfloat/patches/patch-cflags.txt b/hercules4sdl-softfloat/patches/patch-cflags.txt
deleted file mode 100644
index dbc1910d99..0000000000
--- a/hercules4sdl-softfloat/patches/patch-cflags.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-We just want do do a native-wordsize build.
-Do not depend on the object directory name to set the wordsize.
-
---- cflags.txt.orig 2020-11-13 09:38:36.000000000 +0000
-+++ cflags.txt
-@@ -38,25 +38,8 @@ set( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMA
-
- if( NOT WIN32 )
-
-- set( TEMP_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}" )
-- set( CMAKE_REQUIRED_FLAGS "-m32" )
-- Check_C_Compiler_Flag( -m32 OK )
--
-- if( OK )
-- set( m32 "-m32" )
-- else()
- set( m32 "" )
-- endif()
--
-- set( CMAKE_REQUIRED_FLAGS "-m64" )
-- Check_C_Compiler_Flag( -m64 OK )
-- set( CMAKE_REQUIRED_FLAGS "${TEMP_CMAKE_REQUIRED_FLAGS}" )
--
-- if( OK )
-- set( m64 "-m64" )
-- else()
- set( m64 "" )
-- endif()
-
- endif()
-
diff --git a/hercules4sdl-telnet/DESCR b/hercules4sdl-telnet/DESCR
deleted file mode 100644
index 149fa89610..0000000000
--- a/hercules4sdl-telnet/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-Simple RFC-compliant TELNET implementation
-
-libtelnet is a library for handling the TELNET protocol. It includes routines
-for parsing incoming data from a remote peer as well as formatting data to be
-sent to the remote peer.
-
-libtelnet uses a callback-oriented API, allowing application-specific handling
-of various events. The callback system is also used for buffering outgoing
-protocol data, allowing the application to maintain control of the actual
-socket connection.
-
-Features supported include the full TELNET protocol, Q-method option
-negotiation, and NEW-ENVIRON.
-
-This version is the one used by the SoftDevLabs version of
-Hercules 4.x (Hyperion).
diff --git a/hercules4sdl-telnet/Makefile b/hercules4sdl-telnet/Makefile
deleted file mode 100644
index 8cf5e45cda..0000000000
--- a/hercules4sdl-telnet/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD$
-
-DISTNAME= hercules4sdl-telnet-1.0.0
-PKGREVISION= 20210105
-CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
-GITHUB_PROJECT= telnet
-GITHUB_TAG= 2aca101e06ca84526c1a63c0f65e05fe11522c3b # 5 Jan 2021
-
-MAINTAINER= rhialto%NetBSD.org@localhost
-HOMEPAGE= https://github.com/SDL-Hercules-390/telnet
-COMMENT= The SoftDevLabs version of telnet library for Hercules 4.x
-LICENSE= public-domain
-
-USE_TOOLS+= cmake
-USE_LANGUAGES+= c
-
-USE_CMAKE= yes
-BLDDIR= ${WRKDIR}/telnet64.Release
-CONFIGURE_DIRS= ${BLDDIR}
-CMAKE_ARG_PATH= ${WRKSRC}
-CMAKE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/hercules4sdl
-
-pre-configure:
- ${MKDIR} ${BLDDIR}
-
-post-install:
- cd ${DESTDIR}${PREFIX}/lib/hercules4sdl/lib && ${MV} libtelnet64.a libtelnet_pic.a
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/hercules4sdl-telnet/PLIST b/hercules4sdl-telnet/PLIST
deleted file mode 100644
index 603053e6e5..0000000000
--- a/hercules4sdl-telnet/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD$
-lib/hercules4sdl/include/telnet.h
-lib/hercules4sdl/include/telnet_version.h
-lib/hercules4sdl/lib/libtelnet_pic.a
-lib/hercules4sdl/telnet.LICENSE.txt
-lib/hercules4sdl/telnet.README.txt
diff --git a/hercules4sdl-telnet/buildlink3.mk b/hercules4sdl-telnet/buildlink3.mk
deleted file mode 100644
index ef2d108a54..0000000000
--- a/hercules4sdl-telnet/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= hercules4sdl-telnet
-
-.if !defined(HERCULES4SDL_TELNET_BUILDLINK3_MK)
-HERCULES4SDL_TELNET_BUILDLINK3_MK:=
-
-BUILDLINK_DEPMETHOD.hercules4sdl-telnet?= build
-
-BUILDLINK_API_DEPENDS.hercules4sdl-telnet+= hercules4sdl-telnet>=1.0.0
-BUILDLINK_PKGSRCDIR.hercules4sdl-telnet?= ../../wip/hercules4sdl-telnet
-.endif # HERCULES4SDL_TELNET_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -hercules4sdl-telnet
diff --git a/hercules4sdl-telnet/distinfo b/hercules4sdl-telnet/distinfo
deleted file mode 100644
index ef2c88c20a..0000000000
--- a/hercules4sdl-telnet/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-SHA1 (hercules4sdl-telnet-1.0.0-2aca101e06ca84526c1a63c0f65e05fe11522c3b.tar.gz) = c1c1a0fdf6de8f3ad7f3686f5704e061d56b577e
-RMD160 (hercules4sdl-telnet-1.0.0-2aca101e06ca84526c1a63c0f65e05fe11522c3b.tar.gz) = 83d3101ade82b7afb4b60b3798bc7d8162dcbcf5
-SHA512 (hercules4sdl-telnet-1.0.0-2aca101e06ca84526c1a63c0f65e05fe11522c3b.tar.gz) = 78b89d4073e0952b4c5e83b98ab2f30101869a9885759515d4c452e22d665683023e33a79a7ea1957d0190d23d3c9bbcbe70a34a09b9e20edcb550d5acbca2a5
-Size (hercules4sdl-telnet-1.0.0-2aca101e06ca84526c1a63c0f65e05fe11522c3b.tar.gz) = 67165 bytes
-SHA1 (patch-cflags.txt) = ed18a2aaa1da2a7f63c94e5fc061eb9fc0e0f02f
diff --git a/hercules4sdl-telnet/patches/patch-cflags.txt b/hercules4sdl-telnet/patches/patch-cflags.txt
deleted file mode 100644
index 071ca6bd27..0000000000
--- a/hercules4sdl-telnet/patches/patch-cflags.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-We just want do do a native-wordsize build.
-Do not depend on the object directory name to set the wordsize.
-
---- cflags.txt.orig 2020-11-13 09:38:36.000000000 +0000
-+++ cflags.txt
-@@ -32,25 +32,8 @@ set( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMA
-
- if( NOT WIN32 )
-
-- set( TEMP_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}" )
-- set( CMAKE_REQUIRED_FLAGS "-m32" )
-- Check_C_Compiler_Flag( -m32 OK )
--
-- if( OK )
-- set( m32 "-m32" )
-- else()
- set( m32 "" )
-- endif()
--
-- set( CMAKE_REQUIRED_FLAGS "-m64" )
-- Check_C_Compiler_Flag( -m64 OK )
-- set( CMAKE_REQUIRED_FLAGS "${TEMP_CMAKE_REQUIRED_FLAGS}" )
--
-- if( OK )
-- set( m64 "-m64" )
-- else()
- set( m64 "" )
-- endif()
-
- endif()
-
diff --git a/hercules4sdl/DESCR b/hercules4sdl/DESCR
deleted file mode 100644
index ef2d416e9b..0000000000
--- a/hercules4sdl/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-This is an activiely developed version of emulators/hercules.
-
-Hercules is an open source software implementation of the mainframe
-System/370 and ESA/390 architectures, in addition to the new 64-bit
-z/Architecure. Hercules runs under Linux, Windows 98, Windows NT,
-Windows 2000, and NetBSD. Hercules was created by Roger Bowler and
-maintained by Jay Maynard. Jan Jaeger designed and implemented many
-of the advanced features of Hercules, including dynamic
-reconfiguration, integrated console, interpretive execution, and
-z/Architecture support.
-
-This version is developed by SoftDevLabs.
diff --git a/hercules4sdl/Makefile b/hercules4sdl/Makefile
deleted file mode 100644
index 433e6f7a29..0000000000
--- a/hercules4sdl/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD$
-
-PKGNAME= hercules4sdl-4.3
-DISTNAME= Release_${PKGVERSION_NOREV}
-CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
-EXTRACT_USING= bsdtar
-DIST_SUBDIR= hercules4sdl
-
-MAINTAINER= rhialto%NetBSD.org@localhost
-HOMEPAGE= https://github.com/SDL-Hercules-390/hyperion
-COMMENT= The SoftDevLabs version of Hercules 4.x (Hyperion)
-LICENSE= qpl-v1.0
-
-GITHUB_PROJECT= hyperion
-GITHUB_TAG= Release_${PKGVERSION_NOREV}
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= autoconf automake flex gawk grep gm4 gmake perl gsed
-USE_TOOLS+= bash
-USE_LIBTOOL= YES
-USE_LANGUAGES+= c
-PTHREAD_OPTS+= require
-REPLACE_BASH= _dynamic_version
-.if ${MACHINE_ARCH} == i386
-CFLAGS+= -march=i586
-.endif
-
-SUBST_CLASSES+= prefix
-SUBST_STAGE.prefix= pre-configure
-SUBST_MESSAGE.prefix= Correcting configuration path
-SUBST_FILES.prefix= hercules.cnf
-SUBST_SED.prefix= -e 's,/usr/local,${PREFIX},g'
-
-CONFIGURE_ARGS+= --enable-extpkgs=${PREFIX}/lib/hercules4sdl
-
-INSTALLATION_DIRS+= share/examples/hercules
-
-pre-configure:
- ${RM} ${WRKSRC}/ltdl.h ${WRKSRC}/ltdl.c
- cd ${WRKSRC} && ./autogen.sh
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/hercules.cnf ${DESTDIR}${PREFIX}/share/examples/hercules/
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../wip/hercules4sdl-crypto/buildlink3.mk"
-.include "../../wip/hercules4sdl-decnumber/buildlink3.mk"
-.include "../../wip/hercules4sdl-softfloat/buildlink3.mk"
-.include "../../wip/hercules4sdl-telnet/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/hercules4sdl/PLIST b/hercules4sdl/PLIST
deleted file mode 100644
index 2ea987b031..0000000000
--- a/hercules4sdl/PLIST
+++ /dev/null
@@ -1,198 +0,0 @@
-@comment $NetBSD$
-bin/cckd2ckd
-bin/cckd642ckd
-bin/cckdcdsk
-bin/cckdcdsk64
-bin/cckdcomp
-bin/cckdcomp64
-bin/cckddiag
-bin/cckddiag64
-bin/cckdmap
-bin/cckdswap
-bin/cckdswap64
-bin/cfba2fba
-bin/cfba642fba
-bin/ckd2cckd
-bin/ckd2cckd64
-bin/convto64
-bin/dasdcat
-bin/dasdconv
-bin/dasdconv64
-bin/dasdcopy
-bin/dasdcopy64
-bin/dasdinit
-bin/dasdinit64
-bin/dasdisup
-bin/dasdlist
-bin/dasdload
-bin/dasdload64
-bin/dasdls
-bin/dasdpdsu
-bin/dasdseq
-bin/dasdser
-bin/dmap2hrc
-bin/fba2cfba
-bin/fba2cfba64
-bin/hercifc
-bin/herclin
-bin/hercules
-bin/hetget
-bin/hetinit
-bin/hetmap
-bin/hetupd
-bin/maketape
-bin/tapecopy
-bin/tapemap
-bin/tapesplt
-bin/vmfplc2
-bin/voldsext.cmd
-lib/hercules/dyncrypt.la
-lib/hercules/dyngui.la
-lib/hercules/hdt1052c.la
-lib/hercules/hdt1403.la
-lib/hercules/hdt2703.la
-lib/hercules/hdt2880.la
-lib/hercules/hdt3088.la
-lib/hercules/hdt3270.la
-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
-lib/libhercd.la
-lib/libhercs.la
-lib/libherct.la
-lib/libhercu.la
-man/man1/cckddiag.1
-man/man1/dasdseq.1
-man/man1/vmfplc2.1
-man/man4/cckd.4
-share/examples/hercules/hercules.cnf
-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
-share/hercules/hercconf.html
-share/hercules/hercfaq.html
-share/hercules/hercinst.html
-share/hercules/herclic.html
-share/hercules/hercload.html
-share/hercules/hercmsca.html
-share/hercules/hercmscf.html
-share/hercules/hercmscp.html
-share/hercules/hercmsct.html
-share/hercules/hercmscu.html
-share/hercules/hercmsda.html
-share/hercules/hercmsdc.html
-share/hercules/hercmsdg.html
-share/hercules/hercmsdi.html
-share/hercules/hercmsdl.html
-share/hercules/hercmsdn.html
-share/hercules/hercmsds.html
-share/hercules/hercmsdt.html
-share/hercules/hercmsdu.html
-share/hercules/hercmsg.html
-share/hercules/hercmshd.html
-share/hercules/hercmshe.html
-share/hercules/hercmshg.html
-share/hercules/hercmshm.html
-share/hercules/hercmsht.html
-share/hercules/hercmshu.html
-share/hercules/hercmsif.html
-share/hercules/hercmsin.html
-share/hercules/hercmslc.html
-share/hercules/hercmslg.html
-share/hercules/hercmspn.html
-share/hercules/hercmspr.html
-share/hercules/hercmspu.html
-share/hercules/hercmsrd.html
-share/hercules/hercmssd.html
-share/hercules/hercmsta.html
-share/hercules/hercmstc.html
-share/hercules/hercmste.html
-share/hercules/hercmstm.html
-share/hercules/hercmsts.html
-share/hercules/hercmstt.html
-share/hercules/hercmstu.html
-share/hercules/hercmsvm.html
-share/hercules/hercnew.html
-share/hercules/hercrdr.html
-share/hercules/hercrnot.html
-share/hercules/hercsupp.html
-share/hercules/herctcp.html
-share/hercules/hercules.css
-share/hercules/hercules.html
-share/hercules/images/back.gif
-share/hercules/images/bkued.gif
-share/hercules/images/blueu.gif
-share/hercules/images/dial1.gif
-share/hercules/images/dial2.gif
-share/hercules/images/dial3.gif
-share/hercules/images/dial4.gif
-share/hercules/images/favicon.ico
-share/hercules/images/greend.gif
-share/hercules/images/greenu.gif
-share/hercules/images/hercpic-rblk-256.gif
-share/hercules/images/hercpic-rblk-80.gif
-share/hercules/images/interruptd.gif
-share/hercules/images/interruptu.gif
-share/hercules/images/loadd.gif
-share/hercules/images/loadoffu.gif
-share/hercules/images/loadonu.gif
-share/hercules/images/loadu.gif
-share/hercules/images/manoffu.gif
-share/hercules/images/manonu.gif
-share/hercules/images/note.gif
-share/hercules/images/osi-certified-60x50.jpg
-share/hercules/images/poweroffd.gif
-share/hercules/images/poweroffu.gif
-share/hercules/images/poweronoffd.gif
-share/hercules/images/poweronoffu.gif
-share/hercules/images/poweronond.gif
-share/hercules/images/powerononu.gif
-share/hercules/images/redd.gif
-share/hercules/images/redu.gif
-share/hercules/images/restartd.gif
-share/hercules/images/restartu.gif
-share/hercules/images/startd.gif
-share/hercules/images/startu.gif
-share/hercules/images/stopd.gif
-share/hercules/images/stopu.gif
-share/hercules/images/stored.gif
-share/hercules/images/storeu.gif
-share/hercules/images/sysoffu.gif
-share/hercules/images/sysonu.gif
-share/hercules/images/telnetputtyconndata.png
-share/hercules/images/telnetputtysession.png
-share/hercules/images/telnetputtyterminal.png
-share/hercules/images/telnetwin.png
-share/hercules/images/telnetwinntconnect.png
-share/hercules/images/telnetwinnttermpref.png
-share/hercules/images/translucentoffd.gif
-share/hercules/images/translucentoffu.gif
-share/hercules/images/translucentond.gif
-share/hercules/images/translucentonu.gif
-share/hercules/images/waitoffu.gif
-share/hercules/images/waitonu.gif
-share/hercules/include/footer.htmlpart
-share/hercules/include/header.htmlpart
-share/hercules/index.html
-share/hercules/rawstape.jcl
-share/hercules/rexx.html
-share/hercules/scsiboot
-share/hercules/shared.html
-share/hercules/tapeconv.jcl
-share/hercules/tasks.html
-share/hercules/telnet.html
-share/hercules/zzsacard.bin
diff --git a/hercules4sdl/distinfo b/hercules4sdl/distinfo
deleted file mode 100644
index eed27ab68d..0000000000
--- a/hercules4sdl/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
-SHA1 (hercules4sdl/Release_4.3.tar.gz) = 45d756c88b495a932b9aa582868c1c76a2ea0f4f
-RMD160 (hercules4sdl/Release_4.3.tar.gz) = 2552fbe36d0db1dc630e734ea46dcca0d32bb73a
-SHA512 (hercules4sdl/Release_4.3.tar.gz) = e2591b16ecc08f952f16c013764a1d6bfd88aafe9620130dca9619a8af47f2cc04af7d7552c08f75ff6000854fe8e698350b344dbb573551701a610df68fd00a
-Size (hercules4sdl/Release_4.3.tar.gz) = 11609664 bytes
-SHA1 (patch-Makefile.am) = 85b65386cfde0d7c180abaeaab67e05ad7d07385
-SHA1 (patch-configure.ac) = b7f79b0a12cfe20eab389b59ace08bea427d2b63
-SHA1 (patch-hifr.h) = 6b878b957d1847296882316067281b05872a760c
-SHA1 (patch-msgenu.h) = 947d7ddf4395c6c91d2f6640c9d06e8880c8fdf9
-SHA1 (patch-tuntap.c) = 6067b1be32d2cd3aa4ad57e63a7483aa823fbcf1
diff --git a/hercules4sdl/patches/patch-Makefile.am b/hercules4sdl/patches/patch-Makefile.am
deleted file mode 100644
index 7b480b6a2a..0000000000
--- a/hercules4sdl/patches/patch-Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Fix build. Use devel/libltdl instead of internal libltdl.
-- Build dynamic modules only dynamic (-shared), not also static.
-
---- 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@
- hqa_inc = @HQA_INC@
- lns = @LN_S@
--ldadd = @LIBS@
-+ldadd = @LIBS@ -lltdl
-
- #------------------------------------------------------------------------------
-
-@@ -142,9 +142,9 @@ dyndev_SRC = \
- # to Windows DLLs
- #-----------------------------------------------------------------
-
--XSTATIC =
-+XSTATIC = -shared
- DYNSRC =
--LTDL = ltdl.c
-+LTDL =
-
- DYNMOD_LD_FLAGS = \
- -module \
-@@ -512,7 +512,6 @@ libherc_la_SOURCES = \
- $(DYNSRC)
-
- EXTRA_libherc_la_SOURCES = \
-- ltdl.c \
- memrchr.c \
- $(dynamic_SRC) \
- $(dyndev_SRC) \
-@@ -956,7 +955,6 @@ noinst_HEADERS = \
- instfmts.h \
- linklist.h \
- logger.h \
-- ltdl.h \
- machdep.h \
- memrchr.h \
- mpc.h \
diff --git a/hercules4sdl/patches/patch-configure.ac b/hercules4sdl/patches/patch-configure.ac
deleted file mode 100644
index de9cd51971..0000000000
--- a/hercules4sdl/patches/patch-configure.ac
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-- Avoid -march=xxx because it makes binaries nonportable.
-- Fix suffix of helper libraries.
-
---- configure.ac.orig 2020-11-27 18:45:12.000000000 +0000
-+++ configure.ac
-@@ -2826,7 +2826,8 @@ if test "$hc_cv_auto_optimize" = "yes";
- if test "$hc_cv_is_intel_x86_arch" = "yes"; then
-
- # Set CPU type
-- hc_cv_optimization_flags="$hc_cv_optimization_flags -march=$hc_cv_intel_cpu_type"
-+ # Don't do this: it makes binaries unportable.
-+ #hc_cv_optimization_flags="$hc_cv_optimization_flags -march=$hc_cv_intel_cpu_type"
-
- # Dynamically inline small block string operations
- # (subroutine calls still made for large area calls)
-@@ -3031,9 +3032,9 @@ test "$hc_cv_is_mingw" = "yes" &&
- #------------------------------------------------------#
-
- if test "$hc_cv_opt_debug" = "yes"; then
-- hc_cv_pkg_lib_suffix=${hc_cv_cpu_bits}d
-+ hc_cv_pkg_lib_suffix=d_pic
- else
-- hc_cv_pkg_lib_suffix=${hc_cv_cpu_bits}
-+ hc_cv_pkg_lib_suffix=_pic
- fi
-
- AC_CACHE_SAVE()
-@@ -3229,10 +3230,11 @@ extpkg_ldadd="${crypto_libdir}/${crypto_
- ##----------------------------------------------------------------
- ## DEBUGGING
- ##----------------------------------------------------------------
--## AC_MSG_NOTICE( [Using crypto_libdir = ${crypto_libdir}] )
--## AC_MSG_NOTICE( [Using decnumber_libdir = ${decnumber_libdir}] )
--## AC_MSG_NOTICE( [Using softfloat_libdir = ${softfloat_libdir}] )
--## AC_MSG_NOTICE( [Using telnet_libdir = ${telnet_libdir}] )
-+AC_MSG_NOTICE( [Using crypto_libdir = ${crypto_libdir}] )
-+AC_MSG_NOTICE( [Using decnumber_libdir = ${decnumber_libdir}] )
-+AC_MSG_NOTICE( [Using softfloat_libdir = ${softfloat_libdir}] )
-+AC_MSG_NOTICE( [Using telnet_libdir = ${telnet_libdir}] )
-+AC_MSG_NOTICE( [Using extpkg_ldadd = ${extpkg_ldadd}] )
-
- EXTPKG_INCDIRS="${extpkg_incdirs}"
- AC_SUBST(EXTPKG_INCDIRS)
diff --git a/hercules4sdl/patches/patch-hifr.h b/hercules4sdl/patches/patch-hifr.h
deleted file mode 100644
index 74bab3f469..0000000000
--- a/hercules4sdl/patches/patch-hifr.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Correct back over-done "or NetBSD" condition.
-
---- hifr.h.orig 2020-11-30 19:36:38.734299287 +0000
-+++ hifr.h
-@@ -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
diff --git a/hercules4sdl/patches/patch-msgenu.h b/hercules4sdl/patches/patch-msgenu.h
deleted file mode 100644
index 952d99317a..0000000000
--- a/hercules4sdl/patches/patch-msgenu.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Introduce 2 message texts as added to tuntap.c.
-
---- 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/hercules4sdl/patches/patch-tuntap.c b/hercules4sdl/patches/patch-tuntap.c
deleted file mode 100644
index 4739cb75a5..0000000000
--- a/hercules4sdl/patches/patch-tuntap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD$
-
-NetBSD is not Linux. Conditionalize the compilation of Linux stuff.
-
---- tuntap.c.orig 2019-09-10 18:06:20.000000000 +0000
-+++ tuntap.c
-@@ -26,6 +26,11 @@
- /* Thus for preconfigured FreeBSD interfaces we need to modify the */
- /* name of the character file being opened. */
-
-+/* On NetBSD you open /dev/tun<n> which must be given by the user, */
-+/* who has pre-configured that tunnel for use. */
-+/* If you want a L2 (ethernet) interface, open /dev/tap or */
-+/* /dev/tap<n>. You cannot switch from one mode to the other. */
-+
-
- #include "hstdinc.h"
-
-@@ -71,6 +76,7 @@ static void tuntap_term( void* arg )
- //
- // TUNTAP_SetMode (TUNTAP_CreateInterface helper)
- //
-+#if defined(__linux__) || defined(OPTION_W32_CTCI)
- static int TUNTAP_SetMode (int fd, struct hifr *hifr, int iFlags)
- {
- int rc;
-@@ -157,6 +163,7 @@ static int TUNTAP_SetMode (int fd, struc
-
- return rc;
- } // End of function TUNTAP_SetMode()
-+#endif /* __linux__ || OPTION_W32_CTCI */
-
-
- //
-@@ -248,6 +255,7 @@ int TUNTAP_CreateInterface(
- if ( strncasecmp( utsbuf.sysname, "linux", 5 ) == 0 )
- #endif
- {
-+#if defined (__linux__) || defined(OPTION_W32_CTCI)
- // Linux kernel (builtin tun device) or Windows
- struct hifr hifr;
-
-@@ -271,10 +279,18 @@ int TUNTAP_CreateInterface(
- }
-
- strcpy( pszNetDevName, hifr.hifr_name );
-+#endif /* __linux__ || OPTION_W32_CTCI */
- }
- #if !defined( OPTION_W32_CTCI )
- else
- {
-+ if ((iFlags & IFF_TUN) && !strstr(pszTUNDevice, "tun")) {
-+ WRMSG( HHC00156, "W", pszTUNDevice );
-+ }
-+ if ((iFlags & IFF_TAP) && !strstr(pszTUNDevice, "tap")) {
-+ WRMSG( HHC00157, "W", pszTUNDevice );
-+ }
-+
- // Other OS: Simply use basename of the device
- // Notes: (JAP) This is problematic at best. Until we have a
- // clean FreeBSD compile from the base tree I can't
Home |
Main Index |
Thread Index |
Old Index