Update to version 0.53

This version adopted most of the non dict-specific modifications
expressed by `fixes.sed'.  This file has could thus have been notably
reduced in size.

Other changes here:
 * Use autotools.
 * fixes.sed
   * No longer delete lines "This line is printed in <FONT>."
   * One newfound spelling mistake fixed.
   * One alleged fix corrected.
 * Do no longer use `--with-local-libmaa' - failed to build.
 * Add pronounc.txt to documentation.
 * Quote everything containing a variable, just to be safe.

2 files changed, 39 insertions, 145 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8c5d50b40c2a..c6a54fc37a0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,77 +2,89 @@
 # Contributor: Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>
 pkgname=dict-gcide
 _major_debver=0.48
-_debver=${_major_debver}.5
-pkgver=0.52
-pkgrel=2
+_debver="${_major_debver}.5+nmu1"
+pkgver=0.53
+pkgrel=1
 pkgdesc="GNU version of the Collaborative International Dictionary of English for dictd et al."
 arch=('any')
 url="http://gcide.gnu.org.ua/"
 license=('GPL3')
 optdepends=('dictd: dict client and server')
-makedepends=('dictd' 'sed')
+makedepends=('dictd' 'sed' 'libmaa')
 provides=('dictd-gcide')
 conflicts=('dictd-gcide')
-install=${pkgname}.install
+install="${pkgname}.install"
 source=('fixes.sed'
         'post_webfilter.sed'
         'check.sed'
-        "http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${_debver}.tar.xz"
-        "ftp://ftp.gnu.org/gnu/gcide/gcide-${pkgver}.tar.xz"{,.sig})
-sha512sums=('6fc2caf86d96ac9a14f2676ca4455afe987f37933c03ac672b27cf2de7a4fc893457c97c7fa17dc280debfb4e1a3ab4adc5f7c68ee445605dc3c22665d32a445'
+        "https://deb.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${_debver}.tar.xz"
+        "https://ftp.gnu.org/gnu/gcide/gcide-${pkgver}.tar.xz"{,.sig})
+sha512sums=('912e3a6ba1db08a75df4cd7aeaa8b6d4acf02a6e7982a992f0023d979251b0dc46877ef76e2d16a9fc5921e35debaeb339cde19b033d94f9797325320c3fb43b'
             'e7c6766b51ef92c4d8669394b6a71f8c4d7249ac63a1eb940f0a3017cb5ff6841f0f4bce7a60ffbcf180801d92b068db6ca46afd1dceac06a9c37c59dcddbfb3'
             '1304bdce3776355fcd7827cebbf670ae34377bda78b04bf271ba10a25d92e33f6ec69644e168c30a6ec47808ebacc461de47d9494a5a2a5894d58c21be045973'
-            'a10d46947c7d8b7050c44a12cfb38ed374e971063805e69897652cd8993dc5cf0ecc4d9a12680a8ced30d110d20bc84def75bd587166aa2cfa78529b9397aafe'
-            '260e4e7bb30ac857255b9a1f696b18b77bbae06574bb0f0cc35b38be7399bf497d3c561ab0d4a4b7e8fc3127c6bf72efde8e1d4a28fa428f82178d0972f704b3'
+            '775775fbcf49f6f9e29ad60919692f02b920efe710bc311674cc37f045b69ef9ee68e2fe4045a39a90485a0661581267ce13590f893eb3a896c947d5b760638e'
+            '0eb641cdc8186757bb7e221753c9a42f28ead25b72b18cacebf2326ee239c0e5ab2d41b61928371168ff2c8a298aeaa93d50656d8165ae155699c1d359e4918f'
             'SKIP')
 validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732')
 
+
 prepare()
 {
+	cd "${pkgname}-${_debver}"
+
 	sed -Ei \
 		"s/\"(The Collaborative International Dictionary of English) v.${_major_debver}\"/\"\\1 v.${pkgver}\"/" \
-		"${pkgname}-${_debver}/scan.l"
+		scan.l
+
+	# Remove autogenerated autotools files.
+	rm config.guess config.h.in config.sub configure install-sh
 }
 
