From 6b51a2c9068389b4be2e8395e388cf438c66f84b Mon Sep 17 00:00:00 2001
From: Jeremy Drake <github@jdrake.com>
Date: Sat, 12 Jun 2021 21:16:15 -0700
Subject: [PATCH] oce: fix install scripts for new prefixes

---
 mingw-w64-oce/PKGBUILD                               |  4 ++--
 mingw-w64-oce/oce-CLANG64.install                    | 12 ++++++++++++
 .../{oce-i686.install => oce-MINGW32.install}        |  2 +-
 .../{oce-x86_64.install => oce-MINGW64.install}      |  2 +-
 mingw-w64-oce/oce-UCRT64.install                     | 12 ++++++++++++
 5 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 mingw-w64-oce/oce-CLANG64.install
 rename mingw-w64-oce/{oce-i686.install => oce-MINGW32.install} (63%)
 rename mingw-w64-oce/{oce-x86_64.install => oce-MINGW64.install} (63%)
 create mode 100644 mingw-w64-oce/oce-UCRT64.install

diff --git a/mingw-w64-oce/PKGBUILD b/mingw-w64-oce/PKGBUILD
index d2ffc74afa..f6a4e66c28 100644
--- a/mingw-w64-oce/PKGBUILD
+++ b/mingw-w64-oce/PKGBUILD
@@ -4,7 +4,7 @@ _realname=oce
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=0.18.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Open CASCADE Community Edition: patches/improvements/experiments contributed by users over the official Open CASCADE library."
 url="https://github.com/tpaviot/oce"
 arch=('any')
@@ -16,7 +16,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-freetype")
 #depends=('intel-tbb' 'gl2ps' 'freeimage' 'tk')
 source=(https://github.com/tpaviot/${_realname}/archive/OCE-${pkgver}.tar.gz unicode.patch)
 # 99_oce.sh 99_oce.conf)
-install=oce-${CARCH}.install
+install=oce-${MSYSTEM}.install
 sha256sums=('c553d6a7bf52f790abc3b6bb7a1e91a65947e92a426bb1a88a11960c31f0966c'
             'bff7743d03258a532578c642a8140a0583fcff3bd05cc0a81a8bef00f2629c83')
 
diff --git a/mingw-w64-oce/oce-CLANG64.install b/mingw-w64-oce/oce-CLANG64.install
new file mode 100644
index 0000000000..afd1a3d179
--- /dev/null
+++ b/mingw-w64-oce/oce-CLANG64.install
@@ -0,0 +1,12 @@
+post_install() {
+  _mingw=clang64
+  cd ${_mingw}
+  local _prefix=$(pwd -W)
+  cd -
+  sed -e "s|/${_mingw}|${_prefix}|g" -i ${_mingw}/lib/oce/OCE-libraries.cmake
+  sed -e 's|;[A-Z]:\/[^ ;]*\?\/'${_mingw}'|;${_IMPORT_PREFIX}|g' -i ${_mingw}/lib/oce/OCE-libraries-release.cmake
+}
+
+post_upgrade() {
+  post_install
+}
diff --git a/mingw-w64-oce/oce-i686.install b/mingw-w64-oce/oce-MINGW32.install
similarity index 63%
rename from mingw-w64-oce/oce-i686.install
rename to mingw-w64-oce/oce-MINGW32.install
index 0065e577a2..7f71a1034b 100644
--- a/mingw-w64-oce/oce-i686.install
+++ b/mingw-w64-oce/oce-MINGW32.install
@@ -4,7 +4,7 @@ post_install() {
   local _prefix=$(pwd -W)
   cd -
   sed -e "s|/${_mingw}|${_prefix}|g" -i ${_mingw}/lib/oce/OCE-libraries.cmake
-  sed -e 's|;[A-Z]:\/[^ ;]*\?\/mingw32|;${_IMPORT_PREFIX}|g' -i ${_mingw}/lib/oce/OCE-libraries-release.cmake
+  sed -e 's|;[A-Z]:\/[^ ;]*\?\/'${_mingw}'|;${_IMPORT_PREFIX}|g' -i ${_mingw}/lib/oce/OCE-libraries-release.cmake
 }
 
 post_upgrade() {
diff --git a/mingw-w64-oce/oce-x86_64.install b/mingw-w64-oce/oce-MINGW64.install
similarity index 63%
rename from mingw-w64-oce/oce-x86_64.install
rename to mingw-w64-oce/oce-MINGW64.install
index 95ccf54eaa..3a098842f9 100644
--- a/mingw-w64-oce/oce-x86_64.install
+++ b/mingw-w64-oce/oce-MINGW64.install
@@ -4,7 +4,7 @@ post_install() {
   local _prefix=$(pwd -W)
   cd -
   sed -e "s|/${_mingw}|${_prefix}|g" -i ${_mingw}/lib/oce/OCE-libraries.cmake
-  sed -e 's|;[A-Z]:\/[^ ;]*\?\/mingw64|;${_IMPORT_PREFIX}|g' -i ${_mingw}/lib/oce/OCE-libraries-release.cmake
+  sed -e 's|;[A-Z]:\/[^ ;]*\?\/'${_mingw}'|;${_IMPORT_PREFIX}|g' -i ${_mingw}/lib/oce/OCE-libraries-release.cmake
 }
 
 post_upgrade() {
diff --git a/mingw-w64-oce/oce-UCRT64.install b/mingw-w64-oce/oce-UCRT64.install
new file mode 100644
index 0000000000..e7ed999cfc
--- /dev/null
+++ b/mingw-w64-oce/oce-UCRT64.install
@@ -0,0 +1,12 @@
+post_install() {
+  _mingw=ucrt64
+  cd ${_mingw}
+  local _prefix=$(pwd -W)
+  cd -
+  sed -e "s|/${_mingw}|${_prefix}|g" -i ${_mingw}/lib/oce/OCE-libraries.cmake
+  sed -e 's|;[A-Z]:\/[^ ;]*\?\/'${_mingw}'|;${_IMPORT_PREFIX}|g' -i ${_mingw}/lib/oce/OCE-libraries-release.cmake
+}
+
+post_upgrade() {
+  post_install
+}