From 1eeddcc0315cf14dee445416ab10b845e3d4a6ae Mon Sep 17 00:00:00 2001
From: pho <pho@pkgsrc.org>
Date: Sat, 24 Apr 2021 16:42:40 +0000
Subject: [PATCH] Update PLIST

---
 textproc/hs-stringsearch/PLIST | 140 ++++++++++++++++-----------------
 textproc/hs-unicode-show/PLIST |  36 ++++-----
 2 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/textproc/hs-stringsearch/PLIST b/textproc/hs-stringsearch/PLIST
index e25e6f6a89ce..b9f589fd024a 100644
--- a/textproc/hs-stringsearch/PLIST
+++ b/textproc/hs-stringsearch/PLIST
@@ -1,71 +1,71 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/11 17:52:18 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
+@comment $NetBSD: PLIST,v 1.4 2021/04/24 16:42:40 pho Exp $
+lib/stringsearch-${PKGVERSION}/${HS_VERSION}/package-description
+lib/stringsearch-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_IMPL}/Data/ByteString/Lazy/Search.dyn_hi
-${HS_IMPL}/Data/ByteString/Lazy/Search.hi
-${HS_IMPL}/Data/ByteString/Lazy/Search.p_hi
-${HS_IMPL}/Data/ByteString/Lazy/Search/DFA.dyn_hi
-${HS_IMPL}/Data/ByteString/Lazy/Search/DFA.hi
-${HS_IMPL}/Data/ByteString/Lazy/Search/DFA.p_hi
-${HS_IMPL}/Data/ByteString/Lazy/Search/Internal/BoyerMoore.dyn_hi
-${HS_IMPL}/Data/ByteString/Lazy/Search/Internal/BoyerMoore.hi
-${HS_IMPL}/Data/ByteString/Lazy/Search/Internal/BoyerMoore.p_hi
-${HS_IMPL}/Data/ByteString/Lazy/Search/KMP.dyn_hi
-${HS_IMPL}/Data/ByteString/Lazy/Search/KMP.hi
-${HS_IMPL}/Data/ByteString/Lazy/Search/KMP.p_hi
-${HS_IMPL}/Data/ByteString/Lazy/Search/KarpRabin.dyn_hi
-${HS_IMPL}/Data/ByteString/Lazy/Search/KarpRabin.hi
-${HS_IMPL}/Data/ByteString/Lazy/Search/KarpRabin.p_hi
-${HS_IMPL}/Data/ByteString/Search.dyn_hi
-${HS_IMPL}/Data/ByteString/Search.hi
-${HS_IMPL}/Data/ByteString/Search.p_hi
-${HS_IMPL}/Data/ByteString/Search/BoyerMoore.dyn_hi
-${HS_IMPL}/Data/ByteString/Search/BoyerMoore.hi
-${HS_IMPL}/Data/ByteString/Search/BoyerMoore.p_hi
-${HS_IMPL}/Data/ByteString/Search/DFA.dyn_hi
-${HS_IMPL}/Data/ByteString/Search/DFA.hi
-${HS_IMPL}/Data/ByteString/Search/DFA.p_hi
-${HS_IMPL}/Data/ByteString/Search/Internal/BoyerMoore.dyn_hi
-${HS_IMPL}/Data/ByteString/Search/Internal/BoyerMoore.hi
-${HS_IMPL}/Data/ByteString/Search/Internal/BoyerMoore.p_hi
-${HS_IMPL}/Data/ByteString/Search/Internal/KnuthMorrisPratt.dyn_hi
-${HS_IMPL}/Data/ByteString/Search/Internal/KnuthMorrisPratt.hi
-${HS_IMPL}/Data/ByteString/Search/Internal/KnuthMorrisPratt.p_hi
-${HS_IMPL}/Data/ByteString/Search/Internal/Utils.dyn_hi
-${HS_IMPL}/Data/ByteString/Search/Internal/Utils.hi
-${HS_IMPL}/Data/ByteString/Search/Internal/Utils.p_hi
-${HS_IMPL}/Data/ByteString/Search/KMP.dyn_hi
-${HS_IMPL}/Data/ByteString/Search/KMP.hi
-${HS_IMPL}/Data/ByteString/Search/KMP.p_hi
-${HS_IMPL}/Data/ByteString/Search/KarpRabin.dyn_hi
-${HS_IMPL}/Data/ByteString/Search/KarpRabin.hi
-${HS_IMPL}/Data/ByteString/Search/KarpRabin.p_hi
-${HS_IMPL}/Data/ByteString/Search/KnuthMorrisPratt.dyn_hi
-${HS_IMPL}/Data/ByteString/Search/KnuthMorrisPratt.hi
-${HS_IMPL}/Data/ByteString/Search/KnuthMorrisPratt.p_hi
-${HS_IMPL}/Data/ByteString/Search/Substitution.dyn_hi
-${HS_IMPL}/Data/ByteString/Search/Substitution.hi
-${HS_IMPL}/Data/ByteString/Search/Substitution.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
-${HS_DOCS}/LICENCE
-${HS_DOCS}/html/Data-ByteString-Lazy-Search-DFA.html
-${HS_DOCS}/html/Data-ByteString-Lazy-Search-KMP.html
-${HS_DOCS}/html/Data-ByteString-Lazy-Search-KarpRabin.html
-${HS_DOCS}/html/Data-ByteString-Lazy-Search.html
-${HS_DOCS}/html/Data-ByteString-Search-BoyerMoore.html
-${HS_DOCS}/html/Data-ByteString-Search-DFA.html
-${HS_DOCS}/html/Data-ByteString-Search-KMP.html
-${HS_DOCS}/html/Data-ByteString-Search-KarpRabin.html
-${HS_DOCS}/html/Data-ByteString-Search-KnuthMorrisPratt.html
-${HS_DOCS}/html/Data-ByteString-Search-Substitution.html
-${HS_DOCS}/html/Data-ByteString-Search.html
-${HS_DOCS}/html/doc-index.html
-${HS_DOCS}/html/haddock-bundle.min.js
-${HS_DOCS}/html/index.html
-${HS_DOCS}/html/linuwial.css
-${HS_DOCS}/html/meta.json
-${HS_DOCS}/html/quick-jump.css
-${HS_DOCS}/html/stringsearch.haddock
-${HS_DOCS}/html/synopsis.png
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search/DFA.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search/DFA.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search/DFA.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search/Internal/BoyerMoore.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search/Internal/BoyerMoore.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search/Internal/BoyerMoore.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search/KMP.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search/KMP.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search/KMP.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search/KarpRabin.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search/KarpRabin.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Lazy/Search/KarpRabin.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/BoyerMoore.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/BoyerMoore.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/BoyerMoore.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/DFA.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/DFA.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/DFA.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/Internal/BoyerMoore.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/Internal/BoyerMoore.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/Internal/BoyerMoore.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/Internal/KnuthMorrisPratt.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/Internal/KnuthMorrisPratt.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/Internal/KnuthMorrisPratt.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/Internal/Utils.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/Internal/Utils.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/Internal/Utils.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/KMP.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/KMP.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/KMP.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/KarpRabin.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/KarpRabin.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/KarpRabin.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/KnuthMorrisPratt.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/KnuthMorrisPratt.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/KnuthMorrisPratt.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/Substitution.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/Substitution.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Search/Substitution.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/LICENCE
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/Data-ByteString-Lazy-Search-DFA.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/Data-ByteString-Lazy-Search-KMP.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/Data-ByteString-Lazy-Search-KarpRabin.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/Data-ByteString-Lazy-Search.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/Data-ByteString-Search-BoyerMoore.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/Data-ByteString-Search-DFA.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/Data-ByteString-Search-KMP.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/Data-ByteString-Search-KarpRabin.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/Data-ByteString-Search-KnuthMorrisPratt.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/Data-ByteString-Search-Substitution.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/Data-ByteString-Search.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/stringsearch.haddock
+share/doc/${HS_PLATFORM}/stringsearch-${PKGVERSION}/html/synopsis.png
diff --git a/textproc/hs-unicode-show/PLIST b/textproc/hs-unicode-show/PLIST
index 8784d3fb43f0..d6d11d29d2ae 100644
--- a/textproc/hs-unicode-show/PLIST
+++ b/textproc/hs-unicode-show/PLIST
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:18 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
+@comment $NetBSD: PLIST,v 1.2 2021/04/24 16:44:13 pho Exp $
+lib/unicode-show-${PKGVERSION}/${HS_VERSION}/package-description
+lib/unicode-show-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_IMPL}/Text/Show/Unicode.dyn_hi
-${HS_IMPL}/Text/Show/Unicode.hi
-${HS_IMPL}/Text/Show/Unicode.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
-${HS_DOCS}/LICENSE
-${HS_DOCS}/html/Text-Show-Unicode.html
-${HS_DOCS}/html/doc-index.html
-${HS_DOCS}/html/haddock-bundle.min.js
-${HS_DOCS}/html/index.html
-${HS_DOCS}/html/linuwial.css
-${HS_DOCS}/html/meta.json
-${HS_DOCS}/html/quick-jump.css
-${HS_DOCS}/html/synopsis.png
-${HS_DOCS}/html/unicode-show.haddock
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Show/Unicode.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Show/Unicode.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Show/Unicode.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+share/doc/${HS_PLATFORM}/unicode-show-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/unicode-show-${PKGVERSION}/html/Text-Show-Unicode.html
+share/doc/${HS_PLATFORM}/unicode-show-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/unicode-show-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/unicode-show-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/unicode-show-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/unicode-show-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/unicode-show-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/unicode-show-${PKGVERSION}/html/synopsis.png
+share/doc/${HS_PLATFORM}/unicode-show-${PKGVERSION}/html/unicode-show.haddock