+
 build()
 {
 	cd ${pkgname}-${_debver}
 
-	CPPFLAGS="-D_FORTIFY_SOURCE=0" ./configure --with-local-libmaa
+	autoreconf -fis
+	./configure
 	make -j1
 
 	# Do the conversion explicitly, instead of `make db', to account for all
 	# the differences to the original build process.
 	# LANG=C is required so that the index file is properly sorted.
-	../fixes.sed ../gcide-${pkgver}/CIDE.? \
+	../fixes.sed "../gcide-${pkgver}"/CIDE.? \
 		| sed -f debian/sedfile \
 		| ./webfilter \
 		| ../post_webfilter.sed \
 		| tee pre_webfmt.data \
 		| LANG=C ./webfmt -c
 
+	# `dictzip -v' neclects to print a final newline.
 	dictzip -v gcide.dict
+	printf '\n'
 }
 
+
 check()
 {
-	errors="$(./check.sed < ${pkgname}-${_debver}/pre_webfmt.data)"
+	errors="$(./check.sed < "${pkgname}-${_debver}/pre_webfmt.data")"
 
 	if test -n "$errors"
 	then
-		echo "Errors found:"
-		echo "$errors"
+		printf 'Errors found:\n'
+		printf '%s\n' "$errors"
 		return 1
 	fi
 }
 
+
 package()
 {
 	install -m 0755 -d "${pkgdir}/usr/share/dictd"
 	install -m 0644 -t "${pkgdir}/usr/share/dictd/" \
-		${pkgname}-${_debver}/gcide.{dict.dz,index}
+		"${pkgname}-${_debver}"/gcide.{dict.dz,index}
 
 	install -m 0755 -d "${pkgdir}/usr/share/doc/dict-gcide"
 	install -m 0644 -t "${pkgdir}/usr/share/doc/dict-gcide/" \
-		gcide-${pkgver}/{README,INFO}
+		"gcide-${pkgver}"/{README,INFO,pronunc.txt}
 }
diff --git a/fixes.sed b/fixes.sed
index ff8cf356dc40..7bd00847155a 100755
--- a/fixes.sed
+++ b/fixes.sed
@@ -9,131 +9,39 @@
 # http://deb.debian.org/debian/pool/main/d/dict-gcide/dict-gcide_0.48.5.tar.xz
 
 # TODO:
-# * '[<source></source>]'
-# * '</item><item>' (dict -d gcide legislation)
+# * '[<source></source>]' (dict -d gcide duff)
+# * '</item><item>' (dict -d gcide legislature)
 
 
 ## GENERAL
 
-# Remove lines pretending to be in a particular font.
-\`^<p>\s*(<note>\s*)?<hand/\s*(<[^>]*type>\s*)?This\s*line\s*is\s*printed\s*in`, \`^\s*$` d
-
 # Remove book and publ tags in a qau element.
-# <publ> seems to be removed by webfmt, so apparently not necessary to
+# `webfmt' fails on <book>.
+# `<publ>' seems to be removed by webfmt, so apparently not necessary to
 # remove here.
 s`(<qau>[^<]*)(<book>|<publ>)([^<]*)(</book>|</publ>)`\1\3`g
 
 
 ## CIDE.A
 
-# Typo.
-s`^(<p><q><qex>A priori</qex>, that is,) form (these necessities)`\1 from \2`
-
-# Add some semicolon.
+# Add presumably missing word.
 \`^<mhw>\{ <hw>Ar"que\*bus</hw>, <hw>Ar"que\*buse</hw>  \}</mhw>` {
-	s`(<def>A sort of hand gun or firearm) (a contrivance)`\1\; \2`
-}
-
-
-## CIDE.B
-
-# Add a closing paranthis.
-s`\(Thirteenth Greatest of Centuries, 1913\.`&)`
-
-
-## CIDE.C
-
-# Remove empty element.
-s`<stype></stype>``
-
-
-## CIDE.D
-
-# Descartes did not live one and a half millennia.
-\`^<hw>Descartes</hw>` {
-	s`(born) 159, (died)`\1 1596, \2`
-}
-
-# Typo; doubled quote.
-\`^<p><syn><b>Syn\.</b> -- To vary\; disagree\; dissent\; dispute\;` {
-	s`(<xex>)aiffer (with</xex>)`\1differ \2`
-	s`(<rdquo/){2}`\1`
-}
-
-# Remove empty element.
-\`^<p><ent>diploid</ent>`, \`<ent>` {
-	s`^(B: Oh, how I wish.*</q>)\s*<rj><qau></qau></rj>(</p>)`\1\2`
-}
-
-# In 0.48, the 'between' was missing;  I prefer Debian's way of solving it.
-\`^<p><ent>Doublet</ent>`, \`<ent>` {
-	\`^<p><sn>4\.</sn>` {
-		s`(with a) (color between them)`\1 layer of \2`
-	}
-}
-
-
-## CIDE.E
-
-# Restrict qau element to the author themself.
-s`^(<qau>Mark Feeney)(<br/)`\1</qau>\2`
-\`^Copyright 1999 Globe Newspaper Company\.` {
-	s`</qau>``
+	s`(<def>A sort of hand gun or firearm) (a contrivance)`\1 with \2`
 }
 
 
 ## CIDE.F
 
-s`measurments`measurements`
-
-# Fix misattribution.
-s`(Dostoevsky's) (War and Peace)`\1 Crime and Punishment\; or Tolstoy's \2`
-
-s`compIy`comply`
-
+s`measurments`measurements`g
 
-## CIDE.I
 
-# Remove qau tags.
-\`^<rj><qau>Dr\. Rod Beavon<br/`, +2 {
-	s`^(<rj>)<qau>(Dr\. Rod Beavon<br/)`\1\2</rj>`
-	s`^\((17 Dean's Yard London SW1P 3PB)\;(<br/)`<rj>\1</rj>\2`
-	s`(e-mail:  rod\.beavon@westminster\.org\.uk)</qau>(</rj><br/)`<rj>\1\2`
-}
-
-
-## M
-
-# Remove extraneous ', in'.
-s`^(<qau>Andrew Hood), in`\1`
+## CIDE.L
 
-
-## P
-
-# Restrict col element's content.
-\`^<p><cs><col><b>Park of artillery</b></col>` {
-	s`(<col><b>industrial park</b>) `\1</col>`
-	s`</col>(</cs><br/)$`\1`
-}
-
-
-## R
-
-# Typo.
-\`^<hw>Re\*cu"sant</hw>` {
-	s`\bchurc\b`church`
-}
-
-# Remove text centering around a referenced image.
-# Debian removed the preceding paragraph as well.  I do not agree.
-\`<a href="\\cide\\more\\lilac-breasted-roller\.jpg">`, \`zambezi\.co\.uk` d
+s`\<(province)w\>`\1`g
 
 
 ## S
 
-# Fix badly formatted closing tag (<i>(.*)</> -> <i>\1</i>).
-s`<([^><]*)>([^<]*)</>`<\1>\2</\1>`
-
 # If one wanted to fix more than necessary (Debian does):
 #\`^<hw>Ses\*quip"li\*cate</hw>` {
 #	s`^`<p>`
@@ -143,28 +51,6 @@ s`<([^><]*)>([^<]*)</>`<\1>\2</\1>`
 #	s`<prime/`\\'\''b7`
 #}
 
-s`\<(something)l\>`\1`
-
-s`rappng`rapping`
-
-
-## T
-
-# Restrict qau to the author themself.
-\`^<rj><qau>Andrew Forbes/CPA`, +1 {
-	s`^<rj><qau>Andrew Forbes/CPA`&</qau>`
-	s`^(\(from.*)</qau>(</rj><br/)$`\1\2`
-}
-
-
-## U
-
-# Restrict au element to the author themself.
-\`^<au>Kari Jensen \(University of Wisconsin`, +1 {
-	s`^<au>Kari Jensen`&</au>`
-	s`^(\[available at.*)</au>(<br/)$`\1\2`
-}
-
 
 ## V
 
@@ -172,7 +58,3 @@ s`rappng`rapping`
 \`^<p><cs><col><b>Principle of virtual velocities</b>` {
 	s`-(- <col><b>Virtual image</b></col>)`\1`
 }
-
-
-## W
-s`\<(Where\*?)form\>`\1from`