<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/765c9175d8fc6977eafd34a7b59fe9e96e6bb14f">https://github.com/macports/macports-ports/commit/765c9175d8fc6977eafd34a7b59fe9e96e6bb14f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 765c9175d8fc6977eafd34a7b59fe9e96e6bb14f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Nov 29 07:44:39 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> hunspell-{de,en}: don't error when installing
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also update platforms.
</span>---
textproc/hunspell-de/Portfile | 37 ++++++++++--------
textproc/hunspell-en/Portfile | 91 ++++++++++++++++++++++---------------------
2 files changed, 66 insertions(+), 62 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/hunspell-de/Portfile b/textproc/hunspell-de/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a4281efc363..be921539d4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/hunspell-de/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/hunspell-de/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ categories textproc
</span> license {GPL-2 GPL-3}
maintainers nomaintainer
description German dictionary for hunspell
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms any
</span> homepage https://www.j3e.de/ispell/igerman98/index_en.html
master_sites https://www.j3e.de/ispell/igerman98/dict/
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,27 +24,30 @@ use_configure no
</span>
build.target-delete all
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:ispell
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:hunspell
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "The $name port is just a stub. Please install one of the subports:\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+hunspell-de_AT, hunspell-de_CH or hunspell-de_DE."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}. {*}${notes}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo [join $notes] > ${destroot}${prefix}/share/doc/${name}/ReadMe.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:ispell
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set installdir "${destroot}${prefix}/share/hunspell/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:hunspell
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 $installdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set installdir ${destroot}${prefix}/share/hunspell/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport hunspell-de {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Please choose one of the subports: \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hunspell-de_AT, hunspell-de_CH or hunspell-de_DE."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 $installdir
</span> }
}
subport hunspell-de_AT {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: Austrian German
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}: Austrian German
</span> build.target-append hunspell/de_AT.dic hunspell/de_AT.aff
destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +57,7 @@ subport hunspell-de_AT {
</span> }
subport hunspell-de_CH {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: Swiss German
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}: Swiss German
</span> build.target-append hunspell/de_CH.dic hunspell/de_CH.aff
destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +67,7 @@ subport hunspell-de_CH {
</span> }
subport hunspell-de_DE {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: German
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}: German
</span> build.target-append hunspell/de_DE.dic hunspell/de_DE.aff
destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/hunspell-en/Portfile b/textproc/hunspell-en/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 881fd6d66ef..04eaae8fb44 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/hunspell-en/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/hunspell-en/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +10,7 @@ categories textproc
</span> license permissive
maintainers nomaintainer
description SCOWL based hunspell english dictionaries.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms any
</span> homepage http://wordlist.aspell.net/dicts/
master_sites sourceforge:wordlist
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,50 +21,53 @@ checksums rmd160 cac39f67d422ee0ca99daa51b17e32c36661a469 \
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:aspell \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:dos2unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "The $name port is just a stub. Please install one of the subports:\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hunspell-en_AU, hunspell-en_AU_large,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hunspell-en_CA, hunspell-en_CA_large,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hunspell-en_GB_ise, hunspell-en_GB_ize, hunspell-en_GB_large,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hunspell-en_US or hunspell-en_US_large."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description} {*}${notes}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo [join $notes] > ${destroot}${prefix}/share/doc/${name}/ReadMe.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:aspell \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dos2unix
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:hunspell
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:hunspell
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${worksrcpath}/speller
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ./make-hunspell-dict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target -all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Tell MacPorts base not to add a -j1 arg which make-hunspell-dict doesn't understand.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.jobs 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${worksrcpath}/speller
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd ./make-hunspell-dict
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Tell MacPorts base not to add a -j1 arg which make-hunspell-dict doesn't understand.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.jobs 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set installdir "${destroot}${prefix}/share/hunspell/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set installdir "${destroot}${prefix}/share/hunspell/"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 $installdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 $installdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport hunspell-en {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use MacPorts perl https://trac.macports.org/ticket/55116
</span> pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Please choose one of the subports: \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hunspell-en_AU, hunspell-en_AU_large, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hunspell-en_CA, hunspell-en_CA_large, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hunspell-en_GB_ise, hunspell-en_GB_ize, hunspell-en_GB_large, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hunspell-en_US or hunspell-en_US_large."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C -W ${worksrcpath} "s|/usr/bin/perl|${prefix}/bin/perl|g" mk-list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C -W ${worksrcpath}/speller "s|/usr/bin/perl|${prefix}/bin/perl|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add-no-suggest munch-list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C -W ${worksrcpath}/src "s|/usr/bin/perl|${prefix}/bin/perl|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add-accents add-affixes add-other-forms add-other-spellings clean-alan-list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmp-final count find-ss get-level make-README proc-alt12dicts proc-census \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc-neol proc-uk-freq-class rand-sample.pl rand-samples remove-plurals
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# use MacPorts perl https://trac.macports.org/ticket/55116
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C -W ${worksrcpath} "s|/usr/bin/perl|${prefix}/bin/perl|g" mk-list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C -W ${worksrcpath}/speller "s|/usr/bin/perl|${prefix}/bin/perl|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add-no-suggest munch-list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C -W ${worksrcpath}/src "s|/usr/bin/perl|${prefix}/bin/perl|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add-accents add-affixes add-other-forms add-other-spellings clean-alan-list \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmp-final count find-ss get-level make-README proc-alt12dicts proc-census \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proc-neol proc-uk-freq-class rand-sample.pl rand-samples remove-plurals
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport hunspell-en_AU {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: AU English dictionary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}: AU English dictionary
</span>
destroot {
xinstall -m 644 ${worksrcpath}/speller/en_AU.aff $installdir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +76,7 @@ subport hunspell-en_AU {
</span> }
subport hunspell-en_AU_large {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: large AU English dictionary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}: large AU English dictionary
</span>
destroot {
xinstall -m 644 ${worksrcpath}/speller/en_AU-large.aff $installdir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +85,7 @@ subport hunspell-en_AU_large {
</span> }
subport hunspell-en_CA {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: CA English dictionary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}: CA English dictionary
</span>
destroot {
xinstall -m 644 ${worksrcpath}/speller/en_CA.aff $installdir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +94,7 @@ subport hunspell-en_CA {
</span> }
subport hunspell-en_CA_large {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: large CA English dictionary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}: large CA English dictionary
</span>
destroot {
xinstall -m 644 ${worksrcpath}/speller/en_CA-large.aff $installdir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +103,7 @@ subport hunspell-en_CA_large {
</span> }
subport hunspell-en_GB_ise {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: GB English dictionary (-ise version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}: GB English dictionary (-ise version)
</span>
destroot {
xinstall -m 644 ${worksrcpath}/speller/en_GB-ise.aff $installdir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +112,7 @@ subport hunspell-en_GB_ise {
</span> }
subport hunspell-en_GB_ize {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: GB English dictionary (-ize version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}: GB English dictionary (-ize version)
</span>
destroot {
xinstall -m 644 ${worksrcpath}/speller/en_GB-ize.aff $installdir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,7 +121,7 @@ subport hunspell-en_GB_ize {
</span> }
subport hunspell-en_GB_large {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: large GB English dictionary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}: large GB English dictionary
</span>
destroot {
xinstall -m 644 ${worksrcpath}/speller/en_GB-large.aff $installdir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +130,7 @@ subport hunspell-en_GB_large {
</span> }
subport hunspell-en_US {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: US English dictionary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}: US English dictionary
</span>
destroot {
xinstall -m 644 ${worksrcpath}/speller/en_US.aff $installdir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,7 +139,7 @@ subport hunspell-en_US {
</span> }
subport hunspell-en_US_large {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}: large US English dictionary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}: large US English dictionary
</span>
destroot {
xinstall -m 644 ${worksrcpath}/speller/en_US-large.aff $installdir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,4 +150,3 @@ subport hunspell-en_US_large {
</span> livecheck.type regex
livecheck.url https://sourceforge.net/projects/wordlist/files/SCOWL/
livecheck.regex "(\\d{4}\\.\\d{2}\\.\\d{2})"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>