Date: Tuesday, July 26, 2022 @ 20:34:46 Author: arojas Revision: 451676
archrelease: copy trunk to extra-x86_64 Added: ispell/repos/extra-x86_64/PKGBUILD (from rev 451675, ispell/trunk/PKGBUILD) ispell/repos/extra-x86_64/cflags-from-environment.patch (from rev 451675, ispell/trunk/cflags-from-environment.patch) ispell/repos/extra-x86_64/license.txt (from rev 451675, ispell/trunk/license.txt) Deleted: ispell/repos/extra-x86_64/PKGBUILD ispell/repos/extra-x86_64/cflags-from-environment.patch ispell/repos/extra-x86_64/license.txt -------------------------------+ PKGBUILD | 126 ++++++++++----------- cflags-from-environment.patch | 234 ++++++++++++++++++++-------------------- license.txt | 70 +++++------ 3 files changed, 215 insertions(+), 215 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-07-26 20:34:24 UTC (rev 451675) +++ PKGBUILD 2022-07-26 20:34:46 UTC (rev 451676) @@ -1,63 +0,0 @@ -# Contributor: Eric Belanger <e...@archlinux.org> -# Maintainer: - -pkgname=ispell -pkgver=3.4.04 -pkgrel=1 -pkgdesc="An interactive spell-checking program for Unix" -arch=('x86_64') -url="https://www.cs.hmc.edu/~geoff/ispell.html" -license=('BSD') -depends=('ncurses' 'sh') -options=('!makeflags') -source=(https://www.cs.hmc.edu/~geoff/tars/$pkgname-$pkgver.tar.gz - cflags-from-environment.patch - license.txt) -sha256sums=('87bcd6f0521d85a0a3a7834215956d74ebc493144cc7c791f87be6872ccfe13e' - '280459d2cdb17846aab202d53089fd13469e6e59ae9e6da4a95b475597dd4603' - '359eca8bfb77db63785c4c304ecd3568b26cdf736946388e509933fc8a3f66bd') - -prepare() { - cd ${pkgname}-${pkgver} - - # needed for full RELRO (FS#68037) - patch -Np1 -i ../cflags-from-environment.patch - - sed -i -e 's/#undef USG/#define USG/' \ - -e 's|/usr/local|/usr|' \ - -e 's|/lib|/lib/ispell|' local.h.linux - cp local.h.linux local.h -} - -build() { - cd ${pkgname}-${pkgver} - make TMPDIR=/tmp all -} - -package() { - cd ${pkgname}-${pkgver} - -# creating directory structure - install -dm755 "${pkgdir}"/usr/{bin,lib/ispell,share/man/man{1,5}} - -# Installing binary tools - for b in buildhash findaffix icombine ijoin ispell iwhich munchlist tryaffix; do - install -m755 $b "${pkgdir}"/usr/bin/ - done - -# Installing man pages - install -m644 ispell.1 "${pkgdir}"/usr/share/man/man1/ispell.1 - install -m644 ispell.5 "${pkgdir}"/usr/share/man/man5/ispell.5 - -# Installing dictionnaries - install -m644 languages/american/americanmed.hash \ - "${pkgdir}"/usr/lib/ispell/americanmed.hash - install -m644 languages/english/english.aff \ - "${pkgdir}"/usr/lib/ispell/english.aff - ln -s americanmed.hash "${pkgdir}"/usr/lib/ispell/american.hash - ln -s americanmed.hash "${pkgdir}"/usr/lib/ispell/english.hash - -# Installing license - install -Dm644 "${srcdir}"/license.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt -} Copied: ispell/repos/extra-x86_64/PKGBUILD (from rev 451675, ispell/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-07-26 20:34:46 UTC (rev 451676) @@ -0,0 +1,63 @@ +# Contributor: Eric Belanger <e...@archlinux.org> +# Maintainer: + +pkgname=ispell +pkgver=3.4.05 +pkgrel=1 +pkgdesc="An interactive spell-checking program for Unix" +arch=('x86_64') +url="https://www.cs.hmc.edu/~geoff/ispell.html" +license=('BSD') +depends=('ncurses' 'sh') +options=('!makeflags') +source=(https://www.cs.hmc.edu/~geoff/tars/$pkgname-$pkgver.tar.gz + cflags-from-environment.patch + license.txt) +sha256sums=('cf0c6dede3fd25fada4375d86acafe583cb96d8fe546de746a92ebb6df895602' + '280459d2cdb17846aab202d53089fd13469e6e59ae9e6da4a95b475597dd4603' + '359eca8bfb77db63785c4c304ecd3568b26cdf736946388e509933fc8a3f66bd') + +prepare() { + cd ${pkgname}-${pkgver} + + # needed for full RELRO (FS#68037) + patch -Np1 -i ../cflags-from-environment.patch + + sed -i -e 's/#undef USG/#define USG/' \ + -e 's|/usr/local|/usr|' \ + -e 's|/lib|/lib/ispell|' local.h.linux + cp local.h.linux local.h +} + +build() { + cd ${pkgname}-${pkgver} + make TMPDIR=/tmp all +} + +package() { + cd ${pkgname}-${pkgver} + +# creating directory structure + install -dm755 "${pkgdir}"/usr/{bin,lib/ispell,share/man/man{1,5}} + +# Installing binary tools + for b in buildhash findaffix icombine ijoin ispell iwhich munchlist tryaffix; do + install -m755 $b "${pkgdir}"/usr/bin/ + done + +# Installing man pages + install -m644 ispell.1 "${pkgdir}"/usr/share/man/man1/ispell.1 + install -m644 ispell.5 "${pkgdir}"/usr/share/man/man5/ispell.5 + +# Installing dictionnaries + install -m644 languages/american/americanmed.hash \ + "${pkgdir}"/usr/lib/ispell/americanmed.hash + install -m644 languages/english/english.aff \ + "${pkgdir}"/usr/lib/ispell/english.aff + ln -s americanmed.hash "${pkgdir}"/usr/lib/ispell/american.hash + ln -s americanmed.hash "${pkgdir}"/usr/lib/ispell/english.hash + +# Installing license + install -Dm644 "${srcdir}"/license.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt +} Deleted: cflags-from-environment.patch =================================================================== --- cflags-from-environment.patch 2022-07-26 20:34:24 UTC (rev 451675) +++ cflags-from-environment.patch 2022-07-26 20:34:46 UTC (rev 451676) @@ -1,117 +0,0 @@ -From: Robert Luberda <rob...@debian.org> -Date: Sat, 5 Mar 2011 13:19:20 +0100 -Subject: 0015 CFLAGS from environment - -Use CFLAGS from environment instead of hard-coding them in local.h. -Make use of LDFLAGS when needed. ---- - Makefile | 20 +++++++++++--------- - deformatters/Makefile | 4 ++-- - 2 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/Makefile b/Makefile -index c8e4b23..7f6e065 100644 ---- a/Makefile -+++ b/Makefile -@@ -294,7 +294,7 @@ showversion: ispell - .c.o: - @. ./config.sh; \ - set -x; \ -- $$CC $$CFLAGS -c $< -+ $$CC $$CFLAGS -DCFLAGS="\"$$CFLAGS\"" -c $< - - # - # The funny business with y_tab.c is necessary for MS-DOS systems, -@@ -305,7 +305,7 @@ showversion: ispell - set -x; \ - $$YACC $<; \ - [ -f y_tab.c ] || mv y.tab.c y_tab.c; \ -- $$CC $$CFLAGS -c y_tab.c; \ -+ $$CC $$CFLAGS -DCFLAGS="$$CFLAGS" -c y_tab.c; \ - mv y_tab.o $@; \ - rm -f y_tab.c - -@@ -485,22 +485,23 @@ language-subdirs: config.sh - buildhash: config.sh buildhash.o hash.o makedent.o parse.o - @. ./config.sh; \ - set -x; \ -- $$CC $$CFLAGS -o buildhash buildhash.o hash.o makedent.o parse.o \ -+ $$CC $(LDFLAGS) -o buildhash buildhash.o hash.o makedent.o parse.o \ - $$LIBES - - icombine: config.sh icombine.o makedent.o parse.o - @. ./config.sh; \ - set -x; \ -- $$CC $$CFLAGS -o icombine icombine.o makedent.o parse.o \ -+ $$CC $(LDFLAGS) -o icombine icombine.o makedent.o parse.o \ - $$LIBES - - ijoin: config.sh ijoin.o fields.o - @. ./config.sh; \ - set -x; \ -- $$CC $$CFLAGS -o ijoin ijoin.o fields.o $$LIBES -+ $$CC $(LDFLAGS) -o ijoin ijoin.o fields.o $$LIBES - - EDITFILE = notthere - OUTFILE = /dev/null -+CFLAGS ?= -O - - # - # Note: we use "sed -n -e $$p" to achieve "tail -1" here because some -@@ -537,7 +538,7 @@ defhash.h: config.X local.h Makefile - - config.sh: config.X defhash.h local.h Makefile - set $(SHELLDEBUG); \ -- for var in BAKEXT BINDIR CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \ -+ for var in BAKEXT BINDIR CC COUNTSUFFIX DEFDICT DEFHASH \ - DEFLANG EXEEXT HASHSUFFIX INSTALL \ - LANGUAGES LIBDIR LIBES LINK LINT LINTFLAGS LOOK_XREF \ - MAKE_SORTTMP MAN1DIR MAN1EXT MAN45DIR MAN45EXT MAN45SECT MASTERHASH \ -@@ -549,6 +550,7 @@ config.sh: config.X defhash.h local.h Makefile - | sed -e 's/"[^"]*$$/'"'/" -e "s/=/='/" -e 's/\\"/"/g' \ - | sed -n -e '$$p'; \ - done > config.sh; \ -+ echo "CFLAGS='$(CFLAGS)'" >> config.sh; \ - echo 'case "$$MAKE_SORTTMP" in "") \ - SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \ - >> config.sh -@@ -631,17 +633,17 @@ term.o: term.c - ispell: config.sh $(OBJS) - @. ./config.sh; \ - set -x; \ -- $$CC $$CFLAGS -o ispell $(OBJS) $$TERMLIB $$REGLIB $$LIBES -+ $$CC $(LDFLAGS) -o ispell $(OBJS) $$TERMLIB $$REGLIB $$LIBES - - sq: config.sh msgs.h sq.c - @@. ./config.sh; \ - set -x; \ -- $$CC $$CFLAGS -o sq sq.c -+ $$CC $$CFLAGS $(LDFLAGS) -o sq sq.c - - unsq: config.sh msgs.h unsq.c - @@. ./config.sh; \ - set -x; \ -- $$CC $$CFLAGS -o unsq unsq.c -+ $$CC $$CFLAGS $(LDFLAGS) -o unsq unsq.c - - $(OBJS) buildhash.o icombine.o hash.o parse.o: config.h ispell.h local.h - $(OBJS) buildhash.o icombine.o hash.o parse.o: proto.h msgs.h config.sh -diff --git a/deformatters/Makefile b/deformatters/Makefile -index a4d99ee..82337e4 100644 ---- a/deformatters/Makefile -+++ b/deformatters/Makefile -@@ -77,12 +77,12 @@ all: $(PROGRAMS) - defmt-c: defmt-c.o - @. ../config.sh; \ - set -x; \ -- $$CC $$CFLAGS -o $@ $< -+ $$CC $(LDFLAGS) -o $@ $< - - defmt-sh: defmt-sh.o - @. ../config.sh; \ - set -x; \ -- $$CC $$CFLAGS -o $@ $< -+ $$CC $(LDFLAGS) -o $@ $< - - .c.o: - @. ../config.sh; \ Copied: ispell/repos/extra-x86_64/cflags-from-environment.patch (from rev 451675, ispell/trunk/cflags-from-environment.patch) =================================================================== --- cflags-from-environment.patch (rev 0) +++ cflags-from-environment.patch 2022-07-26 20:34:46 UTC (rev 451676) @@ -0,0 +1,117 @@ +From: Robert Luberda <rob...@debian.org> +Date: Sat, 5 Mar 2011 13:19:20 +0100 +Subject: 0015 CFLAGS from environment + +Use CFLAGS from environment instead of hard-coding them in local.h. +Make use of LDFLAGS when needed. +--- + Makefile | 20 +++++++++++--------- + deformatters/Makefile | 4 ++-- + 2 files changed, 13 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index c8e4b23..7f6e065 100644 +--- a/Makefile ++++ b/Makefile +@@ -294,7 +294,7 @@ showversion: ispell + .c.o: + @. ./config.sh; \ + set -x; \ +- $$CC $$CFLAGS -c $< ++ $$CC $$CFLAGS -DCFLAGS="\"$$CFLAGS\"" -c $< + + # + # The funny business with y_tab.c is necessary for MS-DOS systems, +@@ -305,7 +305,7 @@ showversion: ispell + set -x; \ + $$YACC $<; \ + [ -f y_tab.c ] || mv y.tab.c y_tab.c; \ +- $$CC $$CFLAGS -c y_tab.c; \ ++ $$CC $$CFLAGS -DCFLAGS="$$CFLAGS" -c y_tab.c; \ + mv y_tab.o $@; \ + rm -f y_tab.c + +@@ -485,22 +485,23 @@ language-subdirs: config.sh + buildhash: config.sh buildhash.o hash.o makedent.o parse.o + @. ./config.sh; \ + set -x; \ +- $$CC $$CFLAGS -o buildhash buildhash.o hash.o makedent.o parse.o \ ++ $$CC $(LDFLAGS) -o buildhash buildhash.o hash.o makedent.o parse.o \ + $$LIBES + + icombine: config.sh icombine.o makedent.o parse.o + @. ./config.sh; \ + set -x; \ +- $$CC $$CFLAGS -o icombine icombine.o makedent.o parse.o \ ++ $$CC $(LDFLAGS) -o icombine icombine.o makedent.o parse.o \ + $$LIBES + + ijoin: config.sh ijoin.o fields.o + @. ./config.sh; \ + set -x; \ +- $$CC $$CFLAGS -o ijoin ijoin.o fields.o $$LIBES ++ $$CC $(LDFLAGS) -o ijoin ijoin.o fields.o $$LIBES + + EDITFILE = notthere + OUTFILE = /dev/null ++CFLAGS ?= -O + + # + # Note: we use "sed -n -e $$p" to achieve "tail -1" here because some +@@ -537,7 +538,7 @@ defhash.h: config.X local.h Makefile + + config.sh: config.X defhash.h local.h Makefile + set $(SHELLDEBUG); \ +- for var in BAKEXT BINDIR CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \ ++ for var in BAKEXT BINDIR CC COUNTSUFFIX DEFDICT DEFHASH \ + DEFLANG EXEEXT HASHSUFFIX INSTALL \ + LANGUAGES LIBDIR LIBES LINK LINT LINTFLAGS LOOK_XREF \ + MAKE_SORTTMP MAN1DIR MAN1EXT MAN45DIR MAN45EXT MAN45SECT MASTERHASH \ +@@ -549,6 +550,7 @@ config.sh: config.X defhash.h local.h Makefile + | sed -e 's/"[^"]*$$/'"'/" -e "s/=/='/" -e 's/\\"/"/g' \ + | sed -n -e '$$p'; \ + done > config.sh; \ ++ echo "CFLAGS='$(CFLAGS)'" >> config.sh; \ + echo 'case "$$MAKE_SORTTMP" in "") \ + SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \ + >> config.sh +@@ -631,17 +633,17 @@ term.o: term.c + ispell: config.sh $(OBJS) + @. ./config.sh; \ + set -x; \ +- $$CC $$CFLAGS -o ispell $(OBJS) $$TERMLIB $$REGLIB $$LIBES ++ $$CC $(LDFLAGS) -o ispell $(OBJS) $$TERMLIB $$REGLIB $$LIBES + + sq: config.sh msgs.h sq.c + @@. ./config.sh; \ + set -x; \ +- $$CC $$CFLAGS -o sq sq.c ++ $$CC $$CFLAGS $(LDFLAGS) -o sq sq.c + + unsq: config.sh msgs.h unsq.c + @@. ./config.sh; \ + set -x; \ +- $$CC $$CFLAGS -o unsq unsq.c ++ $$CC $$CFLAGS $(LDFLAGS) -o unsq unsq.c + + $(OBJS) buildhash.o icombine.o hash.o parse.o: config.h ispell.h local.h + $(OBJS) buildhash.o icombine.o hash.o parse.o: proto.h msgs.h config.sh +diff --git a/deformatters/Makefile b/deformatters/Makefile +index a4d99ee..82337e4 100644 +--- a/deformatters/Makefile ++++ b/deformatters/Makefile +@@ -77,12 +77,12 @@ all: $(PROGRAMS) + defmt-c: defmt-c.o + @. ../config.sh; \ + set -x; \ +- $$CC $$CFLAGS -o $@ $< ++ $$CC $(LDFLAGS) -o $@ $< + + defmt-sh: defmt-sh.o + @. ../config.sh; \ + set -x; \ +- $$CC $$CFLAGS -o $@ $< ++ $$CC $(LDFLAGS) -o $@ $< + + .c.o: + @. ../config.sh; \ Deleted: license.txt =================================================================== --- license.txt 2022-07-26 20:34:24 UTC (rev 451675) +++ license.txt 2022-07-26 20:34:46 UTC (rev 451676) @@ -1,35 +0,0 @@ - Copyright (c), 1983, by Pace Willisson - - Copyright 1992, 1993, 1999, 2001, 2005, Geoff Kuenning, Claremont, CA - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. All modifications to the source code must be clearly marked as - such. Binary redistributions based on modified source code - must be clearly marked as modified versions in the documentation - and/or other materials provided with the distribution. - 4. The code that causes the 'ispell -v' command to display a prominent - link to the official ispell Web site may not be removed. - 5. The name of Geoff Kuenning may not be used to endorse or promote - products derived from this software without specific prior - written permission. - - THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS IS'' AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL GEOFF KUENNING OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. Copied: ispell/repos/extra-x86_64/license.txt (from rev 451675, ispell/trunk/license.txt) =================================================================== --- license.txt (rev 0) +++ license.txt 2022-07-26 20:34:46 UTC (rev 451676) @@ -0,0 +1,35 @@ + Copyright (c), 1983, by Pace Willisson + + Copyright 1992, 1993, 1999, 2001, 2005, Geoff Kuenning, Claremont, CA + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All modifications to the source code must be clearly marked as + such. Binary redistributions based on modified source code + must be clearly marked as modified versions in the documentation + and/or other materials provided with the distribution. + 4. The code that causes the 'ispell -v' command to display a prominent + link to the official ispell Web site may not be removed. + 5. The name of Geoff Kuenning may not be used to endorse or promote + products derived from this software without specific prior + written permission. + + THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL GEOFF KUENNING OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE.