From ec5a17a0669e655faf78e95150fa8ad7bf369726 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Wed, 12 Jul 2023 08:53:53 +0200
Subject: [PATCH] tcsh: Update to 6.24.10

and drop msysize patch
---
 tcsh/PKGBUILD            | 22 +++++++-------
 tcsh/msys-platform.patch | 64 ----------------------------------------
 2 files changed, 12 insertions(+), 74 deletions(-)
 delete mode 100644 tcsh/msys-platform.patch

diff --git a/tcsh/PKGBUILD b/tcsh/PKGBUILD
index 9f782d686ac..2b3e7cf1f8e 100644
--- a/tcsh/PKGBUILD
+++ b/tcsh/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Masanori Shirayama <mashir43@gmail.com>
 
 pkgname=tcsh
-pkgver=6.23.00
+pkgver=6.24.10
 pkgrel=1
 epoch=
 pkgdesc="C shell with file name completion and command line editing"
@@ -14,25 +14,27 @@ makedepends=('gcc' 'libcrypt-devel' 'libiconv-devel' 'ncurses-devel' 'autotools'
 provides=('csh')
 conflicts=('csh')
 install=tcsh.install
-source=("https://astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "msys-platform.patch")
-sha256sums=('4ebeb2f33633d115d9535f554c651a8523040d8d91e5de333fb2ee045b8e001e'
-            '69d1f10818adf9ebb09369a5eb3500c289f518c5e54f51d93439c7a6ac90af6b')
+source=("https://astron.com/pub/tcsh/tcsh-${pkgver}.tar.gz"{,.asc})
+sha256sums=('13475c0fbeb74139d33ed793bf00ffbbb2ac2dc9fb1d44467a410760aba36664'
+            'SKIP')
+validpgpkeys=('AD87109763D8D8C2C94CBA8065C26E471F45B123') # Kimmo Suominen
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  cp -f config/cygwin config/msys
-  patch -p1 -i ${srcdir}/msys-platform.patch
+
   autoreconf -ivf
 }
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export MSYSTEM=CYGWIN
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CHOST} \
-    --host=${CHOST} \
-    --target=${CHOST}
+    --build=${CYGWIN_CHOST} \
+    --host=${CYGWIN_CHOST} \
+    --target=${CYGWIN_CHOST}
 
   make
 }
diff --git a/tcsh/msys-platform.patch b/tcsh/msys-platform.patch
deleted file mode 100644
index 0b1921dc610..00000000000
--- a/tcsh/msys-platform.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- tcsh-6.18.01/config.guess.orig	2011-12-28 06:20:03.000000000 +0900
-+++ tcsh-6.18.01/config.guess	2014-08-15 16:12:29.397342600 +0900
-@@ -801,6 +801,9 @@
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit ;;
-+    *:MSYS*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
-+	exit ;;
-     *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
---- tcsh-6.18.01/config.rpath.orig	2008-08-30 16:56:27.000000000 +0900
-+++ tcsh-6.18.01/config.rpath	2014-08-15 16:24:49.628258600 +0900
-@@ -112,7 +112,7 @@
- hardcode_minus_L=no
- 
- case "$host_os" in
--  cygwin* | mingw* | pw32*)
-+  cygwin* | msys* | mingw* | pw32*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -152,7 +152,7 @@
-         ld_shlibs=no
-       fi
-       ;;
--    cygwin* | mingw* | pw32*)
-+    cygwin* | msys* | mingw* | pw32*)
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
-       hardcode_libdir_flag_spec='-L$libdir'
-@@ -278,7 +278,7 @@
-       ;;
-     bsdi[45]*)
-       ;;
--    cygwin* | mingw* | pw32*)
-+    cygwin* | msys* | mingw* | pw32*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -459,7 +459,7 @@
-     ;;
-   bsdi[45]*)
-     ;;
--  cygwin* | mingw* | pw32*)
-+  cygwin* | msys* | mingw* | pw32*)
-     shrext=.dll
-     ;;
-   darwin* | rhapsody*)
---- tcsh-6.18.01/configure.ac.orig	2012-02-14 01:33:50.000000000 +0900
-+++ tcsh-6.18.01/configure.ac	2014-08-15 16:28:40.326872700 +0900
-@@ -239,6 +239,11 @@
-     tcsh_config_file=cray
-   ;;
- 
-+  ## Minimal System
-+  *-msys)
-+    tcsh_config_file=msys
-+  ;;
-+
-   ## Red Hat Cygwin
-   *-cygwin)
-     tcsh_config_file=cygwin